diff options
| author | Tom Rini <trini@konsulko.com> | 2021-08-30 16:16:32 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-09-08 02:17:32 +0300 |
| commit | 5f588f831b7459ea910aaf75f4ddd2522987b0e6 (patch) | |
| tree | ba4e04647da735f6ac5ddc547a26578d8e99855c /configs/taurus_defconfig | |
| parent | 87e8d38a3977ee284e1bbaad03f08d652ca1c7ec (diff) | |
| download | u-boot-5f588f831b7459ea910aaf75f4ddd2522987b0e6.tar.xz | |
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>
Diffstat (limited to 'configs/taurus_defconfig')
| -rw-r--r-- | configs/taurus_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig index 19195ad9e4..0bb28d4d12 100644 --- a/configs/taurus_defconfig +++ b/configs/taurus_defconfig @@ -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" |