X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fconfigs%2Fvexpress_aemv8a.h;h=36f535e9a49e898e017d3cb45af12a673df11098;hb=0223462b373b975d970fa86e5e1a7eadd1d41820;hp=4a9b97df184e1074b0b6f2fccddd98a53be0d005;hpb=7985cdf74b280f86a1c7440298a84f1fb2876fd9;p=platform%2Fkernel%2Fu-boot.git diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index 4a9b97d..36f535e 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Configuration for Versatile Express. Parts were derived from other ARM * configurations. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __VEXPRESS_AEMV8A_H @@ -17,22 +16,12 @@ #define CONFIG_REMAKE_ELF -#define CONFIG_SUPPORT_RAW_INITRD - -/* MMU Definitions */ -#define CONFIG_SYS_CACHELINE_SIZE 64 - -#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) #endif @@ -108,50 +97,23 @@ /* 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 +#ifndef CONFIG_TARGET_VEXPRESS64_JUNO /* 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) @@ -164,15 +126,11 @@ #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) @@ -188,21 +146,12 @@ "kernel_addr=0x80080000\0" \ "initrd_name=ramdisk.img\0" \ "initrd_addr=0x84000000\0" \ - "fdt_name=board.dtb\0" \ + "fdtfile=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 "\ @@ -210,10 +159,10 @@ "${kernel_name}; "\ " afs load ${kernel_alt_name} ${kernel_addr};"\ "fi ; "\ - "afs load ${fdt_name} ${fdt_addr} ; " \ + "afs load ${fdtfile} ${fdt_addr} ; " \ "if test $? -eq 1; then "\ " echo Loading ${fdt_alt_name} instead of "\ - "${fdt_name}; "\ + "${fdtfile}; "\ " afs load ${fdt_alt_name} ${fdt_addr}; "\ "fi ; "\ "fdt addr ${fdt_addr}; fdt resize; " \ @@ -224,7 +173,6 @@ "fi ; " \ "booti ${kernel_addr} ${initrd_param} ${fdt_addr}" -#define CONFIG_BOOTDELAY 1 #elif CONFIG_TARGET_VEXPRESS64_BASE_FVP #define CONFIG_EXTRA_ENV_SETTINGS \ @@ -232,24 +180,19 @@ "kernel_addr=0x80080000\0" \ "initrd_name=ramdisk.img\0" \ "initrd_addr=0x88000000\0" \ - "fdt_name=devtree.dtb\0" \ + "fdtfile=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 ${fdtfile} ${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 \ @@ -259,27 +202,13 @@ "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 #endif /* 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 */ #ifdef CONFIG_TARGET_VEXPRESS64_JUNO @@ -299,7 +228,6 @@ #define CONFIG_ENV_SECT_SIZE 0x00040000 #endif -#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 @@ -310,7 +238,5 @@ #define CONFIG_SYS_FLASH_EMPTY_INFO /* flinfo indicates empty blocks */ #define FLASH_MAX_SECTOR_SIZE 0x00040000 #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE -#define CONFIG_ENV_IS_IN_FLASH 1 - #endif /* __VEXPRESS_AEMV8A_H */