Merge branch 'tx28-update' into tx28-bugfix

diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c b/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c
index daae30c451058cb21854106cb336d1d9d2e72cb3..561c04db279f9161979fb23e310d3c7c295a46c0 100644 (file)
--- a/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c
+++ b/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c
@@ -324,8 +324,6 @@ static void mxs_src_power_init(void)
 {
        debug("SPL: Pre-Configuring power block\n");
 
-       debug("SPL: Pre-Configuring power block\n");
-
        /* Improve efficieny and reduce transient ripple */
        writel(POWER_LOOPCTRL_TOGGLE_DIF | POWER_LOOPCTRL_EN_CM_HYST |
                POWER_LOOPCTRL_EN_DF_HYST, &power_regs->hw_power_loopctrl_set);
@@ -370,8 +368,6 @@ static void mxs_power_init_4p2_params(void)
 {
        debug("SPL: Configuring common 4P2 regulator params\n");
 
-       debug("SPL: Configuring common 4P2 regulator params\n");
-
        /* Setup 4P2 parameters */
        clrsetbits_le32(&power_regs->hw_power_dcdc4p2,
                POWER_DCDC4P2_CMPTRIP_MASK | POWER_DCDC4P2_TRG_MASK,
@@ -596,8 +592,6 @@ static void mxs_power_init_dcdc_4p2_source(void)
 {
        debug("SPL: Switching DC-DC converters to 4P2\n");
 
-       debug("SPL: Switching DC-DC converters to 4P2\n");
-
        if (!(readl(&power_regs->hw_power_dcdc4p2) &
                POWER_DCDC4P2_ENABLE_DCDC)) {
                debug("SPL: Already switched - aborting\n");
@@ -695,8 +689,6 @@ static void mxs_boot_valid_5v(void)
 {
        debug("SPL: Booting from 5V supply\n");
 
-       debug("SPL: Booting from 5V supply\n");
-
        /*
         * Use VBUSVALID level instead of VDD5V_GT_VDDIO level to trigger a 5V
         * disconnect event. FIXME
@@ -739,8 +731,6 @@ static void mxs_batt_boot(void)
 {
        debug("SPL: Configuring power block to boot from battery\n");
 
-       debug("SPL: Configuring power block to boot from battery\n");
-
        clrbits_le32(&power_regs->hw_power_5vctrl, POWER_5VCTRL_PWDN_5VBRNOUT);
        clrbits_le32(&power_regs->hw_power_5vctrl, POWER_5VCTRL_ENABLE_DCDC);
 
@@ -844,8 +834,6 @@ static void mxs_5v_boot(void)
 {
        debug("SPL: Configuring power block to boot from 5V input\n");
 
-       debug("SPL: Configuring power block to boot from 5V input\n");
-
        /*
         * NOTE: In original IMX-Bootlets, this also checks for VBUSVALID,
         * but their implementation always returns 1 so we omit it here.
@@ -907,8 +895,6 @@ static void mxs_init_batt_bo(void)
 {
        debug("SPL: Initialising battery brown-out level to 3.0V\n");
 
-       debug("SPL: Initialising battery brown-out level to 3.0V\n");
-
        /* Brownout at 3V */
        clrsetbits_le32(&power_regs->hw_power_battmonitor,
                POWER_BATTMONITOR_BRWNOUT_LVL_MASK,
@@ -928,8 +914,6 @@ static void mxs_switch_vddd_to_dcdc_source(void)
 {
        debug("SPL: Switching VDDD to DC-DC converters\n");
 
-       debug("SPL: Switching VDDD to DC-DC converters\n");
-
        clrsetbits_le32(&power_regs->hw_power_vdddctrl,
                POWER_VDDDCTRL_LINREG_OFFSET_MASK,
                POWER_VDDDCTRL_LINREG_OFFSET_1STEPS_BELOW);
@@ -1011,8 +995,6 @@ static void mxs_enable_output_rail_protection(void)
 {
        debug("SPL: Enabling output rail protection\n");
 
-       debug("SPL: Enabling output rail protection\n");
-
        writel(POWER_CTRL_VDDD_BO_IRQ | POWER_CTRL_VDDA_BO_IRQ |
                POWER_CTRL_VDDIO_BO_IRQ, &power_regs->hw_power_ctrl_clr);
 
@@ -1353,8 +1335,6 @@ void mxs_power_init(void)
 {
        debug("SPL: Initialising Power Block\n");
 
-       debug("SPL: Initialising Power Block\n");
-
        mxs_ungate_power();
 
        mxs_power_clock2xtal();

diff --git a/board/karo/tx28/u-boot.bd b/board/karo/tx28/u-boot.bd
deleted file mode 100644 (file)
index bbf6658..0000000
--- a/board/karo/tx28/u-boot.bd
+++ /dev/null
@@ -1,14 +0,0 @@
-sources {
-       u_boot_spl="@@BUILD_DIR@@spl/u-boot-spl";
-       u_boot="@@BUILD_DIR@@u-boot";
-}
-
-section (0) {
-       load u_boot_spl;
-       load ivt (entry = u_boot_spl:reset) > 0x8000;
-       hab call 0x8000;
-
-       load u_boot;
-       load ivt (entry = u_boot:reset) > 0x8000;
-       hab call 0x8000;
-}

diff --git a/include/configs/tx28.h b/include/configs/tx28.h
index 5976ef8558ef25fc34dd975bd383d8f5c28d87f4..3877461bb5c2ec409d1ceff4fc24d5e8653c74a0 100644 (file)
--- a/include/configs/tx28.h
+++ b/include/configs/tx28.h
@@ -254,8 +254,12 @@
        ",512k@" xstr(CONFIG_SYS_NAND_BBT_OFFSET) "(bbt)ro"
 
 #define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
-#define CONFIG_SYS_INIT_SP_ADDR                (CONFIG_SYS_SDRAM_BASE + 0x1000 - /* Fix this */ \
+#ifndef CONFIG_SPL_BUILD
+#define CONFIG_SYS_INIT_SP_ADDR                (CONFIG_SYS_SDRAM_BASE + 0x1000 - \
                                        GENERATED_GBL_DATA_SIZE)
+#else
+#define CONFIG_SYS_INIT_SP_ADDR                CONFIG_SPL_STACK
+#endif
 
 /* Defines for SPL */
 #define CONFIG_SPL_START_S_PATH                "arch/arm/cpu/arm926ejs/mxs"
@@ -268,5 +272,6 @@
 #define CONFIG_SYS_SPL_BATT_BO_LEVEL   2400
 #define CONFIG_SYS_SPL_VDDA_BO_VAL     100
 #define CONFIG_SYS_SPL_VDDMEM_VAL      0       /* VDDMEM is not utilized on TX28 */
+#define CONFIG_SPL_STACK               0x1fffc /* End of OCRAM */
 
 #endif /* __CONFIG_H */

diff --git a/include/configs/tx6.h b/include/configs/tx6.h
index d8ab70c31e92af68878c0aeee18ca5a15ac0f59d..8b1b05be803d1dd3e4c138c78bb444fee0ff90b8 100644 (file)
--- a/include/configs/tx6.h
+++ b/include/configs/tx6.h
@@ -43,7 +43,6 @@
 #define CONFIG_SYS_GENERIC_BOARD
 #define CONFIG_CMD_GPIO
 
-#ifndef CONFIG_TX6_UBOOT_MFG
 /* LCD Logo and Splash screen support */
 #ifdef CONFIG_LCD
 #define CONFIG_SPLASH_SCREEN
@@ -64,7 +63,6 @@
 #define CONFIG_BMP_32BPP
 #define CONFIG_VIDEO_BMP_RLE8
 #endif /* CONFIG_LCD */
-#endif /* CONFIG_TX6_UBOOT_MFG */
 
 /*
  * Memory configuration options
@@ -184,7 +182,7 @@
 #endif
 
 /*
- * Extra Environments
+ * Extra Environment Settings
  */
 #ifdef CONFIG_TX6_UBOOT_NOENV
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \