March 2015 - U-Boot

[U-Boot] [PATCH 0/10] Add Marvell Armada A38x 88F6820 SoC support
by Stefan Roese 20 Mar '15

20 Mar '15

This patch series adds support for the Marvell Armada A38x SoC's. Specifically the 88F6820 / 88F6828. Basic support for the DB-88F6820-GP evaluation board is added. Supporting the following interfaces: - UART - SPI (including SPI NOR flash) - I2C - Ethernet (neta) One big part of this new SoC support is the move of the already exisiting Armada XP support into the "mach-mvebu" directory. With this move its easier to re-use this code for the A38x, which is pretty similar to the AXP. Thanks, Stefan Stefan Roese (10): arm: armada-xp: Move SoC sources to mach-mvebu arm: armada-xp: Move SoC headers to mach-mvebu/include/mach arm: mvebu: Move mvebu-common into mach-mvebu arm: mvebu: Change header macros from ARMADA_XP to MVEBU arm: mvebu: Remove unreferenced define arm: mvebu: Only define MV88F78X60 for Armada XP arm: mvebu: Move CONFIG_SPL_LDSCRIPT to common header arm: mvebu: Add basic Armada 38x support arm: mvebu: Change network init code to allow a more flexible setup arm: mvebu: Add Armada A38x DB-88F6820-GP board support arch/arm/Kconfig | 6 ++ arch/arm/Makefile | 5 +- arch/arm/cpu/armv7/Makefile | 1 - arch/arm/cpu/armv7/armada-xp/Makefile | 9 -- arch/arm/mach-mvebu/Makefile | 24 ++++++ arch/arm/{cpu/armv7/armada-xp => mach-mvebu}/cpu.c | 99 +++++++++++++++++----- arch/arm/{mvebu-common => mach-mvebu}/dram.c | 0 arch/arm/{mvebu-common => mach-mvebu}/gpio.c | 0 .../include/mach}/config.h | 15 +++- .../include/mach}/cpu.h | 6 +- .../include/mach}/soc.h | 18 ++-- .../armv7/armada-xp => mach-mvebu}/lowlevel_spl.S | 0 arch/arm/{mvebu-common => mach-mvebu}/mbus.c | 0 .../{mvebu-common => mach-mvebu}/serdes/Makefile | 0 .../serdes/board_env_spec.h | 0 .../serdes/high_speed_env_lib.c | 0 .../serdes/high_speed_env_spec.c | 0 .../serdes/high_speed_env_spec.h | 0 arch/arm/{cpu/armv7/armada-xp => mach-mvebu}/spl.c | 0 arch/arm/{mvebu-common => mach-mvebu}/timer.c | 0 .../{mvebu-common => mach-mvebu}/u-boot-spl.lds | 0 board/Marvell/db-88f6820-gp/Kconfig | 15 ++++ board/Marvell/db-88f6820-gp/Makefile | 7 ++ board/Marvell/db-88f6820-gp/binary.0 | 16 ++++ board/Marvell/db-88f6820-gp/db-88f6820-gp.c | 78 +++++++++++++++++ board/Marvell/db-88f6820-gp/kwbimage.cfg | 12 +++ board/Marvell/db-mv784mp-gp/Kconfig | 2 +- board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c | 3 +- board/maxbcm/Kconfig | 2 +- board/maxbcm/maxbcm.c | 2 +- configs/db-88f6820-gp_defconfig | 2 + include/configs/db-88f6820-gp.h | 69 +++++++++++++++ include/configs/db-mv784mp-gp.h | 3 +- include/configs/maxbcm.h | 3 +- 34 files changed, 343 insertions(+), 54 deletions(-) delete mode 100644 arch/arm/cpu/armv7/armada-xp/Makefile create mode 100644 arch/arm/mach-mvebu/Makefile rename arch/arm/{cpu/armv7/armada-xp => mach-mvebu}/cpu.c (71%) rename arch/arm/{mvebu-common => mach-mvebu}/dram.c (100%) rename arch/arm/{mvebu-common => mach-mvebu}/gpio.c (100%) rename arch/arm/{include/asm/arch-armada-xp => mach-mvebu/include/mach}/config.h (86%) rename arch/arm/{include/asm/arch-armada-xp => mach-mvebu/include/mach}/cpu.h (96%) rename arch/arm/{include/asm/arch-armada-xp => mach-mvebu/include/mach}/soc.h (86%) rename arch/arm/{cpu/armv7/armada-xp => mach-mvebu}/lowlevel_spl.S (100%) rename arch/arm/{mvebu-common => mach-mvebu}/mbus.c (100%) rename arch/arm/{mvebu-common => mach-mvebu}/serdes/Makefile (100%) rename arch/arm/{mvebu-common => mach-mvebu}/serdes/board_env_spec.h (100%) rename arch/arm/{mvebu-common => mach-mvebu}/serdes/high_speed_env_lib.c (100%) rename arch/arm/{mvebu-common => mach-mvebu}/serdes/high_speed_env_spec.c (100%) rename arch/arm/{mvebu-common => mach-mvebu}/serdes/high_speed_env_spec.h (100%) rename arch/arm/{cpu/armv7/armada-xp => mach-mvebu}/spl.c (100%) rename arch/arm/{mvebu-common => mach-mvebu}/timer.c (100%) rename arch/arm/{mvebu-common => mach-mvebu}/u-boot-spl.lds (100%) create mode 100644 board/Marvell/db-88f6820-gp/Kconfig create mode 100644 board/Marvell/db-88f6820-gp/Makefile create mode 100644 board/Marvell/db-88f6820-gp/binary.0 create mode 100644 board/Marvell/db-88f6820-gp/db-88f6820-gp.c create mode 100644 board/Marvell/db-88f6820-gp/kwbimage.cfg create mode 100644 configs/db-88f6820-gp_defconfig create mode 100644 include/configs/db-88f6820-gp.h -- 2.3.3

2 12

[U-Boot] [PATCH] ARM: at91: atmel_nand: Support flash based BBT
by David Dueck 20 Mar '15

20 Mar '15

Signed-off-by: David Dueck <davidcdueck(a)googlemail.com> CC: Boris BREZILLON <boris.brezillon(a)free-electrons.com> CC: Josh Wu <josh.wu(a)atmel.com> CC: Andreas Bießmann <andreas.devel(a)googlemail.com> CC: Scott Wood <scottwood(a)freescale.com> --- drivers/mtd/nand/atmel_nand.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c index b16e3aa..a2016e7 100644 --- a/drivers/mtd/nand/atmel_nand.c +++ b/drivers/mtd/nand/atmel_nand.c @@ -1456,6 +1456,9 @@ int board_nand_init(struct nand_chip *nand) nand->dev_ready = at91_nand_wait_ready; #endif nand->chip_delay = 20; +#ifdef CONFIG_SYS_NAND_USE_FLASH_BBT + nand->bbt_options |= NAND_BBT_USE_FLASH; +#endif #ifdef CONFIG_ATMEL_NAND_HWECC #ifdef CONFIG_ATMEL_NAND_HW_PMECC @@ -1522,6 +1525,9 @@ int atmel_nand_chip_init(int devnum, ulong base_addr) nand->dev_ready = at91_nand_ready; #endif nand->chip_delay = 75; +#ifdef CONFIG_SYS_NAND_USE_FLASH_BBT + nand->bbt_options |= NAND_BBT_USE_FLASH; +#endif ret = nand_scan_ident(mtd, CONFIG_SYS_NAND_MAX_CHIPS, NULL); if (ret) -- 2.3.0

2 1

Re: [U-Boot] [PATCH 4/6] mmc: Continue polling MMC card for OCR only if it is still not ready
by Andrew Gabbasov 20 Mar '15

20 Mar '15

Hi Peng, > From: Peng.Fan(a)freescale.com [Peng.Fan(a)freescale.com] > Sent: Friday, March 20, 2015 03:51 > To: Gabbasov, Andrew; u-boot(a)lists.denx.de > Subject: RE: [U-Boot] [PATCH 4/6] mmc: Continue polling MMC card for OCR only if it is still not ready > > Hi, Andrew > > There is already a patch to fix this issue. > Patchwork: https://patchwork.ozlabs.org/patch/451775/ > > Regards, > Peng. Yes, I noticed it just after I sent this series. ;-) Unfortunately, the patch, that you mention, has some drawback that I described in a separate message (in response to the patch). Basically, it leaves the code in some not quite correct state. This series hopefully does not have this drawback and besides fixing the issue has some more useful changes in a single complex. Thanks. Best regards, Andrew -----Original Message----- From: U-Boot [mailto:u-boot-bounces@lists.denx.de] On Behalf Of Andrew Gabbasov Sent: Thursday, March 19, 2015 8:44 PM To: u-boot(a)lists.denx.de Subject: [U-Boot] [PATCH 4/6] mmc: Continue polling MMC card for OCR only if it is still not ready Some MMC cards come to ready state quite quickly, so that the respective flag appears to be set in mmc_send_op_cond already. In this case trying to continue polling the card with CMD1 in mmc_complete_op_cond is incorrect and may lead to unpredictable results. So check the flag before polling and skip it appropriately. Signed-off-by: Andrew Gabbasov <andrew_gabbasov(a)mentor.com> --- drivers/mmc/mmc.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index d073d79..42af47c 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -403,15 +403,17 @@ static int mmc_complete_op_cond(struct mmc *mmc) int err; mmc->op_cond_pending = 0; - start = get_timer(0); - do { - err = mmc_send_op_cond_iter(mmc, 1); - if (err) - return err; - if (get_timer(start) > timeout) - return UNUSABLE_ERR; - udelay(100); - } while (!(mmc->ocr & OCR_BUSY)); + if (!(mmc->ocr & OCR_BUSY)) { + start = get_timer(0); + do { + err = mmc_send_op_cond_iter(mmc, 1); + if (err) + return err; + if (get_timer(start) > timeout) + return UNUSABLE_ERR; + udelay(100); + } while (!(mmc->ocr & OCR_BUSY)); + } if (mmc_host_is_spi(mmc)) { /* read OCR for spi */ cmd.cmdidx = MMC_CMD_SPI_READ_OCR; -- 2.1.0 _______________________________________________ U-Boot mailing list U-Boot(a)lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot

1 0

Re: [U-Boot] Regression in bootcmd handling in v2015.04-rc3?
by Tom Rini 19 Mar '15

19 Mar '15

