diff options
| author | Tom Rini <trini@konsulko.com> | 2021-08-29 17:17:44 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-08-29 21:16:10 -0400 |
| commit | f486264384728305fc2ff683154e166b56138616 (patch) | |
| tree | a41c78f00357984b3dd0fadddc392b93239e29c5 | |
| parent | 3e3a1eecfd96ab086f02058fbd4a2be0b9791885 (diff) | |
| download | u-boot-WIP/migrate-atags.tar.gz | |
arm: Finish migration of CONFIG_MACH_TYPEWIP/migrate-atags
As this is only useful when booting with ATAGs, which are now largely
disabled, remove this value for the remaining platforms.
Cc: Phil Sutter <phil@nwl.cc>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
I am concerned if there are a few other devices out there running modern
U-Boot and very old vendor kernels.
83 files changed, 8 insertions, 244 deletions
@@ -599,16 +599,6 @@ The following options need to be configured: crash. This is needed for buggy hardware (uc101) where no pull down resistor is connected to the signal IDE5V_DD7. - CONFIG_MACH_TYPE [relevant for ARM only][mandatory] - - This setting is mandatory for all boards that have only one - machine type and must be used to specify the machine type - number as it appears in the ARM machine registry - (see https://www.arm.linux.org.uk/developer/machines/). - Only boards that have multiple machine types supported - in a single configuration file and the machine type is - runtime discoverable, do not have to use this setting. - - vxWorks boot parameters: bootvx constructs a valid bootline using the following diff --git a/board/LaCie/netspace_v2/netspace_v2.c b/board/LaCie/netspace_v2/netspace_v2.c index 730eab7e70..22bb008745 100644 --- a/board/LaCie/netspace_v2/netspace_v2.c +++ b/board/LaCie/netspace_v2/netspace_v2.c @@ -73,8 +73,10 @@ int board_early_init_f(void) int board_init(void) { +#ifdef CONFIG_MACH_TYPE /* Machine number */ gd->bd->bi_arch_number = CONFIG_MACH_TYPE; +#endif /* Boot parameters address */ gd->bd->bi_boot_params = mvebu_sdram_bar(0) + 0x100; diff --git a/board/Synology/common/legacy.c b/board/Synology/common/legacy.c index 3c89e92ae7..06f964f53a 100644 --- a/board/Synology/common/legacy.c +++ b/board/Synology/common/legacy.c @@ -15,14 +15,15 @@ static unsigned int syno_board_id(void) { +#ifdef CONFIG_MACH_TYPE switch (CONFIG_MACH_TYPE) { case 527: return SYNO_DS109_ID; case 3036: return SYNO_AXP_4BAY_2BAY; - default: - return 0; } +#endif + return 0; } static unsigned int usb_port_modes(void) diff --git a/configs/am335x_igep003x_defconfig b/configs/am335x_igep003x_defconfig index 0ec6851f32..b669b09dd1 100644 --- a/configs/am335x_igep003x_defconfig +++ b/configs/am335x_igep003x_defconfig @@ -16,7 +16,6 @@ CONFIG_SPL_FS_FAT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_DISTRO_DEFAULTS=y CONFIG_OF_BOARD_SETUP=y -CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0033" # CONFIG_USE_BOOTCOMMAND is not set CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_SPL_FS_EXT4=y diff --git a/configs/axm_defconfig b/configs/axm_defconfig index aa9197f2c0..3150e45399 100644 --- a/configs/axm_defconfig +++ b/configs/axm_defconfig @@ -24,7 +24,7 @@ CONFIG_ENV_OFFSET_REDUND=0x180000 CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_DEBUG_UART=y -CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,MACH_TYPE=2068" +CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="run flash_self" diff --git a/configs/corvus_defconfig b/configs/corvus_defconfig index 42c0a48b23..3f28509171 100644 --- a/configs/corvus_defconfig +++ b/configs/corvus_defconfig @@ -16,7 +16,7 @@ CONFIG_SPL_TEXT_BASE=0x300000 CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL=y CONFIG_ENV_OFFSET_REDUND=0x180000 -CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,MACH_TYPE=2066,SYS_USE_NANDFLASH" +CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,SYS_USE_NANDFLASH" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mtdblock7 rw rootfstype=jffs2" diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig index 80f75ce3d2..271d9647d4 100644 --- a/configs/taurus_defconfig +++ b/configs/taurus_defconfig @@ -26,7 +26,7 @@ CONFIG_ENV_OFFSET_REDUND=0x180000 CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_DEBUG_UART=y -CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,MACH_TYPE=2067" +CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mtdblock7 rw rootfstype=jffs2" diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index ad5616d28f..b37817a71f 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -25,8 +25,6 @@ #define CONFIG_SYS_BOOTM_LEN SZ_16M -#define CONFIG_MACH_TYPE MACH_TYPE_AM335XEVM - /* Clock Defines */ #define V_OSCK 24000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK) diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h index 16849d8701..1a76c4e3dc 100644 --- a/include/configs/am335x_sl50.h +++ b/include/configs/am335x_sl50.h @@ -16,8 +16,6 @@ #define CONFIG_SYS_BOOTM_LEN (16 << 20) -/*#define CONFIG_MACH_TYPE 3589 Until the next sync */ - /* Clock Defines */ #define V_OSCK 24000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK) diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 2a4cd07a24..50c9c4684b 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -14,8 +14,6 @@ #undef CONFIG_DISPLAY_BOARDINFO -#define CONFIG_MACH_TYPE 4886 - #include <asm/arch/imx-regs.h> #include <asm/mach-imx/gpio.h> diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h index 9e5f523600..eab4f22be3 100644 --- a/include/configs/apalis_t30.h +++ b/include/configs/apalis_t30.h @@ -23,8 +23,6 @@ #define CONFIG_TEGRA_ENABLE_UARTA #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE -#define CONFIG_MACH_TYPE MACH_TYPE_APALIS_T30 - /* PCI networking support */ #define CONFIG_E1000_NO_NVM diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h index 78fa1a969e..108d073240 100644 --- a/include/configs/aristainetos2.h +++ b/include/configs/aristainetos2.h @@ -28,7 +28,6 @@ #include "mx6_common.h" -#define CONFIG_MACH_TYPE 4501 #define CONFIG_MMCROOT "/dev/mmcblk0p1" /* MMC Configs */ diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index f6d5bc2dd7..ccc24294d0 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -65,24 +65,6 @@ (ATMEL_BASE_SRAM1 + 16 * 1024 - GENERATED_GBL_DATA_SIZE) #endif -/* - * The (arm)linux board id set by generic code depending on configured board - * (see boards.cfg for different boards) - */ -#ifdef CONFIG_AT91SAM9G20 - /* the sam9g20 variants have two different board ids */ -# ifdef CONFIG_AT91SAM9G20EK_2MMC - /* we may be setup for the 2MMC variant of at91sam9g20ek */ -# define CONFIG_MACH_TYPE MACH_TYPE_AT91SAM9G20EK_2MMC -# else - /* or the normal at91sam9g20ek */ -# define CONFIG_MACH_TYPE MACH_TYPE_AT91SAM9G20EK -# endif -#else - /* otherwise default to good old at91sam9260ek */ -# define CONFIG_MACH_TYPE MACH_TYPE_AT91SAM9260EK -#endif - /* NAND flash */ #ifdef CONFIG_CMD_NAND #define CONFIG_SYS_MAX_NAND_DEVICE 1 diff --git a/include/configs/baltos.h b/include/configs/baltos.h index 42a5abd1b4..b171ea16e0 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -19,8 +19,6 @@ #include <linux/sizes.h> #include <configs/ti_am335x_common.h> -#define CONFIG_MACH_TYPE MACH_TYPE_AM335XEVM - /* Clock Defines */ #define V_OSCK 24000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK) diff --git a/include/configs/beaver.h b/include/configs/beaver.h index 0daa20ed5c..8be491e601 100644 --- a/include/configs/beaver.h +++ b/include/configs/beaver.h @@ -20,8 +20,6 @@ #define CONFIG_TEGRA_ENABLE_UARTA #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE -#define CONFIG_MACH_TYPE MACH_TYPE_BEAVER - /* SPI */ #define CONFIG_TEGRA_SLINK_CTRLS 6 #define CONFIG_SPI_FLASH_SIZE (4 << 20) diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h index 8a01cbd114..c0ae3cf820 100644 --- a/include/configs/brppt1.h +++ b/include/configs/brppt1.h @@ -25,9 +25,6 @@ #define CONFIG_POWER_TPS65217 -/*#define CONFIG_MACH_TYPE 3589*/ -#define CONFIG_MACH_TYPE 0xFFFFFFFF /* TODO: check with kernel*/ - /* * When we have NAND flash we expect to be making use of mtdparts, * both for ease of use in U-Boot and for passing information on to diff --git a/include/configs/brppt2.h b/include/configs/brppt2.h index a05990c62c..4b5ea03ae4 100644 --- a/include/configs/brppt2.h +++ b/include/configs/brppt2.h @@ -27,7 +27,6 @@ #define CONFIG_FSL_USDHC /* Boot */ -#define CONFIG_MACH_TYPE 0xFFFFFFFF /* misc */ #define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024) diff --git a/include/configs/brsmarc1.h b/include/configs/brsmarc1.h index eadb34f83f..c404b01817 100644 --- a/include/configs/brsmarc1.h +++ b/include/configs/brsmarc1.h @@ -25,8 +25,6 @@ #define V_OSCK 26000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK) -#define CONFIG_MACH_TYPE 3589 - #ifndef CONFIG_SPL_BUILD /* Default environment */ diff --git a/include/configs/brxre1.h b/include/configs/brxre1.h index 4133b523bf..6ffd4a0a0d 100644 --- a/include/configs/brxre1.h +++ b/include/configs/brxre1.h @@ -24,8 +24,6 @@ #define V_OSCK 26000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK) -#define CONFIG_MACH_TYPE 3589 - #ifndef CONFIG_SPL_BUILD /* Default environment */ diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h index 8e8b1067b1..f3416b534b 100644 --- a/include/configs/cardhu.h +++ b/include/configs/cardhu.h @@ -24,8 +24,6 @@ #define CONFIG_TEGRA_ENABLE_UARTA #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE -#define CONFIG_MACH_TYPE MACH_TYPE_CARDHU - /* SPI */ #define CONFIG_TEGRA_SLINK_CTRLS 6 #define CONFIG_SPI_FLASH_SIZE (4 << 20) diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index 5ff33a3505..75982619f7 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -14,7 +14,6 @@ /* Machine config */ #define CONFIG_SYS_LITTLE_ENDIAN -#define CONFIG_MACH_TYPE 4273 /* MMC */ #define CONFIG_SYS_FSL_USDHC_NUM 3 diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h index 342cc7fddc..675c5299f6 100644 --- a/include/configs/cm_t335.h +++ b/include/configs/cm_t335.h @@ -17,8 +17,6 @@ #undef CONFIG_MAX_RAM_BANK_SIZE #define CONFIG_MAX_RAM_BANK_SIZE (512 << 20) /* 512MB */ -#define CONFIG_MACH_TYPE MACH_TYPE_CM_T335 - /* Clock Defines */ #define V_OSCK 25000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK) diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h index 158bb09b37..e947b58d96 100644 --- a/include/configs/colibri_t20.h +++ b/include/configs/colibri_t20.h @@ -15,8 +15,6 @@ #define CONFIG_TEGRA_UARTA_SDIO1 #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE -#define CONFIG_MACH_TYPE MACH_TYPE_COLIBRI_TEGRA2 - /* LCD support */ #define CONFIG_LCD_LOGO diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h index 30b48c5fd6..324e607839 100644 --- a/include/configs/colibri_t30.h +++ b/include/configs/colibri_t30.h @@ -24,8 +24,6 @@ #define CONFIG_TEGRA_ENABLE_UARTA #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE -#define CONFIG_MACH_TYPE MACH_TYPE_COLIBRI_T30 - /* Increase console I/O buffer size */ #undef CONFIG_SYS_CBSIZE #define CONFIG_SYS_CBSIZE 1024 diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h index 18d9ba1784..2a020e96c4 100644 --- a/include/configs/dalmore.h +++ b/include/configs/dalmore.h @@ -17,8 +17,6 @@ #define CONFIG_TEGRA_ENABLE_UARTD #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE -#define CONFIG_MACH_TYPE MACH_TYPE_DALMORE - /* Environment in eMMC, at the end of 2nd "boot sector" */ /* SPI */ diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index 522581a143..d9dd99a62c 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -12,8 +12,6 @@ #include <linux/sizes.h> #include <asm/arch/cpu.h> -#define CONFIG_MACH_TYPE MACH_TYPE_DEVKIT3250 - #if !defined(CONFIG_SPL_BUILD) #define CONFIG_SKIP_LOWLEVEL_INIT #endif diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index e8cf24c821..74aa51ca1c 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -15,7 +15,6 @@ #define __CONFIG_H /* High Level Configuration Options */ -#define CONFIG_MACH_TYPE MACH_TYPE_DEVKIT8000 /* * 1MB into the SDRAM to allow for SPL's bss at the beginning of SDRAM diff --git a/include/configs/dns325.h b/include/configs/dns325.h index 8990efb3f6..dccab9f700 100644 --- a/include/configs/dns325.h +++ b/include/configs/dns325.h @@ -13,11 +13,6 @@ #define _CONFIG_DNS325_H /* - * Machine number definition - */ -#define CONFIG_MACH_TYPE MACH_TYPE_DNS325 - -/* * High Level Configuration Options (easy to change) */ #define CONFIG_FEROCEON_88FR131 /* CPU Core subversion */ diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h index 65962ee733..5b71f70c94 100644 --- a/include/configs/dreamplug.h +++ b/include/configs/dreamplug.h @@ -15,7 +15,6 @@ * High Level Configuration Options (easy to change) */ #define CONFIG_SHEEVA_88SV131 1 /* CPU Core subversion */ -#define CONFIG_MACH_TYPE MACH_TYPE_DREAMPLUG #include "mv-plug-common.h" diff --git a/include/configs/ds109.h b/include/configs/ds109.h index f232abe430..62fe144121 100644 --- a/include/configs/ds109.h +++ b/include/configs/ds109.h @@ -11,9 +11,6 @@ #ifndef _CONFIG_DS109_H #define _CONFIG_DS109_H -/* Provide the MACH_TYPE value that the vendor kernel requires. */ -#define CONFIG_MACH_TYPE 527 - /* * High Level Configuration Options (easy to change) */ diff --git a/include/configs/ds414.h b/include/configs/ds414.h index 5d401281c7..9cedcc375e 100644 --- a/include/configs/ds414.h +++ b/include/configs/ds414.h @@ -6,9 +6,6 @@ #ifndef _CONFIG_SYNOLOGY_DS414_H #define _CONFIG_SYNOLOGY_DS414_H -/* Vendor kernel expects this MACH_TYPE */ -#define CONFIG_MACH_TYPE 3036 - /* * High Level Configuration Options (easy to change) */ diff --git a/include/configs/ea-lpc3250devkitv2.h b/include/configs/ea-lpc3250devkitv2.h index c1a37c8a79..792976b285 100644 --- a/include/configs/ea-lpc3250devkitv2.h +++ b/include/configs/ea-lpc3250devkitv2.h @@ -13,7 +13,6 @@ /* * SoC and board defines */ -#define CONFIG_MACH_TYPE MACH_TYPE_LPC3XXX #define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_BOARD_SIZE_LIMIT 0x000fffff /* maximum allowable size for full U-Boot binary */ diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h index f7f4d1b693..edcb79878e 100644 --- a/include/configs/ethernut5.h +++ b/include/configs/ethernut5.h @@ -16,9 +16,6 @@ /* The first stage boot loader takes care of low level initialization. */ #define CONFIG_SKIP_LOWLEVEL_INIT -/* Set our official architecture number. */ -#define CONFIG_MACH_TYPE MACH_TYPE_ETHERNUT5 - /* CPU information */ /* ARM asynchronous clock */ diff --git a/include/configs/exynos5250-common.h b/include/configs/exynos5250-common.h index 65da3815fb..36c3a613eb 100644 --- a/include/configs/exynos5250-common.h +++ b/include/configs/exynos5250-common.h @@ -13,8 +13,6 @@ #define CONFIG_SYS_SDRAM_BASE 0x40000000 -#define CONFIG_MACH_TYPE MACH_TYPE_SMDK5250 - #define CONFIG_SPL_MAX_FOOTPRINT (14 * 1024) #define CONFIG_IRAM_STACK 0x02050000 diff --git a/include/configs/exynos5420-common.h b/include/configs/exynos5420-common.h index 2d362f3961..7762c77164 100644 --- a/include/configs/exynos5420-common.h +++ b/include/configs/exynos5420-common.h @@ -12,9 +12,6 @@ #define CONFIG_EXYNOS5_DT -/* Provide the MACH_TYPE value that the vendor kernel requires. */ -#define CONFIG_MACH_TYPE 8002 - #define CONFIG_VAR_SIZE_SPL #define CONFIG_IRAM_TOP 0x02074000 diff --git a/include/configs/flea3.h b/include/configs/flea3.h index 838a16b320..2a19c9a47a 100644 --- a/include/configs/flea3.h +++ b/include/configs/flea3.h @@ -17,8 +17,6 @@ /* High Level Configuration Options */ #define CONFIG_MX35 -#define CONFIG_MACH_TYPE MACH_TYPE_FLEA3 - /* Set TEXT at the beginning of the NOR flash */ /* This is required to setup the ESDC controller */ diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 3244baa288..6645a76003 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -24,8 +24,6 @@ #include "imx6_spl.h" /* common IMX6 SPL configuration */ #include "mx6_common.h" -#define CONFIG_MACH_TYPE 4520 /* Gateworks Ventana Platform */ - /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M) diff --git a/include/configs/harmony.h b/include/configs/harmony.h index b2464f90de..5a1e72c537 100644 --- a/include/configs/harmony.h +++ b/include/configs/harmony.h @@ -23,8 +23,6 @@ #define CONFIG_SYS_NS16550_COM2 NV_PA_APB_UARTA_BASE #endif -#define CONFIG_MACH_TYPE MACH_TYPE_HARMONY - /* NAND support */ #define CONFIG_TEGRA_NAND #define CONFIG_SYS_MAX_NAND_DEVICE 1 diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h index c99490b85d..8faa794249 100644 --- a/include/configs/iconnect.h +++ b/include/configs/iconnect.h @@ -15,11 +15,6 @@ #define CONFIG_KW88F6281 /* SOC Name */ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ -/* - * Machine type - */ -#define CONFIG_MACH_TYPE MACH_TYPE_ICONNECT - #include "mv-common.h" /* diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index 66bb626ea4..396f49051b 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -25,8 +25,6 @@ #define CONFIG_FEROCEON_88FR131 /* CPU Core subversion */ #define CONFIG_KW88F6281 /* SOC Name */ -#define CONFIG_MACH_TYPE MACH_TYPE_KM_KIRKWOOD - #define CONFIG_NAND_ECC_BCH /* include common defines/options for all Keymile boards */ diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h index 4b20d62d95..e6ed736da4 100644 --- a/include/configs/kzm9g.h +++ b/include/configs/kzm9g.h @@ -8,7 +8,6 @@ #define __KZM9G_H #define CONFIG_SH73A0 -#define CONFIG_MACH_TYPE MACH_TYPE_KZM9G #include <asm/arch/rmobile.h> diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h index 88f784f1f0..cb7fc1deef 100644 --- a/include/configs/lacie_kw.h +++ b/include/configs/lacie_kw.h @@ -7,27 +7,6 @@ #define _CONFIG_LACIE_KW_H /* - * Machine number definition - */ -#if defined(CONFIG_INETSPACE_V2) -#define CONFIG_MACH_TYPE MACH_TYPE_INETSPACE_V2 -#elif defined(CONFIG_NETSPACE_V2) -#define CONFIG_MACH_TYPE MACH_TYPE_NETSPACE_V2 -#elif defined(CONFIG_NETSPACE_LITE_V2) -#define CONFIG_MACH_TYPE MACH_TYPE_NETSPACE_LITE_V2 -#elif defined(CONFIG_NETSPACE_MINI_V2) -#define CONFIG_MACH_TYPE MACH_TYPE_NETSPACE_MINI_V2 -#elif defined(CONFIG_NETSPACE_MAX_V2) -#define CONFIG_MACH_TYPE MACH_TYPE_NETSPACE_MAX_V2 -#elif defined(CONFIG_D2NET_V2) -#define CONFIG_MACH_TYPE MACH_TYPE_D2NET_V2 -#elif defined(CONFIG_NET2BIG_V2) -#define CONFIG_MACH_TYPE MACH_TYPE_NET2BIG_V2 -#else -#error "Unknown board" -#endif - -/* * High Level Configuration Options (easy to change) */ #define CONFIG_FEROCEON_88FR131 /* CPU Core subversion */ diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h index a4a4739d0d..4cd29f3550 100644 --- a/include/configs/lsxl.h +++ b/include/configs/lsxl.h @@ -12,10 +12,8 @@ */ #if defined(CONFIG_LSCHLV2) #define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage-lschl.cfg -#define CONFIG_MACH_TYPE 3006 #elif defined(CONFIG_LSXHL) #define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage-lsxhl.cfg -#define CONFIG_MACH_TYPE 2663 #else #error "unknown board" #endif diff --git a/include/configs/mx23_olinuxino.h b/include/configs/mx23_olinuxino.h index 2ee41aeff1..ac96c9b929 100644 --- a/include/configs/mx23_olinuxino.h +++ b/include/configs/mx23_olinuxino.h @@ -5,9 +5,6 @@ #ifndef __CONFIGS_MX23_OLINUXINO_H__ #define __CONFIGS_MX23_OLINUXINO_H__ -/* System configurations */ -#define CONFIG_MACH_TYPE 4105 - /* U-Boot Commands */ /* Memory configuration */ diff --git a/include/configs/mx23evk.h b/include/configs/mx23evk.h index 3f13e60531..c8470fdc48 100644 --- a/include/configs/mx23evk.h +++ b/include/configs/mx23evk.h @@ -8,9 +8,6 @@ #ifndef __CONFIGS_MX23EVK_H__ #define __CONFIGS_MX23EVK_H__ -/* System configurations */ -#define CONFIG_MACH_TYPE MACH_TYPE_MX23EVK - /* U-Boot Commands */ /* Memory configuration */ diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h index 21f3277d5c..9ebd89177b 100644 --- a/include/configs/mx28evk.h +++ b/include/configs/mx28evk.h @@ -10,9 +10,6 @@ #ifndef __CONFIGS_MX28EVK_H__ #define __CONFIGS_MX28EVK_H__ -/* System configurations */ -#define CONFIG_MACH_TYPE MACH_TYPE_MX28EVK - /* Memory configuration */ #define PHYS_SDRAM_1 0x40000000 /* Base address */ #define PHYS_SDRAM_1_SIZE 0x40000000 /* Max 1 GB RAM */ diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index 9219cdf1fa..4c2a60d219 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -16,7 +16,6 @@ #include <asm/arch/imx-regs.h> -#define CONFIG_MACH_TYPE MACH_TYPE_MX51_BABBAGE /* * Size of malloc() pool */ diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index a8f6f02b1d..79a3befa13 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -9,8 +9,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_MACH_TYPE MACH_TYPE_MX53_LOCO - #include <asm/arch/imx-regs.h> #define CONFIG_SYS_FSL_CLK diff --git a/include/configs/mx6sabreauto.h b/include/configs/mx6sabreauto.h index 626dbd55d7..35608e6f7c 100644 --- a/include/configs/mx6sabreauto.h +++ b/include/configs/mx6sabreauto.h @@ -12,7 +12,6 @@ #include "imx6_spl.h" #endif -#define CONFIG_MACH_TYPE 3529 #define CONFIG_MXC_UART_BASE UART4_BASE #define CONSOLE_DEV "ttymxc3" diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h index 9546887182..dc5372ff88 100644 --- a/include/configs/mx6sabresd.h +++ b/include/configs/mx6sabresd.h @@ -12,7 +12,6 @@ #include "imx6_spl.h" #endif -#define CONFIG_MACH_TYPE 3980 #define CONFIG_MXC_UART_BASE UART1_BASE #define CONSOLE_DEV "ttymxc0" diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index ab32f4e151..4e9c12767c 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -14,8 +14,6 @@ #include "imx6_spl.h" #endif -#define CONFIG_MACH_TYPE MACH_TYPE_MX6SL_EVK - /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (3 * SZ_1M) diff --git a/include/configs/nas220.h b/include/configs/nas220.h index 1fd5471ac5..6d3437ef93 100644 --- a/include/configs/nas220.h +++ b/include/configs/nas220.h @@ -12,11 +12,6 @@ #define _CONFIG_NAS220_H /* - * Machine type ID - */ -#define CONFIG_MACH_TYPE MACH_TYPE_RD88F6192_NAS - -/* * High Level Configuration Options (easy to change) */ #define CONFIG_FEROCEON_88FR131 /* #define CPU Core subversion */ diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index 0c40750351..fe8c683941 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -11,8 +11,6 @@ #include "mx6_common.h" -#define CONFIG_MACH_TYPE 3769 - /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024) diff --git a/include/configs/odroid.h b/include/configs/odroid.h index b67674fc7d..3f568a31c9 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -19,8 +19,6 @@ #define CONFIG_SYS_PL310_BASE 0x10502000 #endif -#define CONFIG_MACH_TYPE 4289 - #define CONFIG_SYS_SDRAM_BASE 0x40000000 #define SDRAM_BANK_SIZE (256 << 20) /* 256 MB */ #define PHYS_SDRAM_1 CONFIG_SYS_SDRAM_BASE diff --git a/include/configs/omap4_sdp4430.h b/include/configs/omap4_sdp4430.h index 462aa4a5b9..fb210ce69b 100644 --- a/include/configs/omap4_sdp4430.h +++ b/include/configs/omap4_sdp4430.h @@ -15,7 +15,6 @@ /* * High Level Configuration Options */ -#define CONFIG_MACH_TYPE MACH_TYPE_OMAP_4430SDP #include <configs/ti_omap4_common.h> diff --git a/include/configs/origen.h b/include/configs/origen.h index 8a0e145c76..6e1e44c86b 100644 --- a/include/configs/origen.h +++ b/include/configs/origen.h @@ -22,8 +22,6 @@ /* memtest works on */ #define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x3E00000) -#define CONFIG_MACH_TYPE MACH_TYPE_ORIGEN - #define CONFIG_SYS_MEM_TOP_HIDE (1 << 20) /* ram console */ #define CONFIG_SYS_MONITOR_BASE 0x00000000 diff --git a/include/configs/paz00.h b/include/configs/paz00.h index 7a09ac0dee..c12f4d0937 100644 --- a/include/configs/paz00.h +++ b/include/configs/paz00.h @@ -19,8 +19,6 @@ #define CONFIG_TEGRA_ENABLE_UARTA #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE -#define CONFIG_MACH_TYPE MACH_TYPE_PAZ00 - /* Environment in eMMC, at the end of 2nd "boot sector" */ #include "tegra-common-post.h" diff --git a/include/configs/pdu001.h b/include/configs/pdu001.h index 53342ce193..3d18747f9b 100644 --- a/include/configs/pdu001.h +++ b/include/configs/pdu001.h @@ -14,9 +14,6 @@ /* Using 32K of volatile storage for environment */ -#define MACH_TYPE_PDU001 5075 -#define CONFIG_MACH_TYPE MACH_TYPE_PDU001 - /* Clock Defines */ #define V_OSCK 24000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK) diff --git a/include/configs/phycore_am335x_r2.h b/include/configs/phycore_am335x_r2.h index 4a347fe154..4925fcc8cf 100644 --- a/include/configs/phycore_am335x_r2.h +++ b/include/configs/phycore_am335x_r2.h @@ -14,8 +14,6 @@ #include <configs/ti_am335x_common.h> -#define CONFIG_MACH_TYPE MACH_TYPE_SBC_PHYCORE_AM335X - #ifdef CONFIG_MTD_RAW_NAND #define NANDARGS \ "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \ diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h index cf2eaef724..014d7ed348 100644 --- a/include/configs/pm9261.h +++ b/include/configs/pm9261.h @@ -27,8 +27,6 @@ #define CONFIG_SYS_AT91_CPU_NAME "AT91SAM9261" -#define CONFIG_MACH_TYPE MACH_TYPE_PM9261 - /* clocks */ /* CKGR_MOR - enable main osc. */ #define CONFIG_SYS_MOR_VAL \ diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h index 663e01d6a0..799179ecf1 100644 --- a/include/configs/pm9263.h +++ b/include/configs/pm9263.h @@ -27,8 +27,6 @@ #define CONFIG_SYS_AT91_CPU_NAME "AT91SAM9263" -#define CONFIG_MACH_TYPE MACH_TYPE_PM9263 - /* clocks */ #define CONFIG_SYS_MOR_VAL \ (AT91_PMC_MOR_MOSCEN | \ diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h index cbe5022297..dbacd0a9ab 100644 --- a/include/configs/pogo_e02.h +++ b/include/configs/pogo_e02.h @@ -13,11 +13,6 @@ #define _CONFIG_POGO_E02_H /* - * Machine type definition and ID - */ -#define CONFIG_MACH_TYPE MACH_TYPE_POGO_E02 - -/* * High Level Configuration Options (easy to change) */ #define CONFIG_FEROCEON_88FR131 /* CPU Core subversion */ diff --git a/include/configs/rpi.h b/include/configs/rpi.h index 0b53b315e3..e92b1e2a3c 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -26,21 +26,6 @@ (&((struct bcm2835_timer_regs *)BCM2835_TIMER_PHYSADDR)->clo) #endif -/* - * 2835 is a SKU in a series for which the 2708 is the first or primary SoC, - * so 2708 has historically been used rather than a dedicated 2835 ID. - * - * We don't define a machine type for bcm2709/bcm2836 since the RPi Foundation - * chose to use someone else's previously registered machine ID (3139, MX51_GGC) - * rather than obtaining a valid ID:-/ - * - * For the bcm2837, hopefully a machine type is not needed, since everything - * is DT. - */ -#ifdef CONFIG_BCM2835 -#define CONFIG_MACH_TYPE MACH_TYPE_BCM2708 -#endif - /* Memory layout */ #define CONFIG_SYS_SDRAM_BASE 0x00000000 #define CONFIG_SYS_UBOOT_BASE CONFIG_SYS_TEXT_BASE diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h index 5b5aa1b2f2..c51517a76b 100644 --- a/include/configs/seaboard.h +++ b/include/configs/seaboard.h @@ -24,8 +24,6 @@ #define CONFIG_TEGRA_ENABLE_UARTD #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE -#define CONFIG_MACH_TYPE MACH_TYPE_SEABOARD - /* Environment in eMMC, at the end of 2nd "boot sector" */ /* NAND support */ diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 0e18d3a822..34d70316a2 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -19,9 +19,6 @@ #define CONFIG_DMA_COHERENT_SIZE (1 << 20) #define CONFIG_SYS_MALLOC_LEN (16 * 1024 * 1024) -#ifdef CONFIG_SIEMENS_MACH_TYPE -#define CONFIG_MACH_TYPE CONFIG_SIEMENS_MACH_TYPE -#endif /* commands to include */ diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index 994f03ad1f..57440fd2af 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -46,7 +46,6 @@ #define CONFIG_SYS_MAXARGS 32 /* setting board specific options */ -#define CONFIG_MACH_TYPE MACH_TYPE_SMARTWEB #define CONFIG_SYS_AUTOLOAD "yes" #define CONFIG_RESET_TO_RETRY diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h index 64934a3082..ca00663405 100644 --- a/include/configs/smdkv310.h +++ b/include/configs/smdkv310.h @@ -16,9 +16,6 @@ /* High Level Configuration Options */ #define CONFIG_EXYNOS4210 1 /* which is a EXYNOS4210 SoC */ -/* Mach Type */ -#define CONFIG_MACH_TYPE MACH_TYPE_SMDKV310 - #define CONFIG_SYS_SDRAM_BASE 0x40000000 /* Handling Sleep Mode*/ diff --git a/include/configs/sun4i.h b/include/configs/sun4i.h index 6033760583..0e1baa91bb 100644 --- a/include/configs/sun4i.h +++ b/include/configs/sun4i.h @@ -16,6 +16,4 @@ */ #include <configs/sunxi-common.h> -#define CONFIG_MACH_TYPE (4104 | ((CONFIG_MACH_TYPE_COMPAT_REV) << 28)) - #endif /* __CONFIG_H */ diff --git a/include/configs/sun5i.h b/include/configs/sun5i.h index ee42af80d4..ada18de753 100644 --- a/include/configs/sun5i.h +++ b/include/configs/sun5i.h @@ -16,6 +16,4 @@ */ #include <configs/sunxi-common.h> -#define CONFIG_MACH_TYPE (4138 | ((CONFIG_MACH_TYPE_COMPAT_REV) << 28)) - #endif /* __CONFIG_H */ diff --git a/include/configs/sun7i.h b/include/configs/sun7i.h index d2fd586672..803a7514cc 100644 --- a/include/configs/sun7i.h +++ b/include/configs/sun7i.h @@ -20,6 +20,4 @@ */ #include <configs/sunxi-common.h> -#define CONFIG_MACH_TYPE (4283 | ((CONFIG_MACH_TYPE_COMPAT_REV) << 28)) - #endif /* __CONFIG_H */ diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 8314741108..709206ff2a 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -15,22 +15,6 @@ #include <asm/arch/cpu.h> #include <linux/stringify.h> -#ifdef CONFIG_OLD_SUNXI_KERNEL_COMPAT -/* - * The U-Boot workarounds bugs in the outdated buggy sunxi-3.4 kernels at the - * expense of restricting some features, so the regular machine id values can - * be used. - */ -# define CONFIG_MACH_TYPE_COMPAT_REV 0 -#else -/* - * A compatibility guard to prevent loading outdated buggy sunxi-3.4 kernels. - * Only sunxi-3.4 kernels with appropriate fixes applied are able to pass - * beyond the machine id check. - */ -# define CONFIG_MACH_TYPE_COMPAT_REV 1 -#endif - #ifdef CONFIG_ARM64 #define CONFIG_SYS_BOOTM_LEN (32 << 20) #endif diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index a2e59ce618..45e8c6ea72 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -12,8 +12,6 @@ /* General configuration */ -#define CONFIG_MACH_TYPE 3980 - #define CONFIG_SYS_HZ 1000 /* Physical Memory Map */ diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h index 0328aef7d1..e1780d297e 100644 --- a/include/configs/ti814x_evm.h +++ b/include/configs/ti814x_evm.h @@ -19,7 +19,6 @@ #include <asm/arch/omap.h> #define CONFIG_SYS_MALLOC_LEN (1024 << 10) -#define CONFIG_MACH_TYPE MACH_TYPE_TI8148EVM /* commands to include */ diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h index 44fdc4c300..b3bfb46c66 100644 --- a/include/configs/ti816x_evm.h +++ b/include/configs/ti816x_evm.h @@ -12,8 +12,6 @@ #include <configs/ti_armv7_omap.h> #include <asm/arch/omap.h> -#define CONFIG_MACH_TYPE MACH_TYPE_TI8168EVM - #define CONFIG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \ diff --git a/include/configs/trats.h b/include/configs/trats.h index a44792d857..299037529c 100644 --- a/include/configs/trats.h +++ b/include/configs/trats.h @@ -29,8 +29,6 @@ /* memtest works on */ #define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x4800000) -#define CONFIG_MACH_TYPE MACH_TYPE_TRATS - #define CONFIG_BOOTCOMMAND "run autoboot" #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR \ diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h index b914e444b6..b562d44a13 100644 --- a/include/configs/trimslice.h +++ b/include/configs/trimslice.h @@ -18,8 +18,6 @@ #define CONFIG_TEGRA_UARTA_GPU #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE -#define CONFIG_MACH_TYPE MACH_TYPE_TRIMSLICE - /* SPI */ /* Environment in SPI */ diff --git a/include/configs/udoo.h b/include/configs/udoo.h index 298369373a..5d62d59528 100644 --- a/include/configs/udoo.h +++ b/include/configs/udoo.h @@ -12,9 +12,6 @@ #include "imx6_spl.h" -/* Provide the MACH_TYPE value that the vendor kernel requires. */ -#define CONFIG_MACH_TYPE 4800 - /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (2 * SZ_1M) diff --git a/include/configs/usb_a9263.h b/include/configs/usb_a9263.h index 0f18a52823..9dbf0e0433 100644 --- a/include/configs/usb_a9263.h +++ b/include/configs/usb_a9263.h @@ -20,8 +20,6 @@ #define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* 12 MHz crystal */ #define CONFIG_SYS_AT91_SLOW_CLOCK 32768 -#define CONFIG_MACH_TYPE MACH_TYPE_USB_A9263 - #define CONFIG_SKIP_LOWLEVEL_INIT /* diff --git a/include/configs/ventana.h b/include/configs/ventana.h index 21f90f38fc..0bd5a1e852 100644 --- a/include/configs/ventana.h +++ b/include/configs/ventana.h @@ -17,8 +17,6 @@ #define CONFIG_TEGRA_ENABLE_UARTD #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE -#define CONFIG_MACH_TYPE MACH_TYPE_VENTANA - /* Environment in eMMC, at the end of 2nd "boot sector" */ #include "tegra-common-post.h" diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h index 9a9324705c..eb4d15d702 100644 --- a/include/configs/vf610twr.h +++ b/include/configs/vf610twr.h @@ -13,8 +13,6 @@ #define CONFIG_SYS_FSL_CLK -#define CONFIG_MACH_TYPE 4146 - #define CONFIG_SKIP_LOWLEVEL_INIT /* Size of malloc() pool */ diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index bd64893fc7..9ef1d60bdb 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -12,8 +12,6 @@ #include "imx6_spl.h" -#define CONFIG_MACH_TYPE MACH_TYPE_WANDBOARD_IMX6 - /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M) diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index 29b7fca850..d5b9acaa42 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -13,12 +13,6 @@ #include <linux/sizes.h> #include <asm/arch/cpu.h> -/* - * Define work_92105 machine type by hand -- done only for compatibility - * with original board code - */ -#define CONFIG_MACH_TYPE 736 - #if !defined(CONFIG_SPL_BUILD) #define CONFIG_SKIP_LOWLEVEL_INIT #endif diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h index 8b92a569c8..5384a6a433 100644 --- a/include/configs/zmx25.h +++ b/include/configs/zmx25.h @@ -15,7 +15,6 @@ #define CONFIG_SYS_TIMER_COUNTER \ (&((struct gpt_regs *)IMX_GPT1_BASE)->counter) -#define CONFIG_MACH_TYPE MACH_TYPE_ZMX25 /* * Environment settings */ |