diff options
Diffstat (limited to 'board')
| -rw-r--r-- | board/highbank/MAINTAINERS | 2 | ||||
| -rw-r--r-- | board/highbank/highbank.c | 32 | ||||
| -rw-r--r-- | board/toradex/common/tdx-cfg-block.c | 4 |
3 files changed, 21 insertions, 17 deletions
diff --git a/board/highbank/MAINTAINERS b/board/highbank/MAINTAINERS index 69ddeddd600..a542bd1ee64 100644 --- a/board/highbank/MAINTAINERS +++ b/board/highbank/MAINTAINERS @@ -1,5 +1,5 @@ HIGHBANK BOARD -M: Rob Herring <robh@kernel.org> +M: Andre Przywara <andre.przywara@arm.com> S: Maintained F: board/highbank/ F: include/configs/highbank.h diff --git a/board/highbank/highbank.c b/board/highbank/highbank.c index 906bd9b6dda..ffb6fd922da 100644 --- a/board/highbank/highbank.c +++ b/board/highbank/highbank.c @@ -8,9 +8,9 @@ #include <cpu_func.h> #include <env.h> #include <fdt_support.h> +#include <fdtdec.h> #include <init.h> #include <net.h> -#include <netdev.h> #include <scsi.h> #include <asm/global_data.h> @@ -52,18 +52,6 @@ int board_init(void) return 0; } -/* We know all the init functions have been run now */ -int board_eth_init(struct bd_info *bis) -{ - int rc = 0; - -#ifdef CONFIG_CALXEDA_XGMAC - rc += calxedaxgmac_initialize(0, 0xfff50000); - rc += calxedaxgmac_initialize(1, 0xfff51000); -#endif - return rc; -} - #ifdef CONFIG_SCSI_AHCI_PLAT void scsi_init(void) { @@ -97,8 +85,12 @@ int misc_init_r(void) int dram_init(void) { - gd->ram_size = SZ_512M; - return 0; + return fdtdec_setup_mem_size_base(); +} + +int dram_init_banksize(void) +{ + return fdtdec_setup_memory_banksize(); } #if defined(CONFIG_OF_BOARD_SETUP) @@ -119,6 +111,16 @@ int ft_board_setup(void *fdt, struct bd_info *bd) } #endif +void *board_fdt_blob_setup(void) +{ + /* + * The ECME management processor loads the DTB from NOR flash + * into DRAM (at 4KB), where it gets patched to contain the + * detected memory size. + */ + return (void *)0x1000; +} + static int is_highbank(void) { uint32_t midr; diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c index b00467f9768..93eb20cf631 100644 --- a/board/toradex/common/tdx-cfg-block.c +++ b/board/toradex/common/tdx-cfg-block.c @@ -556,6 +556,8 @@ static int get_cfgblock_interactive(void) static int get_cfgblock_barcode(char *barcode, struct toradex_hw *tag, u32 *serial) { + char revision[3] = {barcode[6], barcode[7], '\0'}; + if (strlen(barcode) < 16) { printf("Argument too short, barcode is 16 chars long\n"); return -1; @@ -564,7 +566,7 @@ static int get_cfgblock_barcode(char *barcode, struct toradex_hw *tag, /* Get hardware information from the first 8 digits */ tag->ver_major = barcode[4] - '0'; tag->ver_minor = barcode[5] - '0'; - tag->ver_assembly = barcode[7] - '0'; + tag->ver_assembly = simple_strtoul(revision, NULL, 10); barcode[4] = '\0'; tag->prodid = simple_strtoul(barcode, NULL, 10); |