On Wed, Mar 11, 2015 at 10:48:25PM +0100, Karsten Merker wrote: > On Wed, Mar 11, 2015 at 03:35:02PM -0600, Stephen Warren wrote: > > On 03/11/2015 03:21 PM, Karsten Merker wrote: > > > >As a result I will need to update the Debian installation > > >documentation. As I would like to do it right this time ;-), I > > >just would like to get the confirmation that the device-specific > > >commands, such as "run bootcmd_usb0", are an "official" interface > > >that is going to stay in future u-boot versions, or - if they are > > >not - get the information what is the offical method for booting > > >from a specific device at the prompt. > > > > We don't actually have an official specification of that at present. > > doc/README.distro should probably cover this but doesn't. > > > > Suffice to say, I use those macros all the time, and I intended them > > to be used this way when I wrote the boot scripts. So, if I notice a > > change that stops them from working without extremely good reason, > > I'll complain. > > Thanks, I'll update the Debian docs accordingly. So then we're settled on "run bootcmd_usb" was unintended but "run bootcmd_usb0" is and must remain so if anything a slight update to doc/README.distro would be expected and we're good, right? Thanks guys! -- Tom

3 3

[U-Boot] [PATCH 0/28] Adding LS2085AQDS and RDB
by York Sun 19 Mar '15

19 Mar '15

This set adds necessary support in common ls2085a support and board support for QDS and RDB. Bhupesh Sharma (1): armv8/fsl-ch3: Add support to print RCW configuration J. German Rivera (2): drivers/fsl-mc: Changed MC firmware loading for new boot architecture drivers/fsl-mc: Autoload AOIP image from NOR flash Jaiprakash Singh (1): driver/ifc: Add 64KB page support Minghuan Lian (1): armv8: Add SerDes framework for LayerScape Architecture Prabhakar Kushwaha (4): armv8/ls2085a: Update common header file driver/ldpaa_eth: Update ldpaa ethernet driver driver/ldpaa: Add support of WRIOP static data structure board/ls2085qds: Add support ethernet Scott Wood (8): armv8/fsl-lsch3: Set nodes in DVM domain fsl-lsch3: Introduce place for common early SoC init armv8/ls2085a: Add workaround for USB erratum A-008751 armv8/fsl-lsch3: Use correct compatible for serial clock fixup armv8/fsl-lsch3: Enable system error aborts armv8/ls2085aqds: NAND boot support freescale/qixis: Add support for booting from NAND armv8/ls2085ardb: Enable NAND SPL support Shaohui Xie (1): net/memac_phy: reuse driver for little endian SoCs Yangbo Lu (1): ls2085a: esdhc: Add esdhc support for ls2085a York Sun (7): armv8/fsl-lsch3: Implement workaround for erratum A008585 armv8/fsl-lsch3: Fix platform clock calculation armv8/ls2085a: Fix generic timer clock source armv8/fsl-lsch3: Update early MMU table armv8/ls2085aqds: Add support of LS2085AQDS platform armv8/ls2085ardb: Add support of LS2085ARDB platform armv8/fsl-lsch3: Implement workaround for I2C issue pankaj chauhan (2): armv8/ls2085a: Add support for reset request net/phy/cortina: Fix compilation warning README | 8 + arch/arm/Kconfig | 24 + arch/arm/cpu/armv7/ls102xa/clock.c | 4 +- arch/arm/cpu/armv8/fsl-lsch3/Makefile | 2 + arch/arm/cpu/armv8/fsl-lsch3/README | 78 +++- arch/arm/cpu/armv8/fsl-lsch3/cpu.c | 123 ++++- arch/arm/cpu/armv8/fsl-lsch3/fdt.c | 9 +- arch/arm/cpu/armv8/fsl-lsch3/fsl_lsch3_serdes.c | 115 +++++ arch/arm/cpu/armv8/fsl-lsch3/lowlevel.S | 9 + arch/arm/cpu/armv8/fsl-lsch3/ls2085a_serdes.c | 117 +++++ arch/arm/cpu/armv8/fsl-lsch3/soc.c | 103 +++++ arch/arm/cpu/armv8/fsl-lsch3/speed.c | 11 +- arch/arm/cpu/armv8/generic_timer.c | 11 + arch/arm/cpu/armv8/u-boot-spl.lds | 77 ++++ arch/arm/include/asm/arch-fsl-lsch3/config.h | 42 ++ arch/arm/include/asm/arch-fsl-lsch3/fsl_serdes.h | 67 +++ arch/arm/include/asm/arch-fsl-lsch3/immap_lsch3.h | 29 ++ arch/arm/include/asm/arch-fsl-lsch3/soc.h | 8 + arch/arm/lib/crt0_64.S | 7 + arch/powerpc/cpu/mpc85xx/cpu_init_early.c | 8 +- arch/powerpc/cpu/mpc85xx/speed.c | 4 +- board/freescale/bsc9132qds/bsc9132qds.c | 4 +- board/freescale/c29xpcie/c29xpcie.c | 4 +- board/freescale/common/qixis.c | 31 +- board/freescale/ls2085a/ls2085a.c | 29 +- board/freescale/ls2085aqds/Kconfig | 16 + board/freescale/ls2085aqds/MAINTAINERS | 7 + board/freescale/ls2085aqds/Makefile | 9 + board/freescale/ls2085aqds/README | 129 ++++++ board/freescale/ls2085aqds/ddr.c | 196 ++++++++ board/freescale/ls2085aqds/ddr.h | 92 ++++ board/freescale/ls2085aqds/eth.c | 380 +++++++++++++++ board/freescale/ls2085aqds/ls2085aqds.c | 274 +++++++++++ board/freescale/ls2085aqds/ls2085aqds_qixis.h | 30 ++ board/freescale/ls2085ardb/Kconfig | 16 + board/freescale/ls2085ardb/MAINTAINERS | 7 + board/freescale/ls2085ardb/Makefile | 8 + board/freescale/ls2085ardb/README | 109 +++++ board/freescale/ls2085ardb/ddr.c | 196 ++++++++ board/freescale/ls2085ardb/ddr.h | 92 ++++ board/freescale/ls2085ardb/ls2085ardb.c | 249 ++++++++++ board/freescale/ls2085ardb/ls2085ardb_qixis.h | 20 + board/freescale/p1010rdb/p1010rdb.c | 5 +- board/freescale/p1010rdb/spl.c | 4 +- common/board_r.c | 6 + common/spl/spl.c | 2 +- common/spl/spl_nand.c | 2 +- configs/ls2085aqds_defconfig | 3 + configs/ls2085aqds_nand_defconfig | 4 + configs/ls2085ardb_defconfig | 3 + configs/ls2085ardb_nand_defconfig | 4 + drivers/misc/fsl_ifc.c | 12 + drivers/mmc/fsl_esdhc.c | 36 +- drivers/mtd/nand/fsl_ifc_nand.c | 53 ++- drivers/mtd/nand/fsl_ifc_spl.c | 25 +- drivers/net/Makefile | 1 + drivers/net/fm/eth.c | 2 +- drivers/net/fm/memac.c | 2 +- drivers/net/fm/memac_phy.c | 62 ++- drivers/net/fsl-mc/mc.c | 512 ++++++++++++++++----- drivers/net/ldpaa_eth/Makefile | 3 +- drivers/net/ldpaa_eth/ldpaa_eth.c | 62 ++- drivers/net/ldpaa_eth/ldpaa_eth.h | 4 - drivers/net/ldpaa_eth/ldpaa_wriop.c | 146 ++++++ drivers/net/ldpaa_eth/ls2085a.c | 83 ++++ drivers/net/phy/cortina.c | 4 +- drivers/net/vsc9953.c | 2 +- include/configs/ls2085a_common.h | 225 +++++---- include/configs/ls2085a_emu.h | 65 +++ include/configs/ls2085a_simu.h | 122 +++++ include/configs/ls2085aqds.h | 362 +++++++++++++++ include/configs/ls2085ardb.h | 308 +++++++++++++ include/fsl-mc/ldpaa_wriop.h | 70 +++ include/fsl_ddr_sdram.h | 1 + include/fsl_esdhc.h | 4 + include/fsl_ifc.h | 84 ++-- {arch/powerpc/include/asm => include}/fsl_memac.h | 0 77 files changed, 4600 insertions(+), 437 deletions(-) create mode 100644 arch/arm/cpu/armv8/fsl-lsch3/fsl_lsch3_serdes.c create mode 100644 arch/arm/cpu/armv8/fsl-lsch3/ls2085a_serdes.c create mode 100644 arch/arm/cpu/armv8/fsl-lsch3/soc.c create mode 100644 arch/arm/cpu/armv8/u-boot-spl.lds create mode 100644 arch/arm/include/asm/arch-fsl-lsch3/fsl_serdes.h create mode 100644 arch/arm/include/asm/arch-fsl-lsch3/soc.h create mode 100644 board/freescale/ls2085aqds/Kconfig create mode 100644 board/freescale/ls2085aqds/MAINTAINERS create mode 100644 board/freescale/ls2085aqds/Makefile create mode 100644 board/freescale/ls2085aqds/README create mode 100644 board/freescale/ls2085aqds/ddr.c create mode 100644 board/freescale/ls2085aqds/ddr.h create mode 100644 board/freescale/ls2085aqds/eth.c create mode 100644 board/freescale/ls2085aqds/ls2085aqds.c create mode 100644 board/freescale/ls2085aqds/ls2085aqds_qixis.h create mode 100644 board/freescale/ls2085ardb/Kconfig create mode 100644 board/freescale/ls2085ardb/MAINTAINERS create mode 100644 board/freescale/ls2085ardb/Makefile create mode 100644 board/freescale/ls2085ardb/README create mode 100644 board/freescale/ls2085ardb/ddr.c create mode 100644 board/freescale/ls2085ardb/ddr.h create mode 100644 board/freescale/ls2085ardb/ls2085ardb.c create mode 100644 board/freescale/ls2085ardb/ls2085ardb_qixis.h create mode 100644 configs/ls2085aqds_defconfig create mode 100644 configs/ls2085aqds_nand_defconfig create mode 100644 configs/ls2085ardb_defconfig create mode 100644 configs/ls2085ardb_nand_defconfig create mode 100644 drivers/net/ldpaa_eth/ldpaa_wriop.c create mode 100644 drivers/net/ldpaa_eth/ls2085a.c create mode 100644 include/configs/ls2085aqds.h create mode 100644 include/configs/ls2085ardb.h create mode 100644 include/fsl-mc/ldpaa_wriop.h rename {arch/powerpc/include/asm => include}/fsl_memac.h (100%) -- 1.7.9.5

