X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fconfigs%2Fx600.h;h=a6fb9889be6a95b3a585579511745adf27aae44b;hb=5bc0543df3079add8152afa041b887d081d71839;hp=13b0b95849a8038386bea6524a843959ab5eb2ad;hpb=5ebd27d860ec0c6e36f1b0f973653fe66a7360be;p=platform%2Fkernel%2Fu-boot.git diff --git a/include/configs/x600.h b/include/configs/x600.h index 13b0b95..a6fb988 100644 --- a/include/configs/x600.h +++ b/include/configs/x600.h @@ -1,6 +1,6 @@ /* - * (C) Copyright 2009 - * Vipin Kumar, STMicroelectronics, + * Copyright (C) 2009, STMicroelectronics - All Rights Reserved + * Author(s): Vipin Kumar, for STMicroelectronics. * * Copyright (C) 2012, 2015 Stefan Roese * @@ -16,14 +16,12 @@ */ #define CONFIG_SPEAR600 /* SPEAr600 SoC */ #define CONFIG_X600 /* on X600 board */ -#define CONFIG_SYS_THUMB_BUILD #include /* Timer, HZ specific defines */ #define CONFIG_SYS_HZ_CLOCK 8300000 -#define CONFIG_SYS_TEXT_BASE 0x00800040 #define CONFIG_SYS_FLASH_BASE 0xf8000000 /* Reserve 8KiB for SPL */ #define CONFIG_SPL_PAD_TO 8192 /* decimal for 'dd' */ @@ -34,17 +32,12 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE #define CONFIG_SYS_MONITOR_LEN 0x60000 -#define CONFIG_ENV_IS_IN_FLASH - /* Serial Configuration (PL011) */ #define CONFIG_SYS_SERIAL0 0xD0000000 #define CONFIG_SYS_SERIAL1 0xD0080000 #define CONFIG_PL01x_PORTS { (void *)CONFIG_SYS_SERIAL0, \ (void *)CONFIG_SYS_SERIAL1 } -#define CONFIG_PL011_SERIAL #define CONFIG_PL011_CLOCK (48 * 1000 * 1000) -#define CONFIG_CONS_INDEX 0 -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, \ 57600, 115200 } #define CONFIG_SYS_LOADS_BAUD_CHANGE @@ -68,20 +61,14 @@ #define CONFIG_SYS_FSMC_NAND_8BIT #define CONFIG_SYS_NAND_ONFI_DETECTION #define CONFIG_NAND_ECC_BCH -#define CONFIG_BCH /* UBI/UBI config options */ #define CONFIG_MTD_DEVICE #define CONFIG_MTD_PARTITIONS -#define CONFIG_RBTREE /* Ethernet config options */ #define CONFIG_MII #define CONFIG_PHY_RESET_DELAY 10000 /* in usec */ -#define CONFIG_PHY_ADDR 0 /* PHY address */ -#define CONFIG_PHY_GIGE /* Include GbE speed/duplex detection */ -#define CONFIG_PHY_MICREL -#define CONFIG_PHY_MICREL_KSZ9031 #define CONFIG_SPEAR_GPIO @@ -96,34 +83,13 @@ #define CONFIG_SYS_I2C_RTC_ADDR 0x68 /* FPGA config options */ -#define CONFIG_FPGA -#define CONFIG_FPGA_XILINX -#define CONFIG_FPGA_SPARTAN3 #define CONFIG_FPGA_COUNT 1 /* USB EHCI options */ -#define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_SPEAR #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 /* - * Command support defines - */ -#define CONFIG_CMD_DATE -#define CONFIG_CMD_ENV -#define CONFIG_CMD_FPGA_LOADMK -#define CONFIG_CMD_MTDPARTS -#define CONFIG_CMD_NAND -#define CONFIG_CMD_SAVES -#define CONFIG_CMD_UBIFS -#define CONFIG_LZO - -/* Filesystem support (for USB key) */ -#define CONFIG_SUPPORT_VFAT -#define CONFIG_DOS_PARTITION - - -/* * U-Boot Environment placing definitions. */ #define CONFIG_ENV_SECT_SIZE 0x00010000 @@ -140,38 +106,20 @@ #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_MISC_INIT_R -#define CONFIG_BOARD_LATE_INIT #define CONFIG_MX_CYCLIC /* enable mdc/mwc commands */ #define CONFIG_SYS_MEMTEST_START 0x00800000 #define CONFIG_SYS_MEMTEST_END 0x04000000 #define CONFIG_SYS_MALLOC_LEN (8 << 20) -#define CONFIG_SYS_LONGHELP -#define CONFIG_CMDLINE_EDITING -#define CONFIG_AUTO_COMPLETE -#define CONFIG_SYS_CBSIZE 256 -#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ - sizeof(CONFIG_SYS_PROMPT) + 16) -#define CONFIG_SYS_MAXARGS 16 -#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE #define CONFIG_SYS_LOAD_ADDR 0x00800000 -#define CONFIG_SYS_CONSOLE_INFO_QUIET - -/* Use last 2 lwords in internal SRAM for bootcounter */ -#define CONFIG_BOOTCOUNT_LIMIT -#define CONFIG_SYS_BOOTCOUNT_ADDR (CONFIG_SRAM_BASE + \ - CONFIG_SRAM_SIZE) -#define CONFIG_HOSTNAME x600 +#define CONFIG_HOSTNAME "x600" #define CONFIG_UBI_PART ubi0 #define CONFIG_UBIFS_VOLUME rootfs -#define MTDIDS_DEFAULT "nand0=nand" -#define MTDPARTS_DEFAULT "mtdparts=nand:64M(ubi0),64M(ubi1)" - #define CONFIG_EXTRA_ENV_SETTINGS \ "u-boot_addr=1000000\0" \ - "u-boot=" __stringify(CONFIG_HOSTNAME) "/u-boot.spr\0" \ + "u-boot=" CONFIG_HOSTNAME "/u-boot.spr\0" \ "load=tftp ${u-boot_addr} ${u-boot}\0" \ "update=protect off " __stringify(CONFIG_SYS_MONITOR_BASE) \ " +${filesize};" \ @@ -181,7 +129,7 @@ "protect on " __stringify(CONFIG_SYS_MONITOR_BASE) \ " +${filesize}\0" \ "upd=run load update\0" \ - "ubifs=" __stringify(CONFIG_HOSTNAME) "/ubifs.img\0" \ + "ubifs=" CONFIG_HOSTNAME "/ubifs.img\0" \ "part=" __stringify(CONFIG_UBI_PART) "\0" \ "vol=" __stringify(CONFIG_UBIFS_VOLUME) "\0" \ "load_ubifs=tftp ${kernel_addr} ${ubifs}\0" \ @@ -206,12 +154,12 @@ "saveenv;boot\0" \ "ubifsargs=set bootargs ubi.mtd=ubi${boot_part} " \ "root=ubi0:rootfs rootfstype=ubifs\0" \ - "kernel=" __stringify(CONFIG_HOSTNAME) "/uImage\0" \ + "kernel=" CONFIG_HOSTNAME "/uImage\0" \ "kernel_fs=/boot/uImage \0" \ "kernel_addr=1000000\0" \ - "dtb=" __stringify(CONFIG_HOSTNAME) "/" \ - __stringify(CONFIG_HOSTNAME) ".dtb\0" \ - "dtb_fs=/boot/" __stringify(CONFIG_HOSTNAME) ".dtb\0" \ + "dtb=" CONFIG_HOSTNAME "/" \ + CONFIG_HOSTNAME ".dtb\0" \ + "dtb_fs=/boot/" CONFIG_HOSTNAME ".dtb\0" \ "dtb_addr=1800000\0" \ "load_kernel=tftp ${kernel_addr} ${kernel}\0" \ "load_dtb=tftp ${dtb_addr} ${dtb}\0" \ @@ -224,8 +172,8 @@ "net_nfs=run load_dtb load_kernel; " \ "run nfsargs addip addcon addmtd addmisc;" \ "bootm ${kernel_addr} - ${dtb_addr}\0" \ - "mtdids=" MTDIDS_DEFAULT "\0" \ - "mtdparts=" MTDPARTS_DEFAULT "\0" \ + "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \ + "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \ "nand_ubifs=run ubifs_mount ubifs_load ubifsargs addip" \ " addcon addmisc addmtd;" \ "bootm ${kernel_addr} - ${dtb_addr}\0" \ @@ -261,9 +209,6 @@ #define CONFIG_SPL_TEXT_BASE 0xd2800b00 #define CONFIG_SPL_MAX_SIZE (CONFIG_SRAM_SIZE - 0xb00) #define CONFIG_SPL_START_S_PATH "arch/arm/cpu/arm926ejs/spear" -#define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/arm926ejs/spear/u-boot-spl.lds" - -#define CONFIG_SPL_FRAMEWORK /* * Please select/define only one of the following