diff options
| author | Tom Rini <trini@konsulko.com> | 2018-03-30 18:16:56 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-03-30 18:16:56 -0400 |
| commit | 0ca0a546b186478b9de80cbd27fa8baf17e30863 (patch) | |
| tree | da9e58e3cab0a924755bb9be2e809cd18468fc8c /include | |
| parent | 2476d26fd307edc84e8257dc1bccefb65547f88a (diff) | |
| parent | d58717e42559189a226ea800173147399c8edef9 (diff) | |
| download | u-boot-0ca0a546b186478b9de80cbd27fa8baf17e30863.tar.gz | |
Merge git://git.denx.de/u-boot-riscv
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/adp-ae3xx.h | 6 | ||||
| -rw-r--r-- | include/configs/adp-ag101p.h | 6 | ||||
| -rw-r--r-- | include/configs/nx25-ae250.h | 18 |
3 files changed, 3 insertions, 27 deletions
diff --git a/include/configs/adp-ae3xx.h b/include/configs/adp-ae3xx.h index f5a8dec24a..1ebbc4c9e2 100644 --- a/include/configs/adp-ae3xx.h +++ b/include/configs/adp-ae3xx.h @@ -81,12 +81,6 @@ #define CONFIG_SYS_NS16550_CLK ((18432000 * 20) / 25) /* AG101P */ /* - * SD (MMC) controller - */ -#define CONFIG_FTSDC010_NUMBER 1 -#define CONFIG_FTSDC010_SDIO - -/* * Miscellaneous configurable options */ diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h index 6ae6fb4545..ff365c464e 100644 --- a/include/configs/adp-ag101p.h +++ b/include/configs/adp-ag101p.h @@ -83,12 +83,6 @@ #define CONFIG_SYS_NS16550_CLK ((18432000 * 20) / 25) /* AG101P */ /* - * SD (MMC) controller - */ -#define CONFIG_FTSDC010_NUMBER 1 -#define CONFIG_FTSDC010_SDIO - -/* * Miscellaneous configurable options */ diff --git a/include/configs/nx25-ae250.h b/include/configs/nx25-ae250.h index 73c3c33ffa..0e4c431cab 100644 --- a/include/configs/nx25-ae250.h +++ b/include/configs/nx25-ae250.h @@ -11,18 +11,9 @@ /* * CPU and Board Configuration Options */ -#define CONFIG_SKIP_LOWLEVEL_INIT - #define CONFIG_BOOTP_SEND_HOSTNAME #define CONFIG_BOOTP_SERVERIP -#ifdef CONFIG_SKIP_LOWLEVEL_INIT -#ifdef CONFIG_OF_CONTROL -#undef CONFIG_OF_SEPARATE -#define CONFIG_OF_EMBED -#endif -#endif - /* * Miscellaneous configurable options */ @@ -50,6 +41,9 @@ */ #define CONFIG_SYS_MALLOC_LEN (512 << 10) +/* DT blob (fdt) address */ +#define CONFIG_SYS_FDT_BASE 0x000f0000 + /* * Physical Memory Map */ @@ -70,12 +64,6 @@ #endif #define CONFIG_SYS_NS16550_CLK 19660800 -/* - * SD (MMC) controller - */ -#define CONFIG_FTSDC010_NUMBER 1 -#define CONFIG_FTSDC010_SDIO - /* Init Stack Pointer */ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000000 - \ GENERATED_GBL_DATA_SIZE) |