commit 5f588f831b7459ea910aaf75f4ddd2522987b0e6
author Tom Rini <trini@konsulko.com> Mon Aug 30 09:16:32 2021 -0400
committer Tom Rini <trini@konsulko.com> Tue Sep 07 19:17:32 2021 -0400
tree ba4e04647da735f6ac5ddc547a26578d8e99855c
parent 87e8d38a3977ee284e1bbaad03f08d652ca1c7ec

arm: Finish migration of CONFIG_MACH_TYPE

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>

configs/am335x_igep003x_defconfig

diff --git a/configs/am335x_igep003x_defconfig b/configs/am335x_igep003x_defconfig
index d41c64e..af94cc0 100644
--- a/configs/am335x_igep003x_defconfig
+++ b/configs/am335x_igep003x_defconfig
@@ -16,7 +16,6 @@
 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

configs/axm_defconfig

diff --git a/configs/axm_defconfig b/configs/axm_defconfig
index eae53eb..a013338 100644
--- a/configs/axm_defconfig
+++ b/configs/axm_defconfig
@@ -28,7 +28,7 @@
 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"

configs/corvus_defconfig

diff --git a/configs/corvus_defconfig b/configs/corvus_defconfig
index db957a3..72f4310 100644
--- a/configs/corvus_defconfig
+++ b/configs/corvus_defconfig
@@ -20,7 +20,7 @@
 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"

configs/taurus_defconfig

diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig
index 19195ad..0bb28d4 100644
--- a/configs/taurus_defconfig
+++ b/configs/taurus_defconfig
@@ -30,7 +30,7 @@
 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"