arm: Finish migration of CONFIG_MACH_TYPE
authorTom Rini <trini@konsulko.com>
Mon, 30 Aug 2021 13:16:32 +0000 (09:16 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 7 Sep 2021 23:17:32 +0000 (19:17 -0400)
As this is only useful when booting with ATAGs, which are now largely
disabled, remove this value for the remaining platforms.  We have a few
places in the code that had been testing for MACH_TYPE as a sort of
internal logic.  Update those to use different but still correct CONFIG
symbols.

Cc: Phil Sutter <phil@nwl.cc>
Signed-off-by: Tom Rini <trini@konsulko.com>
88 files changed:
README
board/LaCie/netspace_v2/netspace_v2.c
board/Synology/common/legacy.c
board/nvidia/seaboard/seaboard.c
board/toradex/common/tdx-cfg-block.c
configs/am335x_igep003x_defconfig
configs/axm_defconfig
configs/corvus_defconfig
configs/taurus_defconfig
include/configs/am335x_evm.h
include/configs/am335x_sl50.h
include/configs/apalis_imx6.h
include/configs/apalis_t30.h
include/configs/aristainetos2.h
include/configs/at91sam9260ek.h
include/configs/baltos.h
include/configs/beaver.h
include/configs/brppt1.h
include/configs/brppt2.h
include/configs/brsmarc1.h
include/configs/brxre1.h
include/configs/cardhu.h
include/configs/cm_fx6.h
include/configs/cm_t335.h
include/configs/colibri_t20.h
include/configs/colibri_t30.h
include/configs/dalmore.h
include/configs/devkit3250.h
include/configs/devkit8000.h
include/configs/dns325.h
include/configs/draco.h
include/configs/dreamplug.h
include/configs/ds109.h
include/configs/ds414.h
include/configs/ea-lpc3250devkitv2.h
include/configs/ethernut5.h
include/configs/exynos5250-common.h
include/configs/exynos5420-common.h
include/configs/flea3.h
include/configs/gw_ventana.h
include/configs/harmony.h
include/configs/iconnect.h
include/configs/km/km_arm.h
include/configs/kzm9g.h
include/configs/lacie_kw.h
include/configs/lsxl.h
include/configs/mx23_olinuxino.h
include/configs/mx23evk.h
include/configs/mx28evk.h
include/configs/mx51evk.h
include/configs/mx53loco.h
include/configs/mx6sabreauto.h
include/configs/mx6sabresd.h
include/configs/mx6slevk.h
include/configs/nas220.h
include/configs/nitrogen6x.h
include/configs/odroid.h
include/configs/omap4_sdp4430.h
include/configs/origen.h
include/configs/paz00.h
include/configs/pdu001.h
include/configs/phycore_am335x_r2.h
include/configs/pm9261.h
include/configs/pm9263.h
include/configs/pogo_e02.h
include/configs/pxm2.h
include/configs/rpi.h
include/configs/rut.h
include/configs/seaboard.h
include/configs/siemens-am33x-common.h
include/configs/smartweb.h
include/configs/smdkv310.h
include/configs/sun4i.h
include/configs/sun5i.h
include/configs/sun7i.h
include/configs/sunxi-common.h
include/configs/tbs2910.h
include/configs/ti814x_evm.h
include/configs/ti816x_evm.h
include/configs/trats.h
include/configs/trimslice.h
include/configs/udoo.h
include/configs/usb_a9263.h
include/configs/ventana.h
include/configs/vf610twr.h
include/configs/wandboard.h
include/configs/work_92105.h
include/configs/zmx25.h

diff --git a/README b/README
index f996819..6df06c7 100644 (file)
--- a/README
+++ b/README
@@ -586,16 +586,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
index 730eab7..22bb008 100644 (file)
@@ -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;
index 3c89e92..06f964f 100644 (file)
 
 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)
index b88aa8e..8297511 100644 (file)
@@ -16,7 +16,7 @@
 #include <asm/gpio.h>
 
 /* TODO: Remove this code when the SPI switch is working */