1 0

[U-Boot] [PULL] Please pull u-boot-imx
by Stefano Babic 19 Mar '15

19 Mar '15

Hi Tom, please pull (small fixes) from u-boot-imx, thanks ! The following changes since commit 32df39c741788e8637cffe6633d73594b26d70fb: mx5: fix get_reset_cause (2015-03-05 10:29:27 +0100) are available in the git repository at: git://www.denx.de/git/u-boot-imx.git master for you to fetch changes up to d5eb6dcf44f5c889dd80c81cf3b06385a27f8baf: mx6sabre: Do not enable UMS with SPL (2015-03-13 13:46:51 +0100) ---------------------------------------------------------------- Dirk Behme (1): mx6: soc: Switch to cold reset Fabio Estevam (20): mx6sxsabresd: Use the default CONFIG_SYS_PBSIZE mx6slevk: Use the default CONFIG_SYS_PBSIZE mx6qarm2: Use the default CONFIG_SYS_PBSIZE mx53loco: Use the default CONFIG_SYS_PBSIZE mx51evk: Use the default CONFIG_SYS_PBSIZE mx35pdk: Use the default CONFIG_SYS_PBSIZE mx31pdk: Use the default CONFIG_SYS_PBSIZE mx25pdk: Use the default CONFIG_SYS_PBSIZE mxs: Use the default CONFIG_SYS_PBSIZE wandboard: Use the default CONFIG_SYS_PBSIZE hummingboard: Use the default CONFIG_SYS_PBSIZE nitrogen6x: Use the default CONFIG_SYS_PBSIZE warp: Use the default CONFIG_SYS_PBSIZE novena: Use the default CONFIG_SYS_PBSIZE warp: Add Device Firmware Upgrade support warp: Add a README file mx53ard: Use the standard U-boot prompt mx6_common: Do not select esdhc DDR mode for all boards warp: Select CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE mx6sabre: Do not enable UMS with SPL Peng Fan (1): imx:mx6 remove duplicated includes Stefan Roese (1): common/board_f.c: Enable IMX watchdog in init_func_watchdog_init() Stefano Babic (1): Merge branch 'master' of git://git.denx.de/u-boot maxin.john(a)enea.com (1): mx6sabre_common.h: remove deprecated mmc open/close Kconfig | 18 + MAINTAINERS | 14 +- Makefile | 2 +- README | 69 + arch/arm/Kconfig | 7 +- arch/arm/Makefile | 1 + arch/arm/cpu/armv7/Makefile | 1 - arch/arm/cpu/armv7/am33xx/board.c | 13 +- arch/arm/cpu/armv7/exynos/Makefile | 2 + arch/arm/cpu/armv7/exynos/common_setup.h | 62 + arch/arm/cpu/armv7/exynos/exynos5_setup.h | 3 + arch/arm/cpu/armv7/exynos/lowlevel_init.c | 147 +++ arch/arm/cpu/armv7/exynos/sec_boot.S | 128 ++ arch/arm/cpu/armv7/exynos/soc.c | 35 - arch/arm/cpu/armv7/lowlevel_init.S | 22 +- arch/arm/cpu/armv7/mx6/soc.c | 19 +- arch/arm/cpu/armv7/omap-common/hwinit-common.c | 6 +- arch/arm/cpu/armv7/omap3/board.c | 10 +- arch/arm/cpu/armv7/rmobile/Kconfig | 6 +- arch/arm/cpu/armv7/rmobile/pfc-r8a7790.c | 1001 ++++++++++++++- arch/arm/cpu/armv7/rmobile/pfc-r8a7794.c | 148 ++- arch/arm/cpu/armv7/uniphier/ph1-ld4/sg_init.c | 28 - arch/arm/cpu/armv7/uniphier/ph1-pro4/clkrst_init.c | 29 - arch/arm/cpu/armv7/uniphier/ph1-pro4/sbc_init.c | 75 -- arch/arm/cpu/armv7/uniphier/ph1-pro4/sg_init.c | 28 - arch/arm/cpu/armv7/uniphier/ph1-sld8/clkrst_init.c | 29 - arch/arm/cpu/armv8/Makefile | 1 + arch/arm/cpu/armv8/zynqmp/Makefile | 9 + arch/arm/cpu/armv8/zynqmp/clk.c | 49 + arch/arm/cpu/armv8/zynqmp/cpu.c | 28 + arch/arm/dts/uniphier-ph1-ld4.dtsi | 8 +- arch/arm/dts/uniphier-ph1-pro4-ref.dts | 5 +- arch/arm/dts/uniphier-ph1-pro4.dtsi | 22 +- arch/arm/dts/uniphier-ph1-sld3.dtsi | 10 +- arch/arm/dts/uniphier-ph1-sld8.dtsi | 8 +- arch/arm/include/asm/arch-exynos/cpu.h | 5 + arch/arm/include/asm/arch-exynos/system.h | 88 ++ arch/arm/include/asm/arch-rmobile/r8a7794-gpio.h | 114 +- arch/arm/include/asm/arch-uniphier/ehci-uniphier.h | 33 - arch/arm/include/asm/arch-zynqmp/clk.h | 13 + arch/arm/include/asm/arch-zynqmp/hardware.h | 52 + arch/arm/include/asm/arch-zynqmp/sys_proto.h | 15 + arch/arm/include/asm/armv7.h | 45 + arch/arm/include/asm/spl.h | 2 + arch/arm/lib/crt0.S | 13 +- arch/arm/lib/spl.c | 4 + arch/arm/mach-tegra/Kconfig | 3 + .../{cpu/armv7/uniphier => mach-uniphier}/Kconfig | 0 .../{cpu/armv7/uniphier => mach-uniphier}/Makefile | 1 + .../uniphier => mach-uniphier}/board_common.c | 2 +- .../board_early_init_f.c | 9 +- .../board_early_init_r.c | 2 +- .../uniphier => mach-uniphier}/board_late_init.c | 0 .../uniphier => mach-uniphier}/cache_uniphier.c | 2 +- .../armv7/uniphier => mach-uniphier}/cmd_ddrphy.c | 2 +- .../armv7/uniphier => mach-uniphier}/cmd_pinmon.c | 4 +- .../armv7/uniphier => mach-uniphier}/cpu_info.c | 2 +- .../uniphier => mach-uniphier}/ddrphy_training.c | 2 +- .../armv7/uniphier => mach-uniphier}/dram_init.c | 0 .../include/mach}/arm-mpcore.h | 0 .../include/mach}/bcu-regs.h | 0 .../include/mach}/board.h | 0 .../include/mach}/boot-device.h | 0 .../include/mach}/ddrphy-regs.h | 0 .../include/mach}/debug-uart.S | 0 .../include/mach}/led.h | 0 .../include/mach}/mio-regs.h | 0 .../include/mach}/platdevice.h | 2 - .../include/mach}/sbc-regs.h | 0 .../include/mach}/sc-regs.h | 29 +- .../include/mach}/sg-regs.h | 119 +- .../include/mach}/ssc-regs.h | 2 - .../include/mach}/umc-regs.h | 0 .../uniphier => mach-uniphier}/init_page_table.S | 0 .../uniphier => mach-uniphier}/lowlevel_init.S | 16 +- arch/arm/mach-uniphier/memconf.c | 104 ++ .../ph1-pro4 => mach-uniphier/ph1-ld4}/Makefile | 6 +- .../uniphier => mach-uniphier}/ph1-ld4/bcu_init.c | 2 +- .../uniphier => mach-uniphier}/ph1-ld4/boot-mode.c | 0 arch/arm/mach-uniphier/ph1-ld4/clkrst_init.c | 42 + .../ph1-ld4/ddrphy_init.c | 2 +- arch/arm/mach-uniphier/ph1-ld4/early_clkrst_init.c | 1 + .../ph1-ld4/lowlevel_debug.S | 4 +- .../uniphier => mach-uniphier}/ph1-ld4/pinctrl.c | 2 +- .../ph1-ld4/platdevice.c | 16 +- .../uniphier => mach-uniphier}/ph1-ld4/pll_init.c | 4 +- .../ph1-ld4/pll_spectrum.c | 0 arch/arm/mach-uniphier/ph1-ld4/sbc_init.c | 50 + .../ph1-ld4/sbc_init_3cs.c} | 15 +- arch/arm/mach-uniphier/ph1-ld4/sg_init.c | 19 + .../uniphier => mach-uniphier}/ph1-ld4/umc_init.c | 4 +- .../ph1-ld4 => mach-uniphier/ph1-pro4}/Makefile | 6 +- .../ph1-pro4/boot-mode.c | 6 +- arch/arm/mach-uniphier/ph1-pro4/clkrst_init.c | 57 + .../ph1-pro4/ddrphy_init.c | 2 +- .../ph1-pro4/early_clkrst_init.c} | 16 +- .../ph1-pro4/lowlevel_debug.S | 8 +- .../uniphier => mach-uniphier}/ph1-pro4/pinctrl.c | 9 +- .../ph1-pro4/platdevice.c | 13 +- .../uniphier => mach-uniphier}/ph1-pro4/pll_init.c | 21 +- .../ph1-pro4/pll_spectrum.c | 2 +- arch/arm/mach-uniphier/ph1-pro4/sbc_init.c | 43 + arch/arm/mach-uniphier/ph1-pro4/sbc_init_3cs.c | 43 + arch/arm/mach-uniphier/ph1-pro4/sg_init.c | 19 + .../uniphier => mach-uniphier}/ph1-pro4/umc_init.c | 4 +- .../uniphier => mach-uniphier}/ph1-sld8/Makefile | 6 +- .../uniphier => mach-uniphier}/ph1-sld8/bcu_init.c | 0 .../ph1-sld8/boot-mode.c | 0 arch/arm/mach-uniphier/ph1-sld8/clkrst_init.c | 1 + .../ph1-sld8/ddrphy_init.c | 2 +- .../arm/mach-uniphier/ph1-sld8/early_clkrst_init.c | 1 + .../ph1-sld8/lowlevel_debug.S | 4 +- .../uniphier => mach-uniphier}/ph1-sld8/pinctrl.c | 2 +- .../ph1-sld8/platdevice.c | 16 +- .../uniphier => mach-uniphier}/ph1-sld8/pll_init.c | 4 +- .../ph1-sld8/pll_spectrum.c | 0 arch/arm/mach-uniphier/ph1-sld8/sbc_init.c | 1 + .../ph1-sld8/sbc_init_3cs.c} | 32 +- .../uniphier => mach-uniphier}/ph1-sld8/sg_init.c | 0 .../uniphier => mach-uniphier}/ph1-sld8/umc_init.c | 4 +- .../uniphier => mach-uniphier}/print_misc_info.c | 2 +- .../{cpu/armv7/uniphier => mach-uniphier}/reset.c | 2 +- .../{cpu/armv7/uniphier => mach-uniphier}/smp.S | 4 +- .../{cpu/armv7/uniphier => mach-uniphier}/spl.c | 17 +- .../uniphier => mach-uniphier}/support_card.c | 4 +- .../{cpu/armv7/uniphier => mach-uniphier}/timer.c | 2 +- arch/sh/Kconfig | 3 + arch/sh/lib/Makefile | 13 +- arch/sh/lib/{ashiftlt.S => ashlsi3.S} | 0 arch/sh/lib/ashrdi3.c | 27 + arch/sh/lib/{lshiftrt.S => lshrsi3.S} | 0 arch/sh/lib/udiv_qrnnd.S | 60 + arch/sh/lib/udivsi3.S | 66 + arch/sh/lib/udivsi3_i4i-Os.S | 128 ++ arch/sh/lib/udivsi3_i4i.S | 644 ++++++++++ board/balloon3/balloon3.c | 2 +- board/freescale/mpc837xerdb/mpc837xerdb.c | 7 +- board/nvidia/seaboard/seaboard.c | 4 +- board/renesas/alt/alt.c | 69 +- board/renesas/gose/gose.c | 81 ++ board/renesas/koelsch/koelsch.c | 86 ++ board/renesas/lager/lager.c | 73 +- board/renesas/porter/Kconfig | 12 + board/renesas/porter/MAINTAINERS | 6 + board/renesas/porter/Makefile | 10 + board/renesas/porter/porter.c | 228 ++++ board/renesas/porter/qos.c | 1312 ++++++++++++++++++++ board/renesas/porter/qos.h | 13 + board/renesas/silk/silk.c | 59 +- board/samsung/common/board.c | 13 +- board/samsung/common/misc.c | 6 +- board/samsung/odroid/odroid.c | 35 +- board/ti/am335x/MAINTAINERS | 7 +- board/ti/beagle/MAINTAINERS | 2 +- board/ti/evm/MAINTAINERS | 10 +- board/toradex/colibri_pxa270/colibri_pxa270.c | 2 +- board/warp/README | 56 + board/xilinx/zynqmp/Kconfig | 15 + board/xilinx/zynqmp/MAINTAINERS | 6 + board/xilinx/zynqmp/Makefile | 8 + board/xilinx/zynqmp/zynqmp.c | 90 ++ common/board_f.c | 3 +- common/cmd_fastboot.c | 6 + common/fb_mmc.c | 60 +- common/spl/spl.c | 35 + configs/alt_defconfig | 3 + configs/am335x_boneblack_defconfig | 2 + configs/am335x_boneblack_vboot_defconfig | 2 + configs/am335x_evm_defconfig | 2 + configs/am335x_evm_nor_defconfig | 2 + configs/am335x_evm_spiboot_defconfig | 2 + configs/am335x_evm_usbspl_defconfig | 2 + configs/am335x_igep0033_defconfig | 2 + configs/gose_defconfig | 3 + configs/koelsch_defconfig | 3 + configs/lager_defconfig | 3 + configs/ph1_ld4_defconfig | 18 +- configs/ph1_pro4_defconfig | 20 +- configs/ph1_sld8_defconfig | 18 +- configs/porter_defconfig | 6 + configs/silk_defconfig | 3 + configs/xilinx_zynqmp_defconfig | 14 + doc/README.android-fastboot | 5 +- doc/README.uniphier | 3 +- doc/git-mailrc | 2 +- drivers/dfu/dfu.c | 3 + drivers/gpio/Makefile | 4 + drivers/gpio/tegra_gpio.c | 27 +- drivers/serial/ns16550.c | 2 +- drivers/serial/serial_sh.c | 2 +- drivers/serial/serial_sh.h | 5 +- drivers/serial/serial_uniphier.c | 64 +- drivers/usb/gadget/f_fastboot.c | 83 +- drivers/usb/host/Kconfig | 10 +- drivers/usb/host/Makefile | 1 + drivers/usb/host/ehci-uniphier.c | 25 +- drivers/usb/host/xhci-exynos5.c | 2 +- drivers/usb/host/xhci-uniphier.c | 85 ++ drivers/usb/musb-new/omap2430.c | 16 + include/_exports.h | 2 + include/configs/alt.h | 6 +- include/configs/am3517_crane.h | 1 - include/configs/am3517_evm.h | 1 - include/configs/atngw100mkii.h | 4 + include/configs/balloon3.h | 10 +- include/configs/bur_am335x_common.h | 1 - include/configs/cm_t35.h | 1 - include/configs/colibri_pxa270.h | 77 +- include/configs/devkit8000.h | 2 - include/configs/exynos5420-common.h | 16 + include/configs/flea3.h | 2 - include/configs/gose.h | 9 +- include/configs/hummingboard.h | 3 - include/configs/koelsch.h | 10 +- include/configs/lager.h | 6 +- include/configs/mx25pdk.h | 2 - include/configs/mx31pdk.h | 3 - include/configs/mx35pdk.h | 4 - include/configs/mx51evk.h | 2 - include/configs/mx53ard.h | 1 - include/configs/mx53loco.h | 2 - include/configs/mx6_common.h | 2 - include/configs/mx6qarm2.h | 2 - include/configs/mx6sabre_common.h | 6 +- include/configs/mx6slevk.h | 2 - include/configs/mx6sxsabresd.h | 2 - include/configs/mxs.h | 3 - include/configs/nitrogen6x.h | 3 - include/configs/novena.h | 3 - include/configs/odroid.h | 5 +- include/configs/odroid_xu3.h | 10 +- include/configs/omap3_evm_common.h | 1 - include/configs/palmld.h | 1 - include/configs/palmtc.h | 1 - include/configs/palmtreo680.h | 1 - include/configs/porter.h | 112 ++ include/configs/rcar-gen2-common.h | 2 + include/configs/siemens-am33x-common.h | 1 - include/configs/silk.h | 6 +- include/configs/snowball.h | 1 - include/configs/tam3517-common.h | 1 - include/configs/tao3530.h | 1 - include/configs/tegra-common.h | 6 - include/configs/ti814x_evm.h | 1 - include/configs/ti816x_evm.h | 2 - include/configs/ti_armv7_common.h | 5 +- include/configs/tricorder.h | 1 - include/configs/u8500_href.h | 1 - include/configs/uniphier.h | 3 + include/configs/vexpress_common.h | 1 - include/configs/vpac270.h | 3 +- include/configs/wandboard.h | 3 - include/configs/warp.h | 13 +- include/configs/woodburn_common.h | 2 - include/configs/xilinx_zynqmp.h | 131 ++ include/configs/zipitz2.h | 1 - include/dfu.h | 3 + include/exports.h | 2 + include/fb_mmc.h | 1 + include/fdtdec.h | 1 + include/samsung/misc.h | 5 +- lib/fdtdec.c | 1 + scripts/kconfig/confdata.c | 8 - 263 files changed, 6549 insertions(+), 925 deletions(-) create mode 100644 arch/arm/cpu/armv7/exynos/sec_boot.S delete mode 100644 arch/arm/cpu/armv7/uniphier/ph1-ld4/sg_init.c delete mode 100644 arch/arm/cpu/armv7/uniphier/ph1-pro4/clkrst_init.c delete mode 100644 arch/arm/cpu/armv7/uniphier/ph1-pro4/sbc_init.c delete mode 100644 arch/arm/cpu/armv7/uniphier/ph1-pro4/sg_init.c delete mode 100644 arch/arm/cpu/armv7/uniphier/ph1-sld8/clkrst_init.c create mode 100644 arch/arm/cpu/armv8/zynqmp/Makefile create mode 100644 arch/arm/cpu/armv8/zynqmp/clk.c create mode 100644 arch/arm/cpu/armv8/zynqmp/cpu.c delete mode 100644 arch/arm/include/asm/arch-uniphier/ehci-uniphier.h create mode 100644 arch/arm/include/asm/arch-zynqmp/clk.h create mode 100644 arch/arm/include/asm/arch-zynqmp/hardware.h create mode 100644 arch/arm/include/asm/arch-zynqmp/sys_proto.h rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/Kconfig (100%) rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/Makefile (97%) rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/board_common.c (95%) rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/board_early_init_f.c (71%) rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/board_early_init_r.c (89%) rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/board_late_init.c (100%) rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/cache_uniphier.c (99%) rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/cmd_ddrphy.c (99%) rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/cmd_pinmon.c (90%) rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/cpu_info.c (97%) rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ddrphy_training.c (98%) rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/dram_init.c (100%) rename arch/arm/{include/asm/arch-uniphier => mach-uniphier/include/mach}/arm-mpcore.h (100%) rename arch/arm/{include/asm/arch-uniphier => mach-uniphier/include/mach}/bcu-regs.h (100%) rename arch/arm/{include/asm/arch-uniphier => mach-uniphier/include/mach}/board.h (100%) rename arch/arm/{include/asm/arch-uniphier => mach-uniphier/include/mach}/boot-device.h (100%) rename arch/arm/{include/asm/arch-uniphier => mach-uniphier/include/mach}/ddrphy-regs.h (100%) rename arch/arm/{include/asm/arch-uniphier => mach-uniphier/include/mach}/debug-uart.S (100%) rename arch/arm/{include/asm/arch-uniphier => mach-uniphier/include/mach}/led.h (100%) rename arch/arm/{include/asm/arch-uniphier => mach-uniphier/include/mach}/mio-regs.h (100%) rename arch/arm/{include/asm/arch-uniphier => mach-uniphier/include/mach}/platdevice.h (93%) rename arch/arm/{include/asm/arch-uniphier => mach-uniphier/include/mach}/sbc-regs.h (100%) rename arch/arm/{include/asm/arch-uniphier => mach-uniphier/include/mach}/sc-regs.h (64%) rename arch/arm/{include/asm/arch-uniphier => mach-uniphier/include/mach}/sg-regs.h (68%) rename arch/arm/{include/asm/arch-uniphier => mach-uniphier/include/mach}/ssc-regs.h (94%) rename arch/arm/{include/asm/arch-uniphier => mach-uniphier/include/mach}/umc-regs.h (100%) rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/init_page_table.S (100%) rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/lowlevel_init.S (94%) create mode 100644 arch/arm/mach-uniphier/memconf.c rename arch/arm/{cpu/armv7/uniphier/ph1-pro4 => mach-uniphier/ph1-ld4}/Makefile (50%) rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/bcu_init.c (96%) rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/boot-mode.c (100%) create mode 100644 arch/arm/mach-uniphier/ph1-ld4/clkrst_init.c rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/ddrphy_init.c (97%) create mode 100644 arch/arm/mach-uniphier/ph1-ld4/early_clkrst_init.c rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/lowlevel_debug.S (89%) rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/pinctrl.c (98%) rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/platdevice.c (58%) rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/pll_init.c (98%) rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/pll_spectrum.c (100%) create mode 100644 arch/arm/mach-uniphier/ph1-ld4/sbc_init.c rename arch/arm/{cpu/armv7/uniphier/ph1-ld4/sbc_init.c => mach-uniphier/ph1-ld4/sbc_init_3cs.c} (83%) create mode 100644 arch/arm/mach-uniphier/ph1-ld4/sg_init.c rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/umc_init.c (98%) rename arch/arm/{cpu/armv7/uniphier/ph1-ld4 => mach-uniphier/ph1-pro4}/Makefile (51%) rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/boot-mode.c (96%) create mode 100644 arch/arm/mach-uniphier/ph1-pro4/clkrst_init.c rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/ddrphy_init.c (97%) rename arch/arm/{cpu/armv7/uniphier/ph1-ld4/clkrst_init.c => mach-uniphier/ph1-pro4/early_clkrst_init.c} (52%) rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/lowlevel_debug.S (82%) rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/pinctrl.c (85%) rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/platdevice.c (61%) rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/pll_init.c (91%) rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/pll_spectrum.c (89%) create mode 100644 arch/arm/mach-uniphier/ph1-pro4/sbc_init.c create mode 100644 arch/arm/mach-uniphier/ph1-pro4/sbc_init_3cs.c create mode 100644 arch/arm/mach-uniphier/ph1-pro4/sg_init.c rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/umc_init.c (98%) rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/Makefile (50%) rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/bcu_init.c (100%) rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/boot-mode.c (100%) create mode 100644 arch/arm/mach-uniphier/ph1-sld8/clkrst_init.c rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/ddrphy_init.c (98%) create mode 100644 arch/arm/mach-uniphier/ph1-sld8/early_clkrst_init.c rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/lowlevel_debug.S (89%) rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/pinctrl.c (98%) rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/platdevice.c (58%) rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/pll_init.c (98%) rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/pll_spectrum.c (100%) create mode 100644 arch/arm/mach-uniphier/ph1-sld8/sbc_init.c rename arch/arm/{cpu/armv7/uniphier/ph1-sld8/sbc_init.c => mach-uniphier/ph1-sld8/sbc_init_3cs.c} (63%) rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/sg_init.c (100%) rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/umc_init.c (98%) rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/print_misc_info.c (88%) rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/reset.c (94%) rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/smp.S (95%) rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/spl.c (81%) rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/support_card.c (98%) rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/timer.c (96%) rename arch/sh/lib/{ashiftlt.S => ashlsi3.S} (100%) create mode 100644 arch/sh/lib/ashrdi3.c rename arch/sh/lib/{lshiftrt.S => lshrsi3.S} (100%) create mode 100644 arch/sh/lib/udiv_qrnnd.S create mode 100644 arch/sh/lib/udivsi3.S create mode 100644 arch/sh/lib/udivsi3_i4i-Os.S create mode 100644 arch/sh/lib/udivsi3_i4i.S create mode 100644 board/renesas/porter/Kconfig create mode 100644 board/renesas/porter/MAINTAINERS create mode 100644 board/renesas/porter/Makefile create mode 100644 board/renesas/porter/porter.c create mode 100644 board/renesas/porter/qos.c create mode 100644 board/renesas/porter/qos.h create mode 100644 board/warp/README create mode 100644 board/xilinx/zynqmp/Kconfig create mode 100644 board/xilinx/zynqmp/MAINTAINERS create mode 100644 board/xilinx/zynqmp/Makefile create mode 100644 board/xilinx/zynqmp/zynqmp.c create mode 100644 configs/porter_defconfig create mode 100644 configs/xilinx_zynqmp_defconfig create mode 100644 drivers/usb/host/xhci-uniphier.c create mode 100644 include/configs/porter.h create mode 100644 include/configs/xilinx_zynqmp.h -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic(a)denx.de =====================================================================

