diff options
author | Tom Rini <trini@konsulko.com> | 2021-08-30 09:16:32 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2021-09-07 19:17:32 -0400 |
commit | 5f588f831b7459ea910aaf75f4ddd2522987b0e6 (patch) | |
tree | ba4e04647da735f6ac5ddc547a26578d8e99855c /include/configs/at91sam9260ek.h | |
parent | 87e8d38a3977ee284e1bbaad03f08d652ca1c7ec (diff) | |
download | u-boot-WIP/2021-09-07-ATAGs-and-related-migration.tar.gz |
arm: Finish migration of CONFIG_MACH_TYPEWIP/2021-09-07-ATAGs-and-related-migration
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 'include/configs/at91sam9260ek.h')
-rw-r--r-- | include/configs/at91sam9260ek.h | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index d07262c25a..d09a5dbf10 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -64,24 +64,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 |