-#if (CONFIG_MACH_TYPE != MACH_TYPE_VENTANA)
+#ifndef CONFIG_TARGET_VENTANA
 void gpio_early_init_uart(void)
 {
        /* Enable UART via GPIO_PI3 (port 8, bit 3) so serial console works */
index e4f9a0d..fe47cdd 100644 (file)
@@ -493,24 +493,24 @@ static int get_cfgblock_interactive(void)
                else
                        tdx_hw_tag.prodid = COLIBRI_PXA270_520MHZ;
        }
-#ifdef CONFIG_MACH_TYPE
+#if defined(CONFIG_TARGET_APALIS_T30) || defined(CONFIG_TARGET_COLIBRI_T30)
        else if (!strcmp("tegra30", soc)) {
-               if (CONFIG_MACH_TYPE == MACH_TYPE_APALIS_T30) {
-                       if (it == 'y' || it == 'Y')
-                               tdx_hw_tag.prodid = APALIS_T30_IT;
-                       else
-                               if (gd->ram_size == 0x40000000)
-                                       tdx_hw_tag.prodid = APALIS_T30_1GB;
-                               else
-                                       tdx_hw_tag.prodid = APALIS_T30_2GB;
-               } else {
-                       if (it == 'y' || it == 'Y')
-                               tdx_hw_tag.prodid = COLIBRI_T30_IT;
+#ifdef CONFIG_TARGET_APALIS_T30
+               if (it == 'y' || it == 'Y')
+                       tdx_hw_tag.prodid = APALIS_T30_IT;
+               else
+                       if (gd->ram_size == 0x40000000)
+                               tdx_hw_tag.prodid = APALIS_T30_1GB;
                        else
-                               tdx_hw_tag.prodid = COLIBRI_T30;
-               }
+                               tdx_hw_tag.prodid = APALIS_T30_2GB;
+#else
+               if (it == 'y' || it == 'Y')
+                       tdx_hw_tag.prodid = COLIBRI_T30_IT;
+               else
+                       tdx_hw_tag.prodid = COLIBRI_T30;
+#endif
        }
-#endif /* CONFIG_MACH_TYPE */
+#endif /* CONFIG_TARGET_APALIS_T30 || CONFIG_TARGET_COLIBRI_T30 */
        else if (!strcmp("tegra124", soc)) {
                tdx_hw_tag.prodid = APALIS_TK1_2GB;
        } else if (!strcmp("vf500", soc)) {
index d41c64e..af94cc0 100644 (file)
@@ -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
index eae53eb..a013338 100644 (file)
@@ -28,7 +28,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI=y
 CONFIG_DEBUG_UART=y
 CONFIG_SYS_LOAD_ADDR=0x22000000
-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"
index db957a3..72f4310 100644 (file)
@@ -20,7 +20,7 @@ CONFIG_SPL_SERIAL=y
 CONFIG_SPL=y
 CONFIG_ENV_OFFSET_REDUND=0x180000
 CONFIG_SYS_LOAD_ADDR=0x70000000
-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"
index 19195ad..0bb28d4 100644 (file)
@@ -30,7 +30,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI=y
 CONFIG_DEBUG_UART=y
 CONFIG_SYS_LOAD_ADDR=0x22000000
-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"
index b47260d..0f6ffd9 100644 (file)
@@ -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)
index 820bb6a..dff9468 100644 (file)
@@ -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)
index 710b812..23fca1e 100644 (file)
@@ -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>
 
index 9e5f523..eab4f22 100644 (file)
@@ -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
 
index 6939878..b73b0d5 100644 (file)
@@ -28,7 +28,6 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_MACH_TYPE       4501
 #define CONFIG_MMCROOT         "/dev/mmcblk0p1"
 
 /* MMC Configs */
index d07262c..d09a5db 100644 (file)
        (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
index bdac513..2fe6c86 100644 (file)
@@ -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)
index 0daa20e..8be491e 100644 (file)
@@ -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)
index c97a05e..9fb861b 100644 (file)
@@ -24,9 +24,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
index 1b11a5d..3f54baf 100644 (file)
@@ -24,7 +24,6 @@
 #define CONFIG_FSL_USDHC
 
 /* Boot */
-#define CONFIG_MACH_TYPE               0xFFFFFFFF
 
 /* misc */
 
index 714d37e..f1e6dbf 100644 (file)
@@ -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 */
index 9f7fcda..d917976 100644 (file)
@@ -23,8 +23,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 */
index 8e8b106..f3416b5 100644 (file)
@@ -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)
index 7092def..a22fd0e 100644 (file)
@@ -14,7 +14,6 @@
 
 /* Machine config */
 #define CONFIG_SYS_LITTLE_ENDIAN
-#define CONFIG_MACH_TYPE               4273
 
 /* MMC */
 #define CONFIG_SYS_FSL_USDHC_NUM       3
index e6d95b7..4ca4f35 100644 (file)
@@ -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)
index 158bb09..e947b58 100644 (file)
@@ -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
 
index 30b48c5..324e607 100644 (file)
@@ -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
index 18d9ba1..2a020e9 100644 (file)
@@ -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 */
index 40b346b..c2340b2 100644 (file)
@@ -12,8 +12,6 @@
 #include <linux/sizes.h>
 #include <asm/arch/cpu.h>
 
-#define CONFIG_MACH_TYPE               MACH_TYPE_DEVKIT3250
-
 /*
  * Memory configurations
  */
index 7c2ec43..a2a1d93 100644 (file)
@@ -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
index 3a943e4..18ff1bb 100644 (file)
 #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 */
index 6bc7a0b..29ce3a5 100644 (file)
@@ -12,8 +12,6 @@
 #ifndef __CONFIG_DRACO_H
 #define __CONFIG_DRACO_H
 
-#define CONFIG_SIEMENS_MACH_TYPE       MACH_TYPE_DRACO
-
 #include "siemens-am33x-common.h"
 
 #define DDR_PLL_FREQ   303
index 65962ee..5b71f70 100644 (file)
@@ -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"
 
index f232abe..62fe144 100644 (file)
@@ -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)
  */
index 3b74aa9..58ecc5f 100644 (file)
@@ -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)
  */
index 857cf48..220c3c4 100644 (file)
@@ -13,7 +13,6 @@
 /*
  * SoC and board defines
  */
-#define CONFIG_MACH_TYPE MACH_TYPE_LPC3XXX
 #define CONFIG_BOARD_SIZE_LIMIT 0x000fffff /* maximum allowable size for full U-Boot binary */
 
 /*
index 9a15058..80108fc 100644 (file)
@@ -15,9 +15,6 @@
 
 /* The first stage boot loader takes care of low level initialization. */
 
-/* Set our official architecture number. */
-#define CONFIG_MACH_TYPE MACH_TYPE_ETHERNUT5
-
 /* CPU information */
 
 /* ARM asynchronous clock */
index 65da381..36c3a61 100644 (file)
@@ -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
index 2d362f3..7762c77 100644 (file)
@@ -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
index daf90bd..6c3b2c4 100644 (file)
@@ -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 */
index ed8e508..f028958 100644 (file)
@@ -24,8 +24,6 @@
 #include "imx6_spl.h"                  /* common IMX6 SPL configuration */
 #include "mx6_common.h"
 
-#define CONFIG_MACH_TYPE       4520   /* Gateworks Ventana Platform */
-
 /* Serial */
 #define CONFIG_MXC_UART_BASE          UART2_BASE
 
index b2464f9..5a1e72c 100644 (file)
@@ -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
index 2949132..1a716df 100644 (file)
 #define CONFIG_FEROCEON_88FR131                /* CPU Core subversion */
 #define CONFIG_KW88F6281               /* SOC Name */
 
-/*
- * Machine type
- */
-#define CONFIG_MACH_TYPE       MACH_TYPE_ICONNECT
-
 #include "mv-common.h"
 
 /*
index 29fcce9..cca624e 100644 (file)
@@ -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 */
index 094a9f9..c3f690c 100644 (file)
@@ -8,7 +8,6 @@
 #define __KZM9G_H
 
 #define CONFIG_SH73A0
