fsl: refactor MPC8610 and MPC5121 DIU code to use existing bitmap and logo features

[u-boot] / include / configs / qong.h

diff --git a/include/configs/qong.h b/include/configs/qong.h
index baf84815693e73ff0b9a88b5610ed30cf0d35467..7a68b7b97ead66b231f47a6de2eb736f5b5ee4f0 100644 (file)
--- a/include/configs/qong.h
+++ b/include/configs/qong.h
@@ -54,6 +54,17 @@
 
 #define CONFIG_MX31_GPIO
 
+#define CONFIG_MXC_SPI
+#define CONFIG_DEFAULT_SPI_BUS 1
+#define CONFIG_DEFAULT_SPI_MODE        (SPI_MODE_2 | SPI_CS_HIGH)
+#define CONFIG_RTC_MC13783
+
+#define CONFIG_FSL_PMIC
+#define CONFIG_FSL_PMIC_BUS    1
+#define CONFIG_FSL_PMIC_CS     0
+#define CONFIG_FSL_PMIC_CLK    100000
+#define CONFIG_FSL_PMIC_MODE   (SPI_MODE_2 | SPI_CS_HIGH)
+
 /* FPGA */
 #define CONFIG_QONG_FPGA       1
 #define CONFIG_FPGA_BASE       (CS1_BASE)
@@ -73,7 +84,7 @@
 #define        CONFIG_SPLASH_SCREEN
 #define CONFIG_CMD_BMP
 #define CONFIG_BMP_16BPP
-#define CONFIG_DISPLAY_VBEST_VGG322403
+#define CONFIG_DISPLAY_COM57H5M10XRC
 
 /*
  * Reducing the ARP timeout from default 5 seconds to 200ms we speed up the
@@ -93,11 +104,15 @@
 
 #include <config_cmd_default.h>
 
+#define CONFIG_CMD_CACHE
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_NET
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_NAND
+#define CONFIG_CMD_SPI
+#define CONFIG_CMD_DATE
+#define BOARD_LATE_INIT
 
 /*
  * You can compile in a MAC address and your custom net settings by using
@@ -129,9 +144,9 @@
                " console=ttymxc0,${baudrate}\0"                        \
        "addmtd=setenv bootargs ${bootargs} ${mtdparts}\0"              \
        "addmisc=setenv bootargs ${bootargs}\0"                         \
-       "uboot_addr=a0000000\0"                                         \
-       "kernel_addr=a0080000\0"                                        \
-       "ramdisk_addr=a0300000\0"                                       \
+       "uboot_addr=A0000000\0"                                         \
+       "kernel_addr=A00A0000\0"                                        \
+       "ramdisk_addr=A0300000\0"                                       \
        "u-boot=qong/u-boot.bin\0"                                      \
        "kernel_addr_r=80800000\0"                                      \
        "hostname=qong\0"                                               \
@@ -174,6 +189,10 @@
 #define CONFIG_SYS_HZ                  1000
 
 #define CONFIG_CMDLINE_EDITING 1
+#define CONFIG_SYS_HUSH_PARSER         1       /* Use the HUSH parser          */
+#ifdef CONFIG_SYS_HUSH_PARSER
+#define        CONFIG_SYS_PROMPT_HUSH_PS2      "> "
+#endif
 
 #define CONFIG_MISC_INIT_R     1
 /*-----------------------------------------------------------------------
@@ -260,7 +279,17 @@ extern int qong_nand_rdy(void *chip);
 #define CONFIG_FLASH_CFI_MTD
 #define MTDIDS_DEFAULT         "nor0=physmap-flash.0"
 #define MTDPARTS_DEFAULT       \
-       "mtdparts=physmap-flash.0:256k(U-Boot),128k(env1),"     \
-       "128k(env2),2560k(kernel),13m(ramdisk),-(user)"
+       "mtdparts=physmap-flash.0:384k(U-Boot),128k(env1),"     \
+       "128k(env2),2432k(kernel),13m(ramdisk),-(user)"
+
+/* additions for new relocation code, must added to all boards */
+#undef CONFIG_SYS_ARM_WITHOUT_RELOC /* This board is tested with relocation support */
+#define CONFIG_SYS_SDRAM_BASE          0x80000000
+#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
+#define CONFIG_SYS_INIT_RAM_END                IRAM_SIZE
+#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
+#define CONFIG_SYS_INIT_SP_ADDR                (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_GBL_DATA_OFFSET)
+
+#define CONFIG_BOARD_EARLY_INIT_F      1
 
 #endif /* __CONFIG_H */