diff options
| author | Tom Rini <trini@konsulko.com> | 2020-08-06 20:57:55 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-08-06 20:57:55 -0400 |
| commit | ce2724909b07737030666b2046222f47f2d9feb8 (patch) | |
| tree | ee655d923cfdfd5d4a273f75db4ec3d3f314fe28 /include | |
| parent | 99c69538093143984edf0bcebdadc0a6d767c0a4 (diff) | |
| parent | 276b6c943a9b8166666b808c64d8a1deefdccbb3 (diff) | |
| download | u-boot-ce2724909b07737030666b2046222f47f2d9feb8.tar.gz u-boot-ce2724909b07737030666b2046222f47f2d9feb8.tar.xz u-boot-ce2724909b07737030666b2046222f47f2d9feb8.zip | |
Merge branch '2020-08-06-Kconfig-sram-options'
- Migrate a few SRAM related options to Kconfig, related cleanups.
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/devkit8000.h | 4 | ||||
| -rw-r--r-- | include/configs/pic32mzdask.h | 3 | ||||
| -rw-r--r-- | include/configs/tricorder.h | 4 | ||||
| -rw-r--r-- | include/init.h | 22 | ||||
| -rw-r--r-- | include/serial.h | 2 |
5 files changed, 23 insertions, 12 deletions
diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index 5ef0fe7f92..87da4410f5 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -137,10 +137,6 @@ /* Boot Argument Buffer Size */ -/* SRAM config */ -#define CONFIG_SYS_SRAM_START 0x40200000 -#define CONFIG_SYS_SRAM_SIZE 0x10000 - /* Defines for SPL */ /* NAND boot config */ diff --git a/include/configs/pic32mzdask.h b/include/configs/pic32mzdask.h index 73edd28f1a..d50edc7715 100644 --- a/include/configs/pic32mzdask.h +++ b/include/configs/pic32mzdask.h @@ -19,9 +19,6 @@ /*---------------------------------------------------------------------- * Memory Layout */ -#define CONFIG_SYS_SRAM_BASE 0x80000000 -#define CONFIG_SYS_SRAM_SIZE 0x00080000 /* 512K */ - /* Initial RAM for temporary stack, global data */ #define CONFIG_SYS_INIT_RAM_SIZE 0x10000 #define CONFIG_SYS_INIT_RAM_ADDR \ diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index 02f57281af..55f25857eb 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -197,10 +197,6 @@ CONFIG_SYS_INIT_RAM_SIZE - \ GENERATED_GBL_DATA_SIZE) -/* SRAM config */ -#define CONFIG_SYS_SRAM_START 0x40200000 -#define CONFIG_SYS_SRAM_SIZE 0x10000 - /* Defines for SPL */ #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" diff --git a/include/init.h b/include/init.h index de408baf89..0f48ccb57a 100644 --- a/include/init.h +++ b/include/init.h @@ -142,6 +142,28 @@ int arch_reserve_stacks(void); int arch_reserve_mmu(void); /** + * arch_setup_bdinfo() - Architecture dependent boardinfo setup + * + * Architecture-specific routine for populating various boardinfo fields of + * gd->bd. It is called during the generic board init sequence. + * + * If an implementation is not provided, it will just be a nop stub. + * + * Return: 0 if OK + */ +int arch_setup_bdinfo(void); + +/** + * setup_bdinfo() - Generic boardinfo setup + * + * Routine for populating various generic boardinfo fields of + * gd->bd. It is called during the generic board init sequence. + * + * Return: 0 if OK + */ +int setup_bdinfo(void); + +/** * init_cache_f_r() - Turn on the cache in preparation for relocation * * Return: 0 if OK, -ve on error diff --git a/include/serial.h b/include/serial.h index c590637b1f..6d1e62c677 100644 --- a/include/serial.h +++ b/include/serial.h @@ -42,10 +42,10 @@ extern struct serial_device eserial5_device; extern struct serial_device eserial6_device; extern void serial_register(struct serial_device *); -extern void serial_initialize(void); extern void serial_stdio_init(void); extern int serial_assign(const char *name); extern void serial_reinit_all(void); +int serial_initialize(void); /* For usbtty */ #ifdef CONFIG_USB_TTY |