diff options
| author | Tom Rini <trini@konsulko.com> | 2021-09-07 22:29:57 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-09-07 22:29:57 -0400 |
| commit | 07298e4828b7d0904fbfd77d386f01b4a37a5609 (patch) | |
| tree | ba4e04647da735f6ac5ddc547a26578d8e99855c /include/configs/apalis_imx6.h | |
| parent | ec929484ecd95279abd5a95516ec8307571a26a4 (diff) | |
| parent | 5f588f831b7459ea910aaf75f4ddd2522987b0e6 (diff) | |
Merge branch '2021-09-07-ATAGs-and-related-migration' into next
- Merge ATAGs and MACH_ID options to Kconfig, and then disable them for
nearly all platforms. A small number of platforms actively require
this support still, and have it still enabled. Otherwise, it's migrated
and disabled.
Diffstat (limited to 'include/configs/apalis_imx6.h')
| -rw-r--r-- | include/configs/apalis_imx6.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 839af489dd8..23fca1e447b 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> @@ -23,12 +21,6 @@ #include "imx6_spl.h" #endif -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG -#define CONFIG_SERIAL_TAG - #define CONFIG_MXC_UART_BASE UART1_BASE /* MMC Configs */ |