]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
Merge branch 'master' of git://git.denx.de/u-boot-arm
authorStefano Babic <sbabic@denx.de>
Fri, 13 Sep 2013 10:04:54 +0000 (12:04 +0200)
committerStefano Babic <sbabic@denx.de>
Fri, 13 Sep 2013 10:10:07 +0000 (12:10 +0200)
Conflicts:
MAINTAINERS
boards.cfg

Signed-off-by: Stefano Babic <sbabic@denx.de>
33 files changed:
arch/arm/cpu/arm926ejs/mx27/asm-offsets.c
arch/arm/cpu/arm926ejs/mxs/spl_boot.c
arch/arm/cpu/arm926ejs/mxs/spl_power_init.c
arch/arm/cpu/arm926ejs/mxs/start.S
arch/arm/cpu/armv7/mx6/clock.c
arch/arm/include/asm/arch-mx27/imx-regs.h
arch/arm/include/asm/arch-mxs/sys_proto.h
board/armadeus/apf27/Makefile [new file with mode: 0644]
board/armadeus/apf27/apf27.c [new file with mode: 0644]
board/armadeus/apf27/apf27.h [new file with mode: 0644]
board/armadeus/apf27/fpga.c [new file with mode: 0644]
board/armadeus/apf27/fpga.h [new file with mode: 0644]
board/armadeus/apf27/lowlevel_init.S [new file with mode: 0644]
board/bluegiga/apx4devkit/spl_boot.c
board/boundary/nitrogen6x/nitrogen6x.c
board/creative/xfi3/Makefile [new file with mode: 0644]
board/creative/xfi3/spl_boot.c [new file with mode: 0644]
board/creative/xfi3/xfi3.c [new file with mode: 0644]
board/denx/m28evk/spl_boot.c
board/freescale/mx23evk/spl_boot.c
board/freescale/mx28evk/iomux.c
board/freescale/mx6sabresd/mx6sabresd.c
board/olimex/mx23_olinuxino/spl_boot.c
board/sandisk/sansa_fuze_plus/Makefile [new file with mode: 0644]
board/sandisk/sansa_fuze_plus/sfp.c [new file with mode: 0644]
board/sandisk/sansa_fuze_plus/spl_boot.c [new file with mode: 0644]
board/schulercontrol/sc_sps_1/spl_boot.c
boards.cfg
drivers/mtd/nand/mxs_nand.c
include/configs/apf27.h [new file with mode: 0644]
include/configs/sansa_fuze_plus.h [new file with mode: 0644]
include/configs/xfi3.h [new file with mode: 0644]
tools/mxsboot.c

index 8db2a67f37a185c406541895fcd5faaea61645f9..629b7277454478e1a300d265db5428f37f0f52a5 100644 (file)
@@ -38,5 +38,10 @@ int main(void)
        DEFINE(ESDCFG1_ROF, offsetof(struct esdramc_regs, esdcfg1));
        DEFINE(ESDMISC_ROF, offsetof(struct esdramc_regs, esdmisc));
 
+       DEFINE(GPCR, IMX_SYSTEM_CTL_BASE +
+               offsetof(struct system_control_regs, gpcr));
+       DEFINE(FMCR, IMX_SYSTEM_CTL_BASE +
+               offsetof(struct system_control_regs, fmcr));
+
        return 0;
 }
index 0392afd9be4b024083be19f7e359dc7f0d4d9957..68c30afc48be85f46cf8e3d4ae0ed8e3372c4212 100644 (file)
@@ -102,8 +102,9 @@ static uint8_t mxs_get_bootmode_index(void)
        return i;
 }
 
-void mxs_common_spl_init(const iomux_cfg_t *iomux_setup,
-                       const unsigned int iomux_size)
+void mxs_common_spl_init(const uint32_t arg, const uint32_t *resptr,
+                        const iomux_cfg_t *iomux_setup,
+                        const unsigned int iomux_size)
 {
        struct mxs_spl_data *data = (struct mxs_spl_data *)
                ((CONFIG_SYS_TEXT_BASE - sizeof(struct mxs_spl_data)) & ~0xf);
index f3579590598332406be2cd9f7455d7a6dd8184ab..4275c5d0a69a588a41c52fb669f8e1746de72007 100644 (file)
 
 #include "mxs_init.h"
 
+/**
+ * mxs_power_clock2xtal() - Switch CPU core clock source to 24MHz XTAL
+ *
+ * This function switches the CPU core clock from PLL to 24MHz XTAL
+ * oscilator. This is necessary if the PLL is being reconfigured to
+ * prevent crash of the CPU core.
+ */
 static void mxs_power_clock2xtal(void)
 {
        struct mxs_clkctrl_regs *clkctrl_regs =
@@ -24,6 +31,13 @@ static void mxs_power_clock2xtal(void)
                &clkctrl_regs->hw_clkctrl_clkseq_set);
 }
 
+/**
+ * mxs_power_clock2pll() - Switch CPU core clock source to PLL
+ *
+ * This function switches the CPU core clock from 24MHz XTAL oscilator
+ * to PLL. This can only be called once the PLL has re-locked and once
+ * the PLL is stable after reconfiguration.
+ */
 static void mxs_power_clock2pll(void)
 {
        struct mxs_clkctrl_regs *clkctrl_regs =
@@ -36,6 +50,13 @@ static void mxs_power_clock2pll(void)
                        CLKCTRL_CLKSEQ_BYPASS_CPU);
 }
 
+/**
+ * mxs_power_set_auto_restart() - Set the auto-restart bit
+ *
+ * This function ungates the RTC block and sets the AUTO_RESTART
+ * bit to work around a design bug on MX28EVK Rev. A .
+ */
 static void mxs_power_set_auto_restart(void)
 {
        struct mxs_rtc_regs *rtc_regs =
@@ -66,6 +87,14 @@ static void mxs_power_set_auto_restart(void)
                ;
 }
 
+/**
+ * mxs_power_set_linreg() - Set linear regulators 25mV below DC-DC converter
+ *
+ * This function configures the VDDIO, VDDA and VDDD linear regulators output
+ * to be 25mV below the VDDIO, VDDA and VDDD output from the DC-DC switching
+ * converter. This is the recommended setting for the case where we use both
+ * linear regulators and DC-DC converter to power the VDDIO rail.
+ */
 static void mxs_power_set_linreg(void)
 {
        struct mxs_power_regs *power_regs =
@@ -85,6 +114,11 @@ static void mxs_power_set_linreg(void)
                        POWER_VDDIOCTRL_LINREG_OFFSET_1STEPS_BELOW);
 }
 
+/**
+ * mxs_get_batt_volt() - Measure battery input voltage
+ *
+ * This function retrieves the battery input voltage and returns it.
+ */
 static int mxs_get_batt_volt(void)
 {
        struct mxs_power_regs *power_regs =
@@ -96,11 +130,24 @@ static int mxs_get_batt_volt(void)
        return volt;
 }
 
+/**
+ * mxs_is_batt_ready() - Test if the battery provides enough voltage to boot
+ *
+ * This function checks if the battery input voltage is higher than 3.6V and
+ * therefore allows the system to successfully boot using this power source.
+ */
 static int mxs_is_batt_ready(void)
 {
        return (mxs_get_batt_volt() >= 3600);
 }
 
+/**
+ * mxs_is_batt_good() - Test if battery is operational at all
+ *
+ * This function starts recharging the battery and tests if the input current
+ * provided by the 5V input recharging the battery is also sufficient to power
+ * the DC-DC converter.
+ */
 static int mxs_is_batt_good(void)
 {
        struct mxs_power_regs *power_regs =
@@ -141,6 +188,15 @@ static int mxs_is_batt_good(void)
        return 0;
 }
 
+/**
+ * mxs_power_setup_5v_detect() - Start the 5V input detection comparator
+ *
+ * This function enables the 5V detection comparator and sets the 5V valid
+ * threshold to 4.4V . We use 4.4V threshold here to make sure that even
+ * under high load, the voltage drop on the 5V input won't be so critical
+ * to cause undervolt on the 4P2 linear regulator supplying the DC-DC
+ * converter and thus making the system crash.
+ */
 static void mxs_power_setup_5v_detect(void)
 {
        struct mxs_power_regs *power_regs =
@@ -153,6 +209,12 @@ static void mxs_power_setup_5v_detect(void)
                        POWER_5VCTRL_PWRUP_VBUS_CMPS);
 }
 
+/**
+ * mxs_src_power_init() - Preconfigure the power block
+ *
+ * This function configures reasonable values for the DC-DC control loop
+ * and battery monitor.
+ */
 static void mxs_src_power_init(void)
 {
        struct mxs_power_regs *power_regs =
@@ -184,6 +246,12 @@ static void mxs_src_power_init(void)
        clrbits_le32(&power_regs->hw_power_5vctrl, POWER_5VCTRL_DCDC_XFER);
 }
 
+/**
+ * mxs_power_init_4p2_params() - Configure the parameters of the 4P2 regulator
+ *
+ * This function configures the necessary parameters for the 4P2 linear
+ * regulator to supply the DC-DC converter from 5V input.
+ */
 static void mxs_power_init_4p2_params(void)
 {
        struct mxs_power_regs *power_regs =
@@ -208,6 +276,12 @@ static void mxs_power_init_4p2_params(void)
                0x3f << POWER_5VCTRL_CHARGE_4P2_ILIMIT_OFFSET);
 }
 
+/**
+ * mxs_enable_4p2_dcdc_input() - Enable or disable the DCDC input from 4P2
+ * @xfer:      Select if the input shall be enabled or disabled
+ *
+ * This function enables or disables the 4P2 input into the DC-DC converter.
+ */
 static void mxs_enable_4p2_dcdc_input(int xfer)
 {
        struct mxs_power_regs *power_regs =
@@ -304,6 +378,12 @@ static void mxs_enable_4p2_dcdc_input(int xfer)
                                POWER_CTRL_ENIRQ_VDD5V_DROOP);
 }
 
+/**
+ * mxs_power_init_4p2_regulator() - Start the 4P2 regulator
+ *
+ * This function enables the 4P2 regulator and switches the DC-DC converter
+ * to use the 4P2 input.
+ */
 static void mxs_power_init_4p2_regulator(void)
 {
        struct mxs_power_regs *power_regs =
@@ -388,6 +468,12 @@ static void mxs_power_init_4p2_regulator(void)
        writel(POWER_CTRL_DCDC4P2_BO_IRQ, &power_regs->hw_power_ctrl_clr);
 }
 
+/**
+ * mxs_power_init_dcdc_4p2_source() - Switch DC-DC converter to 4P2 source
+ *
+ * This function configures the DC-DC converter to be supplied from the 4P2
+ * linear regulator.
+ */
 static void mxs_power_init_dcdc_4p2_source(void)
 {
        struct mxs_power_regs *power_regs =
@@ -410,6 +496,12 @@ static void mxs_power_init_dcdc_4p2_source(void)
        }
 }
 
+/**
+ * mxs_power_enable_4p2() - Power up the 4P2 regulator
+ *
+ * This function drives the process of powering up the 4P2 linear regulator
+ * and switching the DC-DC converter input over to the 4P2 linear regulator.
+ */
 static void mxs_power_enable_4p2(void)
 {
        struct mxs_power_regs *power_regs =
@@ -469,6 +561,14 @@ static void mxs_power_enable_4p2(void)
                        &power_regs->hw_power_charge_clr);
 }
 
+/**
+ * mxs_boot_valid_5v() - Boot from 5V supply
+ *
+ * This function configures the power block to boot from valid 5V input.
+ * This is called only if the 5V is reliable and can properly supply the
+ * CPU. This function proceeds to configure the 4P2 converter to be supplied
+ * from the 5V input.
+ */
 static void mxs_boot_valid_5v(void)
 {
        struct mxs_power_regs *power_regs =
@@ -492,6 +592,11 @@ static void mxs_boot_valid_5v(void)
        mxs_power_enable_4p2();
 }
 
+/**
+ * mxs_powerdown() - Shut down the system
+ *
+ * This function powers down the CPU completely.
+ */
 static void mxs_powerdown(void)
 {
        struct mxs_power_regs *power_regs =
@@ -501,6 +606,12 @@ static void mxs_powerdown(void)
                &power_regs->hw_power_reset);
 }
 
+/**
+ * mxs_batt_boot() - Configure the power block to boot from battery input
+ *
+ * This function configures the power block to boot from the battery voltage
+ * supply.
+ */
 static void mxs_batt_boot(void)
 {
        struct mxs_power_regs *power_regs =
@@ -545,6 +656,14 @@ static void mxs_batt_boot(void)
                0x8 << POWER_5VCTRL_CHARGE_4P2_ILIMIT_OFFSET);
 }
 
+/**
+ * mxs_handle_5v_conflict() - Test if the 5V input is reliable
+ *
+ * This function tests if the 5V input can reliably supply the system. If it
+ * can, then proceed to configuring the system to boot from 5V source, otherwise
+ * try booting from battery supply. If we can not boot from battery supply
+ * either, shut down the system.
+ */
 static void mxs_handle_5v_conflict(void)
 {
        struct mxs_power_regs *power_regs =
@@ -581,6 +700,12 @@ static void mxs_handle_5v_conflict(void)
        }
 }
 
+/**
+ * mxs_5v_boot() - Configure the power block to boot from 5V input
+ *
+ * This function handles configuration of the power block when supplied by
+ * a 5V input.
+ */
 static void mxs_5v_boot(void)
 {
        struct mxs_power_regs *power_regs =
@@ -604,6 +729,12 @@ static void mxs_5v_boot(void)
        mxs_handle_5v_conflict();
 }
 
+/**
+ * mxs_init_batt_bo() - Configure battery brownout threshold
+ *
+ * This function configures the battery input brownout threshold. The value
+ * at which the battery brownout happens is configured to 3.0V in the code.
+ */
 static void mxs_init_batt_bo(void)
 {
        struct mxs_power_regs *power_regs =
@@ -618,6 +749,12 @@ static void mxs_init_batt_bo(void)
        writel(POWER_CTRL_ENIRQ_BATT_BO, &power_regs->hw_power_ctrl_clr);
 }
 
+/**
+ * mxs_switch_vddd_to_dcdc_source() - Switch VDDD rail to DC-DC converter
+ *
+ * This function turns off the VDDD linear regulator and therefore makes
+ * the VDDD rail be supplied only by the DC-DC converter.
+ */
 static void mxs_switch_vddd_to_dcdc_source(void)
 {
        struct mxs_power_regs *power_regs =
@@ -632,6 +769,15 @@ static void mxs_switch_vddd_to_dcdc_source(void)
                POWER_VDDDCTRL_DISABLE_STEPPING);
 }
 
+/**
+ * mxs_power_configure_power_source() - Configure power block source
+ *
+ * This function is the core of the power configuration logic. The function
+ * selects the power block input source and configures the whole power block
+ * accordingly. After the configuration is complete and the system is stable
+ * again, the function switches the CPU clock source back to PLL. Finally,
+ * the function switches the voltage rails to DC-DC converter.
+ */
 static void mxs_power_configure_power_source(void)
 {
        int batt_ready, batt_good;
@@ -676,6 +822,15 @@ static void mxs_power_configure_power_source(void)
 #endif
 }
 
+/**
+ * mxs_enable_output_rail_protection() - Enable power rail protection
+ *
+ * This function enables overload protection on the power rails. This is
+ * triggered if the power rails' voltage drops rapidly due to overload and
+ * in such case, the supply to the powerrail is cut-off, protecting the
+ * CPU from damage. Note that under such condition, the system will likely
+ * crash or misbehave.
+ */
 static void mxs_enable_output_rail_protection(void)
 {
        struct mxs_power_regs *power_regs =
@@ -694,6 +849,13 @@ static void mxs_enable_output_rail_protection(void)
                        POWER_VDDIOCTRL_PWDN_BRNOUT);
 }
 
+/**
+ * mxs_get_vddio_power_source_off() - Get VDDIO rail power source
+ *
+ * This function tests if the VDDIO rail is supplied by linear regulator
+ * or by the DC-DC converter. Returns 1 if powered by linear regulator,
+ * returns 0 if powered by the DC-DC converter.
+ */
 static int mxs_get_vddio_power_source_off(void)
 {
        struct mxs_power_regs *power_regs =
@@ -722,6 +884,13 @@ static int mxs_get_vddio_power_source_off(void)
 
 }
 
