mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-11 07:34:31 +00:00
2c2b218383
This patch makes the 2nd DRAM bank available on Juno only and not on
other vexpress64 targets, eg. the FVP models.
The commit below added a 2nd bank of NOR flash for Juno, but also for
all vexpress64 targets:
commit 2d0cee1ca2
Author: Liviu Dudau <Liviu.Dudau@foss.arm.com>
Date: Mon Oct 19 11:08:31 2015 +0100
vexpress64: Juno: Declare all 8GB of RAM and make them visible to the kernel.
Juno comes with 8GB RAM, but U-Boot only passes 2GB to the kernel.
Declare a secondary memory bank and set the sizes correctly.
Signed-off-by: Liviu Dudau <Liviu.Dudau@foss.arm.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Ryan Harkin <ryan.harkin@linaro.org>
Tested-by: Ryan Harkin <ryan.harkin@linaro.org>
Unfortunately, I only fully tested on Juno R0, R1 and the FVP Foundation
model. Whilst FVP Base AEMV8 models run U-Boot OK, they fail to boot
the kernel.
Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
Acked-by: Liviu Dudau <liviu.dudau@foss.arm.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
323 lines
9.8 KiB
C
323 lines
9.8 KiB
C
/*
|
|
* Configuration for Versatile Express. Parts were derived from other ARM
|
|
* configurations.
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0+
|
|
*/
|
|
|
|
#ifndef __VEXPRESS_AEMV8A_H
|
|
#define __VEXPRESS_AEMV8A_H
|
|
|
|
#ifdef CONFIG_TARGET_VEXPRESS64_BASE_FVP
|
|
#ifndef CONFIG_SEMIHOSTING
|
|
#error CONFIG_TARGET_VEXPRESS64_BASE_FVP requires CONFIG_SEMIHOSTING
|
|
#endif
|
|
#define CONFIG_ARMV8_SWITCH_TO_EL1
|
|
#endif
|
|
|
|
#define CONFIG_REMAKE_ELF
|
|
|
|
#define CONFIG_SUPPORT_RAW_INITRD
|
|
|
|
/* Cache Definitions */
|
|
#define CONFIG_SYS_DCACHE_OFF
|
|
#define CONFIG_SYS_ICACHE_OFF
|
|
|
|
#define CONFIG_IDENT_STRING " vexpress_aemv8a"
|
|
#define CONFIG_BOOTP_VCI_STRING "U-boot.armv8.vexpress_aemv8a"
|
|
|
|
/* Link Definitions */
|
|
#if defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP) || \
|
|
defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP_DRAM)
|
|
/* ATF loads u-boot here for BASE_FVP model */
|
|
#define CONFIG_SYS_TEXT_BASE 0x88000000
|
|
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x03f00000)
|
|
#elif CONFIG_TARGET_VEXPRESS64_JUNO
|
|
#define CONFIG_SYS_TEXT_BASE 0xe0000000
|
|
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x7fff0)
|
|
#else
|
|
#error "Unknown board variant"
|
|
#endif
|
|
|
|
#define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */
|
|
|
|
/* Flat Device Tree Definitions */
|
|
#define CONFIG_OF_LIBFDT
|
|
|
|
/* CS register bases for the original memory map. */
|
|
#define V2M_PA_CS0 0x00000000
|
|
#define V2M_PA_CS1 0x14000000
|
|
#define V2M_PA_CS2 0x18000000
|
|
#define V2M_PA_CS3 0x1c000000
|
|
#define V2M_PA_CS4 0x0c000000
|
|
#define V2M_PA_CS5 0x10000000
|
|
|
|
#define V2M_PERIPH_OFFSET(x) (x << 16)
|
|
#define V2M_SYSREGS (V2M_PA_CS3 + V2M_PERIPH_OFFSET(1))
|
|
#define V2M_SYSCTL (V2M_PA_CS3 + V2M_PERIPH_OFFSET(2))
|
|
#define V2M_SERIAL_BUS_PCI (V2M_PA_CS3 + V2M_PERIPH_OFFSET(3))
|
|
|
|
#define V2M_BASE 0x80000000
|
|
|
|
/* Common peripherals relative to CS7. */
|
|
#define V2M_AACI (V2M_PA_CS3 + V2M_PERIPH_OFFSET(4))
|
|
#define V2M_MMCI (V2M_PA_CS3 + V2M_PERIPH_OFFSET(5))
|
|
#define V2M_KMI0 (V2M_PA_CS3 + V2M_PERIPH_OFFSET(6))
|
|
#define V2M_KMI1 (V2M_PA_CS3 + V2M_PERIPH_OFFSET(7))
|
|
|
|
#ifdef CONFIG_TARGET_VEXPRESS64_JUNO
|
|
#define V2M_UART0 0x7ff80000
|
|
#define V2M_UART1 0x7ff70000
|
|
#else /* Not Juno */
|
|
#define V2M_UART0 (V2M_PA_CS3 + V2M_PERIPH_OFFSET(9))
|
|
#define V2M_UART1 (V2M_PA_CS3 + V2M_PERIPH_OFFSET(10))
|
|
#define V2M_UART2 (V2M_PA_CS3 + V2M_PERIPH_OFFSET(11))
|
|
#define V2M_UART3 (V2M_PA_CS3 + V2M_PERIPH_OFFSET(12))
|
|
#endif
|
|
|
|
#define V2M_WDT (V2M_PA_CS3 + V2M_PERIPH_OFFSET(15))
|
|
|
|
#define V2M_TIMER01 (V2M_PA_CS3 + V2M_PERIPH_OFFSET(17))
|
|
#define V2M_TIMER23 (V2M_PA_CS3 + V2M_PERIPH_OFFSET(18))
|
|
|
|
#define V2M_SERIAL_BUS_DVI (V2M_PA_CS3 + V2M_PERIPH_OFFSET(22))
|
|
#define V2M_RTC (V2M_PA_CS3 + V2M_PERIPH_OFFSET(23))
|
|
|
|
#define V2M_CF (V2M_PA_CS3 + V2M_PERIPH_OFFSET(26))
|
|
|
|
#define V2M_CLCD (V2M_PA_CS3 + V2M_PERIPH_OFFSET(31))
|
|
|
|
/* System register offsets. */
|
|
#define V2M_SYS_CFGDATA (V2M_SYSREGS + 0x0a0)
|
|
#define V2M_SYS_CFGCTRL (V2M_SYSREGS + 0x0a4)
|
|
#define V2M_SYS_CFGSTAT (V2M_SYSREGS + 0x0a8)
|
|
|
|
/* Generic Timer Definitions */
|
|
#define COUNTER_FREQUENCY (0x1800000) /* 24MHz */
|
|
|
|
/* Generic Interrupt Controller Definitions */
|
|
#ifdef CONFIG_GICV3
|
|
#define GICD_BASE (0x2f000000)
|
|
#define GICR_BASE (0x2f100000)
|
|
#else
|
|
|
|
#if defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP) || \
|
|
defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP_DRAM)
|
|
#define GICD_BASE (0x2f000000)
|
|
#define GICC_BASE (0x2c000000)
|
|
#elif CONFIG_TARGET_VEXPRESS64_JUNO
|
|
#define GICD_BASE (0x2C010000)
|
|
#define GICC_BASE (0x2C02f000)
|
|
#else
|
|
#error "Unknown board variant"
|
|
#endif
|
|
#endif /* !CONFIG_GICV3 */
|
|
|
|
/* Size of malloc() pool */
|
|
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (8 << 20))
|
|
|
|
/* Ethernet Configuration */
|
|
#ifdef CONFIG_TARGET_VEXPRESS64_JUNO
|
|
/* The real hardware Versatile express uses SMSC9118 */
|
|
#define CONFIG_SMC911X 1
|
|
#define CONFIG_SMC911X_32_BIT 1
|
|
#define CONFIG_SMC911X_BASE (0x018000000)
|
|
#else
|
|
/* The Vexpress64 simulators use SMSC91C111 */
|
|
#define CONFIG_SMC91111 1
|
|
#define CONFIG_SMC91111_BASE (0x01A000000)
|
|
#endif
|
|
|
|
/* PL011 Serial Configuration */
|
|
#define CONFIG_BAUDRATE 115200
|
|
#define CONFIG_CONS_INDEX 0
|
|
#define CONFIG_PL01X_SERIAL
|
|
#define CONFIG_PL011_SERIAL
|
|
#ifdef CONFIG_TARGET_VEXPRESS64_JUNO
|
|
#define CONFIG_PL011_CLOCK 7273800
|
|
#else
|
|
#define CONFIG_PL011_CLOCK 24000000
|
|
#endif
|
|
|
|
/* Command line configuration */
|
|
#define CONFIG_MENU
|
|
/*#define CONFIG_MENU_SHOW*/
|
|
#define CONFIG_CMD_CACHE
|
|
#define CONFIG_CMD_BOOTI
|
|
#define CONFIG_CMD_UNZIP
|
|
#define CONFIG_CMD_DHCP
|
|
#define CONFIG_CMD_PXE
|
|
#define CONFIG_CMD_ENV
|
|
#define CONFIG_CMD_MII
|
|
#define CONFIG_CMD_PING
|
|
#define CONFIG_CMD_FAT
|
|
#define CONFIG_DOS_PARTITION
|
|
|
|
/* BOOTP options */
|
|
#define CONFIG_BOOTP_BOOTFILESIZE
|
|
#define CONFIG_BOOTP_BOOTPATH
|
|
#define CONFIG_BOOTP_GATEWAY
|
|
#define CONFIG_BOOTP_HOSTNAME
|
|
#define CONFIG_BOOTP_PXE
|
|
#define CONFIG_BOOTP_PXE_CLIENTARCH 0x100
|
|
|
|
/* Miscellaneous configurable options */
|
|
#define CONFIG_SYS_LOAD_ADDR (V2M_BASE + 0x10000000)
|
|
|
|
/* Physical Memory Map */
|
|
#define PHYS_SDRAM_1 (V2M_BASE) /* SDRAM Bank #1 */
|
|
/* Top 16MB reserved for secure world use */
|
|
#define DRAM_SEC_SIZE 0x01000000
|
|
#define PHYS_SDRAM_1_SIZE 0x80000000 - DRAM_SEC_SIZE
|
|
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
|
|
|
|
#ifdef CONFIG_TARGET_VEXPRESS64_JUNO
|
|
#define CONFIG_NR_DRAM_BANKS 2
|
|
#define PHYS_SDRAM_2 (0x880000000)
|
|
#define PHYS_SDRAM_2_SIZE 0x180000000
|
|
#else
|
|
#define CONFIG_NR_DRAM_BANKS 1
|
|
#endif
|
|
|
|
/* Enable memtest */
|
|
#define CONFIG_CMD_MEMTEST
|
|
#define CONFIG_SYS_MEMTEST_START PHYS_SDRAM_1
|
|
#define CONFIG_SYS_MEMTEST_END (PHYS_SDRAM_1 + PHYS_SDRAM_1_SIZE)
|
|
|
|
/* Initial environment variables */
|
|
#ifdef CONFIG_TARGET_VEXPRESS64_JUNO
|
|
/*
|
|
* Defines where the kernel and FDT exist in NOR flash and where it will
|
|
* be copied into DRAM
|
|
*/
|
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
|
"kernel_name=norkern\0" \
|
|
"kernel_alt_name=Image\0" \
|
|
"kernel_addr=0x80000000\0" \
|
|
"initrd_name=ramdisk.img\0" \
|
|
"initrd_addr=0x84000000\0" \
|
|
"fdt_name=board.dtb\0" \
|
|
"fdt_alt_name=juno\0" \
|
|
"fdt_addr=0x83000000\0" \
|
|
"fdt_high=0xffffffffffffffff\0" \
|
|
"initrd_high=0xffffffffffffffff\0" \
|
|
|
|
/* Assume we boot with root on the first partition of a USB stick */
|
|
#define CONFIG_BOOTARGS "console=ttyAMA0,115200n8 " \
|
|
"root=/dev/sda2 rw " \
|
|
"rootwait "\
|
|
"earlyprintk=pl011,0x7ff80000 debug "\
|
|
"user_debug=31 "\
|
|
"androidboot.hardware=juno "\
|
|
"loglevel=9"
|
|
|
|
/* Copy the kernel and FDT to DRAM memory and boot */
|
|
#define CONFIG_BOOTCOMMAND "afs load ${kernel_name} ${kernel_addr} ; " \
|
|
"if test $? -eq 1; then "\
|
|
" echo Loading ${kernel_alt_name} instead of "\
|
|
"${kernel_name}; "\
|
|
" afs load ${kernel_alt_name} ${kernel_addr};"\
|
|
"fi ; "\
|
|
"afs load ${fdt_name} ${fdt_addr} ; " \
|
|
"if test $? -eq 1; then "\
|
|
" echo Loading ${fdt_alt_name} instead of "\
|
|
"${fdt_name}; "\
|
|
" afs load ${fdt_alt_name} ${fdt_addr}; "\
|
|
"fi ; "\
|
|
"fdt addr ${fdt_addr}; fdt resize; " \
|
|
"if afs load ${initrd_name} ${initrd_addr} ; "\
|
|
"then "\
|
|
" setenv initrd_param ${initrd_addr}; "\
|
|
" else setenv initrd_param -; "\
|
|
"fi ; " \
|
|
"booti ${kernel_addr} ${initrd_param} ${fdt_addr}"
|
|
|
|
#define CONFIG_BOOTDELAY 1
|
|
|
|
#elif CONFIG_TARGET_VEXPRESS64_BASE_FVP
|
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
|
"kernel_name=Image\0" \
|
|
"kernel_addr=0x80000000\0" \
|
|
"initrd_name=ramdisk.img\0" \
|
|
"initrd_addr=0x88000000\0" \
|
|
"fdt_name=devtree.dtb\0" \
|
|
"fdt_addr=0x83000000\0" \
|
|
"fdt_high=0xffffffffffffffff\0" \
|
|
"initrd_high=0xffffffffffffffff\0"
|
|
|
|
#define CONFIG_BOOTARGS "console=ttyAMA0 earlyprintk=pl011,"\
|
|
"0x1c090000 debug user_debug=31 "\
|
|
"loglevel=9"
|
|
|
|
#define CONFIG_BOOTCOMMAND "smhload ${kernel_name} ${kernel_addr}; " \
|
|
"smhload ${fdt_name} ${fdt_addr}; " \
|
|
"smhload ${initrd_name} ${initrd_addr} "\
|
|
"initrd_end; " \
|
|
"fdt addr ${fdt_addr}; fdt resize; " \
|
|
"fdt chosen ${initrd_addr} ${initrd_end}; " \
|
|
"booti $kernel_addr - $fdt_addr"
|
|
|
|
#define CONFIG_BOOTDELAY 1
|
|
|
|
#elif CONFIG_TARGET_VEXPRESS64_BASE_FVP_DRAM
|
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
|
"kernel_addr=0x80080000\0" \
|
|
"initrd_addr=0x84000000\0" \
|
|
"fdt_addr=0x83000000\0" \
|
|
"fdt_high=0xffffffffffffffff\0" \
|
|
"initrd_high=0xffffffffffffffff\0"
|
|
|
|
#define CONFIG_BOOTARGS "console=ttyAMA0 earlyprintk=pl011,"\
|
|
"0x1c090000 debug user_debug=31 "\
|
|
"androidboot.hardware=fvpbase "\
|
|
"root=/dev/vda2 rw "\
|
|
"rootwait "\
|
|
"loglevel=9"
|
|
|
|
#define CONFIG_BOOTCOMMAND "booti $kernel_addr $initrd_addr $fdt_addr"
|
|
|
|
#define CONFIG_BOOTDELAY 1
|
|
|
|
#else
|
|
#error "Unknown board variant"
|
|
#endif
|
|
|
|
/* Do not preserve environment */
|
|
#define CONFIG_ENV_IS_NOWHERE 1
|
|
#define CONFIG_ENV_SIZE 0x1000
|
|
|
|
/* Monitor Command Prompt */
|
|
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
|
|
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
|
|
sizeof(CONFIG_SYS_PROMPT) + 16)
|
|
#define CONFIG_SYS_HUSH_PARSER
|
|
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
|
|
#define CONFIG_SYS_LONGHELP
|
|
#define CONFIG_CMDLINE_EDITING
|
|
#define CONFIG_SYS_MAXARGS 64 /* max command args */
|
|
|
|
/* Flash memory is available on the Juno board only */
|
|
#ifndef CONFIG_TARGET_VEXPRESS64_JUNO
|
|
#define CONFIG_SYS_NO_FLASH
|
|
#else
|
|
#define CONFIG_CMD_ARMFLASH
|
|
#define CONFIG_SYS_FLASH_CFI 1
|
|
#define CONFIG_FLASH_CFI_DRIVER 1
|
|
#define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_32BIT
|
|
#define CONFIG_SYS_FLASH_BASE 0x08000000
|
|
#define CONFIG_SYS_FLASH_SIZE 0x04000000 /* 64 MiB */
|
|
#define CONFIG_SYS_MAX_FLASH_BANKS 2
|
|
|
|
/* Timeout values in ticks */
|
|
#define CONFIG_SYS_FLASH_ERASE_TOUT (2 * CONFIG_SYS_HZ) /* Erase Timeout */
|
|
#define CONFIG_SYS_FLASH_WRITE_TOUT (2 * CONFIG_SYS_HZ) /* Write Timeout */
|
|
|
|
/* 255 0x40000 sectors + first or last sector may have 4 erase regions = 259 */
|
|
#define CONFIG_SYS_MAX_FLASH_SECT 259 /* Max sectors */
|
|
#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE /* use buffered writes */
|
|
#define CONFIG_SYS_FLASH_PROTECTION /* The devices have real protection */
|
|
#define CONFIG_SYS_FLASH_EMPTY_INFO /* flinfo indicates empty blocks */
|
|
|
|
#endif
|
|
|
|
#endif /* __VEXPRESS_AEMV8A_H */
|