Merge tag 'xilinx-for-v2017.07' of git://www.denx.de/git/u-boot-microblaze

[people/ms/u-boot.git] / include / configs / kc1.h

diff --git a/include/configs/kc1.h b/include/configs/kc1.h
index 281041dc312e663030c60a16a102eb73145b5535..408e5634b612c290bc26a6c21071e41701c0b7ac 100644 (file)
--- a/include/configs/kc1.h
+++ b/include/configs/kc1.h
@@ -16,23 +16,12 @@
  * Build
  */
 
-#define CONFIG_SYS_THUMB_BUILD
-
 /*
  * CPU
  */
 
 #define CONFIG_SYS_L2_PL310            1
 #define CONFIG_SYS_PL310_BASE          0x48242000
-#define CONFIG_SYS_CACHELINE_SIZE      32
-
-/*
- * Platform
- */
-
-#define CONFIG_OMAP
-#define CONFIG_OMAP4430
-#define CONFIG_OMAP_COMMON
 
 /*
  * Board
@@ -64,12 +53,6 @@
 
 #define CONFIG_SYS_MALLOC_LEN          (1024 * 1024 + CONFIG_ENV_SIZE)
 
-/*
- * GPIO
- */
-
-#define CONFIG_OMAP_GPIO
-
 /*
  * I2C
  */
@@ -80,24 +63,6 @@
 #define CONFIG_SYS_I2C_OMAP24XX
 #define CONFIG_I2C_MULTI_BUS
 
-#define CONFIG_CMD_I2C
-
-/*
- * Flash
- */
-
-#define CONFIG_SYS_NO_FLASH
-
-/*
- * MMC
- */
-
-#define CONFIG_MMC
-#define CONFIG_GENERIC_MMC
-#define CONFIG_OMAP_HSMMC
-
-#define CONFIG_CMD_MMC
-
 /*
  * Power
  */
@@ -105,11 +70,10 @@
 #define CONFIG_TWL6030_POWER
 
 /*
- * Partitions
+ * Input
  */
 
-#define CONFIG_PARTITION_UUIDS
-#define CONFIG_CMD_PART
+#define CONFIG_TWL6030_INPUT
 
 /*
  * SPL
@@ -118,39 +82,22 @@
 #define CONFIG_SPL_FRAMEWORK
 
 #define CONFIG_SPL_TEXT_BASE           0x40300000
-#define CONFIG_SPL_MAX_SIZE            (48 * 1024)
+#define CONFIG_SPL_MAX_SIZE            (SRAM_SCRATCH_SPACE_ADDR - \
+                                        CONFIG_SPL_TEXT_BASE)
 #define CONFIG_SPL_BSS_START_ADDR      0x80000000
 #define CONFIG_SPL_BSS_MAX_SIZE                (512 * 1024)
 #define CONFIG_SYS_SPL_MALLOC_START    0x80208000
 #define CONFIG_SYS_SPL_MALLOC_SIZE     (1024 * 1024)
 
-#define CONFIG_SPL_LDSCRIPT            "$(CPUDIR)/omap-common/u-boot-spl.lds"
-#define CONFIG_SPL_BOARD_INIT
-
-#define CONFIG_SPL_LIBGENERIC_SUPPORT
-#define CONFIG_SPL_LIBCOMMON_SUPPORT
-#define CONFIG_SPL_LIBDISK_SUPPORT
-#define CONFIG_SPL_SERIAL_SUPPORT
-#define CONFIG_SPL_POWER_SUPPORT
-#define CONFIG_SPL_GPIO_SUPPORT
-#define CONFIG_SPL_I2C_SUPPORT
-#define CONFIG_SPL_MMC_SUPPORT
-
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION     2
+#define CONFIG_SPL_LDSCRIPT            "arch/arm/mach-omap2/u-boot-spl.lds"
 
 /*
  * Console
  */
 
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
-
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
-
 #define CONFIG_AUTO_COMPLETE
 
 #define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_HUSH_PARSER
 
 #define CONFIG_SYS_MAXARGS     16
 #define CONFIG_SYS_CBSIZE      512
@@ -167,10 +114,30 @@
 #define CONFIG_SYS_NS16550_COM3                UART3_BASE
 #define CONFIG_CONS_INDEX              3
 
-#define CONFIG_BAUDRATE                        115200
 #define CONFIG_SYS_BAUDRATE_TABLE      { 4800, 9600, 19200, 38400, 57600, \
                                          115200 }
 
+/*
+ * USB gadget
+ */
+
+#define CONFIG_USB_MUSB_PIO_ONLY
+#define CONFIG_USB_MUSB_OMAP2PLUS
+
+/*
+ * Fastboot
+ */
+
+#define CONFIG_USB_FUNCTION_FASTBOOT
+
+#define CONFIG_FASTBOOT_BUF_ADDR       CONFIG_SYS_LOAD_ADDR
+#define CONFIG_FASTBOOT_BUF_SIZE       0x2000000
+
+#define CONFIG_FASTBOOT_FLASH
+#define CONFIG_FASTBOOT_FLASH_MMC_DEV  0
+
+#define CONFIG_CMD_FASTBOOT
+
 /*
  * Environment
  */
@@ -192,7 +159,9 @@
        "boot_mmc_dev=0\0" \
        "kernel_mmc_part=7\0" \
        "recovery_mmc_part=5\0" \
-       "bootargs=mem=512M console=ttyO2\0"
+       "fdtfile=omap4-kc1.dtb\0" \
+       "bootfile=/boot/extlinux/extlinux.conf\0" \
+       "bootargs=console=ttyO2,115200 mem=512M\0"
 
 /*
  * ATAGs
@@ -214,6 +183,10 @@
 
 #define CONFIG_BOOTCOMMAND \
        "setenv boot_mmc_part ${kernel_mmc_part}; " \
+       "if test reboot-${reboot-mode} = reboot-r; then " \
+       "echo recovery; setenv boot_mmc_part ${recovery_mmc_part}; fi; " \
+       "if test reboot-${reboot-mode} = reboot-b; then " \
+       "echo fastboot; fastboot 0; fi; " \
        "part start mmc ${boot_mmc_dev} ${boot_mmc_part} boot_mmc_start; " \
        "part size mmc ${boot_mmc_dev} ${boot_mmc_part} boot_mmc_size; " \
        "mmc dev ${boot_mmc_dev}; " \