2 1

[U-Boot] [i2c] Pull request
by Heiko Schocher 19 Mar '15

19 Mar '15

Hello Tom, please pull from u-boot-i2c.git The following changes since commit 052a681bae8ee91c9854089549b20c857d499fd7: Prepare v2015.04-rc4 (2015-03-17 16:37:48 -0400) are available in the git repository at: git://git.denx.de/u-boot-i2c.git master for you to fetch changes up to e6fbc3e4f1f2f974ec8efe9d52cfcb22b87f6294: mv_i2c: fix warnings on 64-bit builds (2015-03-18 09:13:17 +0100) ---------------------------------------------------------------- Rob Herring (1): mv_i2c: fix warnings on 64-bit builds drivers/i2c/mv_i2c.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) bye, Heiko -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

2 2

[U-Boot] Pull request: u-boot-mmc 18032015
by Pantelis Antoniou 19 Mar '15

19 Mar '15

Hi Tom, Only bug fixes for now, rather uneventful. The following changes since commit 323aaaa1e364bf8426a9c8fd5158fe2d155ae7b9: mmc: fsl_esdhc fix register offset (2015-03-17 09:09:47 -0400) are available in the git repository at: git://git.denx.de/u-boot-mmc.git master for you to fetch changes up to 3a48944bc9a7455fec97e9df74c3d5bb600d3d7c: mv_sdhci: fix warnings on 64-bit builds (2015-03-18 09:56:17 +0200) ---------------------------------------------------------------- Matt Reimer (2): mmc: s5p: properly mask SELBASECLK mmc: sdhci: don't clobber adjacent registers Rob Herring (2): sdhci: fix warnings on 64-bit builds mv_sdhci: fix warnings on 64-bit builds drivers/mmc/mv_sdhci.c | 4 ++-- drivers/mmc/s5p_sdhci.c | 2 +- drivers/mmc/sdhci.c | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) Regards — Pantelis

