diff options
| author | Tom Rini | 2021-08-30 09:16:31 -0400 |
|---|---|---|
| committer | Tom Rini | 2021-09-07 16:22:31 -0400 |
| commit | 87e8d38a3977ee284e1bbaad03f08d652ca1c7ec (patch) | |
| tree | 7e698249cfd388f894925753b990b1961484c50b | |
| parent | 9774462e34faaa64a91eb9c68b438a52d22bba6a (diff) | |
arm: Add Kconfig entry for MACH_TYPE
As part of migrating support for ATAGs to Kconfig, add an option for
setting and passing MACH_TYPE.
Signed-off-by: Tom Rini <trini@konsulko.com>
| -rw-r--r-- | arch/arm/Kconfig | 14 | ||||
| -rw-r--r-- | configs/ds109_defconfig | 2 | ||||
| -rw-r--r-- | configs/ds414_defconfig | 2 | ||||
| -rw-r--r-- | configs/icnova-a20-swac_defconfig | 2 | ||||
| -rw-r--r-- | configs/nokia_rx51_defconfig | 2 | ||||
| -rw-r--r-- | include/configs/nokia_rx51.h | 2 |
6 files changed, 22 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index dbf5ceb9d25..21f17c202f6 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1937,6 +1937,20 @@ config SERIAL_TAG bool "Pass system serial number via ATAG" depends on SUPPORT_PASSING_ATAGS +config STATIC_MACH_TYPE + bool "Statically define the Machine ID number" + help + When booting via ATAGs, enable this option if we know the correct + machine ID number to use at compile time. Some systems will be + passed the number dynamically by whatever loads U-Boot. + +config MACH_TYPE + int "Machine ID number" + depends on STATIC_MACH_TYPE + help + When booting via ATAGs, the machine type must be passed as a number. + For the full list see https://www.arm.linux.org.uk/developer/machines + config ARCH_SUPPORT_TFABOOT bool diff --git a/configs/ds109_defconfig b/configs/ds109_defconfig index e06b7fdf1a3..d7e865111f4 100644 --- a/configs/ds109_defconfig +++ b/configs/ds109_defconfig @@ -6,6 +6,8 @@ CONFIG_ARCH_KIRKWOOD=y CONFIG_SUPPORT_PASSING_ATAGS=y CONFIG_CMDLINE_TAG=y CONFIG_INITRD_TAG=y +CONFIG_STATIC_MACH_TYPE=y +CONFIG_MACH_TYPE=527 CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_NR_DRAM_BANKS=2 CONFIG_TARGET_DS109=y diff --git a/configs/ds414_defconfig b/configs/ds414_defconfig index de5d85cbda6..6402e253d1d 100644 --- a/configs/ds414_defconfig +++ b/configs/ds414_defconfig @@ -4,6 +4,8 @@ CONFIG_ARCH_MVEBU=y CONFIG_SUPPORT_PASSING_ATAGS=y CONFIG_CMDLINE_TAG=y CONFIG_INITRD_TAG=y +CONFIG_STATIC_MACH_TYPE=y +CONFIG_MACH_TYPE=3036 CONFIG_SYS_TEXT_BASE=0x00800000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/icnova-a20-swac_defconfig b/configs/icnova-a20-swac_defconfig index c759d7e2357..de766b226bb 100644 --- a/configs/icnova-a20-swac_defconfig +++ b/configs/icnova-a20-swac_defconfig @@ -4,6 +4,8 @@ CONFIG_SUPPORT_PASSING_ATAGS=y CONFIG_CMDLINE_TAG=y CONFIG_INITRD_TAG=y CONFIG_SERIAL_TAG=y +CONFIG_STATIC_MACH_TYPE=y +CONFIG_MACH_TYPE=4283 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-icnova-swac" CONFIG_SPL=y CONFIG_MACH_SUN7I=y diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig index e6e8f2af51e..69784d972ad 100644 --- a/configs/nokia_rx51_defconfig +++ b/configs/nokia_rx51_defconfig @@ -6,6 +6,8 @@ CONFIG_SUPPORT_PASSING_ATAGS=y CONFIG_CMDLINE_TAG=y CONFIG_INITRD_TAG=y CONFIG_REVISION_TAG=y +CONFIG_STATIC_MACH_TYPE=y +CONFIG_MACH_TYPE=1955 CONFIG_SYS_TEXT_BASE=0x80008000 CONFIG_NR_DRAM_BANKS=2 CONFIG_SYS_MALLOC_LEN=0xc0000 diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index 972df00d43f..b37e05406e9 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -23,8 +23,6 @@ */ #define CONFIG_SYS_L2CACHE_OFF /* pretend there is no L2 CACHE */ -#define CONFIG_MACH_TYPE MACH_TYPE_NOKIA_RX51 - #include <asm/arch/cpu.h> /* get chip and board defs */ #include <asm/arch/omap.h> #include <asm/arch/mem.h> |