+/**
+ * mxs_get_vddd_power_source_off() - Get VDDD rail power source
+ *
+ * This function tests if the VDDD rail is supplied by linear regulator
+ * or by the DC-DC converter. Returns 1 if powered by linear regulator,
+ * returns 0 if powered by the DC-DC converter.
+ */
 static int mxs_get_vddd_power_source_off(void)
 {
        struct mxs_power_regs *power_regs =
@@ -810,6 +979,18 @@ static const struct mxs_vddx_cfg mxs_vddmem_cfg = {
 };
 #endif
 
+/**
+ * mxs_power_set_vddx() - Configure voltage on DC-DC converter rail
+ * @cfg:               Configuration data of the DC-DC converter rail
+ * @new_target:                New target voltage of the DC-DC converter rail
+ * @new_brownout:      New brownout trigger voltage
+ *
+ * This function configures the output voltage on the DC-DC converter rail.
+ * The rail is selected by the @cfg argument. The new voltage target is
+ * selected by the @new_target and the voltage is specified in mV. The
+ * new brownout value is selected by the @new_brownout argument and the
+ * value is also in mV.
+ */
 static void mxs_power_set_vddx(const struct mxs_vddx_cfg *cfg,
                                uint32_t new_target, uint32_t new_brownout)
 {
@@ -883,6 +1064,14 @@ static void mxs_power_set_vddx(const struct mxs_vddx_cfg *cfg,
        }
 }
 
+/**
+ * mxs_setup_batt_detect() - Start the battery voltage measurement logic
+ *
+ * This function starts and configures the LRADC block. This allows the
+ * power initialization code to measure battery voltage and based on this
+ * knowledge, decide whether to boot at all, boot from battery or boot
+ * from 5V input.
+ */
 static void mxs_setup_batt_detect(void)
 {
        mxs_lradc_init();
@@ -890,6 +1079,14 @@ static void mxs_setup_batt_detect(void)
        early_delay(10);
 }
 
+/**
+ * mxs_ungate_power() - Ungate the POWER block
+ *
+ * This function ungates clock to the power block. In case the power block
+ * was still gated at this point, it will not be possible to configure the
+ * block and therefore the power initialization would fail. This function
+ * is only needed on i.MX233, on i.MX28 the power block is always ungated.
+ */
 static void mxs_ungate_power(void)
 {
 #ifdef CONFIG_MX23
@@ -900,6 +1097,12 @@ static void mxs_ungate_power(void)
 #endif
 }
 
+/**
+ * mxs_power_init() - The power block init main function
+ *
+ * This function calls all the power block initialization functions in
+ * proper sequence to start the power block.
+ */
 void mxs_power_init(void)
 {
        struct mxs_power_regs *power_regs =
@@ -933,6 +1136,12 @@ void mxs_power_init(void)
 }
 
 #ifdef CONFIG_SPL_MXS_PSWITCH_WAIT
+/**
+ * mxs_power_wait_pswitch() - Wait for power switch to be pressed
+ *
+ * This function waits until the power-switch was pressed to start booting
+ * the board.
+ */
 void mxs_power_wait_pswitch(void)
 {
        struct mxs_power_regs *power_regs =
index 94b2b3fd30ef1da148fbe9e3a8b1e0f4ec07bf44..3e454ae1bca419c7d3fd1f8517a687a22e1766dd 100644 (file)
@@ -152,39 +152,49 @@ _reset:
        /*
         * Store all registers on old stack pointer, this will allow us later to
         * return to the BootROM and let the BootROM load U-Boot into RAM.
+        *
+        * WARNING: Register r0 and r1 are used by the BootROM to pass data
+        *          to the called code. Register r0 will contain arbitrary
+        *          data that are set in the BootStream. In case this code
+        *          was started with CALL instruction, register r1 will contain
+        *          pointer to the return value this function can then set.
+        *          The code below MUST NOT CHANGE register r0 and r1 !
         */
        push    {r0-r12,r14}
 
-       /* save control register c1 */
-       mrc     p15, 0, r0, c1, c0, 0
-       push    {r0}
+       /* Save control register c1 */
+       mrc     p15, 0, r2, c1, c0, 0
+       push    {r2}
 
-       /*
-        * set the cpu to SVC32 mode and store old CPSR register content
-        */
-       mrs     r0,cpsr
-       push    {r0}
-       bic     r0,r0,#0x1f
-       orr     r0,r0,#0xd3
-       msr     cpsr,r0
+       /* Set the cpu to SVC32 mode and store old CPSR register content. */
+       mrs     r2, cpsr
+       push    {r2}
+       bic     r2, r2, #0x1f
+       orr     r2, r2, #0xd3
+       msr     cpsr, r2
 
        bl      board_init_ll
 
+       /* Restore BootROM's CPU mode (especially FIQ). */
+       pop     {r2}
+       msr     cpsr,r2
+
        /*
-        * restore bootrom's cpu mode (especially FIQ)
+        * Restore c1 register. Especially set exception vector location
+        * back to BootROM space which is required by bootrom for USB boot.
         */
-       pop     {r0}
-       msr     cpsr,r0
+       pop     {r2}
+       mcr     p15, 0, r2, c1, c0, 0
+
+       pop     {r0-r12,r14}
 
        /*
-        * restore c1 register
-        * (especially set exception vector location back to
-        * bootrom space which is required by bootrom for USB boot)
+        * In case this code was started by the CALL instruction, the register
+        * r0 is examined by the BootROM after this code returns. The value in
+        * r0 must be set to 0 to indicate successful return.
         */
-       pop     {r0}
-       mcr     p15, 0, r0, c1, c0, 0
+       mov r0, #0
 
-       pop     {r0-r12,r14}
        bx      lr
 
 _hang:
index 7efb0d209a5c86a5d4b13e71a7905c08b8a014cd..7a29c9b6921e3732cab5fd57530590c194e07e03 100644 (file)
@@ -228,13 +228,13 @@ static u32 get_axi_clk(void)
 
 static u32 get_emi_slow_clk(void)
 {
-       u32 emi_clk_sel, emi_slow_pof, cscmr1, root_freq = 0;
+       u32 emi_clk_sel, emi_slow_podf, cscmr1, root_freq = 0;
 
        cscmr1 =  __raw_readl(&imx_ccm->cscmr1);
        emi_clk_sel = cscmr1 & MXC_CCM_CSCMR1_ACLK_EMI_SLOW_MASK;
        emi_clk_sel >>= MXC_CCM_CSCMR1_ACLK_EMI_SLOW_OFFSET;
-       emi_slow_pof = cscmr1 & MXC_CCM_CSCMR1_ACLK_EMI_SLOW_PODF_MASK;
-       emi_slow_pof >>= MXC_CCM_CSCMR1_ACLK_EMI_PODF_OFFSET;
+       emi_slow_podf = cscmr1 & MXC_CCM_CSCMR1_ACLK_EMI_SLOW_PODF_MASK;
+       emi_slow_podf >>= MXC_CCM_CSCMR1_ACLK_EMI_SLOW_PODF_OFFSET;
 
        switch (emi_clk_sel) {
        case 0:
@@ -251,7 +251,7 @@ static u32 get_emi_slow_clk(void)
                break;
        }
 
-       return root_freq / (emi_slow_pof + 1);
+       return root_freq / (emi_slow_podf + 1);
 }
 
 #ifdef CONFIG_MX6SL
index a27145ba28820436c481f1a04c03657d2c09f467..92c847e44af3a6fbbcdcd49fb3f6f30d7159a8a0 100644 (file)
@@ -169,7 +169,7 @@ struct iim_regs {
        struct fuse_bank {
                u32 fuse_regs[0x20];
                u32 fuse_rsvd[0xe0];
-       } bank[1];
+       } bank[2];
 };
 
 struct fuse_bank0_regs {
@@ -209,9 +209,13 @@ struct fuse_bank0_regs {
 #define IIM_BASE_ADDR          IMX_IIM_BASE
 #define IMX_FEC_BASE           (0x2b000 + IMX_IO_BASE)
 
+#define IMX_NFC_BASE           (0xD8000000)
 #define IMX_ESD_BASE           (0xD8001000)
 #define IMX_WEIM_BASE          (0xD8002000)
 
+#define NFC_BASE_ADDR          IMX_NFC_BASE
+
+
 /* FMCR System Control bit definition*/
 #define UART4_RXD_CTL  (1 << 25)
 #define UART4_RTS_CTL  (1 << 24)
index 1038592c927a4a364e8409f1a34a9b47b67307ae..43c7dd6bf10e7c274c3272cbae112daf47b45bef 100644 (file)
@@ -28,8 +28,9 @@ int mxsmmc_initialize(bd_t *bis, int id, int (*wp)(int), int (*cd)(int));
 #include <asm/arch/iomux-mx28.h>
 #endif
 
-void mxs_common_spl_init(const iomux_cfg_t *iomux_setup,
-                       const unsigned int iomux_size);
+void mxs_common_spl_init(const uint32_t arg, const uint32_t *resptr,
+                        const iomux_cfg_t *iomux_setup,
+                        const unsigned int iomux_size);
 #endif
 
 struct mxs_pair {
diff --git a/board/armadeus/apf27/Makefile b/board/armadeus/apf27/Makefile
new file mode 100644 (file)
index 0000000..5fcda6e
--- /dev/null
@@ -0,0 +1,33 @@
+#
+# (C) Copyright 2000-2004
+# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
+# (C) Copyright 2012-2013
+# Eric Jarrige <eric.jarrige@armadeus.org>
+#
+# SPDX-License-Identifier:    GPL-2.0+
+#
+
+include $(TOPDIR)/config.mk
+
+LIB    = $(obj)lib$(BOARD).o
+
+COBJS  := apf27.o
+SOBJS  := lowlevel_init.o
+ifdef CONFIG_FPGA
+COBJS  += fpga.o
+endif
+
+SRCS   := $(COBJS:.o=.c) $(SOBJS:.o=.S)
+OBJS   := $(addprefix $(obj),$(COBJS))
+SOBJS  := $(addprefix $(obj),$(SOBJS))
+
+$(LIB):        $(obj).depend $(OBJS) $(SOBJS)
+       $(call cmd_link_o_target, $(OBJS) $(SOBJS))
+
+#########################################################################
+
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
+
+#########################################################################
diff --git a/board/armadeus/apf27/apf27.c b/board/armadeus/apf27/apf27.c
new file mode 100644 (file)
index 0000000..30e720d
--- /dev/null
@@ -0,0 +1,256 @@
+/*
+ * Copyright (C) 2008-2013 Eric Jarrige <eric.jarrige@armadeus.org>
+ *
+ * based on the files by
+ * Sascha Hauer, Pengutronix
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <environment.h>
+#include <jffs2/jffs2.h>
+#include <nand.h>
+#include <netdev.h>
+#include <asm/io.h>
+#include <asm/arch/imx-regs.h>
+#include <asm/arch/gpio.h>
+#include <asm/gpio.h>
+#include <asm/errno.h>
+#include "apf27.h"
+#include "crc.h"
+#include "fpga.h"
+
+DECLARE_GLOBAL_DATA_PTR;
+
+/*
+ * Fuse bank 1 row 8 is "reserved for future use" and therefore available for
+ * customer use. The APF27 board uses this fuse to store the board revision:
+ * 0: initial board revision
+ * 1: first revision - Presence of the second RAM chip on the board is blown in
+ *     fuse bank 1 row 9  bit 0 - No hardware change
+ * N: to be defined
+ */
+static u32 get_board_rev(void)
+{
+       struct iim_regs *iim = (struct iim_regs *)IMX_IIM_BASE;
+
+       return readl(&iim->bank[1].fuse_regs[8]);
+}
+
+/*
+ * Fuse bank 1 row 9 is "reserved for future use" and therefore available for
+ * customer use. The APF27 board revision 1 uses the bit 0 to permanently store
+ * the presence of the second RAM chip
+ * 0: AFP27 with 1 RAM of 64 MiB
+ * 1: AFP27 with 2 RAM chips of 64 MiB each (128MB)
+ */
+static int get_num_ram_bank(void)
+{
+       struct iim_regs *iim = (struct iim_regs *)IMX_IIM_BASE;
+       int nr_dram_banks = 1;
+
+       if ((get_board_rev() > 0) && (CONFIG_NR_DRAM_BANKS > 1))
+               nr_dram_banks += readl(&iim->bank[1].fuse_regs[9]) & 0x01;
+       else
+               nr_dram_banks = CONFIG_NR_DRAM_POPULATED;
+
+       return nr_dram_banks;
+}
+
+static void apf27_port_init(int port, u32 gpio_dr, u32 ocr1, u32 ocr2,
+                           u32 iconfa1, u32 iconfa2, u32 iconfb1, u32 iconfb2,
+                           u32 icr1, u32 icr2, u32 imr, u32 gpio_dir, u32 gpr,
+                           u32 puen, u32 gius)
+{
+       struct gpio_port_regs *regs = (struct gpio_port_regs *)IMX_GPIO_BASE;
+
+       writel(gpio_dr,   &regs->port[port].gpio_dr);
+       writel(ocr1,      &regs->port[port].ocr1);
+       writel(ocr2,      &regs->port[port].ocr2);
+       writel(iconfa1,   &regs->port[port].iconfa1);
+       writel(iconfa2,   &regs->port[port].iconfa2);
+       writel(iconfb1,   &regs->port[port].iconfb1);
+       writel(iconfb2,   &regs->port[port].iconfb2);
+       writel(icr1,      &regs->port[port].icr1);
+       writel(icr2,      &regs->port[port].icr2);
+       writel(imr,       &regs->port[port].imr);
+       writel(gpio_dir,  &regs->port[port].gpio_dir);
+       writel(gpr,       &regs->port[port].gpr);
+       writel(puen,      &regs->port[port].puen);
+       writel(gius,      &regs->port[port].gius);
+}
+
+#define APF27_PORT_INIT(n) apf27_port_init(PORT##n, ACFG_DR_##n##_VAL,   \
+       ACFG_OCR1_##n##_VAL, ACFG_OCR2_##n##_VAL, ACFG_ICFA1_##n##_VAL,   \
+       ACFG_ICFA2_##n##_VAL, ACFG_ICFB1_##n##_VAL, ACFG_ICFB2_##n##_VAL, \
+       ACFG_ICR1_##n##_VAL, ACFG_ICR2_##n##_VAL, ACFG_IMR_##n##_VAL,     \
+       ACFG_DDIR_##n##_VAL, ACFG_GPR_##n##_VAL, ACFG_PUEN_##n##_VAL,     \
+       ACFG_GIUS_##n##_VAL)
+
+static void apf27_iomux_init(void)
+{
+       APF27_PORT_INIT(A);
+       APF27_PORT_INIT(B);
+       APF27_PORT_INIT(C);
+       APF27_PORT_INIT(D);
+       APF27_PORT_INIT(E);
+       APF27_PORT_INIT(F);
+}
+
+static int apf27_devices_init(void)
+{
+       int i;
+       unsigned int mode[] = {
+               PC5_PF_I2C2_DATA,
+               PC6_PF_I2C2_CLK,
+               PD17_PF_I2C_DATA,
+               PD18_PF_I2C_CLK,
+       };
+
+       for (i = 0; i < ARRAY_SIZE(mode); i++)
+               imx_gpio_mode(mode[i]);
+
+#ifdef CONFIG_MXC_UART
+       mx27_uart1_init_pins();
+#endif
+
+#ifdef CONFIG_FEC_MXC
+       mx27_fec_init_pins();
+#endif
+
+#ifdef CONFIG_MXC_MMC
+       mx27_sd2_init_pins();
+       imx_gpio_mode((GPIO_PORTF | GPIO_OUT | GPIO_PUEN | GPIO_GPIO | 16));
+       gpio_request(PC_PWRON, "pc_pwron");
+       gpio_set_value(PC_PWRON, 1);
+#endif
+       return 0;
+}
+
+static void apf27_setup_csx(void)
+{
+       struct weim_regs *weim = (struct weim_regs *)IMX_WEIM_BASE;
+
+       writel(ACFG_CS0U_VAL, &weim->cs0u);
+       writel(ACFG_CS0L_VAL, &weim->cs0l);
+       writel(ACFG_CS0A_VAL, &weim->cs0a);
+
+       writel(ACFG_CS1U_VAL, &weim->cs1u);
+       writel(ACFG_CS1L_VAL, &weim->cs1l);
+       writel(ACFG_CS1A_VAL, &weim->cs1a);
+
+       writel(ACFG_CS2U_VAL, &weim->cs2u);
+       writel(ACFG_CS2L_VAL, &weim->cs2l);
+       writel(ACFG_CS2A_VAL, &weim->cs2a);
+
+       writel(ACFG_CS3U_VAL, &weim->cs3u);
+       writel(ACFG_CS3L_VAL, &weim->cs3l);
+       writel(ACFG_CS3A_VAL, &weim->cs3a);
+
+       writel(ACFG_CS4U_VAL, &weim->cs4u);
+       writel(ACFG_CS4L_VAL, &weim->cs4l);
+       writel(ACFG_CS4A_VAL, &weim->cs4a);
+
+       writel(ACFG_CS5U_VAL, &weim->cs5u);
+       writel(ACFG_CS5L_VAL, &weim->cs5l);
+       writel(ACFG_CS5A_VAL, &weim->cs5a);
+
+       writel(ACFG_EIM_VAL, &weim->eim);
+}
+
+static void apf27_setup_port(void)
+{
+       struct system_control_regs *system =
+               (struct system_control_regs *)IMX_SYSTEM_CTL_BASE;
+
+       writel(ACFG_FMCR_VAL, &system->fmcr);
+}
+
+int board_init(void)
+{
+       gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
+
+       apf27_setup_csx();
+       apf27_setup_port();
+       apf27_iomux_init();
+       apf27_devices_init();
+#if defined(CONFIG_FPGA)
+       APF27_init_fpga();
+#endif
+
+
+       return 0;
+}
+
+int dram_init(void)
+{
+       gd->ram_size = get_ram_size((void *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE);
+       if (get_num_ram_bank() > 1)
+               gd->ram_size += get_ram_size((void *)PHYS_SDRAM_2,
+                                            PHYS_SDRAM_2_SIZE);
+
+       return 0;
+}
+
+void dram_init_banksize(void)
+{
+       gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
+       gd->bd->bi_dram[0].size  = get_ram_size((void *)PHYS_SDRAM_1,
+                                               PHYS_SDRAM_1_SIZE);
+       gd->bd->bi_dram[1].start = PHYS_SDRAM_2;
+       if (get_num_ram_bank() > 1)
+               gd->bd->bi_dram[1].size = get_ram_size((void *)PHYS_SDRAM_2,
+                                            PHYS_SDRAM_2_SIZE);
+       else
+               gd->bd->bi_dram[1].size = 0;
+}
+
+ulong board_get_usable_ram_top(ulong total_size)
+{
+       ulong ramtop;
+
+       if (get_num_ram_bank() > 1)
+               ramtop = PHYS_SDRAM_2 + get_ram_size((void *)PHYS_SDRAM_2,
+                                                    PHYS_SDRAM_2_SIZE);
+       else
+               ramtop = PHYS_SDRAM_1 + get_ram_size((void *)PHYS_SDRAM_1,
+                                                    PHYS_SDRAM_1_SIZE);
+
+       return ramtop;
+}
+
+int checkboard(void)
+{
+       printf("Board: Armadeus APF27 revision %d\n", get_board_rev());
+       return 0;
+}
+
+#ifdef CONFIG_SPL_BUILD
+inline void hang(void)
+{
+       for (;;)
+               ;
+}
+
+void board_init_f(ulong bootflag)
+{
+       /*
+        * copy ourselves from where we are running to where we were
+        * linked at. Use ulong pointers as all addresses involved
+        * are 4-byte-aligned.
+        */
+       ulong *start_ptr, *end_ptr, *link_ptr, *run_ptr, *dst;
+       asm volatile ("ldr %0, =_start" : "=r"(start_ptr));
+       asm volatile ("ldr %0, =_end" : "=r"(end_ptr));
+       asm volatile ("ldr %0, =board_init_f" : "=r"(link_ptr));
+       asm volatile ("adr %0, board_init_f" : "=r"(run_ptr));
+       for (dst = start_ptr; dst < end_ptr; dst++)
+               *dst = *(dst+(run_ptr-link_ptr));
+
+       /*
+        * branch to nand_boot's link-time address.
+        */
+       asm volatile("ldr pc, =nand_boot");
+}
+#endif /* CONFIG_SPL_BUILD */
diff --git a/board/armadeus/apf27/apf27.h b/board/armadeus/apf27/apf27.h
new file mode 100644 (file)
index 0000000..64e7e4d
--- /dev/null
@@ -0,0 +1,489 @@
+/*
+ * Copyright (C) 2008-2013 Eric Jarrige <eric.jarrige@armadeus.org>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#ifndef __APF27_H
+#define __APF27_H
+
+/* FPGA program pin configuration */
+#define ACFG_FPGA_PWR  (GPIO_PORTF | 19)       /* FPGA prog pin  */
+#define ACFG_FPGA_PRG  (GPIO_PORTF | 11)       /* FPGA prog pin  */
+#define ACFG_FPGA_CLK  (GPIO_PORTF | 15)       /* FPGA clk pin   */
+#define ACFG_FPGA_RDATA        0xD6000000              /* FPGA data addr */
+#define ACFG_FPGA_WDATA        0xD6000000              /* FPGA data addr */
+#define ACFG_FPGA_INIT (GPIO_PORTF | 12)       /* FPGA init pin  */
+#define ACFG_FPGA_DONE (GPIO_PORTF | 9)        /* FPGA done pin  */
+#define ACFG_FPGA_RW   (GPIO_PORTF | 21)       /* FPGA done pin  */
+#define ACFG_FPGA_CS   (GPIO_PORTF | 22)       /* FPGA done pin  */
+#define ACFG_FPGA_SUSPEND (GPIO_PORTF | 10)    /* FPGA done pin  */
+#define ACFG_FPGA_RESET        (GPIO_PORTF | 7)        /* FPGA done pin  */
+
+/* MMC pin */
+#define PC_PWRON       (GPIO_PORTF | 16)
+
+/*
+ * MPU CLOCK source before PLL
+ * ACFG_CLK_FREQ (2/3 MPLL clock or ext 266 MHZ)
+ */
+#define ACFG_MPCTL0_VAL                0x01EF15D5      /* 399.000 MHz */
+#define ACFG_MPCTL1_VAL                0
+#define CONFIG_MPLL_FREQ       399
+
+#define ACFG_CLK_FREQ  (CONFIG_MPLL_FREQ*2/3) /* 266 MHz */
+
+/* Serial clock source before PLL (should be named ACFG_SYSPLL_CLK_FREQ)*/
+#define ACFG_SPCTL0_VAL                0x0475206F      /* 299.99937 MHz */
+#define ACFG_SPCTL1_VAL                0
+#define CONFIG_SPLL_FREQ       300             /* MHz */
+
+/* ARM bus frequency (have to be a CONFIG_MPLL_FREQ ratio) */
+#define CONFIG_ARM_FREQ                399     /* up to 400 MHz */
+
+/* external bus frequency (have to be a ACFG_CLK_FREQ ratio) */
+#define CONFIG_HCLK_FREQ       133     /* (ACFG_CLK_FREQ/2) */
+
+#define CONFIG_PERIF1_FREQ     16      /* 16.625 MHz UART, GPT, PWM */
+#define CONFIG_PERIF2_FREQ     33      /* 33.25 MHz CSPI and SDHC */
+#define CONFIG_PERIF3_FREQ     33      /* 33.25 MHz LCD */
+#define CONFIG_PERIF4_FREQ     33      /* 33.25 MHz CSI */
+#define CONFIG_SSI1_FREQ       66      /* 66.50 MHz SSI1 */
+#define CONFIG_SSI2_FREQ       66      /* 66.50 MHz SSI2 */
+#define CONFIG_MSHC_FREQ       66      /* 66.50 MHz MSHC */
+#define CONFIG_H264_FREQ       66      /* 66.50 MHz H264 */
+#define CONFIG_CLK0_DIV                3       /* Divide CLK0 by 4 */
+#define CONFIG_CLK0_EN         1       /* CLK0 enabled */
+
+/* external bus frequency (have to be a CONFIG_HCLK_FREQ ratio) */
+#define CONFIG_NFC_FREQ                44      /* NFC Clock up to 44 MHz wh 133MHz */
+
+/* external serial bus frequency (have to be a CONFIG_SPLL_FREQ ratio) */
+#define CONFIG_USB_FREQ                60      /* 60 MHz */
+
+/*
+ * SDRAM
+ */
+#if (ACFG_SDRAM_MBYTE_SYZE == 64) /* micron MT46H16M32LF -6 */
+/* micron 64MB */
+#define ACFG_SDRAM_NUM_COL             9  /* 8, 9, 10 or 11
+                                           * column address bits
+                                           */
+#define ACFG_SDRAM_NUM_ROW             13 /* 11, 12 or 13
+                                           * row address bits
+                                           */
+#define ACFG_SDRAM_REFRESH             3  /* 0=OFF 1=2048
+                                           * 2=4096 3=8192 refresh
+                                           */
+#define ACFG_SDRAM_EXIT_PWD            25 /* ns exit power
+                                           * down delay
+                                           */
+#define ACFG_SDRAM_W2R_DELAY           1  /* write to read
+                                           * cycle delay > 0
+                                           */
+#define ACFG_SDRAM_ROW_PRECHARGE_DELAY 18 /* ns */
+#define ACFG_SDRAM_TMRD_DELAY          2  /* Load mode register
+                                           * cycle delay 1..4
+                                           */
+#define ACFG_SDRAM_TWR_DELAY           1  /* LPDDR: 0=2ck 1=3ck
+                                           * SDRAM: 0=1ck 1=2ck
+                                           */
+#define ACFG_SDRAM_RAS_DELAY           42 /* ns ACTIVE-to-PRECHARGE delay */
+#define ACFG_SDRAM_RRD_DELAY           12 /* ns ACTIVE-to-ACTIVE delay */
+#define ACFG_SDRAM_RCD_DELAY           18 /* ns Row to Column delay */
+#define ACFG_SDRAM_RC_DELAY            70 /* ns Row cycle delay (tRFC
+                                           * refresh to command)
+                                           */
+#define ACFG_SDRAM_CLOCK_CYCLE_CL_1    0 /* ns clock cycle time
+                                          * estimated fo CL=1
+                                          * 0=force 3 for lpddr
+                                          */
+#define ACFG_SDRAM_PARTIAL_ARRAY_SR    0  /* 0=full 1=half 2=quater
+                                           * 3=Eighth 4=Sixteenth
+                                           */
+#define ACFG_SDRAM_DRIVE_STRENGH       0  /* 0=Full-strength 1=half
+                                           * 2=quater 3=Eighth
+                                           */
+#define ACFG_SDRAM_BURST_LENGTH                3  /* 2^N BYTES (N=0..3) */
+#define ACFG_SDRAM_SINGLE_ACCESS       0  /* 1= single access
+                                           * 0 = Burst mode
+                                           */
+#endif
+
+#if (ACFG_SDRAM_MBYTE_SYZE == 128)
+/* micron 128MB */
+#define ACFG_SDRAM_NUM_COL             9  /* 8, 9, 10 or 11
+                                           * column address bits
+                                           */
+#define ACFG_SDRAM_NUM_ROW             14 /* 11, 12 or 13
+                                           * row address bits
+                                           */
+#define ACFG_SDRAM_REFRESH             3  /* 0=OFF 1=2048
+                                           * 2=4096 3=8192 refresh
+                                           */
+#define ACFG_SDRAM_EXIT_PWD            25 /* ns exit power
+                                           * down delay
+                                           */
+#define ACFG_SDRAM_W2R_DELAY           1  /* write to read
+                                           * cycle delay > 0
+                                           */
+#define ACFG_SDRAM_ROW_PRECHARGE_DELAY 18 /* ns */
+#define ACFG_SDRAM_TMRD_DELAY          2  /* Load mode register
+                                           * cycle delay 1..4
+                                           */
+#define ACFG_SDRAM_TWR_DELAY           1  /* LPDDR: 0=2ck 1=3ck
+                                           * SDRAM: 0=1ck 1=2ck
+                                           */
+#define ACFG_SDRAM_RAS_DELAY           42 /* ns ACTIVE-to-PRECHARGE delay */
+#define ACFG_SDRAM_RRD_DELAY           12 /* ns ACTIVE-to-ACTIVE delay */
+#define ACFG_SDRAM_RCD_DELAY           18 /* ns Row to Column delay */
+#define ACFG_SDRAM_RC_DELAY            70 /* ns Row cycle delay (tRFC
+                                           * refresh to command)
+                                           */
+#define ACFG_SDRAM_CLOCK_CYCLE_CL_1    0 /* ns clock cycle time
+                                          * estimated fo CL=1
+                                          * 0=force 3 for lpddr
+                                          */
+#define ACFG_SDRAM_PARTIAL_ARRAY_SR    0  /* 0=full 1=half 2=quater
+                                           * 3=Eighth 4=Sixteenth
+                                           */
+#define ACFG_SDRAM_DRIVE_STRENGH       0  /* 0=Full-strength 1=half
+                                           * 2=quater 3=Eighth
+                                           */
+#define ACFG_SDRAM_BURST_LENGTH                3  /* 2^N BYTES (N=0..3) */
+#define ACFG_SDRAM_SINGLE_ACCESS       0  /* 1= single access
+                                           * 0 = Burst mode
+                                           */
+#endif
+
+#if (ACFG_SDRAM_MBYTE_SYZE == 256)
+/* micron 256MB */
+#define ACFG_SDRAM_NUM_COL             10  /* 8, 9, 10 or 11
+                                            * column address bits
+                                            */
+#define ACFG_SDRAM_NUM_ROW             14 /* 11, 12 or 13
+                                           * row address bits
+                                           */
+#define ACFG_SDRAM_REFRESH             3  /* 0=OFF 1=2048
+                                           * 2=4096 3=8192 refresh
+                                           */
+#define ACFG_SDRAM_EXIT_PWD            25 /* ns exit power
+                                           * down delay
+                                           */
+#define ACFG_SDRAM_W2R_DELAY           1  /* write to read cycle
+                                           * delay > 0
+                                           */
+#define ACFG_SDRAM_ROW_PRECHARGE_DELAY 18 /* ns */
+#define ACFG_SDRAM_TMRD_DELAY          2  /* Load mode register
+                                           * cycle delay 1..4
+                                           */
+#define ACFG_SDRAM_TWR_DELAY           1  /* LPDDR: 0=2ck 1=3ck
+                                           * SDRAM: 0=1ck 1=2ck
+                                           */
+#define ACFG_SDRAM_RAS_DELAY           42 /* ns ACTIVE-to-PRECHARGE delay */
+#define ACFG_SDRAM_RRD_DELAY           12 /* ns ACTIVE-to-ACTIVE delay */
+#define ACFG_SDRAM_RCD_DELAY           18 /* ns Row to Column delay */
+#define ACFG_SDRAM_RC_DELAY            70 /* ns Row cycle delay (tRFC
+                                           * refresh to command)
+                                           */
+#define ACFG_SDRAM_CLOCK_CYCLE_CL_1    0 /* ns clock cycle time
+                                          * estimated fo CL=1
+                                          * 0=force 3 for lpddr
+                                          */
+#define ACFG_SDRAM_PARTIAL_ARRAY_SR    0  /* 0=full 1=half 2=quater
+                                           * 3=Eighth 4=Sixteenth
+                                           */
+#define ACFG_SDRAM_DRIVE_STRENGH       0  /* 0=Full-strength
+                                           * 1=half
+                                           * 2=quater
+                                           * 3=Eighth
+                                           */
+#define ACFG_SDRAM_BURST_LENGTH                3  /* 2^N BYTES (N=0..3) */
+#define ACFG_SDRAM_SINGLE_ACCESS       0  /* 1= single access
+                                           * 0 = Burst mode
+                                           */
+#endif
+
+/*
+ * External interface
+ */
+/*
+ * CSCRxU_VAL:
+ * 31| x | x | x x |x x x x| x x | x | x  |x x x x|16
+ *   |SP |WP | BCD |  BCS  | PSZ |PME|SYNC|  DOL  |
+ *
+ * 15| x x  | x x x x x x | x | x x x x | x x x x |0
+ *   | CNC  |     WSC     |EW |   WWS   |   EDC   |
+ *
+ * CSCRxL_VAL:
+ * 31|  x x x x  | x x x x  | x x x x  | x x x x  |16
+ *   |    OEA    |   OEN    |   EBWA   |   EBWN   |
+ * 15|x x x x| x |x x x |x x x x| x | x | x  | x  | 0
+ *   |  CSA  |EBC| DSZ  |  CSN  |PSR|CRE|WRAP|CSEN|
+ *
+ * CSCRxA_VAL:
+ * 31|  x x x x  | x x x x  | x x x x  | x x x x  |16
+ *   |   EBRA    |   EBRN   |   RWA    |   RWN    |
+ * 15| x | x x |x x x|x x|x x|x x| x | x | x  | x | 0
+ *   |MUM| LAH | LBN |LBA|DWW|DCT|WWU|AGE|CNC2|FCE|
+ */
+
+/* CS0 configuration for 16 bit nor flash */
+#define ACFG_CS0U_VAL  0x0000CC03
+#define ACFG_CS0L_VAL  0xa0330D01
+#define ACFG_CS0A_VAL  0x00220800
+
+#define ACFG_CS1U_VAL  0x00000f00
+#define ACFG_CS1L_VAL  0x00000D01
+#define ACFG_CS1A_VAL  0
+
+#define ACFG_CS2U_VAL  0
+#define ACFG_CS2L_VAL  0
+#define ACFG_CS2A_VAL  0
+
+#define ACFG_CS3U_VAL  0
+#define ACFG_CS3L_VAL  0
+#define ACFG_CS3A_VAL  0
+
+#define ACFG_CS4U_VAL  0
+#define ACFG_CS4L_VAL  0
+#define ACFG_CS4A_VAL  0
+
+/* FPGA 16 bit data bus */
+#define ACFG_CS5U_VAL  0x00000600
+#define ACFG_CS5L_VAL  0x00000D01
+#define ACFG_CS5A_VAL  0
+
+#define ACFG_EIM_VAL   0x00002200
+
+
+/*
+ * FPGA specific settings
+ */
+
+/* CLKO */
+#define ACFG_CCSR_VAL 0x00000305
+/* drive strength CLKO set to 2 */
+#define ACFG_DSCR10_VAL 0x00020000
+/* drive strength A1..A12 set to 2 */
+#define ACFG_DSCR3_VAL 0x02AAAAA8
+/* drive strength ctrl */
+#define ACFG_DSCR7_VAL 0x00020880
+/* drive strength data */
+#define ACFG_DSCR2_VAL 0xAAAAAAAA
+
+
+/*
+ * Default configuration for GPIOs and peripherals
+ */
+#define ACFG_DDIR_A_VAL                0x00000000
+#define ACFG_OCR1_A_VAL                0x00000000
+#define ACFG_OCR2_A_VAL                0x00000000
+#define ACFG_ICFA1_A_VAL       0xFFFFFFFF
+#define ACFG_ICFA2_A_VAL       0xFFFFFFFF
+#define ACFG_ICFB1_A_VAL       0xFFFFFFFF
+#define ACFG_ICFB2_A_VAL       0xFFFFFFFF
+#define ACFG_DR_A_VAL          0x00000000
+#define ACFG_GIUS_A_VAL                0xFFFFFFFF
+#define ACFG_ICR1_A_VAL                0x00000000
+#define ACFG_ICR2_A_VAL                0x00000000
+#define ACFG_IMR_A_VAL         0x00000000
+#define ACFG_GPR_A_VAL         0x00000000
+#define ACFG_PUEN_A_VAL                0xFFFFFFFF
+
+#define ACFG_DDIR_B_VAL                0x00000000
+#define ACFG_OCR1_B_VAL                0x00000000
+#define ACFG_OCR2_B_VAL                0x00000000
+#define ACFG_ICFA1_B_VAL       0xFFFFFFFF
+#define ACFG_ICFA2_B_VAL       0xFFFFFFFF
+#define ACFG_ICFB1_B_VAL       0xFFFFFFFF
+#define ACFG_ICFB2_B_VAL       0xFFFFFFFF
+#define ACFG_DR_B_VAL          0x00000000
+#define ACFG_GIUS_B_VAL                0xFF3FFFF0
+#define ACFG_ICR1_B_VAL                0x00000000
+#define ACFG_ICR2_B_VAL                0x00000000
+#define ACFG_IMR_B_VAL         0x00000000
+#define ACFG_GPR_B_VAL         0x00000000
+#define ACFG_PUEN_B_VAL                0xFFFFFFFF
+
+#define ACFG_DDIR_C_VAL                0x00000000
+#define ACFG_OCR1_C_VAL                0x00000000
+#define ACFG_OCR2_C_VAL                0x00000000
+#define ACFG_ICFA1_C_VAL       0xFFFFFFFF
+#define ACFG_ICFA2_C_VAL       0xFFFFFFFF
+#define ACFG_ICFB1_C_VAL       0xFFFFFFFF
+#define ACFG_ICFB2_C_VAL       0xFFFFFFFF
+#define ACFG_DR_C_VAL          0x00000000
+#define ACFG_GIUS_C_VAL                0xFFFFC07F
+#define ACFG_ICR1_C_VAL                0x00000000
+#define ACFG_ICR2_C_VAL                0x00000000
+#define ACFG_IMR_C_VAL         0x00000000
+#define ACFG_GPR_C_VAL         0x00000000
+#define ACFG_PUEN_C_VAL                0xFFFFFF87
+
+#define ACFG_DDIR_D_VAL                0x00000000
+#define ACFG_OCR1_D_VAL                0x00000000
+#define ACFG_OCR2_D_VAL                0x00000000
+#define ACFG_ICFA1_D_VAL       0xFFFFFFFF
+#define ACFG_ICFA2_D_VAL       0xFFFFFFFF
+#define ACFG_ICFB1_D_VAL       0xFFFFFFFF
+#define ACFG_ICFB2_D_VAL       0xFFFFFFFF
+#define ACFG_DR_D_VAL          0x00000000
+#define ACFG_GIUS_D_VAL                0xFFFFFFFF
+#define ACFG_ICR1_D_VAL                0x00000000
+#define ACFG_ICR2_D_VAL                0x00000000
+#define ACFG_IMR_D_VAL         0x00000000
+#define ACFG_GPR_D_VAL         0x00000000
+#define ACFG_PUEN_D_VAL                0xFFFFFFFF
+
+#define ACFG_DDIR_E_VAL                0x00000000
+#define ACFG_OCR1_E_VAL                0x00000000
+#define ACFG_OCR2_E_VAL                0x00000000
+#define ACFG_ICFA1_E_VAL       0xFFFFFFFF
+#define ACFG_ICFA2_E_VAL       0xFFFFFFFF
+#define ACFG_ICFB1_E_VAL       0xFFFFFFFF
+#define ACFG_ICFB2_E_VAL       0xFFFFFFFF
+#define ACFG_DR_E_VAL          0x00000000
+#define ACFG_GIUS_E_VAL                0xFCFFCCF8
+#define ACFG_ICR1_E_VAL                0x00000000
+#define ACFG_ICR2_E_VAL                0x00000000
+#define ACFG_IMR_E_VAL         0x00000000
+#define ACFG_GPR_E_VAL         0x00000000
+#define ACFG_PUEN_E_VAL                0xFFFFFFFF
+
+#define ACFG_DDIR_F_VAL                0x00000000
+#define ACFG_OCR1_F_VAL                0x00000000
+#define ACFG_OCR2_F_VAL                0x00000000
+#define ACFG_ICFA1_F_VAL       0xFFFFFFFF
+#define ACFG_ICFA2_F_VAL       0xFFFFFFFF
+#define ACFG_ICFB1_F_VAL       0xFFFFFFFF
+#define ACFG_ICFB2_F_VAL       0xFFFFFFFF
+#define ACFG_DR_F_VAL          0x00000000
+#define ACFG_GIUS_F_VAL                0xFF7F8000
+#define ACFG_ICR1_F_VAL                0x00000000
+#define ACFG_ICR2_F_VAL                0x00000000
+#define ACFG_IMR_F_VAL         0x00000000
+#define ACFG_GPR_F_VAL         0x00000000
+#define ACFG_PUEN_F_VAL                0xFFFFFFFF
+
+/* Enforce DDR signal strengh & enable USB/PP/DMA burst override bits */
+#define ACFG_GPCR_VAL          0x0003000F
+
+#define ACFG_ESDMISC_VAL       ESDMISC_LHD+ESDMISC_MDDREN
+
+/* FMCR select num LPDDR RAMs and nand 16bits, 2KB pages */
+#if (CONFIG_NR_DRAM_BANKS == 1)
+#define ACFG_FMCR_VAL 0xFFFFFFF9
+#elif (CONFIG_NR_DRAM_BANKS == 2)
+#define ACFG_FMCR_VAL 0xFFFFFFFB
+#endif
+
+#define ACFG_AIPI1_PSR0_VAL    0x20040304
+#define ACFG_AIPI1_PSR1_VAL    0xDFFBFCFB
+#define ACFG_AIPI2_PSR0_VAL    0x00000000
+#define ACFG_AIPI2_PSR1_VAL    0xFFFFFFFF
+
+/* PCCR enable DMA FEC I2C1 IIM SDHC1 */
+#define ACFG_PCCR0_VAL         0x05070410
+#define ACFG_PCCR1_VAL         0xA14A0608
+
+/*
+ * From here, there should not be any user configuration.
+ * All Equations are automatic
+ */
+
+/* fixme none integer value (7.5ns) => 2*hclock = 15ns */
+#define ACFG_2XHCLK_LGTH       (2000/CONFIG_HCLK_FREQ) /* ns */
+
+/* USB 60 MHz ; ARM up to 400; HClK up to 133MHz*/
+#define CSCR_MASK 0x0300800D
+
+#define ACFG_CSCR_VAL                                          \
+       (CSCR_MASK                                              \
+       |((((CONFIG_SPLL_FREQ/CONFIG_USB_FREQ)-1)&0x07) << 28)  \
+       |((((CONFIG_MPLL_FREQ/CONFIG_ARM_FREQ)-1)&0x03) << 12)  \
+       |((((ACFG_CLK_FREQ/CONFIG_HCLK_FREQ)-1)&0x03) << 8))
+
+/* SSIx CLKO NFC H264 MSHC */
+#define ACFG_PCDR0_VAL\
+       (((((ACFG_CLK_FREQ/CONFIG_MSHC_FREQ)-1)&0x3F)<<0)       \
+       |((((CONFIG_HCLK_FREQ/CONFIG_NFC_FREQ)-1)&0x0F)<<6)     \
+       |(((((ACFG_CLK_FREQ/CONFIG_H264_FREQ)-2)*2)&0x3F)<<10)\
+       |(((((ACFG_CLK_FREQ/CONFIG_SSI1_FREQ)-2)*2)&0x3F)<<16)\
+       |(((CONFIG_CLK0_DIV)&0x07)<<22)\
+       |(((CONFIG_CLK0_EN)&0x01)<<25)\
+       |(((((ACFG_CLK_FREQ/CONFIG_SSI2_FREQ)-2)*2)&0x3F)<<26))
+
+/* PERCLKx  */
+#define ACFG_PCDR1_VAL\
+       (((((ACFG_CLK_FREQ/CONFIG_PERIF1_FREQ)-1)&0x3F)<<0)     \
+       |((((ACFG_CLK_FREQ/CONFIG_PERIF2_FREQ)-1)&0x3F)<<8)     \
+       |((((ACFG_CLK_FREQ/CONFIG_PERIF3_FREQ)-1)&0x3F)<<16)    \
+       |((((ACFG_CLK_FREQ/CONFIG_PERIF4_FREQ)-1)&0x3F)<<24))
+
+/* SDRAM controller programming Values */
+#if (((2*ACFG_SDRAM_CLOCK_CYCLE_CL_1) > (3*ACFG_2XHCLK_LGTH)) || \
+       (ACFG_SDRAM_CLOCK_CYCLE_CL_1 < 1))
+#define REG_FIELD_SCL_VAL 3
+#define REG_FIELD_SCLIMX_VAL 0
+#else
+#define REG_FIELD_SCL_VAL\
+       ((2*ACFG_SDRAM_CLOCK_CYCLE_CL_1+ACFG_2XHCLK_LGTH-1)/ \
+               ACFG_2XHCLK_LGTH)
+#define REG_FIELD_SCLIMX_VAL REG_FIELD_SCL_VAL
+#endif
+
+#if ((2*ACFG_SDRAM_RC_DELAY) > (16*ACFG_2XHCLK_LGTH))
+#define REG_FIELD_SRC_VAL 0
+#else
+#define REG_FIELD_SRC_VAL\
+       ((2*ACFG_SDRAM_RC_DELAY+ACFG_2XHCLK_LGTH-1)/ \
+               ACFG_2XHCLK_LGTH)
+#endif
+
+/* TBD Power down timer ; PRCT Bit Field Encoding; burst length 8 ; FP = 0*/
+#define REG_ESDCTL_BASE_CONFIG (0x80020485\
+                               | (((ACFG_SDRAM_NUM_ROW-11)&0x7)<<24)\
+                               | (((ACFG_SDRAM_NUM_COL-8)&0x3)<<20)\
+                               | (((ACFG_SDRAM_REFRESH)&0x7)<<13))
+
+#define ACFG_NORMAL_RW_CMD     ((0x0<<28)+REG_ESDCTL_BASE_CONFIG)
+#define ACFG_PRECHARGE_CMD     ((0x1<<28)+REG_ESDCTL_BASE_CONFIG)
+#define ACFG_AUTOREFRESH_CMD   ((0x2<<28)+REG_ESDCTL_BASE_CONFIG)
+#define ACFG_SET_MODE_REG_CMD  ((0x3<<28)+REG_ESDCTL_BASE_CONFIG)
+
+/* ESDRAMC Configuration Registers : force CL=3 to lpddr */
+#define ACFG_SDRAM_ESDCFG_REGISTER_VAL (0x0\
+       | (((((2*ACFG_SDRAM_EXIT_PWD+ACFG_2XHCLK_LGTH-1)/ \
+               ACFG_2XHCLK_LGTH)-1)&0x3)<<21)\
+       | (((ACFG_SDRAM_W2R_DELAY-1)&0x1)<<20)\
+       | (((((2*ACFG_SDRAM_ROW_PRECHARGE_DELAY+ \
+               ACFG_2XHCLK_LGTH-1)/ACFG_2XHCLK_LGTH)-1)&0x3)<<18) \
+       | (((ACFG_SDRAM_TMRD_DELAY-1)&0x3)<<16)\
+       | (((ACFG_SDRAM_TWR_DELAY)&0x1)<<15)\
+       | (((((2*ACFG_SDRAM_RAS_DELAY+ACFG_2XHCLK_LGTH-1)/ \
+               ACFG_2XHCLK_LGTH)-1)&0x7)<<12) \
+       | (((((2*ACFG_SDRAM_RRD_DELAY+ACFG_2XHCLK_LGTH-1)/ \
+               ACFG_2XHCLK_LGTH)-1)&0x3)<<10) \
+       | (((REG_FIELD_SCLIMX_VAL)&0x3)<<8)\
+       | (((((2*ACFG_SDRAM_RCD_DELAY+ACFG_2XHCLK_LGTH-1)/ \
+               ACFG_2XHCLK_LGTH)-1)&0x7)<<4) \
+       | (((REG_FIELD_SRC_VAL)&0x0F)<<0))
+
+/* Issue Mode register Command to SDRAM */
+#define ACFG_SDRAM_MODE_REGISTER_VAL\
+       ((((ACFG_SDRAM_BURST_LENGTH)&0x7)<<(0))\
+       | (((REG_FIELD_SCL_VAL)&0x7)<<(4))\
+       | ((0)<<(3)) /* sequentiql access */ \
+       /*| (((ACFG_SDRAM_SINGLE_ACCESS)&0x1)<<(1))*/)
+
+/* Issue Extended Mode register Command to SDRAM */
+#define ACFG_SDRAM_EXT_MODE_REGISTER_VAL\
+       ((ACFG_SDRAM_PARTIAL_ARRAY_SR<<0)\
+       | (ACFG_SDRAM_DRIVE_STRENGH<<(5))\
+       | (1<<(ACFG_SDRAM_NUM_COL+ACFG_SDRAM_NUM_ROW+1+2)))
+
+/* Issue Precharge all Command to SDRAM */
+#define ACFG_SDRAM_PRECHARGE_ALL_VAL (1<<10)
+
+#endif /* __APF27_H */
diff --git a/board/armadeus/apf27/fpga.c b/board/armadeus/apf27/fpga.c
new file mode 100644 (file)
index 0000000..0c08c06
--- /dev/null
@@ -0,0 +1,224 @@
+/*
+ * (C) Copyright 2002-2013
+ * Eric Jarrige <eric.jarrige@armadeus.org>
+ *
+ * based on the files by
+ * Rich Ireland, Enterasys Networks, rireland@enterasys.com
+ * and
+ * Keith Outwater, keith_outwater@mvis.com
+ *
+ * SPDX-License-Identifier:     GPL-2.0+
+ */
+#include <common.h>
+
+#include <asm/arch/imx-regs.h>
+#include <asm/gpio.h>
+#include <asm/io.h>
+#include <command.h>
+#include <config.h>
+#include "fpga.h"
+#include <spartan3.h>
+#include "apf27.h"
+
+/*
+ * Note that these are pointers to code that is in Flash.  They will be
+ * relocated at runtime.
+ * Spartan2 code is used to download our Spartan 3 :) code is compatible.
+ * Just take care about the file size
+ */
+Xilinx_Spartan3_Slave_Parallel_fns fpga_fns = {
+       fpga_pre_fn,
+       fpga_pgm_fn,
+       fpga_init_fn,
+       NULL,
+       fpga_done_fn,
+       fpga_clk_fn,
+       fpga_cs_fn,
+       fpga_wr_fn,
+       fpga_rdata_fn,
+       fpga_wdata_fn,
+       fpga_busy_fn,
+       fpga_abort_fn,
+       fpga_post_fn,
+};
+
+Xilinx_desc fpga[CONFIG_FPGA_COUNT] = {
+       {Xilinx_Spartan3,
+        slave_parallel,
+        1196128l/8,
+        (void *)&fpga_fns,
+        0,
+        "3s200aft256"}
+};
+
+/*
+ * Initialize GPIO port B before download
+ */
+int fpga_pre_fn(int cookie)
+{
+       /* Initialize GPIO pins */
+       gpio_set_value(ACFG_FPGA_PWR, 1);
+       imx_gpio_mode(ACFG_FPGA_INIT | GPIO_IN | GPIO_PUEN | GPIO_GPIO);
+       imx_gpio_mode(ACFG_FPGA_DONE | GPIO_IN | GPIO_PUEN | GPIO_GPIO);
+       imx_gpio_mode(ACFG_FPGA_PRG | GPIO_OUT | GPIO_PUEN | GPIO_GPIO);
+       imx_gpio_mode(ACFG_FPGA_CLK | GPIO_OUT | GPIO_PUEN | GPIO_GPIO);
+       imx_gpio_mode(ACFG_FPGA_RW | GPIO_OUT | GPIO_PUEN | GPIO_GPIO);
+       imx_gpio_mode(ACFG_FPGA_CS | GPIO_OUT | GPIO_PUEN | GPIO_GPIO);
+       imx_gpio_mode(ACFG_FPGA_SUSPEND|GPIO_OUT|GPIO_PUEN|GPIO_GPIO);
+       gpio_set_value(ACFG_FPGA_RESET, 1);
+       imx_gpio_mode(ACFG_FPGA_RESET | GPIO_OUT | GPIO_PUEN | GPIO_GPIO);
+       imx_gpio_mode(ACFG_FPGA_PWR | GPIO_OUT | GPIO_PUEN | GPIO_GPIO);
+       gpio_set_value(ACFG_FPGA_PRG, 1);
+       gpio_set_value(ACFG_FPGA_CLK, 1);
+       gpio_set_value(ACFG_FPGA_RW, 1);
+       gpio_set_value(ACFG_FPGA_CS, 1);
+       gpio_set_value(ACFG_FPGA_SUSPEND, 0);
+       gpio_set_value(ACFG_FPGA_PWR, 0);
+       udelay(30000); /*wait until supply started*/
+
+       return cookie;
+}
+
+/*
+ * Set the FPGA's active-low program line to the specified level
+ */
+int fpga_pgm_fn(int assert, int flush, int cookie)
+{
+       debug("%s:%d: FPGA PROGRAM %s", __func__, __LINE__,
+             assert ? "high" : "low");
+       gpio_set_value(ACFG_FPGA_PRG, !assert);
+       return assert;
+}
+
+/*
+ * Set the FPGA's active-high clock line to the specified level
+ */
+int fpga_clk_fn(int assert_clk, int flush, int cookie)
+{
+       debug("%s:%d: FPGA CLOCK %s", __func__, __LINE__,
+             assert_clk ? "high" : "low");
+       gpio_set_value(ACFG_FPGA_CLK, !assert_clk);
+       return assert_clk;
+}
+
+/*
+ * Test the state of the active-low FPGA INIT line.  Return 1 on INIT
+ * asserted (low).
+ */
+int fpga_init_fn(int cookie)
+{
+       int value;
+       debug("%s:%d: INIT check... ", __func__, __LINE__);
+       value = gpio_get_value(ACFG_FPGA_INIT);
+       /* printf("init value read %x",value); */
+#ifdef CONFIG_SYS_FPGA_IS_PROTO
+       return value;
+#else
+       return !value;
+#endif
+}
+
+/*
+ * Test the state of the active-high FPGA DONE pin
+ */
+int fpga_done_fn(int cookie)
+{
+       debug("%s:%d: DONE check... %s", __func__, __LINE__,
+             gpio_get_value(ACFG_FPGA_DONE) ? "high" : "low");
+       return gpio_get_value(ACFG_FPGA_DONE) ? FPGA_SUCCESS : FPGA_FAIL;
+}
+
+/*
+ * Set the FPGA's wr line to the specified level
+ */
+int fpga_wr_fn(int assert_write, int flush, int cookie)
+{
+       debug("%s:%d: FPGA RW... %s ", __func__, __LINE__,
+             assert_write ? "high" : "low");
+       gpio_set_value(ACFG_FPGA_RW, !assert_write);
+       return assert_write;
+}
+
+int fpga_cs_fn(int assert_cs, int flush, int cookie)
+{
+       debug("%s:%d: FPGA CS %s ", __func__, __LINE__,
+             assert_cs ? "high" : "low");
+       gpio_set_value(ACFG_FPGA_CS, !assert_cs);
+       return assert_cs;
+}
+
+int fpga_rdata_fn(unsigned char *data, int cookie)
+{
+       debug("%s:%d: FPGA READ DATA %02X ", __func__, __LINE__,
+             *((char *)ACFG_FPGA_RDATA));
+       *data = (unsigned char)
+               ((*((unsigned short *)ACFG_FPGA_RDATA))&0x00FF);
+       return *data;
+}
+
+int fpga_wdata_fn(unsigned char data, int flush, int cookie)
+{
+       debug("%s:%d: FPGA WRITE DATA %02X ", __func__, __LINE__,
+             data);
+       *((unsigned short *)ACFG_FPGA_WDATA) = data;
+       return data;
+}
+
+int fpga_abort_fn(int cookie)
+{
+       return fpga_post_fn(cookie);
+}
+
+
+int fpga_busy_fn(int cookie)
+{
+       return 1;
+}
+
+int fpga_post_fn(int cookie)
+{
+       debug("%s:%d: FPGA POST ", __func__, __LINE__);
+
+       imx_gpio_mode(ACFG_FPGA_RW | GPIO_PF | GPIO_PUEN);
+       imx_gpio_mode(ACFG_FPGA_CS | GPIO_PF | GPIO_PUEN);
+       imx_gpio_mode(ACFG_FPGA_CLK | GPIO_PF | GPIO_PUEN);
+       gpio_set_value(ACFG_FPGA_PRG, 1);
+       gpio_set_value(ACFG_FPGA_RESET, 0);
+       imx_gpio_mode(ACFG_FPGA_RESET | GPIO_OUT | GPIO_PUEN | GPIO_GPIO);
+       return cookie;
+}
+
+void apf27_fpga_setup(void)
+{
+       struct pll_regs *pll = (struct pll_regs *)IMX_PLL_BASE;
+       struct system_control_regs *system =
+               (struct system_control_regs *)IMX_SYSTEM_CTL_BASE;
+
+       /* Configure FPGA CLKO */
+       writel(ACFG_CCSR_VAL, &pll->ccsr);
+
+       /* Configure strentgh for FPGA */
+       writel(ACFG_DSCR10_VAL, &system->dscr10);
+       writel(ACFG_DSCR3_VAL, &system->dscr3);
+       writel(ACFG_DSCR7_VAL, &system->dscr7);
+       writel(ACFG_DSCR2_VAL, &system->dscr2);
+}
+
+/*
+ * Initialize the fpga.  Return 1 on success, 0 on failure.
+ */
+void APF27_init_fpga(void)
+{
+       int i;
+
+       apf27_fpga_setup();
+
+       fpga_init();
+
+       for (i = 0; i < CONFIG_FPGA_COUNT; i++) {
+               debug("%s:%d: Adding fpga %d\n", __func__, __LINE__, i);
+               fpga_add(fpga_xilinx, &fpga[i]);
+       }
+
+       return;
+}
diff --git a/board/armadeus/apf27/fpga.h b/board/armadeus/apf27/fpga.h
new file mode 100644 (file)
index 0000000..84a5244
--- /dev/null
@@ -0,0 +1,25 @@
+/*
+ * (C) Copyright 2002-2013
+ * Eric Jarrige <eric.jarrige@armadeus.org>
+ *
+ * based on the files by
+ * Rich Ireland, Enterasys Networks, rireland@enterasys.com
+ * and
+ * Keith Outwater, keith_outwater@mvis.com
+ *
+ * SPDX-License-Identifier:     GPL-2.0+
+ */
+extern void APF27_init_fpga(void);
+
+extern int fpga_pre_fn(int cookie);
+extern int fpga_pgm_fn(int assert_pgm, int flush, int cookie);
+extern int fpga_cs_fn(int assert_cs, int flush, int cookie);
+extern int fpga_init_fn(int cookie);
+extern int fpga_done_fn(int cookie);
+extern int fpga_clk_fn(int assert_clk, int flush, int cookie);
+extern int fpga_wr_fn(int assert_write, int flush, int cookie);
+extern int fpga_rdata_fn(unsigned char *data, int cookie);
+extern int fpga_wdata_fn(unsigned char data, int flush, int cookie);
+extern int fpga_abort_fn(int cookie);
+extern int fpga_post_fn(int cookie);
+extern int fpga_busy_fn(int cookie);
diff --git a/board/armadeus/apf27/lowlevel_init.S b/board/armadeus/apf27/lowlevel_init.S
new file mode 100644 (file)
index 0000000..4293cb1
--- /dev/null
@@ -0,0 +1,168 @@
+/*
+ * (C) Copyright 2013 Philippe Reynes <tremyfr@yahoo.fr>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <config.h>
+#include <generated/asm-offsets.h>
+#include <version.h>
+#include <asm/macro.h>
+#include <asm/arch/imx-regs.h>
+#include "apf27.h"
+
+       .macro init_aipi
+       /*
+        * setup AIPI1 and AIPI2
+        */
+       write32 AIPI1_PSR0, ACFG_AIPI1_PSR0_VAL
+       write32 AIPI1_PSR1, ACFG_AIPI1_PSR1_VAL
+       write32 AIPI2_PSR0, ACFG_AIPI2_PSR0_VAL
+       write32 AIPI2_PSR1, ACFG_AIPI2_PSR1_VAL
+
+       /* Change SDRAM signal strengh */
+       ldr r0, =GPCR
+       ldr r1, =ACFG_GPCR_VAL
+       ldr r5, [r0]
+       orr r5, r5, r1
+       str r5, [r0]
+
+       .endm /* init_aipi */
+
+       .macro init_clock
+       ldr r0, =CSCR
+       /* disable MPLL/SPLL first */
+       ldr r1, [r0]
+       bic r1, r1, #(CSCR_MPEN|CSCR_SPEN)
+       str r1, [r0]
+
+       /*
+        * pll clock initialization predefined in apf27.h
+        */
+       write32 MPCTL0, ACFG_MPCTL0_VAL
+       write32 SPCTL0, ACFG_SPCTL0_VAL
+
+       write32 CSCR, ACFG_CSCR_VAL|CSCR_MPLL_RESTART|CSCR_SPLL_RESTART
+
+       /*
+        * add some delay here
+        */
+       mov r1, #0x1000
+       1:  subs r1, r1, #0x1
+       bne 1b
+
+       /* peripheral clock divider */
+       write32 PCDR0, ACFG_PCDR0_VAL
+       write32 PCDR1, ACFG_PCDR1_VAL
+
+       /* Configure PCCR0 and PCCR1 */
+       write32 PCCR0, ACFG_PCCR0_VAL
+       write32 PCCR1, ACFG_PCCR1_VAL
+
+       .endm /* init_clock */
+
+       .macro init_ddr
+       /* wait for SDRAM/LPDDR ready (SDRAMRDY) */
+       ldr             r0, =IMX_ESD_BASE
+       ldr             r4, =ESDMISC_SDRAM_RDY
+2:     ldr             r1, [r0, #ESDMISC_ROF]
+       ands            r1, r1, r4
+       bpl             2b
+
+       /* LPDDR Soft Reset Mobile/Low Power DDR SDRAM. */
+       ldr             r0, =IMX_ESD_BASE
+       ldr             r4, =ACFG_ESDMISC_VAL
+       orr             r1, r4, #ESDMISC_MDDR_DL_RST
+       str             r1, [r0, #ESDMISC_ROF]
+
+       /* Hold for more than 200ns */
+       ldr             r1, =0x10000
+1:     subs            r1, r1, #0x1
+       bne             1b
+
+       str             r4, [r0]
+
+       ldr             r0, =IMX_ESD_BASE
+       ldr             r1, =ACFG_SDRAM_ESDCFG_REGISTER_VAL
+       str             r1, [r0, #ESDCFG0_ROF]
+
+       ldr             r0, =IMX_ESD_BASE
+       ldr             r1, =ACFG_PRECHARGE_CMD
+       str             r1, [r0, #ESDCTL0_ROF]
+
+       /* write8(0xA0001000, any value) */
+       ldr             r1, =PHYS_SDRAM_1+ACFG_SDRAM_PRECHARGE_ALL_VAL
+       strb            r2, [r1]
+
+       ldr             r1, =ACFG_AUTOREFRESH_CMD
+       str             r1, [r0, #ESDCTL0_ROF]
+
+       ldr             r4, =PHYS_SDRAM_1       /* CSD0 base address    */
+
+       ldr             r6,=0x7         /* load loop counter    */
+1:     str             r5,[r4]         /* run auto-refresh cycle to array 0 */
+       subs            r6,r6,#1
+       bne 1b
+
+       ldr             r1, =ACFG_SET_MODE_REG_CMD
+       str             r1, [r0, #ESDCTL0_ROF]
+
+       /* set standard mode register */
+       ldr             r4, = PHYS_SDRAM_1+ACFG_SDRAM_MODE_REGISTER_VAL
+       strb            r2, [r4]
+
+       /* set extended mode register */
+       ldr             r4, =PHYS_SDRAM_1+ACFG_SDRAM_EXT_MODE_REGISTER_VAL
+       strb            r5, [r4]
+
+       ldr             r1, =ACFG_NORMAL_RW_CMD
+       str             r1, [r0, #ESDCTL0_ROF]
+
+       /* 2nd sdram */
+       ldr             r0, =IMX_ESD_BASE
+       ldr             r1, =ACFG_SDRAM_ESDCFG_REGISTER_VAL
+       str             r1, [r0, #ESDCFG1_ROF]
+
+       ldr             r0, =IMX_ESD_BASE
+       ldr             r1, =ACFG_PRECHARGE_CMD
+       str             r1, [r0, #ESDCTL1_ROF]
+
+       /* write8(0xB0001000, any value) */
+       ldr             r1, =PHYS_SDRAM_2+ACFG_SDRAM_PRECHARGE_ALL_VAL
+       strb            r2, [r1]
+
+       ldr             r1, =ACFG_AUTOREFRESH_CMD
+       str             r1, [r0, #ESDCTL1_ROF]
+
+       ldr             r4, =PHYS_SDRAM_2       /* CSD1 base address */
+
+       ldr             r6,=0x7         /* load loop counter */
+1:     str             r5,[r4]         /* run auto-refresh cycle to array 0 */
+       subs            r6,r6,#1
+       bne 1b
+
+       ldr             r1, =ACFG_SET_MODE_REG_CMD
+       str             r1, [r0, #ESDCTL1_ROF]
+
+       /* set standard mode register */
+       ldr             r4, =PHYS_SDRAM_2+ACFG_SDRAM_MODE_REGISTER_VAL
+       strb            r2, [r4]
+
+       /* set extended mode register */
+       ldr             r4, =PHYS_SDRAM_2+ACFG_SDRAM_EXT_MODE_REGISTER_VAL
+       strb            r2, [r4]
+
+       ldr             r1, =ACFG_NORMAL_RW_CMD
+       str             r1, [r0, #ESDCTL1_ROF]
+       .endm /* init_ddr */
+
+.globl lowlevel_init
+lowlevel_init:
+
+       init_aipi
+       init_clock
+#ifdef CONFIG_SPL_BUILD
+       init_ddr
+#endif
+
+       mov     pc, lr
index 3b05baaa708aa1a24e06d6a9e769dfb21d4fe8eb..81419f963599eadb1a6aabc2cb97261ebc915595 100644 (file)
@@ -132,9 +132,9 @@ const iomux_cfg_t iomux_setup[] = {
        MX28_PAD_EMI_CKE__EMI_CKE | MUX_CONFIG_EMI,
 };
 
-void board_init_ll(void)
+void board_init_ll(const uint32_t arg, const uint32_t *resptr)
 {
-       mxs_common_spl_init(iomux_setup, ARRAY_SIZE(iomux_setup));
+       mxs_common_spl_init(arg, resptr, iomux_setup, ARRAY_SIZE(iomux_setup));
 
        /* switch LED on */
        gpio_direction_output(MX28_PAD_PWM3__GPIO_3_28, 0);
index f664f6de6b398b03848fffa3344a4c6f6564eed5..2b61e5d2a9bbfe806184ee5080837da42ee52b4d 100644 (file)
@@ -593,6 +593,7 @@ int board_video_skip(void)
                if (!panel) {
                        panel = displays[0].mode.name;
                        printf("No panel detected: default to %s\n", panel);
+                       i = 0;
                }
        } else {
                for (i = 0; i < ARRAY_SIZE(displays); i++) {
@@ -609,9 +610,10 @@ int board_video_skip(void)
                               displays[i].mode.name,
                               displays[i].mode.xres,
                               displays[i].mode.yres);
-               } else
+               } else {
                        printf("LCD %s cannot be configured: %d\n",
                               displays[i].mode.name, ret);
+               }
        } else {
                printf("unsupported panel %s\n", panel);
                ret = -EINVAL;
diff --git a/board/creative/xfi3/Makefile b/board/creative/xfi3/Makefile
new file mode 100644 (file)
index 0000000..4dc2b48
--- /dev/null
@@ -0,0 +1,31 @@
+#
+# (C) Copyright 2000-2006
+# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
+#
+# SPDX-License-Identifier:     GPL-2.0+
+#
+
+include $(TOPDIR)/config.mk
+
+LIB    = $(obj)lib$(BOARD).o
+
+ifndef CONFIG_SPL_BUILD
+COBJS  := xfi3.o
+else
+COBJS  := spl_boot.o
+endif
+
+SRCS   := $(COBJS:.o=.c)
+OBJS   := $(addprefix $(obj),$(COBJS))
+
+$(LIB):        $(obj).depend $(OBJS)
+       $(call cmd_link_o_target, $(OBJS))
+
+#########################################################################
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
+
+#########################################################################
diff --git a/board/creative/xfi3/spl_boot.c b/board/creative/xfi3/spl_boot.c
new file mode 100644 (file)
index 0000000..af7aa0e
--- /dev/null
@@ -0,0 +1,134 @@
+/*
+ * Creative ZEN X-Fi3 setup
+ *
+ * Copyright (C) 2013 Marek Vasut <marex@denx.de>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <config.h>
+#include <asm/io.h>
+#include <asm/arch/iomux-mx23.h>
+#include <asm/arch/imx-regs.h>
+#include <asm/arch/sys_proto.h>
+
+#define        MUX_CONFIG_EMI  (MXS_PAD_1V8 | MXS_PAD_12MA | MXS_PAD_PULLUP)
+#define        MUX_CONFIG_SSP  (MXS_PAD_3V3 | MXS_PAD_8MA | MXS_PAD_PULLUP)
+#define        MUX_CONFIG_LCD  (MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_NOPULL)
+
+const iomux_cfg_t iomux_setup[] = {
+       /* EMI */
+       MX23_PAD_EMI_D00__EMI_D00 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_D01__EMI_D01 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_D02__EMI_D02 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_D03__EMI_D03 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_D04__EMI_D04 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_D05__EMI_D05 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_D06__EMI_D06 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_D07__EMI_D07 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_D08__EMI_D08 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_D09__EMI_D09 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_D10__EMI_D10 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_D11__EMI_D11 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_D12__EMI_D12 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_D13__EMI_D13 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_D14__EMI_D14 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_D15__EMI_D15 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_DQM0__EMI_DQM0 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_DQM1__EMI_DQM1 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_DQS0__EMI_DQS0 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_DQS1__EMI_DQS1 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_CLK__EMI_CLK | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_CLKN__EMI_CLKN | MUX_CONFIG_EMI,
+
+       MX23_PAD_EMI_A00__EMI_A00 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_A01__EMI_A01 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_A02__EMI_A02 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_A03__EMI_A03 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_A04__EMI_A04 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_A05__EMI_A05 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_A06__EMI_A06 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_A07__EMI_A07 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_A08__EMI_A08 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_A09__EMI_A09 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_A10__EMI_A10 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_A11__EMI_A11 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_A12__EMI_A12 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_BA0__EMI_BA0 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_BA1__EMI_BA1 | MUX_CONFIG_EMI,
+
+       MX23_PAD_EMI_CASN__EMI_CASN | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_CE0N__EMI_CE0N | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_CE1N__EMI_CE1N | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_CKE__EMI_CKE | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_RASN__EMI_RASN | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_WEN__EMI_WEN | MUX_CONFIG_EMI,
+
+       MX23_PAD_LCD_D00__LCD_D00 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D01__LCD_D01 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D02__LCD_D02 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D03__LCD_D03 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D04__LCD_D04 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D05__LCD_D05 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D06__LCD_D06 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D07__LCD_D07 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D08__LCD_D08 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D09__LCD_D09 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D10__LCD_D10 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D11__LCD_D11 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D12__LCD_D12 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D13__LCD_D13 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D14__LCD_D14 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D15__LCD_D15 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D16__LCD_D16 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D17__LCD_D17 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_RESET__LCD_RESET | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_RS__LCD_RS | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_WR__LCD_WR | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_CS__LCD_CS | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_ENABLE__LCD_ENABLE | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_VSYNC__LCD_VSYNC | MUX_CONFIG_LCD,
+
+       MX23_PAD_SSP1_CMD__SSP1_CMD | MUX_CONFIG_SSP,
+       MX23_PAD_SSP1_DETECT__GPIO_2_1 | MUX_CONFIG_SSP,
+       MX23_PAD_SSP1_DATA0__SSP1_DATA0 | MUX_CONFIG_SSP,
+       MX23_PAD_SSP1_DATA1__SSP1_DATA1 | MUX_CONFIG_SSP,
+       MX23_PAD_SSP1_DATA2__SSP1_DATA2 | MUX_CONFIG_SSP,
+       MX23_PAD_SSP1_DATA3__SSP1_DATA3 | MUX_CONFIG_SSP,
+       MX23_PAD_SSP1_SCK__SSP1_SCK | MUX_CONFIG_SSP,
+       MX23_PAD_GPMI_D07__GPIO_0_7 | MUX_CONFIG_SSP,
+
+       MX23_PAD_GPMI_D00__SSP2_DATA0 | MUX_CONFIG_SSP,
+       MX23_PAD_GPMI_D01__SSP2_DATA1 | MUX_CONFIG_SSP,
+       MX23_PAD_GPMI_D02__SSP2_DATA2 | MUX_CONFIG_SSP,
+       MX23_PAD_GPMI_D03__SSP2_DATA3 | MUX_CONFIG_SSP,
+       MX23_PAD_GPMI_RDY1__SSP2_CMD | MUX_CONFIG_SSP,
+       MX23_PAD_GPMI_WRN__SSP2_SCK | MUX_CONFIG_SSP,
+
+       /* PWM -- FIXME */
+       MX23_PAD_PWM2__GPIO_1_28 | MXS_PAD_3V3 | MXS_PAD_12MA | MXS_PAD_PULLUP,
+};
+
+void mxs_adjust_memory_params(uint32_t *dram_vals)
+{
+       /* mDDR configuration values */
+       const uint32_t regs[] = {
+               0x01010001, 0x00010000, 0x01000000, 0x00000001,
+               0x00010101, 0x00000001, 0x00010000, 0x01000001,
+               0x01010000, 0x00000001, 0x07000200, 0x04070203,
+               0x02020002, 0x06070a02, 0x0d000201, 0x0305000d,
+               0x02080800, 0x19330f0a, 0x1f1f1c00, 0x020a1313,
+               0x03061323, 0x0000000a, 0x00080008, 0x00200020,
+               0x00200020, 0x00200020, 0x000003f7, 0x00000000,
+               0x00000000, 0x00000000, 0x00000020, 0x00000000,
+               0x001023cd, 0x20410010, 0x00006665, 0x00000000,
+               0x00000101, 0x00000001, 0x00000000, 0x00000000,
+       };
+       memcpy(dram_vals, regs, sizeof(regs));
+}
+
+void board_init_ll(const uint32_t arg, const uint32_t *resptr)
+{
+       mxs_common_spl_init(arg, resptr, iomux_setup, ARRAY_SIZE(iomux_setup));
+}
diff --git a/board/creative/xfi3/xfi3.c b/board/creative/xfi3/xfi3.c
new file mode 100644 (file)
index 0000000..1d83ea8
--- /dev/null
@@ -0,0 +1,224 @@
+/*
+ * Creative ZEN X-Fi3 board
+ *
+ * Copyright (C) 2013 Marek Vasut <marex@denx.de>
+ *
+ * Hardware investigation done by:
+ *
+ * Amaury Pouly <amaury.pouly@gmail.com>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <errno.h>
+#include <asm/gpio.h>
+#include <asm/io.h>
+#include <asm/arch/iomux-mx23.h>
+#include <asm/arch/imx-regs.h>
+#include <asm/arch/clock.h>
+#include <asm/arch/sys_proto.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+/*
+ * Functions
+ */
+int board_early_init_f(void)
+{
+       /* IO0 clock at 480MHz */
+       mxs_set_ioclk(MXC_IOCLK0, 480000);
+
+       /* SSP0 clock at 96MHz */
+       mxs_set_sspclk(MXC_SSPCLK0, 96000, 0);
+
+       return 0;
+}
+
+int dram_init(void)
+{
+       return mxs_dram_init();
+}
+
+#ifdef CONFIG_CMD_MMC
+static int xfi3_mmc_cd(int id)
+{
+       switch (id) {
+       case 0:
+               /* The SSP_DETECT is inverted on this board. */
+               return gpio_get_value(MX23_PAD_SSP1_DETECT__GPIO_2_1);
+       case 1:
+               /* Phison bridge always present */
+               return 1;
+       default:
+               return 0;
+       }
+}
+
+int board_mmc_init(bd_t *bis)
+{
+       int ret;
+
+       /* MicroSD slot */
+       gpio_direction_input(MX23_PAD_SSP1_DETECT__GPIO_2_1);
+       gpio_direction_output(MX23_PAD_GPMI_D07__GPIO_0_7, 0);
+       ret = mxsmmc_initialize(bis, 0, NULL, xfi3_mmc_cd);
+       if (ret)
+               return ret;
+
+       /* Phison SD-NAND bridge */
+       ret = mxsmmc_initialize(bis, 1, NULL, xfi3_mmc_cd);
+
+       return ret;
+}
+#endif
+
+#ifdef CONFIG_VIDEO_MXS
+static int mxsfb_write_byte(uint32_t payload, const unsigned int data)
+{
+       struct mxs_lcdif_regs *regs = (struct mxs_lcdif_regs *)MXS_LCDIF_BASE;
+       const unsigned int timeout = 0x10000;
+
+       if (mxs_wait_mask_clr(&regs->hw_lcdif_ctrl_reg, LCDIF_CTRL_RUN,
+                             timeout))
+               return -ETIMEDOUT;
+
+       writel((1 << LCDIF_TRANSFER_COUNT_V_COUNT_OFFSET) |
+               (1 << LCDIF_TRANSFER_COUNT_H_COUNT_OFFSET),
+               &regs->hw_lcdif_transfer_count);
+
+       writel(LCDIF_CTRL_DATA_SELECT | LCDIF_CTRL_RUN,
+              &regs->hw_lcdif_ctrl_clr);
+
+       if (data)
+               writel(LCDIF_CTRL_DATA_SELECT, &regs->hw_lcdif_ctrl_set);
+
+       writel(LCDIF_CTRL_RUN, &regs->hw_lcdif_ctrl_set);
+
+       if (mxs_wait_mask_clr(&regs->hw_lcdif_lcdif_stat_reg, 1 << 29,
+                             timeout))
+               return -ETIMEDOUT;
+
+       writel(payload, &regs->hw_lcdif_data);
+       return mxs_wait_mask_clr(&regs->hw_lcdif_ctrl_reg, LCDIF_CTRL_RUN,
+                                timeout);
+}
+
+static void mxsfb_write_register(uint32_t reg, uint32_t data)
+{
+       mxsfb_write_byte(reg, 0);
+       mxsfb_write_byte(data, 1);
+}
+
+static const struct {
+       uint8_t         reg;
+       uint8_t         delay;
+       uint16_t        val;
+} lcd_regs[] = {
+       { 0x01, 0,  0x001c },
+       { 0x02, 0,  0x0100 },
+       /* Writing 0x30 to reg. 0x03 flips the LCD */
+       { 0x03, 0,  0x1038 },
+       { 0x08, 0,  0x0808 },
+       /* This can contain 0x111 to rotate the LCD. */
+       { 0x0c, 0,  0x0000 },
+       { 0x0f, 0,  0x0c01 },
+       { 0x20, 0,  0x0000 },
+       { 0x21, 30, 0x0000 },
+       /* Wait 30 mS here */
+       { 0x10, 0,  0x0a00 },
+       { 0x11, 30, 0x1038 },
+       /* Wait 30 mS here */
+       { 0x12, 0,  0x1010 },
+       { 0x13, 0,  0x0050 },
+       { 0x14, 0,  0x4f58 },
+       { 0x30, 0,  0x0000 },
+       { 0x31, 0,  0x00db },
+       { 0x32, 0,  0x0000 },
+       { 0x33, 0,  0x0000 },
+       { 0x34, 0,  0x00db },
+       { 0x35, 0,  0x0000 },
+       { 0x36, 0,  0x00af },
+       { 0x37, 0,  0x0000 },
+       { 0x38, 0,  0x00db },
+       { 0x39, 0,  0x0000 },
+       { 0x50, 0,  0x0000 },
+       { 0x51, 0,  0x0705 },
+       { 0x52, 0,  0x0e0a },
+       { 0x53, 0,  0x0300 },
+       { 0x54, 0,  0x0a0e },
+       { 0x55, 0,  0x0507 },
+       { 0x56, 0,  0x0000 },
+       { 0x57, 0,  0x0003 },
+       { 0x58, 0,  0x090a },
+       { 0x59, 30, 0x0a09 },
+       /* Wait 30 mS here */
+       { 0x07, 30, 0x1017 },
+       /* Wait 40 mS here */
+       { 0x36, 0,  0x00af },
+       { 0x37, 0,  0x0000 },
+       { 0x38, 0,  0x00db },
+       { 0x39, 0,  0x0000 },
+       { 0x20, 0,  0x0000 },
+       { 0x21, 0,  0x0000 },
+};
+
+void board_mxsfb_system_setup(void)
+{
+       struct mxs_lcdif_regs *regs = (struct mxs_lcdif_regs *)MXS_LCDIF_BASE;
+       int i;
+
+       /* Switch the LCDIF into System-Mode */
+       writel(LCDIF_CTRL_LCDIF_MASTER | LCDIF_CTRL_DOTCLK_MODE |
+               LCDIF_CTRL_BYPASS_COUNT, &regs->hw_lcdif_ctrl_clr);
+
+       /* Restart the SmartLCD controller */
+       mdelay(50);
+       writel(1, &regs->hw_lcdif_ctrl1_set);
+       mdelay(50);
+       writel(1, &regs->hw_lcdif_ctrl1_clr);
+       mdelay(50);
+       writel(1, &regs->hw_lcdif_ctrl1_set);
+       mdelay(50);
+
+       /* Program the SmartLCD controller */
+       writel(LCDIF_CTRL1_RECOVER_ON_UNDERFLOW, &regs->hw_lcdif_ctrl1_set);
+
+       writel((0x03 << LCDIF_TIMING_CMD_HOLD_OFFSET) |
+              (0x03 << LCDIF_TIMING_CMD_SETUP_OFFSET) |
+              (0x03 << LCDIF_TIMING_DATA_HOLD_OFFSET) |
+              (0x02 << LCDIF_TIMING_DATA_SETUP_OFFSET),
+              &regs->hw_lcdif_timing);
+
+       /*
+        * OTM2201A init and configuration sequence.
+        */
+       for (i = 0; i < ARRAY_SIZE(lcd_regs); i++) {
+               mxsfb_write_register(lcd_regs[i].reg, lcd_regs[i].val);
+               if (lcd_regs[i].delay)
+                       mdelay(lcd_regs[i].delay);
+       }
+       /* Turn on Framebuffer Upload Mode */
+       mxsfb_write_byte(0x22, 0);
+
+       writel(LCDIF_CTRL_LCDIF_MASTER | LCDIF_CTRL_DATA_SELECT,
+              &regs->hw_lcdif_ctrl_set);
+}
+#endif
+
+int board_init(void)
+{
+       /* Adress of boot parameters */
+       gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
+
+       /* Turn on PWM backlight */
+       gpio_direction_output(MX23_PAD_PWM2__GPIO_1_28, 1);
+
+       return 0;
+}
+
+int board_eth_init(bd_t *bis)
+{
+       usb_eth_initialize(bis);
+       return 0;
+}
index 525ba6ae7539c0906d9f9e65450d2c19e1f9c41c..5a1010e59550a4c65d9e2fc2ad3922ae0e5f9660 100644 (file)
@@ -200,7 +200,7 @@ const iomux_cfg_t iomux_setup[] = {
                (MXS_PAD_3V3 | MXS_PAD_8MA | MXS_PAD_PULLUP),
 };
 
-void board_init_ll(void)
+void board_init_ll(const uint32_t arg, const uint32_t *resptr)
 {
-       mxs_common_spl_init(iomux_setup, ARRAY_SIZE(iomux_setup));
+       mxs_common_spl_init(arg, resptr, iomux_setup, ARRAY_SIZE(iomux_setup));
 }
index 054ca0a93b0e175fe9814b96134e76009da88d18..603f4dcfd1df034266cf9cbfbeb55f22d3af3d88 100644 (file)
@@ -129,7 +129,7 @@ void mxs_adjust_memory_params(uint32_t *dram_vals)
        dram_vals[HW_DRAM_CTL14] = HW_DRAM_CTL14_CONFIG;
 }
 
-void board_init_ll(void)
+void board_init_ll(const uint32_t arg, const uint32_t *resptr)
 {
-       mxs_common_spl_init(iomux_setup, ARRAY_SIZE(iomux_setup));
+       mxs_common_spl_init(arg, resptr, iomux_setup, ARRAY_SIZE(iomux_setup));
 }
index 6ca842ba863a5cb3a4bdaf0a0a85e2c06d7d41d0..97c2376da1bff72e25b8de3fa4b1ef2bc21dcf97 100644 (file)
@@ -200,7 +200,7 @@ void mxs_adjust_memory_params(uint32_t *dram_vals)
        dram_vals[HW_DRAM_CTL29] = HW_DRAM_CTL29_CONFIG;
 }
 
-void board_init_ll(void)
+void board_init_ll(const uint32_t arg, const uint32_t *resptr)
 {
-       mxs_common_spl_init(iomux_setup, ARRAY_SIZE(iomux_setup));
+       mxs_common_spl_init(arg, resptr, iomux_setup, ARRAY_SIZE(iomux_setup));
 }
index 5db516d5fd92fa07a248c55efcd7267693016c54..c832bd98a851bc70ef83fd4762083ede630f8c6b 100644 (file)
@@ -234,47 +234,171 @@ int board_phy_config(struct phy_device *phydev)
 }
 
 #if defined(CONFIG_VIDEO_IPUV3)
-static struct fb_videomode const hdmi = {
-       .name           = "HDMI",
-       .refresh        = 60,
-       .xres           = 1024,
-       .yres           = 768,
-       .pixclock       = 15385,
-       .left_margin    = 220,
-       .right_margin   = 40,
-       .upper_margin   = 21,
-       .lower_margin   = 7,
-       .hsync_len      = 60,
-       .vsync_len      = 10,
-       .sync           = FB_SYNC_EXT,
-       .vmode          = FB_VMODE_NONINTERLACED
+struct display_info_t {
+       int     bus;
+       int     addr;
+       int     pixfmt;
+       int     (*detect)(struct display_info_t const *dev);
+       void    (*enable)(struct display_info_t const *dev);
+       struct  fb_videomode mode;
 };
 
-int board_video_skip(void)
+static int detect_hdmi(struct display_info_t const *dev)
 {
-       int ret;
+       struct hdmi_regs *hdmi  = (struct hdmi_regs *)HDMI_ARB_BASE_ADDR;
+       return readb(&hdmi->phy_stat0) & HDMI_DVI_STAT;
+}
 
-       ret = ipuv3_fb_init(&hdmi, 0, IPU_PIX_FMT_RGB24);
+static void do_enable_hdmi(struct display_info_t const *dev)
+{
+       imx_enable_hdmi_phy();
+}
 
-       if (ret)
-               printf("HDMI cannot be configured: %d\n", ret);
+static void enable_lvds(struct display_info_t const *dev)
+{
+       struct iomuxc *iomux = (struct iomuxc *)
+                               IOMUXC_BASE_ADDR;
+       u32 reg = readl(&iomux->gpr[2]);
+       reg |= IOMUXC_GPR2_DATA_WIDTH_CH0_24BIT |
+              IOMUXC_GPR2_DATA_WIDTH_CH1_24BIT;
+       writel(reg, &iomux->gpr[2]);
+}
+static struct display_info_t const displays[] = {{
+       .bus    = -1,
+       .addr   = 0,
+       .pixfmt = IPU_PIX_FMT_RGB24,
+       .detect = detect_hdmi,
+       .enable = do_enable_hdmi,
+       .mode   = {
+               .name           = "HDMI",
+               .refresh        = 60,
+               .xres           = 1024,
+               .yres           = 768,
+               .pixclock       = 15385,
+               .left_margin    = 220,
+               .right_margin   = 40,
+               .upper_margin   = 21,
+               .lower_margin   = 7,
+               .hsync_len      = 60,
+               .vsync_len      = 10,
+               .sync           = FB_SYNC_EXT,
+               .vmode          = FB_VMODE_NONINTERLACED
+} }, {
+       .bus    = -1,
+       .addr   = 0,
+       .pixfmt = IPU_PIX_FMT_LVDS666,
+       .detect = NULL,
+       .enable = enable_lvds,
+       .mode   = {
+               .name           = "Hannstar-XGA",
+               .refresh        = 60,
+               .xres           = 1024,
+               .yres           = 768,
+               .pixclock       = 15385,
+               .left_margin    = 220,
+               .right_margin   = 40,
+               .upper_margin   = 21,
+               .lower_margin   = 7,
+               .hsync_len      = 60,
+               .vsync_len      = 10,
+               .sync           = FB_SYNC_EXT,
+               .vmode          = FB_VMODE_NONINTERLACED
+} } };
 
-       imx_enable_hdmi_phy();
-       return ret;
+int board_video_skip(void)
+{
+       int i;
+       int ret;
+       char const *panel = getenv("panel");
+       if (!panel) {
+               for (i = 0; i < ARRAY_SIZE(displays); i++) {
+                       struct display_info_t const *dev = displays+i;
+                       if (dev->detect(dev)) {
+                               panel = dev->mode.name;
+                               printf("auto-detected panel %s\n", panel);
+                               break;
+                       }
+               }
+               if (!panel) {
+                       panel = displays[0].mode.name;
+                       printf("No panel detected: default to %s\n", panel);
+               }
+       } else {
+               for (i = 0; i < ARRAY_SIZE(displays); i++) {
+                       if (!strcmp(panel, displays[i].mode.name))
+                               break;
+               }
+       }
+       if (i < ARRAY_SIZE(displays)) {
+               ret = ipuv3_fb_init(&displays[i].mode, 0,
+                                   displays[i].pixfmt);
+               if (!ret) {
+                       displays[i].enable(displays+i);
+                       printf("Display: %s (%ux%u)\n",
+                              displays[i].mode.name,
+                              displays[i].mode.xres,
+                              displays[i].mode.yres);
+               } else
+                       printf("LCD %s cannot be configured: %d\n",
+                              displays[i].mode.name, ret);
+       } else {
+               printf("unsupported panel %s\n", panel);
+               return -EINVAL;
+       }
+
+       return 0;
 }
 
 static void setup_display(void)
 {
        struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
+       struct iomuxc *iomux = (struct iomuxc *)IOMUXC_BASE_ADDR;
        int reg;
 
        enable_ipu_clock();
        imx_setup_hdmi();
 
+       /* Turn on LDB0, LDB1, IPU,IPU DI0 clocks */
+       reg = __raw_readl(&mxc_ccm->CCGR3);
+       reg |=  MXC_CCM_CCGR3_LDB_DI0_MASK | MXC_CCM_CCGR3_LDB_DI1_MASK;
+       writel(reg, &mxc_ccm->CCGR3);
+
+       /* set LDB0, LDB1 clk select to 011/011 */
+       reg = readl(&mxc_ccm->cs2cdr);
+       reg &= ~(MXC_CCM_CS2CDR_LDB_DI0_CLK_SEL_MASK
+                | MXC_CCM_CS2CDR_LDB_DI1_CLK_SEL_MASK);
+       reg |= (3 << MXC_CCM_CS2CDR_LDB_DI0_CLK_SEL_OFFSET)
+             | (3 << MXC_CCM_CS2CDR_LDB_DI1_CLK_SEL_OFFSET);
+       writel(reg, &mxc_ccm->cs2cdr);
+
+       reg = readl(&mxc_ccm->cscmr2);
+       reg |= MXC_CCM_CSCMR2_LDB_DI0_IPU_DIV | MXC_CCM_CSCMR2_LDB_DI1_IPU_DIV;
+       writel(reg, &mxc_ccm->cscmr2);
+
        reg = readl(&mxc_ccm->chsccdr);
        reg |= (CHSCCDR_CLK_SEL_LDB_DI0
                << MXC_CCM_CHSCCDR_IPU1_DI0_CLK_SEL_OFFSET);
+       reg |= (CHSCCDR_CLK_SEL_LDB_DI0
+               << MXC_CCM_CHSCCDR_IPU1_DI1_CLK_SEL_OFFSET);
        writel(reg, &mxc_ccm->chsccdr);
+
+       reg = IOMUXC_GPR2_BGREF_RRMODE_EXTERNAL_RES
+            | IOMUXC_GPR2_DI1_VS_POLARITY_ACTIVE_LOW
+            | IOMUXC_GPR2_DI0_VS_POLARITY_ACTIVE_LOW
+            | IOMUXC_GPR2_BIT_MAPPING_CH1_SPWG
+            | IOMUXC_GPR2_DATA_WIDTH_CH1_18BIT
+            | IOMUXC_GPR2_BIT_MAPPING_CH0_SPWG
+            | IOMUXC_GPR2_DATA_WIDTH_CH0_18BIT
+            | IOMUXC_GPR2_LVDS_CH0_MODE_DISABLED
+            | IOMUXC_GPR2_LVDS_CH1_MODE_ENABLED_DI0;
+       writel(reg, &iomux->gpr[2]);
+
+       reg = readl(&iomux->gpr[3]);
+       reg = (reg & ~(IOMUXC_GPR3_LVDS1_MUX_CTL_MASK
+                       | IOMUXC_GPR3_HDMI_MUX_CTL_MASK))
+           | (IOMUXC_GPR3_MUX_SRC_IPU1_DI0
+              << IOMUXC_GPR3_LVDS1_MUX_CTL_OFFSET);
+       writel(reg, &iomux->gpr[3]);
 }
 #endif /* CONFIG_VIDEO_IPUV3 */
 
index 0a6630395da981f965de9274d955903b4df5a2b3..5272dfa4e676dbb5e2296f45df6494458083929d 100644 (file)
@@ -85,7 +85,7 @@ const iomux_cfg_t iomux_setup[] = {
                (MXS_PAD_3V3 | MXS_PAD_12MA | MXS_PAD_NOPULL),
 };
 
-void board_init_ll(void)
+void board_init_ll(const uint32_t arg, const uint32_t *resptr)
 {
-       mxs_common_spl_init(iomux_setup, ARRAY_SIZE(iomux_setup));
+       mxs_common_spl_init(arg, resptr, iomux_setup, ARRAY_SIZE(iomux_setup));
 }
diff --git a/board/sandisk/sansa_fuze_plus/Makefile b/board/sandisk/sansa_fuze_plus/Makefile
new file mode 100644 (file)
index 0000000..571cc07
--- /dev/null
@@ -0,0 +1,31 @@
+#
+# (C) Copyright 2000-2006
+# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
+#
+# SPDX-License-Identifier:     GPL-2.0+
+#
+
+include $(TOPDIR)/config.mk
+
+LIB    = $(obj)lib$(BOARD).o
+
+ifndef CONFIG_SPL_BUILD
+COBJS  := sfp.o
+else
+COBJS  := spl_boot.o
+endif
+
+SRCS   := $(COBJS:.o=.c)
+OBJS   := $(addprefix $(obj),$(COBJS))
+
+$(LIB):        $(obj).depend $(OBJS)
+       $(call cmd_link_o_target, $(OBJS))
+
+#########################################################################
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
+
+#########################################################################
diff --git a/board/sandisk/sansa_fuze_plus/sfp.c b/board/sandisk/sansa_fuze_plus/sfp.c
new file mode 100644 (file)
index 0000000..a3865ad
--- /dev/null
@@ -0,0 +1,388 @@
+/*
+ * SanDisk Sansa Fuze Plus board
+ *
+ * Copyright (C) 2013 Marek Vasut <marex@denx.de>
+ *
+ * Hardware investigation done by:
+ *
+ * Amaury Pouly <amaury.pouly@gmail.com>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <errno.h>
+#include <asm/gpio.h>
+#include <asm/io.h>
+#include <asm/arch/iomux-mx23.h>
+#include <asm/arch/imx-regs.h>
+#include <asm/arch/clock.h>
+#include <asm/arch/sys_proto.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+/*
+ * Functions
+ */
+int board_early_init_f(void)
+{
+       /* IO0 clock at 480MHz */
+       mxs_set_ioclk(MXC_IOCLK0, 480000);
+
+       /* SSP0 clock at 96MHz */
+       mxs_set_sspclk(MXC_SSPCLK0, 96000, 0);
+
+       return 0;
+}
+
+int dram_init(void)
+{
+       return mxs_dram_init();
+}
+
+#ifdef CONFIG_CMD_MMC
+static int xfi3_mmc_cd(int id)
+{
+       switch (id) {
+       case 0:
+               /* The SSP_DETECT is inverted on this board. */
+               return gpio_get_value(MX23_PAD_SSP1_DETECT__GPIO_2_1);
+       case 1:
+               /* Internal eMMC always present */
+               return 1;
+       default:
+               return 0;
+       }
+}
+
+int board_mmc_init(bd_t *bis)
+{
+       int ret;
+
+       /* MicroSD slot */
+       gpio_direction_input(MX23_PAD_SSP1_DETECT__GPIO_2_1);
+       gpio_direction_output(MX23_PAD_GPMI_D08__GPIO_0_8, 0);
+       ret = mxsmmc_initialize(bis, 0, NULL, xfi3_mmc_cd);
+       if (ret)
+               return ret;
+
+       /* Internal eMMC */
+       gpio_direction_output(MX23_PAD_PWM3__GPIO_1_29, 0);
+       ret = mxsmmc_initialize(bis, 1, NULL, xfi3_mmc_cd);
+
+       return ret;
+}
+#endif
+
+#ifdef CONFIG_VIDEO_MXS
+#define        MUX_CONFIG_LCD  (MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_NOPULL)
+const iomux_cfg_t iomux_lcd_gpio[] = {
+       MX23_PAD_LCD_D00__GPIO_1_0 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D01__GPIO_1_1 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D02__GPIO_1_2 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D03__GPIO_1_3 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D04__GPIO_1_4 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D05__GPIO_1_5 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D06__GPIO_1_6 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D07__GPIO_1_7 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D08__GPIO_1_8 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D09__GPIO_1_9 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D10__GPIO_1_10 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D11__GPIO_1_11 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D12__GPIO_1_12 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D13__GPIO_1_13 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D14__GPIO_1_14 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D15__GPIO_1_15 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D16__GPIO_1_16 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D17__GPIO_1_17 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_RESET__GPIO_1_18 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_RS__GPIO_1_19 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_WR__GPIO_1_20 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_CS__GPIO_1_21 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_ENABLE__GPIO_1_23 | MUX_CONFIG_LCD,
+};
+
+const iomux_cfg_t iomux_lcd_lcd[] = {
+       MX23_PAD_LCD_D00__LCD_D00 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D01__LCD_D01 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D02__LCD_D02 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D03__LCD_D03 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D04__LCD_D04 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D05__LCD_D05 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D06__LCD_D06 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D07__LCD_D07 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D08__LCD_D08 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D09__LCD_D09 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D10__LCD_D10 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D11__LCD_D11 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D12__LCD_D12 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D13__LCD_D13 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D14__LCD_D14 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D15__LCD_D15 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D16__LCD_D16 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D17__LCD_D17 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_RESET__LCD_RESET | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_RS__LCD_RS | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_WR__LCD_WR | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_CS__LCD_CS | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_ENABLE__LCD_ENABLE | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_VSYNC__LCD_VSYNC | MUX_CONFIG_LCD,
+};
+
+static int mxsfb_read_register(uint32_t reg, uint32_t *value)
+{
+       iomux_cfg_t mux;
+       uint32_t val = 0;
+       int i;
+
+       /* Mangle the register offset. */
+       reg = ((reg & 0xff) << 1) | (((reg >> 8) & 0xff) << 10);
+
+       /*
+        * The SmartLCD interface on MX233 can only do WRITE operation
+        * via the LCDIF controller. Implement the READ operation by
+        * fiddling with bits.
+        */
+       mxs_iomux_setup_multiple_pads(iomux_lcd_gpio,
+               ARRAY_SIZE(iomux_lcd_gpio));
+
+       gpio_direction_output(MX23_PAD_LCD_RS__GPIO_1_19, 1);
+       gpio_direction_output(MX23_PAD_LCD_CS__GPIO_1_21, 1);
+       gpio_direction_output(MX23_PAD_LCD_WR__GPIO_1_20, 1);
+       gpio_direction_output(MX23_PAD_LCD_ENABLE__GPIO_1_23, 1);
+
+       for (i = 0; i < 18; i++) {
+               mux = MXS_IOMUX_PAD_NAKED(1, i, PAD_MUXSEL_GPIO);
+               gpio_direction_output(mux, 0);
+       }
+
+       udelay(2);
+       gpio_direction_output(MX23_PAD_LCD_RS__GPIO_1_19, 0);
+       udelay(1);
+       gpio_direction_output(MX23_PAD_LCD_CS__GPIO_1_21, 0);
+       udelay(1);
+       gpio_direction_output(MX23_PAD_LCD_WR__GPIO_1_20, 0);
+       udelay(1);
+
+       for (i = 0; i < 18; i++) {
+               mux = MXS_IOMUX_PAD_NAKED(1, i, PAD_MUXSEL_GPIO);
+               gpio_direction_output(mux, (reg >> i) & 1);
+       }
+       udelay(1);
+
+       gpio_direction_output(MX23_PAD_LCD_WR__GPIO_1_20, 1);
+       udelay(3);
+
+       for (i = 0; i < 18; i++) {
+               mux = MXS_IOMUX_PAD_NAKED(1, i, PAD_MUXSEL_GPIO);
+               gpio_direction_input(mux);
+       }
+       udelay(2);
+
+       gpio_direction_output(MX23_PAD_LCD_ENABLE__GPIO_1_23, 0);
+       udelay(1);
+       gpio_direction_output(MX23_PAD_LCD_RS__GPIO_1_19, 1);
+       udelay(1);
+       gpio_direction_output(MX23_PAD_LCD_ENABLE__GPIO_1_23, 1);
+       udelay(3);
+       gpio_direction_output(MX23_PAD_LCD_ENABLE__GPIO_1_23, 0);
+       udelay(2);
+
+       for (i = 0; i < 18; i++) {
+               mux = MXS_IOMUX_PAD_NAKED(1, i, PAD_MUXSEL_GPIO);
+               val |= !!gpio_get_value(mux) << i;
+       }
+       udelay(1);
+
+       gpio_direction_output(MX23_PAD_LCD_ENABLE__GPIO_1_23, 1);
+       udelay(1);
+       gpio_direction_output(MX23_PAD_LCD_CS__GPIO_1_21, 1);
+       udelay(1);
+
+       mxs_iomux_setup_multiple_pads(iomux_lcd_lcd,
+               ARRAY_SIZE(iomux_lcd_lcd));
+
+       /* Demangle the register value. */
+       *value = ((val >> 1) & 0xff) | ((val >> 2) & 0xff00);
+
+       writel(val, 0x2000);
+       return 0;
+}
+
+static int mxsfb_write_byte(uint32_t payload, const unsigned int data)
+{
+       struct mxs_lcdif_regs *regs = (struct mxs_lcdif_regs *)MXS_LCDIF_BASE;
+       const unsigned int timeout = 0x10000;
+
+       /* What is going on here I do not know. FIXME */
+       payload = ((payload & 0xff) << 1) | (((payload >> 8) & 0xff) << 10);
+
+       if (mxs_wait_mask_clr(&regs->hw_lcdif_ctrl_reg, LCDIF_CTRL_RUN,
+                             timeout))
+               return -ETIMEDOUT;
+
+       writel((1 << LCDIF_TRANSFER_COUNT_V_COUNT_OFFSET) |
+               (1 << LCDIF_TRANSFER_COUNT_H_COUNT_OFFSET),
+               &regs->hw_lcdif_transfer_count);
+
+       writel(LCDIF_CTRL_DATA_SELECT | LCDIF_CTRL_RUN,
+               &regs->hw_lcdif_ctrl_clr);
+
+       if (data)
+               writel(LCDIF_CTRL_DATA_SELECT, &regs->hw_lcdif_ctrl_set);
+
+       writel(LCDIF_CTRL_RUN, &regs->hw_lcdif_ctrl_set);
+
+       if (mxs_wait_mask_clr(&regs->hw_lcdif_lcdif_stat_reg, 1 << 29,
+                             timeout))
+               return -ETIMEDOUT;
+
+       writel(payload, &regs->hw_lcdif_data);
+       return mxs_wait_mask_clr(&regs->hw_lcdif_ctrl_reg, LCDIF_CTRL_RUN,
+                                timeout);
+}
+
+static void mxsfb_write_register(uint32_t reg, uint32_t data)
+{
+       mxsfb_write_byte(reg, 0);
+       mxsfb_write_byte(data, 1);
+}
+
+static const struct {
+       uint8_t         reg;
+       uint8_t         delay;
+       uint16_t        val;
+} lcd_regs[] = {
+       { 0xe5, 0  , 0x78f0 },
+       { 0xe3, 0  , 0x3008 },
+       { 0xe7, 0  , 0x0012 },
+       { 0xef, 0  , 0x1231 },
+       { 0x00, 0  , 0x0001 },
+       { 0x01, 0  , 0x0100 },
+       { 0x02, 0  , 0x0700 },
+       { 0x03, 0  , 0x1030 },
+       { 0x04, 0  , 0x0000 },
+       { 0x08, 0  , 0x0207 },
+       { 0x09, 0  , 0x0000 },
+       { 0x0a, 0  , 0x0000 },
+       { 0x0c, 0  , 0x0000 },
+       { 0x0d, 0  , 0x0000 },
+       { 0x0f, 0  , 0x0000 },
+       { 0x10, 0  , 0x0000 },
+       { 0x11, 0  , 0x0007 },
+       { 0x12, 0  , 0x0000 },
+       { 0x13, 20 , 0x0000 },
+       /* Wait 20 mS here. */
+       { 0x10, 0  , 0x1290 },
+       { 0x11, 50 , 0x0007 },
+       /* Wait 50 mS here. */
+       { 0x12, 50 , 0x0019 },
+       /* Wait 50 mS here. */
+       { 0x13, 0  , 0x1700 },
+       { 0x29, 50 , 0x0014 },
+       /* Wait 50 mS here. */
+       { 0x20, 0  , 0x0000 },
+       { 0x21, 0  , 0x0000 },
+       { 0x30, 0  , 0x0504 },
+       { 0x31, 0  , 0x0007 },
+       { 0x32, 0  , 0x0006 },
+       { 0x35, 0  , 0x0106 },
+       { 0x36, 0  , 0x0202 },
+       { 0x37, 0  , 0x0504 },
+       { 0x38, 0  , 0x0500 },
+       { 0x39, 0  , 0x0706 },
+       { 0x3c, 0  , 0x0204 },
+       { 0x3d, 0  , 0x0202 },
+       { 0x50, 0  , 0x0000 },
+       { 0x51, 0  , 0x00ef },
+       { 0x52, 0  , 0x0000 },
+       { 0x53, 0  , 0x013f },
+       { 0x60, 0  , 0xa700 },
+       { 0x61, 0  , 0x0001 },
+       { 0x6a, 0  , 0x0000 },
+       { 0x2b, 50 , 0x000d },
+       /* Wait 50 mS here. */
+       { 0x90, 0  , 0x0011 },
+       { 0x92, 0  , 0x0600 },
+       { 0x93, 0  , 0x0003 },
+       { 0x95, 0  , 0x0110 },
+       { 0x97, 0  , 0x0000 },
+       { 0x98, 0  , 0x0000 },
+       { 0x07, 0  , 0x0173 },
+};
+
+void board_mxsfb_system_setup(void)
+{
+       struct mxs_lcdif_regs *regs = (struct mxs_lcdif_regs *)MXS_LCDIF_BASE;
+       uint32_t id;
+       int i;
+
+       /* Switch the LCDIF into System-Mode */
+       writel(LCDIF_CTRL_LCDIF_MASTER | LCDIF_CTRL_DOTCLK_MODE |
+               LCDIF_CTRL_BYPASS_COUNT, &regs->hw_lcdif_ctrl_clr);
+
+       /* To program the LCD, switch to 18bit bus + 18bit data. */
+       clrsetbits_le32(&regs->hw_lcdif_ctrl,
+               LCDIF_CTRL_WORD_LENGTH_MASK | LCDIF_CTRL_LCD_DATABUS_WIDTH_MASK,
+               LCDIF_CTRL_WORD_LENGTH_18BIT |
+               LCDIF_CTRL_LCD_DATABUS_WIDTH_18BIT);
+
+       mxsfb_read_register(0, &id);
+       writel(id, 0x2004);
+
+       /* Restart the SmartLCD controller */
+       mdelay(50);
+       writel(1, &regs->hw_lcdif_ctrl1_set);
+       mdelay(50);
+       writel(1, &regs->hw_lcdif_ctrl1_clr);
+       mdelay(50);
+       writel(1, &regs->hw_lcdif_ctrl1_set);
+       mdelay(50);
+
+       /* Program the SmartLCD controller */
+       writel(LCDIF_CTRL1_RECOVER_ON_UNDERFLOW, &regs->hw_lcdif_ctrl1_set);
+
+       writel((0x02 << LCDIF_TIMING_CMD_HOLD_OFFSET) |
+              (0x02 << LCDIF_TIMING_CMD_SETUP_OFFSET) |
+              (0x02 << LCDIF_TIMING_DATA_HOLD_OFFSET) |
+              (0x01 << LCDIF_TIMING_DATA_SETUP_OFFSET),
+              &regs->hw_lcdif_timing);
+
+       /*
+        * ILI9325 init and configuration sequence.
+        */
+       for (i = 0; i < ARRAY_SIZE(lcd_regs); i++) {
+               mxsfb_write_register(lcd_regs[i].reg, lcd_regs[i].val);
+               if (lcd_regs[i].delay)
+                       mdelay(lcd_regs[i].delay);
+       }
+       /* Turn on Framebuffer Upload Mode */
+       mxsfb_write_byte(0x22, 0);
+
+       writel(LCDIF_CTRL_LCDIF_MASTER | LCDIF_CTRL_DATA_SELECT,
+               &regs->hw_lcdif_ctrl_set);
+
+       /* Operate the framebuffer in 16bit mode. */
+       clrsetbits_le32(&regs->hw_lcdif_ctrl,
+               LCDIF_CTRL_WORD_LENGTH_MASK | LCDIF_CTRL_LCD_DATABUS_WIDTH_MASK,
+               LCDIF_CTRL_WORD_LENGTH_16BIT |
+               LCDIF_CTRL_LCD_DATABUS_WIDTH_18BIT);
+}
+#endif
+
+int board_init(void)
+{
+       /* Adress of boot parameters */
+       gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
+
+       /* Turn on PWM backlight */
+       gpio_direction_output(MX23_PAD_PWM2__GPIO_1_28, 1);
+
+       return 0;
+}
+
+int board_eth_init(bd_t *bis)
+{
+       usb_eth_initialize(bis);
+       return 0;
+}
diff --git a/board/sandisk/sansa_fuze_plus/spl_boot.c b/board/sandisk/sansa_fuze_plus/spl_boot.c
new file mode 100644 (file)
index 0000000..825be82
--- /dev/null
@@ -0,0 +1,140 @@
+/*
+ * SanDisk Sansa Fuze Plus setup
+ *
+ * Copyright (C) 2013 Marek Vasut <marex@denx.de>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <config.h>
+#include <asm/io.h>
+#include <asm/arch/iomux-mx23.h>
+#include <asm/arch/imx-regs.h>
+#include <asm/arch/sys_proto.h>
+
+#define        MUX_CONFIG_EMI  (MXS_PAD_1V8 | MXS_PAD_12MA | MXS_PAD_PULLUP)
+#define        MUX_CONFIG_SSP  (MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_PULLUP)
+#define        MUX_CONFIG_LCD  (MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_NOPULL)
+
+const iomux_cfg_t iomux_setup[] = {
+       /* EMI */
+       MX23_PAD_EMI_D00__EMI_D00 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_D01__EMI_D01 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_D02__EMI_D02 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_D03__EMI_D03 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_D04__EMI_D04 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_D05__EMI_D05 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_D06__EMI_D06 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_D07__EMI_D07 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_D08__EMI_D08 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_D09__EMI_D09 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_D10__EMI_D10 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_D11__EMI_D11 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_D12__EMI_D12 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_D13__EMI_D13 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_D14__EMI_D14 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_D15__EMI_D15 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_DQM0__EMI_DQM0 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_DQM1__EMI_DQM1 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_DQS0__EMI_DQS0 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_DQS1__EMI_DQS1 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_CLK__EMI_CLK | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_CLKN__EMI_CLKN | MUX_CONFIG_EMI,
+
+       MX23_PAD_EMI_A00__EMI_A00 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_A01__EMI_A01 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_A02__EMI_A02 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_A03__EMI_A03 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_A04__EMI_A04 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_A05__EMI_A05 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_A06__EMI_A06 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_A07__EMI_A07 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_A08__EMI_A08 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_A09__EMI_A09 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_A10__EMI_A10 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_A11__EMI_A11 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_A12__EMI_A12 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_BA0__EMI_BA0 | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_BA1__EMI_BA1 | MUX_CONFIG_EMI,
+
+       MX23_PAD_EMI_CASN__EMI_CASN | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_CE0N__EMI_CE0N | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_CE1N__EMI_CE1N | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_CKE__EMI_CKE | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_RASN__EMI_RASN | MUX_CONFIG_EMI,
+       MX23_PAD_EMI_WEN__EMI_WEN | MUX_CONFIG_EMI,
+
+       MX23_PAD_LCD_D00__LCD_D00 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D01__LCD_D01 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D02__LCD_D02 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D03__LCD_D03 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D04__LCD_D04 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D05__LCD_D05 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D06__LCD_D06 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D07__LCD_D07 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D08__LCD_D08 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D09__LCD_D09 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D10__LCD_D10 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D11__LCD_D11 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D12__LCD_D12 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D13__LCD_D13 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D14__LCD_D14 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D15__LCD_D15 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D16__LCD_D16 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_D17__LCD_D17 | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_RESET__LCD_RESET | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_RS__LCD_RS | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_WR__LCD_WR | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_CS__LCD_CS | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_ENABLE__LCD_ENABLE | MUX_CONFIG_LCD,
+       MX23_PAD_LCD_VSYNC__LCD_VSYNC | MUX_CONFIG_LCD,
+
+       MX23_PAD_SSP1_CMD__SSP1_CMD | MUX_CONFIG_SSP,
+       MX23_PAD_SSP1_DETECT__GPIO_2_1 | MUX_CONFIG_SSP,
+       MX23_PAD_SSP1_DATA0__SSP1_DATA0 | MUX_CONFIG_SSP,
+       MX23_PAD_SSP1_DATA1__SSP1_DATA1 | MUX_CONFIG_SSP,
+       MX23_PAD_SSP1_DATA2__SSP1_DATA2 | MUX_CONFIG_SSP,
+       MX23_PAD_SSP1_DATA3__SSP1_DATA3 | MUX_CONFIG_SSP,
+       MX23_PAD_SSP1_SCK__SSP1_SCK | MUX_CONFIG_SSP,
+       MX23_PAD_GPMI_D08__GPIO_0_8 | MUX_CONFIG_SSP,
+
+       MX23_PAD_GPMI_D00__SSP2_DATA0 | MUX_CONFIG_SSP,
+       MX23_PAD_GPMI_D01__SSP2_DATA1 | MUX_CONFIG_SSP,
+       MX23_PAD_GPMI_D02__SSP2_DATA2 | MUX_CONFIG_SSP,
+       MX23_PAD_GPMI_D03__SSP2_DATA3 | MUX_CONFIG_SSP,
+       MX23_PAD_GPMI_D04__SSP2_DATA4 | MUX_CONFIG_SSP,
+       MX23_PAD_GPMI_D05__SSP2_DATA5 | MUX_CONFIG_SSP,
+       MX23_PAD_GPMI_D06__SSP2_DATA6 | MUX_CONFIG_SSP,
+       MX23_PAD_GPMI_D07__SSP2_DATA7 | MUX_CONFIG_SSP,
+       MX23_PAD_GPMI_RDY1__SSP2_CMD | MUX_CONFIG_SSP,
+       MX23_PAD_GPMI_WRN__SSP2_SCK |
+               (MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_NOPULL),
+       MX23_PAD_PWM3__GPIO_1_29 | MUX_CONFIG_SSP,
+
+       /* PWM -- FIXME */
+       MX23_PAD_PWM2__GPIO_1_28 | MXS_PAD_3V3 | MXS_PAD_12MA | MXS_PAD_PULLUP,
+};
+
+void mxs_adjust_memory_params(uint32_t *dram_vals)
+{
+       /* mDDR configuration values */
+       const uint32_t regs[] = {
+               0x01010001, 0x00010000, 0x01000000, 0x00000001,
+               0x00010101, 0x00000001, 0x00010000, 0x01000001,
+               0x01010000, 0x00000001, 0x07000200, 0x04070203,
+               0x02020002, 0x06070a02, 0x0d000201, 0x0305000d,
+               0x02080800, 0x19330f0a, 0x1f1f1c00, 0x020a1313,
+               0x03061323, 0x0000000a, 0x00080008, 0x00200020,
+               0x00200020, 0x00200020, 0x000003f7, 0x00000000,
+               0x00000000, 0x00000000, 0x00000020, 0x00000000,
+               0x001023cd, 0x20410010, 0x00006665, 0x00000000,
+               0x00000101, 0x00000001, 0x00000000, 0x00000000,
+       };
+       memcpy(dram_vals, regs, sizeof(regs));
+}
+
+void board_init_ll(const uint32_t arg, const uint32_t *resptr)
+{
+       mxs_common_spl_init(arg, resptr, iomux_setup, ARRAY_SIZE(iomux_setup));
+}
index 1fe9224e5a1c5d9b6d24198bedfb73f1abb9c12b..60195c3a7d1dee237604a06198b12b62508b8016 100644 (file)
@@ -138,9 +138,9 @@ const iomux_cfg_t iomux_setup[] = {
        MX28_PAD_GPMI_D06__GPIO_0_6 | MUX_CONFIG_LED,
 };
 
-void board_init_ll(void)
+void board_init_ll(const uint32_t arg, const uint32_t *resptr)
 {
-       mxs_common_spl_init(iomux_setup, ARRAY_SIZE(iomux_setup));
+       mxs_common_spl_init(arg, resptr, iomux_setup, ARRAY_SIZE(iomux_setup));
 }
 
 void mxs_adjust_memory_params(uint32_t *dram_vals)
index dbd8479e32c8ea021440b6fb4f29c9fad9cd7bb5..80846c966cda9b03d19ad26c01bb91e48f7c0ae1 100644 (file)
@@ -196,15 +196,18 @@ Active  arm         arm926ejs      mb86r0x     syteco          jadecpu
 Active  arm         arm926ejs      mx25        freescale       mx25pdk             mx25pdk                              mx25pdk:IMX_CONFIG=board/freescale/mx25pdk/imximage.cfg                                                                           Fabio Estevam <fabio.estevam@freescale.com>
 Active  arm         arm926ejs      mx25        karo            tx25                tx25                                 -                                                                                                                                 John Rigby <jcrigby@gmail.com>
 Active  arm         arm926ejs      mx25        syteco          zmx25               zmx25                                -                                                                                                                                 Matthias Weisser <weisserm@arcor.de>
+Active  arm         arm926ejs      mx27        armadeus        apf27               apf27                                -                                                                                                                                 Philippe Reynes <tremyfr@yahoo.fr>:Eric Jarrige <eric.jarrige@armadeus.org> 
 Active  arm         arm926ejs      mx27        logicpd         imx27lite           imx27lite                            -                                                                                                                                 Wolfgang Denk <wd@denx.de>
 Active  arm         arm926ejs      mx27        logicpd         imx27lite           magnesium                            -                                                                                                                                 Heiko Schocher <hs@denx.de>
 Active  arm         arm926ejs      mxs         bluegiga        apx4devkit          apx4devkit                           apx4devkit                                                                                                                        Lauri Hintsala <lauri.hintsala@bluegiga.com>
+Active  arm         arm926ejs      mxs         creative        xfi3                xfi3                                 -                                                                                                                                 Marek Vasut <marek.vasut@gmail.com>
 Active  arm         arm926ejs      mxs         denx            m28evk              m28evk                               m28evk                                                                                                                            Marek Vasut <marek.vasut@gmail.com>
 Active  arm         arm926ejs      mxs         freescale       mx23evk             mx23evk                              mx23evk                                                                                                                           Otavio Salvador <otavio@ossystems.com.br>
 Active  arm         arm926ejs      mxs         freescale       mx28evk             mx28evk                              mx28evk:ENV_IS_IN_MMC                                                                                                             Fabio Estevam <fabio.estevam@freescale.com>
 Active  arm         arm926ejs      mxs         freescale       mx28evk             mx28evk_auart_console                mx28evk:MXS_AUART,MXS_AUART_BASE=MXS_UARTAPP3_BASE,ENV_IS_IN_MMC                                                                  Fabio Estevam <fabio.estevam@freescale.com>
 Active  arm         arm926ejs      mxs         freescale       mx28evk             mx28evk_nand                         mx28evk:ENV_IS_IN_NAND                                                                                                            Fabio Estevam <fabio.estevam@freescale.com>
 Active  arm         arm926ejs      mxs         olimex          mx23_olinuxino      mx23_olinuxino                       mx23_olinuxino                                                                                                                    Marek Vasut <marek.vasut@gmail.com>
+Active  arm         arm926ejs      mxs         sandisk         sansa_fuze_plus     sansa_fuze_plus                      -                                                                                                                                 Marek Vasut <marek.vasut@gmail.com>
 Active  arm         arm926ejs      mxs         schulercontrol  sc_sps_1            sc_sps_1                             -                                                                                                                                 Marek Vasut <marek.vasut@gmail.com>
 Active  arm         arm926ejs      nomadik     st              nhk8815             nhk8815                              -                                                                                                                                 Nomadik Linux Team <STN_WMM_nomadik_linux@list.st.com>:Alessandro Rubini <rubini@unipv.it>
 Active  arm         arm926ejs      nomadik     st              nhk8815             nhk8815_onenand                      nhk8815:BOOT_ONENAND                                                                                                              Nomadik Linux Team <STN_WMM_nomadik_linux@list.st.com>:Alessandro Rubini <rubini@unipv.it>
index 378f8c513aac6381a6e5cc931c384270ec71b047..036c113ad3e93ad6ffaa8a637d6e042fe2758a94 100644 (file)
@@ -155,6 +155,9 @@ static inline uint32_t mxs_nand_get_ecc_strength(uint32_t page_data_size,
 
                if (page_oob_size == 218)
                        return 16;
+
+               if (page_oob_size == 224)
+                       return 16;
        }
 
        return 0;
diff --git a/include/configs/apf27.h b/include/configs/apf27.h
new file mode 100644 (file)
index 0000000..e7e258f
--- /dev/null
@@ -0,0 +1,388 @@
+/*
+ *
+ * Configuration settings for the Armadeus Project motherboard APF27
+ *
+ * Copyright (C) 2008-2013 Eric Jarrige <eric.jarrige@armadeus.org>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#ifndef __CONFIG_H
+#define __CONFIG_H
+
+#define CONFIG_VERSION_VARIABLE
+#define CONFIG_ENV_VERSION     10
+#define CONFIG_IDENT_STRING    " apf27 patch 3.10"
+#define CONFIG_BOARD_NAME apf27
+
+/*
+ * SoC configurations
+ */
+#define CONFIG_ARM926EJS               /* this is an ARM926EJS CPU */
+#define CONFIG_MX27                    /* in a Freescale i.MX27 Chip */
+#define CONFIG_MACH_TYPE       1698    /* APF27 */
+#define CONFIG_SYS_GENERIC_BOARD
+
+/*
+ * Enable the call to miscellaneous platform dependent initialization.
+ */
+#define CONFIG_SYS_NO_FLASH    /* to be define before <config_cmd_default.h> */
+
+/*
+ * Board display option
+ */
+#define CONFIG_DISPLAY_BOARDINFO
+#define CONFIG_DISPLAY_CPUINFO
+
+/*
+ * SPL
+ */
+#define CONFIG_SPL
+#define CONFIG_SPL_TARGET      "u-boot-with-spl.bin"
+#define CONFIG_SPL_LDSCRIPT    "arch/$(ARCH)/cpu/u-boot-spl.lds"
+#define CONFIG_SPL_MAX_SIZE    2048
+#define CONFIG_SPL_TEXT_BASE    0xA0000000
+
+/* NAND boot config */
+#define CONFIG_SPL_NAND_SUPPORT
+#define CONFIG_SYS_NAND_U_BOOT_START    CONFIG_SYS_TEXT_BASE
+#define CONFIG_SYS_NAND_U_BOOT_OFFS    0x800
+#define CONFIG_SYS_NAND_U_BOOT_DST     CONFIG_SYS_TEXT_BASE
+#define CONFIG_SYS_NAND_U_BOOT_SIZE    CONFIG_SYS_MONITOR_LEN - 0x800
+
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_SUBNETMASK
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_DNS
+#define CONFIG_BOOTP_DNS2
+
+#define CONFIG_HOSTNAME        CONFIG_BOARD_NAME
+#define CONFIG_ROOTPATH        "/tftpboot/" __stringify(CONFIG_BOARD_NAME) "-root"
+
+/*
+ * U-Boot Commands
+ */
+#include <config_cmd_default.h>
+
+#define CONFIG_CMD_ASKENV      /* ask for env variable         */
+#define CONFIG_CMD_BSP         /* Board Specific functions     */
+#define CONFIG_CMD_CACHE       /* icache, dcache               */
+#define CONFIG_CMD_DATE
+#define CONFIG_CMD_DHCP                /* DHCP Support                 */
+#define CONFIG_CMD_DNS
+#define CONFIG_CMD_EEPROM
+#define CONFIG_CMD_EXT2
+#define CONFIG_CMD_FAT         /* FAT support                  */
+#define CONFIG_CMD_IMX_FUSE    /* imx iim fuse                 */
+#define CONFIG_CMD_I2C
+#define CONFIG_CMD_MII         /* MII support                  */
+#define CONFIG_CMD_MMC
+#define CONFIG_CMD_MTDPARTS    /* MTD partition support        */
+#define CONFIG_CMD_NAND                /* NAND support                 */
+#define CONFIG_CMD_NAND_LOCK_UNLOCK
+#define CONFIG_CMD_NAND_TRIMFFS
+#define CONFIG_CMD_NFS         /* NFS support                  */
+#define CONFIG_CMD_PING                /* ping support                 */
+#define CONFIG_CMD_SETEXPR     /* setexpr support              */
+#define CONFIG_CMD_UBI
+#define CONFIG_CMD_UBIFS
+
+/*
+ * Memory configurations
+ */
+#define CONFIG_NR_DRAM_POPULATED 1
+#define CONFIG_NR_DRAM_BANKS   2
+
+#define ACFG_SDRAM_MBYTE_SYZE 64
+
+#define PHYS_SDRAM_1                   0xA0000000
+#define PHYS_SDRAM_2                   0xB0000000
+#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
+#define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + (512<<10))
+#define CONFIG_SYS_MEMTEST_START       0xA0000000      /* memtest test area  */
+#define CONFIG_SYS_MEMTEST_END         0xA0300000      /* 3 MiB RAM test */
+
+#define CONFIG_SYS_INIT_SP_ADDR        (CONFIG_SYS_SDRAM_BASE  \
+               + PHYS_SDRAM_1_SIZE - 0x0100000)
+
+#define CONFIG_SYS_TEXT_BASE           0xA0000800
+
+/*
+ * FLASH organization
+ */
+#define        ACFG_MONITOR_OFFSET             0x00000000
+#define        CONFIG_SYS_MONITOR_LEN          0x00100000      /* 1MiB */
+#define CONFIG_ENV_IS_IN_NAND
+#define        CONFIG_ENV_OVERWRITE
+#define        CONFIG_ENV_OFFSET               0x00100000      /* NAND offset */
+#define        CONFIG_ENV_SIZE                 0x00020000      /* 128kB  */
+#define CONFIG_ENV_RANGE               0X00080000      /* 512kB */
+#define        CONFIG_ENV_OFFSET_REDUND        \
+               (CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE)  /* +512kB */
+#define        CONFIG_ENV_SIZE_REDUND          CONFIG_ENV_SIZE /* 512kB */
+#define        CONFIG_FIRMWARE_OFFSET          0x00200000
+#define        CONFIG_FIRMWARE_SIZE            0x00080000      /* 512kB  */
+#define        CONFIG_KERNEL_OFFSET            0x00300000
+#define        CONFIG_ROOTFS_OFFSET            0x00800000
+
+#define CONFIG_MTDMAP                  "mxc_nand.0"
+#define MTDIDS_DEFAULT                 "nand0=" CONFIG_MTDMAP
+#define MTDPARTS_DEFAULT       "mtdparts=" CONFIG_MTDMAP \
+                               ":1M(u-boot)ro," \
+                               "512K(env)," \
+                               "512K(env2)," \
+                               "512K(firmware)," \
+                               "512K(dtb)," \
+                               "5M(kernel)," \
+                               "-(rootfs)"
+
+/*
+ * U-Boot general configurations
+ */
+#define CONFIG_SYS_LONGHELP
+#define CONFIG_SYS_PROMPT              "BIOS> "        /* prompt string */
+#define CONFIG_SYS_CBSIZE              2048            /* console I/O buffer */
+#define CONFIG_SYS_PBSIZE              \
+                               (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
+                                               /* Print buffer size */
+#define CONFIG_SYS_MAXARGS             16              /* max command args */
+#define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
+                                               /* Boot argument buffer size */
+#define CONFIG_AUTO_COMPLETE
+#define CONFIG_CMDLINE_EDITING
+#define CONFIG_SYS_HUSH_PARSER                 /* enable the "hush" shell */
+#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "    /* secondary prompt string */
+#define CONFIG_ENV_VARS_UBOOT_CONFIG
+#define CONFIG_PREBOOT                 "run check_flash check_env;"
+
+
+/*
+ * Boot Linux
+ */
+#define CONFIG_CMDLINE_TAG             /* send commandline to Kernel   */
+#define CONFIG_SETUP_MEMORY_TAGS       /* send memory definition to kernel */
+#define CONFIG_INITRD_TAG              /* send initrd params   */
+
+#define CONFIG_OF_LIBFDT
+
+#define CONFIG_BOOTDELAY       5
+#define CONFIG_ZERO_BOOTDELAY_CHECK
+#define        CONFIG_BOOTFILE         __stringify(CONFIG_BOARD_NAME) "-linux.bin"
+#define CONFIG_BOOTARGS                "console=" __stringify(ACFG_CONSOLE_DEV) "," \
+                       __stringify(CONFIG_BAUDRATE) " " MTDPARTS_DEFAULT \
+                       " ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs "
+
+#define ACFG_CONSOLE_DEV       ttySMX0
+#define CONFIG_BOOTCOMMAND     "run ubifsboot"
+#define CONFIG_SYS_AUTOLOAD    "no"
+/*
+ * Default load address for user programs and kernel
+ */
+#define CONFIG_LOADADDR                        0xA0000000
+#define        CONFIG_SYS_LOAD_ADDR            CONFIG_LOADADDR
+
+/*
+ * Extra Environments
+ */
+#define CONFIG_EXTRA_ENV_SETTINGS \
+       "env_version="          __stringify(CONFIG_ENV_VERSION)         "\0" \
+       "consoledev="           __stringify(ACFG_CONSOLE_DEV)           "\0" \
+       "mtdparts="             MTDPARTS_DEFAULT                        "\0" \
+       "partition=nand0,6\0"                                           \
+       "u-boot_addr="          __stringify(ACFG_MONITOR_OFFSET)        "\0" \
+       "env_addr="             __stringify(CONFIG_ENV_OFFSET)          "\0" \
+       "firmware_addr="        __stringify(CONFIG_FIRMWARE_OFFSET)     "\0" \
+       "firmware_size="        __stringify(CONFIG_FIRMWARE_SIZE)       "\0" \
+       "kernel_addr="          __stringify(CONFIG_KERNEL_OFFSET)       "\0" \
+       "rootfs_addr="          __stringify(CONFIG_ROOTFS_OFFSET)       "\0" \
+       "board_name="           __stringify(CONFIG_BOARD_NAME)          "\0" \
+       "kernel_addr_r=A0000000\0" \
+       "check_env=if test -n ${flash_env_version}; "                   \
+               "then env default env_version; "                        \
+               "else env set flash_env_version ${env_version}; env save; "\
+               "fi; "                                                  \
+               "if itest ${flash_env_version} < ${env_version}; then " \
+                       "echo \"*** Warning - Environment version"      \
+                       " change suggests: run flash_reset_env; reset\"; "\
+                       "env default flash_reset_env; "\
+               "fi; \0"                                                \
+       "check_flash=nand lock; nand unlock ${env_addr}; \0"    \
+       "flash_reset_env=env default -f -a; saveenv; run update_env;"   \
+               "echo Flash environment variables erased!\0"            \
+       "download_uboot=tftpboot ${loadaddr} ${board_name}"             \
+               "-u-boot-with-spl.bin\0"                                \
+       "flash_uboot=nand unlock ${u-boot_addr} ;"                      \
+               "nand erase.part u-boot;"               \
+               "if nand write.trimffs ${fileaddr} ${u-boot_addr} ${filesize};"\
+                       "then nand lock; nand unlock ${env_addr};"      \
+                               "echo Flashing of uboot succeed;"       \
+                       "else echo Flashing of uboot failed;"           \
+               "fi; \0"                                                \
+       "update_uboot=run download_uboot flash_uboot\0"                 \
+       "download_env=tftpboot ${loadaddr} ${board_name}"               \
+               "-u-boot-env.txt\0"                             \
+       "flash_env=env import -t ${loadaddr}; env save; \0"             \
+       "update_env=run download_env flash_env\0"                       \
+       "update_all=run update_env update_uboot\0"                      \
+       "unlock_regs=mw 10000008 0; mw 10020008 0\0"                    \
+
+/*
+ * Serial Driver
+ */
+#define CONFIG_MXC_UART
+#define CONFIG_CONS_INDEX              1
+#define CONFIG_BAUDRATE                        115200
+#define CONFIG_MXC_UART_BASE           UART1_BASE
+
+/*
+ * GPIO
+ */
+#define CONFIG_MXC_GPIO
+
+/*
+ * NOR
+ */
+
+/*
+ * NAND
+ */
+#define CONFIG_NAND_MXC
+
+#define CONFIG_MXC_NAND_REGS_BASE      0xD8000000
+#define CONFIG_SYS_NAND_BASE           CONFIG_MXC_NAND_REGS_BASE
+#define CONFIG_SYS_MAX_NAND_DEVICE     1
+
+#define CONFIG_MXC_NAND_HWECC
+#define CONFIG_SYS_NAND_LARGEPAGE
+#define CONFIG_SYS_NAND_BUSWIDTH_16BIT
+#define CONFIG_SYS_NAND_PAGE_SIZE      2048
+#define CONFIG_SYS_NAND_BLOCK_SIZE     (128 * 1024)
+#define CONFIG_SYS_NAND_PAGE_COUNT     CONFIG_SYS_NAND_BLOCK_SIZE / \
+                                               CONFIG_SYS_NAND_PAGE_SIZE
+#define CONFIG_SYS_NAND_SIZE           (256 * 1024 * 1024)
+#define CONFIG_SYS_NAND_BAD_BLOCK_POS  11
+#define NAND_MAX_CHIPS                 1
+
+#define CONFIG_FLASH_SHOW_PROGRESS     45
+#define CONFIG_SYS_NAND_QUIET          1
+
+/*
+ * Partitions & Filsystems
+ */
+#define CONFIG_MTD_DEVICE
+#define CONFIG_MTD_PARTITIONS
+#define CONFIG_DOS_PARTITION
+#define CONFIG_SUPPORT_VFAT
+
+/*
+ * UBIFS
+ */
+#define CONFIG_RBTREE
+#define CONFIG_LZO
+
+/*
+ * Ethernet (on SOC imx FEC)
+ */
+#define CONFIG_FEC_MXC
+#define CONFIG_FEC_MXC_PHYADDR         0x1f
+#define CONFIG_MII                             /* MII PHY management   */
+
+/*
+ * FPGA
+ */
+#ifndef CONFIG_SPL_BUILD
+#define CONFIG_FPGA
+#endif
+#define CONFIG_FPGA_COUNT              1
+#define CONFIG_FPGA_XILINX
+#define CONFIG_FPGA_SPARTAN3
+#define CONFIG_SYS_FPGA_WAIT           250 /* 250 ms */
+#define CONFIG_SYS_FPGA_PROG_FEEDBACK
+#define CONFIG_SYS_FPGA_CHECK_CTRLC
+#define CONFIG_SYS_FPGA_CHECK_ERROR
+
+/*
+ * Fuses - IIM
+ */
+#ifdef CONFIG_CMD_IMX_FUSE
+#define IIM_MAC_BANK           0
+#define IIM_MAC_ROW            5
+#define IIM0_SCC_KEY           11
+#define IIM1_SUID              1
+#endif
+
+/*
+ * I2C
+ */
+
+#ifdef CONFIG_CMD_I2C
+#define CONFIG_HARD_I2C
+#define CONFIG_I2C_MXC
+#define CONFIG_SYS_I2C_BASE            IMX_I2C1_BASE
+#define CONFIG_SYS_I2C_SPEED           100000  /* 100 kHz */
+#define CONFIG_SYS_I2C_SLAVE           0x7F
+#define CONFIG_SYS_I2C_NOPROBES                { }
+
+#ifdef CONFIG_CMD_EEPROM
+# define CONFIG_SYS_I2C_EEPROM_ADDR    0x50    /* EEPROM 24LC02 */
+# define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1      /* bytes of address */
+#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS      3
+#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS  10      /* msec */
+#endif /* CONFIG_CMD_EEPROM */
+#endif /* CONFIG_CMD_I2C */
+
+/*
+ * SD/MMC
+ */
+#ifdef CONFIG_CMD_MMC
+#define CONFIG_MMC
+#define CONFIG_GENERIC_MMC
+#define CONFIG_MXC_MMC
+#define CONFIG_MXC_MCI_REGS_BASE       0x10014000
+#endif
+
+/*
+ * RTC
+ */
+#ifdef CONFIG_CMD_DATE
+#define CONFIG_RTC_DS1374
+#define CONFIG_SYS_RTC_BUS_NUM         0
+#endif /* CONFIG_CMD_DATE */
+
+/*
+ * Clocks
+ */
+#define        CONFIG_SYS_HZ                   1000    /* Ticks per second */
+
+/*
+ * PLL
+ *
+ *  31 | x  |x| x x x x |x x x x x x x x x x |x x|x x x x|x x x x x x x x x x| 0
+ *     |CPLM|X|----PD---|--------MFD---------|XXX|--MFI--|-----MFN-----------|
+ */
+#define CONFIG_MX27_CLK32              32768   /* 32768 or 32000 Hz crystal */
+
+#if (ACFG_SDRAM_MBYTE_SYZE == 64) /* micron MT46H16M32LF -6 */
+/* micron 64MB */
+#define PHYS_SDRAM_1_SIZE                      0x04000000 /* 64 MB */
+#define PHYS_SDRAM_2_SIZE                      0x04000000 /* 64 MB */
+#endif
+
+#if (ACFG_SDRAM_MBYTE_SYZE == 128)
+/* micron 128MB */
+#define PHYS_SDRAM_1_SIZE                      0x08000000 /* 128 MB */
+#define PHYS_SDRAM_2_SIZE                      0x08000000 /* 128 MB */
+#endif
+
+#if (ACFG_SDRAM_MBYTE_SYZE == 256)
+/* micron 256MB */
+#define PHYS_SDRAM_1_SIZE                      0x10000000 /* 256 MB */
+#define PHYS_SDRAM_2_SIZE                      0x10000000 /* 256 MB */
+#endif
+
+#endif /* __CONFIG_H */
diff --git a/include/configs/sansa_fuze_plus.h b/include/configs/sansa_fuze_plus.h
new file mode 100644 (file)
index 0000000..a85eb1c
--- /dev/null
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2013 Marek Vasut <marex@denx.de>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+#ifndef __CONFIGS_SANSA_FUZE_PLUS_H__
+#define __CONFIGS_SANSA_FUZE_PLUS_H__
+
+/* System configurations */
+#define CONFIG_MX23                            /* i.MX23 SoC */
+
+/* U-Boot Commands */
+#define CONFIG_SYS_NO_FLASH
+#include <config_cmd_default.h>
+#define CONFIG_DISPLAY_CPUINFO
+#define CONFIG_DOS_PARTITION
+
+#define CONFIG_CMD_CACHE
+#define CONFIG_CMD_EXT2
+#define CONFIG_CMD_FAT
+#define CONFIG_CMD_GPIO
+#define CONFIG_CMD_MMC
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_USB
+#define CONFIG_VIDEO
+#define CONFIG_CMD_MEMTEST
+
+/* Memory configuration */
+#define CONFIG_NR_DRAM_BANKS           1               /* 1 bank of DRAM */
+#define PHYS_SDRAM_1                   0x40000000      /* Base address */
+#define PHYS_SDRAM_1_SIZE              0x08000000      /* Max 128 MB RAM */
+#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
+
+/* Environment */
+#define CONFIG_ENV_SIZE                        (16 * 1024)
+#define CONFIG_ENV_IS_NOWHERE
+#define CONFIG_ENV_OVERWRITE
+
+/* Booting Linux */
+#define CONFIG_BOOTDELAY       3
+#define CONFIG_BOOTFILE                "uImage"
+#define CONFIG_BOOTARGS                "console=ttyAMA0,115200n8 "
+#define CONFIG_LOADADDR                0x42000000
+#define CONFIG_SYS_LOAD_ADDR   CONFIG_LOADADDR
+
+/* LCD */
+#ifdef CONFIG_VIDEO
+#define CONFIG_VIDEO_FONT_4X6
+#define CONFIG_VIDEO_MXS_MODE_SYSTEM
+#define CONFIG_SYS_BLACK_IN_WRITE
+#define LCD_BPP        LCD_COLOR16
+#endif
+
+/* USB */
+#ifdef CONFIG_CMD_USB
+#define CONFIG_EHCI_MXS_PORT0
+#define CONFIG_USB_MAX_CONTROLLER_COUNT 1
+
+#define CONFIG_MV_UDC          /* ChipIdea CI13xxx UDC */
+#define CONFIG_USB_GADGET_DUALSPEED
+
+#define CONFIG_USB_ETHER
+#define CONFIG_USB_ETH_CDC
+#define CONFIG_NETCONSOLE
+#endif
+
+/* The rest of the configuration is shared */
+#include <configs/mxs.h>
+
+#endif /* __CONFIGS_SANSA_FUZE_PLUS_H__ */
diff --git a/include/configs/xfi3.h b/include/configs/xfi3.h
new file mode 100644 (file)
index 0000000..022bc95
--- /dev/null
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2013 Marek Vasut <marex@denx.de>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+#ifndef __CONFIGS_XFI3_H__
+#define __CONFIGS_XFI3_H__
+
+/* System configurations */
+#define CONFIG_MX23                            /* i.MX23 SoC */
+
+/* U-Boot Commands */
+#define CONFIG_SYS_NO_FLASH
+#include <config_cmd_default.h>
+#define CONFIG_DISPLAY_CPUINFO
+#define CONFIG_DOS_PARTITION
+
+#define CONFIG_CMD_CACHE
+#define CONFIG_CMD_EXT2
+#define CONFIG_CMD_FAT
+#define CONFIG_CMD_GPIO
+#define CONFIG_CMD_MMC
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_USB
+#define CONFIG_VIDEO
+
+/* Memory configuration */
+#define CONFIG_NR_DRAM_BANKS           1               /* 1 bank of DRAM */
+#define PHYS_SDRAM_1                   0x40000000      /* Base address */
+#define PHYS_SDRAM_1_SIZE              0x08000000      /* Max 128 MB RAM */
+#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
+
+/* Environment */
+#define CONFIG_ENV_SIZE                        (16 * 1024)
+#define CONFIG_ENV_IS_NOWHERE
+#define CONFIG_ENV_OVERWRITE
+
+/* Booting Linux */
+#define CONFIG_BOOTDELAY       3
+#define CONFIG_BOOTFILE                "uImage"
+#define CONFIG_BOOTARGS                "console=ttyAMA0,115200n8 "
+#define CONFIG_LOADADDR                0x42000000
+#define CONFIG_SYS_LOAD_ADDR   CONFIG_LOADADDR
+
+/* LCD */
+#ifdef CONFIG_VIDEO
+#define CONFIG_VIDEO_FONT_4X6
+#define CONFIG_VIDEO_MXS_MODE_SYSTEM
+#define CONFIG_SYS_BLACK_IN_WRITE
+#define LCD_BPP        LCD_COLOR16
+#endif
+
+/* USB */
+#ifdef CONFIG_CMD_USB
+#define CONFIG_EHCI_MXS_PORT0
+#define CONFIG_USB_MAX_CONTROLLER_COUNT 1
+
+#define CONFIG_MV_UDC          /* ChipIdea CI13xxx UDC */
+#define CONFIG_USB_GADGET_DUALSPEED
+
+#define CONFIG_USB_ETHER
+#define CONFIG_USB_ETH_CDC
+#define CONFIG_NETCONSOLE
+#endif
+
+/* The rest of the configuration is shared */
+#include <configs/mxs.h>
+
+#endif /* __CONFIGS_XFI3_H__ */
index 1060cbf605f82a382a2db32ac46f550dad8f7ccc..90b21737b92f80bba2a78e41bb066dd40724ff94 100644 (file)
@@ -379,7 +379,7 @@ static uint8_t *mx28_nand_fcb_block(struct mx28_nand_fcb *fcb)
        return block;
 }
 
-static int mx28_nand_write_fcb(struct mx28_nand_fcb *fcb, char *buf)
+static int mx28_nand_write_fcb(struct mx28_nand_fcb *fcb, uint8_t *buf)
 {
        uint32_t offset;
        uint8_t *fcbblock;
@@ -393,13 +393,15 @@ static int mx28_nand_write_fcb(struct mx28_nand_fcb *fcb, char *buf)
        for (i = 0; i < STRIDE_PAGES * STRIDE_COUNT; i += STRIDE_PAGES) {
                offset = i * nand_writesize;
                memcpy(buf + offset, fcbblock, nand_writesize + nand_oobsize);
+               /* Mark the NAND page is OK. */
+               buf[offset + nand_writesize] = 0xff;
        }
 
        free(fcbblock);
        return ret;
 }
 
-static int mx28_nand_write_dbbt(struct mx28_nand_dbbt *dbbt, char *buf)
+static int mx28_nand_write_dbbt(struct mx28_nand_dbbt *dbbt, uint8_t *buf)
 {
        uint32_t offset;
        int i = STRIDE_PAGES * STRIDE_COUNT;
@@ -413,7 +415,7 @@ static int mx28_nand_write_dbbt(struct mx28_nand_dbbt *dbbt, char *buf)
 }
 
 static int mx28_nand_write_firmware(struct mx28_nand_fcb *fcb, int infd,
-                                       char *buf)
+                                   uint8_t *buf)
 {
        int ret;
        off_t size;
@@ -462,7 +464,7 @@ static int mx28_create_nand_image(int infd, int outfd)
        struct mx28_nand_fcb *fcb;
        struct mx28_nand_dbbt *dbbt;
        int ret = -1;
-       char *buf;
+       uint8_t *buf;
        int size;
        ssize_t wr_size;