-#define CONFIG_MACH_TYPE MACH_TYPE_KZM9G
 
 #include <asm/arch/rmobile.h>
 
index 6b6f0d6..146d8ad 100644 (file)
@@ -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 */
index 00c0c8f..7294a3c 100644 (file)
  */
 #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
index 0314f34..b0c78d3 100644 (file)
@@ -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 */
index d82dbc1..1f40d98 100644 (file)
@@ -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 */
index f5f1ab0..10292c8 100644 (file)
@@ -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 */
index 3e23940..9cc297d 100644 (file)
@@ -16,7 +16,6 @@
 
 #include <asm/arch/imx-regs.h>
 
-#define CONFIG_MACH_TYPE       MACH_TYPE_MX51_BABBAGE
 /*
  * Hardware drivers
  */
index 8595c93..b026c6f 100644 (file)
@@ -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
index 1bfc035..5cd51a4 100644 (file)
@@ -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"
 
index a9f353d..9a9f588 100644 (file)
@@ -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"
 
index 4bfeff1..e8fd212 100644 (file)
@@ -14,8 +14,6 @@
 #include "imx6_spl.h"
 #endif
 
-#define CONFIG_MACH_TYPE               MACH_TYPE_MX6SL_EVK
-
 #define CONFIG_MXC_UART_BASE           UART1_IPS_BASE_ADDR
 
 /* MMC Configs */
index 1a43587..be02220 100644 (file)
 #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 */
index d704b82..cd53c49 100644 (file)
@@ -11,8 +11,6 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_MACH_TYPE       3769
-
 #define CONFIG_USBD_HS
 
 #define CONFIG_MXC_UART_BASE          UART2_BASE
index 30d4783..281922a 100644 (file)
@@ -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
index 462aa4a..fb210ce 100644 (file)
@@ -15,7 +15,6 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_MACH_TYPE       MACH_TYPE_OMAP_4430SDP
 
 #include <configs/ti_omap4_common.h>
 
index d63de28..881df2d 100644 (file)
@@ -19,8 +19,6 @@
 #define PHYS_SDRAM_1                   CONFIG_SYS_SDRAM_BASE
 #define SDRAM_BANK_SIZE                        (256 << 20)     /* 256 MB */
 
-#define CONFIG_MACH_TYPE               MACH_TYPE_ORIGEN
-
 #define CONFIG_SYS_MEM_TOP_HIDE        (1 << 20)       /* ram console */
 
 #define CONFIG_SYS_MONITOR_BASE        0x00000000
index 7a09ac0..c12f4d0 100644 (file)
@@ -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"
index 53342ce..3d18747 100644 (file)
@@ -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)
index 4a347fe..4925fcc 100644 (file)
@@ -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" \
index 3af4135..1523eff 100644 (file)
@@ -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                                             \
index 18eec71..cf74e0e 100644 (file)
@@ -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 |                                  \
index ef51da3..f49bcfb 100644 (file)
 #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 */
index 1438130..a333326 100644 (file)
@@ -13,8 +13,6 @@
 #ifndef __CONFIG_PXM2_H
 #define __CONFIG_PXM2_H
 
-#define CONFIG_SIEMENS_MACH_TYPE       MACH_TYPE_PXM2
-
 #include "siemens-am33x-common.h"
 
 #define DDR_IOCTRL_VAL         0x18b
index 14c89a9..55768a4 100644 (file)
        (&((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
index d240d8e..68d68d0 100644 (file)
@@ -13,8 +13,6 @@
 #ifndef __CONFIG_RUT_H
 #define __CONFIG_RUT_H
 
-#define CONFIG_SIEMENS_MACH_TYPE       MACH_TYPE_RUT
-
 #include "siemens-am33x-common.h"
 
 #define RUT_IOCTRL_VAL 0x18b
index 5b5aa1b..c51517a 100644 (file)
@@ -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 */
index 5d89ed3..6ccba95 100644 (file)
 #define CONFIG_DMA_COHERENT
 #define CONFIG_DMA_COHERENT_SIZE       (1 << 20)
 
-#ifdef CONFIG_SIEMENS_MACH_TYPE
-#define CONFIG_MACH_TYPE               CONFIG_SIEMENS_MACH_TYPE
-#endif
-
 /* commands to include */
 
 #ifndef CONFIG_SPL_BUILD
index 233a26a..5bcc3a6 100644 (file)
@@ -45,7 +45,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
 
index 61d5968..4a6b625 100644 (file)
@@ -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*/
index 6033760..0e1baa9 100644 (file)
@@ -16,6 +16,4 @@
  */
 #include <configs/sunxi-common.h>
 
-#define CONFIG_MACH_TYPE       (4104 | ((CONFIG_MACH_TYPE_COMPAT_REV) << 28))
-
 #endif /* __CONFIG_H */
index ee42af8..ada18de 100644 (file)
@@ -16,6 +16,4 @@
  */
 #include <configs/sunxi-common.h>
 
-#define CONFIG_MACH_TYPE       (4138 | ((CONFIG_MACH_TYPE_COMPAT_REV) << 28))
-
 #endif /* __CONFIG_H */
index d2fd586..803a751 100644 (file)
@@ -20,6 +20,4 @@
  */
 #include <configs/sunxi-common.h>
 
-#define CONFIG_MACH_TYPE       (4283 | ((CONFIG_MACH_TYPE_COMPAT_REV) << 28))
-
 #endif /* __CONFIG_H */
index 5a967bb..f7d0a7e 100644 (file)
 #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
index acc6e6c..0438b5a 100644 (file)
@@ -12,8 +12,6 @@
 
 /* General configuration */
 
-#define CONFIG_MACH_TYPE               3980
-
 #define CONFIG_SYS_HZ                  1000
 
 /* Physical Memory Map */
index f12e9f7..ee63ce3 100644 (file)
@@ -18,8 +18,6 @@
 
 #include <asm/arch/omap.h>
 
-#define CONFIG_MACH_TYPE               MACH_TYPE_TI8148EVM
-
 /* commands to include */
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
index c8f5a07..cffa794 100644 (file)
@@ -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" \
index 7284663..396e9f2 100644 (file)
@@ -26,8 +26,6 @@
 #define PHYS_SDRAM_1                   CONFIG_SYS_SDRAM_BASE
 #define SDRAM_BANK_SIZE                        (256 << 20)     /* 256 MB */
 
-#define CONFIG_MACH_TYPE               MACH_TYPE_TRATS
-
 #define CONFIG_BOOTCOMMAND             "run autoboot"
 
 #define CONFIG_SYS_INIT_SP_ADDR        (CONFIG_SYS_LOAD_ADDR \
index b914e44..b562d44 100644 (file)
@@ -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 */
index 14b5325..fe6ea68 100644 (file)
@@ -12,9 +12,6 @@
 
 #include "imx6_spl.h"
 
-/* Provide the MACH_TYPE value that the vendor kernel requires. */
-#define CONFIG_MACH_TYPE               4800
-
 #define CONFIG_MXC_UART_BASE           UART2_BASE
 
 /* SATA Configs */
index 61b577e..c12e536 100644 (file)
@@ -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
-
 /*
  * Hardware drivers
  */
index 21f90f3..0bd5a1e 100644 (file)
@@ -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"
index 2330310..49053ce 100644 (file)
@@ -13,8 +13,6 @@
 
 #define CONFIG_SYS_FSL_CLK
 
-#define CONFIG_MACH_TYPE               4146
-
 /* NAND support */
 #define CONFIG_SYS_NAND_ONFI_DETECTION
 
index f922688..ece762e 100644 (file)
@@ -12,8 +12,6 @@
 
 #include "imx6_spl.h"
 
-#define CONFIG_MACH_TYPE               MACH_TYPE_WANDBOARD_IMX6
-
 #define CONFIG_MXC_UART_BASE           UART1_BASE
 
 /* SATA Configs */
index 23a0bed..83b24a7 100644 (file)
 #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
-
-/*
  * Memory configurations
  */
 #define CONFIG_SYS_SDRAM_BASE          EMC_DYCS0_BASE
index 2991360..46596e9 100644 (file)
@@ -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
  */