2 1

[U-Boot] [PATCH] dfu: cmd: trigger watchdog before calling usb_gadget_handle_interrupts
by Heiko Schocher 19 Mar '15

19 Mar '15

trigger watchdog before calling usb_gadget_handle_interrupts() This prevents board resets when calling dfu command on boards which have a watchdog. Signed-off-by: Heiko Schocher <hs(a)denx.de> --- common/cmd_dfu.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/cmd_dfu.c b/common/cmd_dfu.c index e975abe..46af4cf 100644 --- a/common/cmd_dfu.c +++ b/common/cmd_dfu.c @@ -9,6 +9,7 @@ */ #include <common.h> +#include <watchdog.h> #include <dfu.h> #include <g_dnl.h> #include <usb.h> @@ -64,6 +65,7 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) if (ctrlc()) goto exit; + WATCHDOG_RESET(); usb_gadget_handle_interrupts(); } exit: -- 2.1.0

4 11

[U-Boot] [PATCH v2] arm: mx5: Add support for USB armory board
by andrej＠inversepath.com 19 Mar '15

19 Mar '15

From: Andrej Rosano <andrej(a)inversepath.com> Add support for Inverse Path USB armory board, an open source flash-drive sized computer based on Freescale i.MX53 SoC. http://inversepath.com/usbarmory Signed-off-by: Andrej Rosano <andrej(a)inversepath.com> Cc: Stefano Babic <sbabic(a)denx.de> Cc: Chris Kuethe <chris.kuethe(a)gmail.com> Cc: Fabio Estevam <festevam(a)gmail.com> --- Changes for v2: - Fix double print_cpuinfo() call - Fix CONFIG_BOOTCOMMAND typo - Fix CONFIG_SYS_FSL_ESDHC_NUM to 1 arch/arm/Kconfig | 5 + board/inversepath/usbarmory/Kconfig | 15 + board/inversepath/usbarmory/MAINTAINERS | 6 + board/inversepath/usbarmory/Makefile | 10 + board/inversepath/usbarmory/imximage.cfg | 82 ++++++ board/inversepath/usbarmory/usbarmory.c | 439 ++++++++++++++++++++++++++++++ configs/usbarmory_defconfig | 3 + include/configs/usbarmory.h | 115 ++++++++ 8 files changed, 675 insertions(+) create mode 100644 board/inversepath/usbarmory/Kconfig create mode 100644 board/inversepath/usbarmory/MAINTAINERS create mode 100644 board/inversepath/usbarmory/Makefile create mode 100644 board/inversepath/usbarmory/imximage.cfg create mode 100644 board/inversepath/usbarmory/usbarmory.c create mode 100644 configs/usbarmory_defconfig create mode 100644 include/configs/usbarmory.h diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index b9ebee1..a490084 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -462,6 +462,10 @@ config TARGET_MX53SMD bool "Support mx53smd" select CPU_V7 +config TARGET_USBARMORY + bool "Support USB armory" + select CPU_V7 + config TARGET_MX51_EFIKAMX bool "Support mx51_efikamx" select CPU_V7 @@ -819,6 +823,7 @@ source "board/h2200/Kconfig" source "board/hale/tt01/Kconfig" source "board/icpdas/lp8x4x/Kconfig" source "board/imx31_phycore/Kconfig" +source "board/inversepath/usbarmory/Kconfig" source "board/isee/igep0033/Kconfig" source "board/jornada/Kconfig" source "board/karo/tx25/Kconfig" diff --git a/board/inversepath/usbarmory/Kconfig b/board/inversepath/usbarmory/Kconfig new file mode 100644 index 0000000..254b6c9 --- /dev/null +++ b/board/inversepath/usbarmory/Kconfig @@ -0,0 +1,15 @@ +if TARGET_USBARMORY + +config SYS_BOARD + default "usbarmory" + +config SYS_VENDOR + default "inversepath" + +config SYS_SOC + default "mx5" + +config SYS_CONFIG_NAME + default "usbarmory" + +endif diff --git a/board/inversepath/usbarmory/MAINTAINERS b/board/inversepath/usbarmory/MAINTAINERS new file mode 100644 index 0000000..71a3dd4 --- /dev/null +++ b/board/inversepath/usbarmory/MAINTAINERS @@ -0,0 +1,6 @@ +USBARMORY BOARD +M: Andrej Rosano <andrej(a)inversepath.com> +S: Maintained +F: board/inversepath/usbarmory/ +F: include/configs/usbarmory.h +F: configs/usbarmory_defconfig diff --git a/board/inversepath/usbarmory/Makefile b/board/inversepath/usbarmory/Makefile new file mode 100644 index 0000000..9b8bd80 --- /dev/null +++ b/board/inversepath/usbarmory/Makefile @@ -0,0 +1,10 @@ +# +# USB armory MkI board Makefile +# http://inversepath.com/usbarmory +# +# Copyright (C) 2015, Inverse Path +# Andrej Rosano <andrej(a)inversepath.com> +# +# SPDX-License-Identifier:|____GPL-2.0+ + +obj-y := usbarmory.o diff --git a/board/inversepath/usbarmory/imximage.cfg b/board/inversepath/usbarmory/imximage.cfg new file mode 100644 index 0000000..392d2f9 --- /dev/null +++ b/board/inversepath/usbarmory/imximage.cfg @@ -0,0 +1,82 @@ +/* + * USB armory MkI board imximage configuration + * http://inversepath.com/usbarmory + * + * Copyright (C) 2015, Inverse Path + * Andrej Rosano <andrej(a)inversepath.com> + * + * SPDX-License-Identifier:|____GPL-2.0+ + */ + +IMAGE_VERSION 2 +BOOT_FROM sd + + +/* IOMUX */ + +DATA 4 0x53fa86f4 0x00000000 /* GRP_DDRMODE_CTL */ +DATA 4 0x53fa8714 0x00000000 /* GRP_DDRMODE */ +DATA 4 0x53fa86fc 0x00000000 /* GRP_DDRPKE */ +DATA 4 0x53fa8724 0x04000000 /* GRP_DDR_TYPE */ + +DATA 4 0x53fa872c 0x00300000 /* GRP_B3DS */ +DATA 4 0x53fa8554 0x00300000 /* DRAM_DQM3 */ +DATA 4 0x53fa8558 0x00300040 /* DRAM_SDQS3 */ + +DATA 4 0x53fa8728 0x00300000 /* GRP_B2DS */ +DATA 4 0x53fa8560 0x00300000 /* DRAM_DQM2 */ +DATA 4 0x53fa8568 0x00300040 /* DRAM_SDQS2 */ + +DATA 4 0x53fa871c 0x00300000 /* GRP_B1DS */ +DATA 4 0x53fa8594 0x00300000 /* DRAM_DQM1 */ +DATA 4 0x53fa8590 0x00300040 /* DRAM_SDQS1 */ + +DATA 4 0x53fa8718 0x00300000 /* GRP_B0DS */ +DATA 4 0x53fa8584 0x00300000 /* DRAM_DQM0 */ +DATA 4 0x53fa857c 0x00300040 /* DRAM_SDQS0 */ + +DATA 4 0x53fa8578 0x00300000 /* DRAM_SDCLK0 */ +DATA 4 0x53fa8570 0x00300000 /* DRAM_SDCLK1 */ + +DATA 4 0x53fa8574 0x00300000 /* DRAM_CAS */ +DATA 4 0x53fa8588 0x00300000 /* DRAM_RAS */ +DATA 4 0x53fa86f0 0x00300000 /* GRP_ADDS */ +DATA 4 0x53fa8720 0x00300000 /* GRP_CTLDS */ + +DATA 4 0x53fa8564 0x00300040 /* DRAM_SDODT1 */ +DATA 4 0x53fa8580 0x00300040 /* DRAM_SDODT0 */ + + +/* ESDCTL */ + +DATA 4 0x63fd9000 0x84180000 /* ESDCTL_ESDCTL */ + +DATA 4 0x63fd9004 0x0002002d /* ESDCTL_ESDPTC */ +DATA 4 0x63fd9008 0x12273030 /* ESDCTL_ESDOTC */ +DATA 4 0x63fd900c 0x9f5152e3 /* ESDCTL_ESDCFG0 */ +DATA 4 0x63fd9010 0xb68e8a63 /* ESDCTL_ESDCFG1 */ +DATA 4 0x63fd9014 0x01ff00db /* ESDCTL_ESDCFG2 */ +DATA 4 0x63fd9018 0x00011740 /* ESDCTL_ESDMISC */ + +DATA 4 0x63fd901c 0x00008032 /* ESDCTL_ESDSCR */ +DATA 4 0x63fd901c 0x00008033 +DATA 4 0x63fd901c 0x00028031 +DATA 4 0x63fd901c 0x052080b0 +DATA 4 0x63fd901c 0x04008040 +DATA 4 0x63fd901c 0x0000803a +DATA 4 0x63fd901c 0x0000803b +DATA 4 0x63fd901c 0x00028039 +DATA 4 0x63fd901c 0x05208138 +DATA 4 0x63fd901c 0x04008048 +DATA 4 0x63fd901c 0x00000000 + +DATA 4 0x63fd9020 0x00005800 /* ESDCTL_ESDREF */ +DATA 4 0x63fd902c 0x000026d2 /* ESDCTL_ESDEWD */ +DATA 4 0x63fd9030 0x009f0e21 /* ESDCTL_ESDOR */ +DATA 4 0x63fd9040 0x05380003 /* ESDCTL_ZQHWCTRL */ +DATA 4 0x63fd9058 0x00022227 /* ESDCTL_ODTCTRL */ + +DATA 4 0x63fd907c 0x01370138 /* ESDCTL_DGCTRL0 */ +DATA 4 0x63fd9080 0x013b013c /* ESDCTL_DGCTRL1 */ +DATA 4 0x63fd9088 0x35343535 /* ESDCTL_RDDLCTL */ +DATA 4 0x63fd9090 0x4d444c44 /* ESDCTL_WRDLCTL */ diff --git a/board/inversepath/usbarmory/usbarmory.c b/board/inversepath/usbarmory/usbarmory.c new file mode 100644 index 0000000..1fc3586 --- /dev/null +++ b/board/inversepath/usbarmory/usbarmory.c @@ -0,0 +1,439 @@ +/* + * USB armory MkI board initialization + * http://inversepath.com/usbarmory + * + * Copyright (C) 2015, Inverse Path + * Andrej Rosano <andrej(a)inversepath.com> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <asm/io.h> +#include <asm/arch/imx-regs.h> +#include <asm/arch/sys_proto.h> +#include <asm/arch/crm_regs.h> +#include <asm/arch/clock.h> +#include <asm/arch/iomux-mx53.h> +#include <asm/errno.h> +#include <i2c.h> +#include <mmc.h> +#include <fsl_esdhc.h> +#include <asm/gpio.h> + +DECLARE_GLOBAL_DATA_PTR; + +u32 get_board_rev(void) +{ + struct iim_regs *iim = (struct iim_regs *)IMX_IIM_BASE; + struct fuse_bank *bank = &iim->bank[0]; + struct fuse_bank0_regs *fuse = + (struct fuse_bank0_regs *)bank->fuse_regs; + + int rev = readl(&fuse->gp[6]); + + return (get_cpu_rev() & ~(0xF << 8)) | (rev & 0xF) << 8; +} + +#ifdef CONFIG_FSL_ESDHC +struct fsl_esdhc_cfg esdhc_cfg[1] = { + {MMC_SDHC1_BASE_ADDR} +}; + +int board_mmc_getcd(struct mmc *mmc) +{ + /* CD not present */ + return 1; +} + +int board_mmc_init(bd_t *bis) +{ + int ret = 0; + + esdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK); + ret = fsl_esdhc_initialize(bis, &esdhc_cfg[0]); + + return ret; +} +#endif + +#define SD_CMD_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_DSE_HIGH | \ + PAD_CTL_PUS_100K_UP) +#define I2C_PAD_CTRL (PAD_CTL_SRE_FAST | PAD_CTL_DSE_HIGH | \ + PAD_CTL_PUS_100K_UP | PAD_CTL_ODE) +#define PAD_CTRL_UP PAD_CTL_PUS_100K_UP +#define PAD_CTRL_GND PAD_CTL_PUS_100K_DOWN + +static void setup_iomux_sd(void) +{ + static const iomux_v3_cfg_t pads[] = { + NEW_PAD_CTRL(MX53_PAD_SD1_CMD__ESDHC1_CMD, SD_CMD_PAD_CTRL), + NEW_PAD_CTRL(MX53_PAD_SD1_CLK__ESDHC1_CLK, MX53_SDHC_PAD_CTRL), + NEW_PAD_CTRL(MX53_PAD_SD1_DATA0__ESDHC1_DAT0, + MX53_SDHC_PAD_CTRL), + NEW_PAD_CTRL(MX53_PAD_SD1_DATA1__ESDHC1_DAT1, + MX53_SDHC_PAD_CTRL), + NEW_PAD_CTRL(MX53_PAD_SD1_DATA2__ESDHC1_DAT2, + MX53_SDHC_PAD_CTRL), + NEW_PAD_CTRL(MX53_PAD_SD1_DATA3__ESDHC1_DAT3, + MX53_SDHC_PAD_CTRL), + MX53_PAD_EIM_DA13__GPIO3_13, + }; + + imx_iomux_v3_setup_multiple_pads(pads, ARRAY_SIZE(pads)); +} + +static void setup_iomux_led(void) +{ + static const iomux_v3_cfg_t pads[] = { + NEW_PAD_CTRL(MX53_PAD_DISP0_DAT6__GPIO4_27, + PAD_CTL_PUS_100K_DOWN), + }; + + imx_iomux_v3_setup_multiple_pads(pads, ARRAY_SIZE(pads)); +} + +static void setup_iomux_i2c(void) +{ + static const iomux_v3_cfg_t pads[] = { + NEW_PAD_CTRL(MX53_PAD_EIM_D28__I2C1_SDA, I2C_PAD_CTRL), + NEW_PAD_CTRL(MX53_PAD_EIM_D21__I2C1_SCL, I2C_PAD_CTRL), + }; + + imx_iomux_v3_setup_multiple_pads(pads, ARRAY_SIZE(pads)); +} + +static void setup_iomux_pinheader(void) +{ + static const iomux_v3_cfg_t pads[] = { + NEW_PAD_CTRL(MX53_PAD_CSI0_DAT8__GPIO5_26, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_CSI0_DAT9__GPIO5_27, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_CSI0_DAT10__UART1_TXD_MUX, + MX53_UART_PAD_CTRL), + NEW_PAD_CTRL(MX53_PAD_CSI0_DAT11__UART1_RXD_MUX, + MX53_UART_PAD_CTRL), + NEW_PAD_CTRL(MX53_PAD_CSI0_DAT12__GPIO5_30, PAD_CTRL_UP), + }; + + imx_iomux_v3_setup_multiple_pads(pads, ARRAY_SIZE(pads)); +} + +static void setup_iomux_unused_boot(void) +{ + static const iomux_v3_cfg_t pads[] = { + + /* Pulled-up pads */ + NEW_PAD_CTRL(MX53_PAD_EIM_A21__GPIO2_17, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_EIM_DA0__GPIO3_0, PAD_CTRL_UP), + + /* Grounded pads */ + NEW_PAD_CTRL(MX53_PAD_EIM_LBA__GPIO2_27, PAD_CTRL_GND), + NEW_PAD_CTRL(MX53_PAD_EIM_EB0__GPIO2_28, PAD_CTRL_GND), + NEW_PAD_CTRL(MX53_PAD_EIM_EB1__GPIO2_29, PAD_CTRL_GND), + NEW_PAD_CTRL(MX53_PAD_EIM_A16__GPIO2_22, PAD_CTRL_GND), + NEW_PAD_CTRL(MX53_PAD_EIM_A17__GPIO2_21, PAD_CTRL_GND), + NEW_PAD_CTRL(MX53_PAD_EIM_A18__GPIO2_20, PAD_CTRL_GND), + NEW_PAD_CTRL(MX53_PAD_EIM_A19__GPIO2_19, PAD_CTRL_GND), + NEW_PAD_CTRL(MX53_PAD_EIM_A20__GPIO2_18, PAD_CTRL_GND), + NEW_PAD_CTRL(MX53_PAD_EIM_A22__GPIO2_16, PAD_CTRL_GND), + NEW_PAD_CTRL(MX53_PAD_EIM_DA1__GPIO3_1, PAD_CTRL_GND), + NEW_PAD_CTRL(MX53_PAD_EIM_DA2__GPIO3_2, PAD_CTRL_GND), + NEW_PAD_CTRL(MX53_PAD_EIM_DA3__GPIO3_3, PAD_CTRL_GND), + NEW_PAD_CTRL(MX53_PAD_EIM_DA4__GPIO3_4, PAD_CTRL_GND), + NEW_PAD_CTRL(MX53_PAD_EIM_DA5__GPIO3_5, PAD_CTRL_GND), + NEW_PAD_CTRL(MX53_PAD_EIM_DA6__GPIO3_6, PAD_CTRL_GND), + NEW_PAD_CTRL(MX53_PAD_EIM_DA7__GPIO3_7, PAD_CTRL_GND), + NEW_PAD_CTRL(MX53_PAD_EIM_DA8__GPIO3_8, PAD_CTRL_GND), + NEW_PAD_CTRL(MX53_PAD_EIM_DA9__GPIO3_9, PAD_CTRL_GND), + NEW_PAD_CTRL(MX53_PAD_EIM_DA10__GPIO3_10, PAD_CTRL_GND), + }; + + imx_iomux_v3_setup_multiple_pads(pads, ARRAY_SIZE(pads)); +} + +static void setup_iomux_unused_nc(void) +{ + /* Out of reset values define the pin values before the + ROM is executed so we force all the not connected pins + to a known state */ + static const iomux_v3_cfg_t pads[] = { + + /* CONTROL PINS block */ + NEW_PAD_CTRL(MX53_PAD_GPIO_0__GPIO1_0, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_GPIO_1__GPIO1_1, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_GPIO_2__GPIO1_2, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_GPIO_3__GPIO1_3, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_GPIO_4__GPIO1_4, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_GPIO_5__GPIO1_5, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_GPIO_6__GPIO1_6, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_GPIO_7__GPIO1_7, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_GPIO_8__GPIO1_8, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_GPIO_9__GPIO1_9, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_GPIO_10__GPIO4_0, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_GPIO_11__GPIO4_1, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_GPIO_12__GPIO4_2, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_GPIO_13__GPIO4_3, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_GPIO_14__GPIO4_4, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_GPIO_16__GPIO7_11, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_GPIO_17__GPIO7_12, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_GPIO_18__GPIO7_13, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_GPIO_19__GPIO4_5, PAD_CTRL_UP), + + /* EIM block */ + NEW_PAD_CTRL(MX53_PAD_EIM_OE__GPIO2_25, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_EIM_WAIT__GPIO5_0, PAD_CTRL_UP), + /* EIM_LBA: setup_iomux_unused_boot() */ + NEW_PAD_CTRL(MX53_PAD_EIM_RW__GPIO2_26, PAD_CTRL_UP), + /* EIM_EB0: setup_iomux_unused_boot() */ + /* EIM_EB1: setup_iomux_unused_boot() */ + NEW_PAD_CTRL(MX53_PAD_EIM_EB2__GPIO2_30, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_EIM_EB3__GPIO2_31, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_EIM_CS0__GPIO2_23, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_EIM_CS1__GPIO2_24, PAD_CTRL_UP), + /* EIM_A16: setup_iomux_unused_boot() */ + /* EIM_A17: setup_iomux_unused_boot() */ + /* EIM_A18: setup_iomux_unused_boot() */ + /* EIM_A19: setup_iomux_unused_boot() */ + /* EIM_A20: setup_iomux_unused_boot() */ + /* EIM_A21: setup_iomux_unused_boot() */ + /* EIM_A22: setup_iomux_unused_boot() */ + NEW_PAD_CTRL(MX53_PAD_EIM_A23__GPIO6_6, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_EIM_A24__GPIO5_4, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_EIM_A25__GPIO5_2, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_EIM_D16__GPIO3_16, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_EIM_D17__GPIO3_17, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_EIM_D18__GPIO3_18, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_EIM_D19__GPIO3_19, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_EIM_D20__GPIO3_20, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_EIM_D21__GPIO3_21, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_EIM_D22__GPIO3_22, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_EIM_D23__GPIO3_23, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_EIM_D24__GPIO3_24, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_EIM_D25__GPIO3_25, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_EIM_D26__GPIO3_26, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_EIM_D27__GPIO3_27, PAD_CTRL_UP), + /* EIM_D28: setup_iomux_unused_boot() */ + /* EIM_D29: setup_iomux_unused_boot() */ + NEW_PAD_CTRL(MX53_PAD_EIM_D30__GPIO3_30, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_EIM_D31__GPIO3_31, PAD_CTRL_UP), + /* EIM_DA0: setup_iomux_unused_boot() */ + /* EIM_DA1: setup_iomux_unused_boot() */ + /* EIM_DA2: setup_iomux_unused_boot() */ + /* EIM_DA3: setup_iomux_unused_boot() */ + /* EIM_DA4: setup_iomux_unused_boot() */ + /* EIM_DA5: setup_iomux_unused_boot() */ + /* EIM_DA6: setup_iomux_unused_boot() */ + /* EIM_DA7: setup_iomux_unused_boot() */ + /* EIM_DA8: setup_iomux_unused_boot() */ + /* EIM_DA9: setup_iomux_unused_boot() */ + /* EIM_DA10: setup_iomux_unused_boot() */ + NEW_PAD_CTRL(MX53_PAD_EIM_DA11__GPIO3_11, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_EIM_DA12__GPIO3_12, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_EIM_DA13__GPIO3_13, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_EIM_DA14__GPIO3_14, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_EIM_DA15__GPIO3_15, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_NANDF_WE_B__GPIO6_12, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_NANDF_RE_B__GPIO6_13, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_NANDF_ALE__GPIO6_8, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_NANDF_CLE__GPIO6_7, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_NANDF_WP_B__GPIO6_9, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_NANDF_RB0__GPIO6_10, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_NANDF_CS0__GPIO6_11, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_NANDF_CS1__GPIO6_14, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_NANDF_CS2__GPIO6_15, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_NANDF_CS3__GPIO6_16, PAD_CTRL_UP), + + /* MISC block */ + NEW_PAD_CTRL(MX53_PAD_FEC_MDC__GPIO1_31, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_FEC_MDIO__GPIO1_22, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_FEC_CRS_DV__GPIO1_25, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_FEC_REF_CLK__GPIO1_23, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_FEC_RX_ER__GPIO1_24, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_FEC_TX_EN__GPIO1_28, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_FEC_RXD0__GPIO1_27, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_FEC_RXD1__GPIO1_26, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_FEC_TXD0__GPIO1_30, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_FEC_TXD1__GPIO1_29, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_KEY_COL0__GPIO4_6, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_KEY_ROW0__GPIO4_7, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_KEY_COL1__GPIO4_8, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_KEY_ROW1__GPIO4_9, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_KEY_COL2__GPIO4_10, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_KEY_ROW2__GPIO4_11, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_KEY_COL3__GPIO4_12, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_KEY_ROW3__GPIO4_13, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_KEY_COL4__GPIO4_14, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_KEY_ROW4__GPIO4_15, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_SD2_CMD__GPIO1_11, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_SD2_CLK__GPIO1_10, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_SD2_DATA0__GPIO1_15, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_SD2_DATA1__GPIO1_14, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_SD2_DATA2__GPIO1_13, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_SD2_DATA3__GPIO1_12, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_PATA_BUFFER_EN__GPIO7_1, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_PATA_CS_0__GPIO7_9, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_PATA_CS_1__GPIO7_10, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_PATA_DA_0__GPIO7_6, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_PATA_DA_1__GPIO7_7, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_PATA_DA_2__GPIO7_8, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_PATA_DATA0__GPIO2_0, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_PATA_DATA1__GPIO2_1, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_PATA_DATA2__GPIO2_2, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_PATA_DATA3__GPIO2_3, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_PATA_DATA4__GPIO2_4, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_PATA_DATA5__GPIO2_5, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_PATA_DATA6__GPIO2_6, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_PATA_DATA7__GPIO2_7, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_PATA_DATA8__GPIO2_8, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_PATA_DATA9__GPIO2_9, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_PATA_DATA10__GPIO2_10, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_PATA_DATA11__GPIO2_11, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_PATA_DATA12__GPIO2_12, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_PATA_DATA13__GPIO2_13, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_PATA_DATA14__GPIO2_14, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_PATA_DATA15__GPIO2_15, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_PATA_DIOR__GPIO7_3, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_PATA_DIOW__GPIO6_17, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_PATA_DMACK__GPIO6_18, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_PATA_DMARQ__GPIO7_0, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_PATA_INTRQ__GPIO7_2, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_PATA_IORDY__GPIO7_5, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_PATA_RESET_B__GPIO7_4, PAD_CTRL_UP), + + /* IPU block */ + NEW_PAD_CTRL(MX53_PAD_CSI0_DAT4__GPIO5_22, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_CSI0_DAT5__GPIO5_23, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_CSI0_DAT6__GPIO5_24, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_CSI0_DAT7__GPIO5_25, PAD_CTRL_UP), + /* CSI0_DAT8: setup_iomux_pinheader() */ + /* CSI0_DAT9: setup_iomux_pinheader() */ + /* CSI0_DAT10: setup_iomux_pinheader() */ + /* CSI0_DAT11: setup_iomux_pinheader() */ + /* CSI0_DAT12: setup_iomux_pinheader() */ + NEW_PAD_CTRL(MX53_PAD_CSI0_DAT13__GPIO5_31, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_CSI0_DAT14__GPIO6_0, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_CSI0_DAT15__GPIO6_1, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_CSI0_DAT16__GPIO6_2, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_CSI0_DAT17__GPIO6_3, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_CSI0_DAT18__GPIO6_4, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_CSI0_DAT19__GPIO6_5, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_CSI0_VSYNC__GPIO5_21, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_CSI0_PIXCLK__GPIO5_18, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_CSI0_MCLK__GPIO5_19, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_CSI0_DATA_EN__GPIO5_20, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_DI0_PIN2__GPIO4_18, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_DI0_PIN3__GPIO4_19, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_DI0_PIN4__GPIO4_20, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_DI0_PIN15__GPIO4_17, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_DISP0_DAT0__GPIO4_21, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_DISP0_DAT1__GPIO4_22, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_DISP0_DAT2__GPIO4_23, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_DISP0_DAT3__GPIO4_24, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_DISP0_DAT4__GPIO4_25, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_DISP0_DAT5__GPIO4_26, PAD_CTRL_UP), + /* DISP0_DAT6: setup_iomux_led() */ + NEW_PAD_CTRL(MX53_PAD_DISP0_DAT7__GPIO4_28, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_DISP0_DAT8__GPIO4_29, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_DISP0_DAT9__GPIO4_30, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_DISP0_DAT10__GPIO4_31, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_DISP0_DAT11__GPIO5_5, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_DISP0_DAT12__GPIO5_6, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_DISP0_DAT13__GPIO5_7, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_DISP0_DAT14__GPIO5_8, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_DISP0_DAT15__GPIO5_9, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_DISP0_DAT16__GPIO5_10, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_DISP0_DAT17__GPIO5_11, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_DISP0_DAT18__GPIO5_12, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_DISP0_DAT19__GPIO5_13, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_DISP0_DAT20__GPIO5_14, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_DISP0_DAT21__GPIO5_15, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_DISP0_DAT22__GPIO5_16, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_DISP0_DAT23__GPIO5_17, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_DI0_DISP_CLK__GPIO4_16, PAD_CTRL_UP), + + /* LVDS block */ + NEW_PAD_CTRL(MX53_PAD_LVDS0_TX0_P__GPIO7_30, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_LVDS0_TX1_P__GPIO7_28, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_LVDS0_TX2_P__GPIO7_26, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_LVDS0_TX3_P__GPIO7_22, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_LVDS1_TX0_P__GPIO6_30, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_LVDS1_TX1_P__GPIO6_28, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_LVDS1_TX2_P__GPIO6_24, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_LVDS1_TX3_P__GPIO6_22, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_LVDS0_CLK_P__GPIO7_24, PAD_CTRL_UP), + NEW_PAD_CTRL(MX53_PAD_LVDS1_CLK_P__GPIO6_26, PAD_CTRL_UP), + }; + + imx_iomux_v3_setup_multiple_pads(pads, ARRAY_SIZE(pads)); +} + +static void setup_gpio(void) +{ + int i, j; + + /* set all GPIO ports as input */ + for (i = 0; i < 8; i++) { + for (j = 0; j < 32; j++) + gpio_direction_input(IMX_GPIO_NR(i, j)); + } +} + +#define CPU_CLOCK 800 + +static void set_clock(void) +{ + u32 ref_clk = MXC_HCLK; + const uint32_t cpuclk = CPU_CLOCK; + const uint32_t dramclk = 400; + int ret; + + ret = mxc_set_clock(ref_clk, cpuclk, MXC_ARM_CLK); + if (ret) + printf("CPU: Switch CPU clock to %dMHZ failed\n", cpuclk); + + ret = mxc_set_clock(ref_clk, dramclk, MXC_PERIPH_CLK); + if (ret) + printf("CPU: Switch peripheral clock to %dMHz failed\n", + dramclk); + + ret = mxc_set_clock(ref_clk, dramclk, MXC_DDR_CLK); + if (ret) + printf("CPU: Switch DDR clock to %dMHz failed\n", dramclk); +} + +int board_early_init_f(void) +{ + setup_iomux_unused_nc(); + setup_iomux_unused_boot(); + setup_iomux_sd(); + setup_iomux_led(); + setup_iomux_pinheader(); + setup_gpio(); + + set_clock(); + return 0; +} + +int board_init(void) +{ + gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; + setup_iomux_i2c(); + return 0; +} + +int board_late_init(void) +{ + return 0; +} + +int dram_init(void) +{ + gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE, 1 << 30); + return 0; +} + +int checkboard(void) +{ + puts("Board: Inverse Path USB armory MkI\n"); + return 0; +} diff --git a/configs/usbarmory_defconfig b/configs/usbarmory_defconfig new file mode 100644 index 0000000..994d2c7 --- /dev/null +++ b/configs/usbarmory_defconfig @@ -0,0 +1,3 @@ +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/inversepath/usbarmory/imximage.cfg" +CONFIG_ARM=y +CONFIG_TARGET_USBARMORY=y diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h new file mode 100644 index 0000000..e9109f4 --- /dev/null +++ b/include/configs/usbarmory.h @@ -0,0 +1,115 @@ +/* + * USB armory MkI board configuration settings + * http://inversepath.com/usbarmory + * + * Copyright (C) 2015, Inverse Path + * Andrej Rosano <andrej(a)inversepath.com> + * + * SPDX-License-Identifier:|____GPL-2.0+ + */ + +#ifndef __CONFIG_H +#define __CONFIG_H + +#define CONFIG_MX53 +#define CONFIG_DISPLAY_CPUINFO +#define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_BOARD_EARLY_INIT_F +#define CONFIG_BOARD_LATE_INIT +#define CONFIG_OF_LIBFDT +#define CONFIG_SYS_GENERIC_BOARD +#define CONFIG_MXC_GPIO + +#include <asm/arch/imx-regs.h> +#include <config_cmd_default.h> + +/* U-Boot commands */ +#define CONFIG_CMD_BOOTZ +#define CONFIG_CMD_FAT +#define CONFIG_CMD_MEMTEST +#define CONFIG_CMD_EXT2 +#undef CONFIG_CMD_IMLS + +/* U-Boot environment */ +#define CONFIG_ENV_OVERWRITE +#define CONFIG_SYS_NO_FLASH +#define CONFIG_ENV_OFFSET (6 * 64 * 1024) +#define CONFIG_ENV_SIZE (8 * 1024) +#define CONFIG_ENV_IS_IN_MMC +#define CONFIG_SYS_MMC_ENV_DEV 0 + +/* U-Boot general configurations */ +#define CONFIG_SYS_LONGHELP +#define CONFIG_SYS_HUSH_PARSER +#define CONFIG_AUTO_COMPLETE +#define CONFIG_SYS_CBSIZE 512 +#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) +#define CONFIG_SYS_MAXARGS 16 +#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE +#define CONFIG_CMDLINE_EDITING + +/* UART */ +#define CONFIG_MXC_UART +#define CONFIG_MXC_UART_BASE UART1_BASE +#define CONFIG_CONS_INDEX 1 +#define CONFIG_BAUDRATE 115200 + +/* SD/MMC */ +#define CONFIG_CMD_MMC +#define CONFIG_FSL_ESDHC +#define CONFIG_SYS_FSL_ESDHC_ADDR 0 +#define CONFIG_SYS_FSL_ESDHC_NUM 1 +#define CONFIG_MMC +#define CONFIG_GENERIC_MMC +#define CONFIG_DOS_PARTITION + +/* USB */ +#define CONFIG_CMD_USB +#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_MX5 +#define CONFIG_USB_STORAGE +#define CONFIG_MXC_USB_PORT 1 +#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CONFIG_MXC_USB_FLAGS 0 + +/* I2C */ +#define CONFIG_CMD_I2C +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_MXC + +/* Fuse */ +#define CONFIG_CMD_FUSE +#define CONFIG_FSL_IIM + +/* Linux boot */ +#define CONFIG_BOOTDELAY 1 +#define CONFIG_LOADADDR 0x72000000 +#define CONFIG_SYS_TEXT_BASE 0x77800000 +#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_HOSTNAME usbarmory +#define CONFIG_BOOTARGS \ + "console=ttymxc0,115200 root=/dev/mmcblk0p1 rootwait rw" +#define CONFIG_BOOTCOMMAND \ + "ext2load mmc 0:1 0x70800000 /boot/uImage; ext2load mmc 0:1 " \ + "0x71000000 /boot/imx53-usbarmory.dtb; bootm 0x70800000 - 0x71000000" + +/* Physical Memory Map */ +#define CONFIG_NR_DRAM_BANKS 1 +#define PHYS_SDRAM CSD0_BASE_ADDR +#define PHYS_SDRAM_SIZE (gd->ram_size) + +#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM +#define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR +#define CONFIG_SYS_INIT_RAM_SIZE IRAM_SIZE + +#define CONFIG_SYS_INIT_SP_OFFSET \ + (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE) +#define CONFIG_SYS_INIT_SP_ADDR \ + (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) + +#define CONFIG_SYS_MEMTEST_START 0x70000000 +#define CONFIG_SYS_MEMTEST_END 0x90000000 + +#define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024) + +#endif /* __CONFIG_H */ -- 1.7.10.4

2 1