Merge branch 'master' of git://git.denx.de/u-boot-mips
authorTom Rini <trini@konsulko.com>
Thu, 1 Jun 2017 02:28:06 +0000 (22:28 -0400)
committerTom Rini <trini@konsulko.com>
Thu, 1 Jun 2017 02:28:06 +0000 (22:28 -0400)
Please pull another update for Broadcom MIPS.
This contains new SoC's, new boards and new drivers and some bugfixes.

71 files changed:
README
arch/Kconfig
arch/arm/Kconfig
arch/arm/dts/armada-3720-db.dts
arch/arm/dts/armada-37xx.dtsi
arch/arm/dts/armada-7040-db.dts
arch/arm/mach-exynos/Kconfig
arch/arm/mach-mvebu/arm64-common.c
arch/arm/mach-tegra/Kconfig
board/solidrun/clearfog/clearfog.c
board/ti/common/Kconfig
cmd/Kconfig
cmd/mem.c
common/hash.c
configs/apalis_imx6_defconfig
configs/apalis_imx6_nospl_com_defconfig
configs/apalis_imx6_nospl_it_defconfig
configs/bcm958622hr_defconfig
configs/calimain_defconfig
configs/clearfog_defconfig
configs/colibri_imx6_defconfig
configs/colibri_imx6_nospl_defconfig
configs/da850_am18xxevm_defconfig
configs/da850evm_defconfig
configs/da850evm_direct_nor_defconfig
configs/ea20_defconfig
configs/imx6qdl_icore_mmc_defconfig
configs/imx6qdl_icore_rqs_mmc_defconfig
configs/imx6ul_geam_mmc_defconfig
configs/imx6ul_geam_nand_defconfig
configs/imx6ul_isiot_emmc_defconfig
configs/imx6ul_isiot_mmc_defconfig
configs/imx6ul_isiot_nand_defconfig
configs/ipam390_defconfig
configs/legoev3_defconfig
configs/mvebu_db-88f3720_defconfig
configs/mvebu_db-88f7040-nand_defconfig
configs/mvebu_db-88f7040_defconfig
configs/mvebu_db-88f8040_defconfig
configs/mvebu_mcbin-88f8040_defconfig
configs/omapl138_lcdk_defconfig
configs/xtfpga_defconfig
drivers/pinctrl/Makefile
drivers/pinctrl/mvebu/Kconfig
drivers/pinctrl/mvebu/Makefile
drivers/pinctrl/mvebu/pinctrl-armada-37xx.c [new file with mode: 0644]
include/configs/apalis_imx6.h
include/configs/bcm23550_w1d.h
include/configs/bcm28155_ap.h
include/configs/bcm_ep_board.h
include/configs/calimain.h
include/configs/clearfog.h
include/configs/colibri_imx6.h
include/configs/da850evm.h
include/configs/ea20.h
include/configs/exynos5-common.h
include/configs/imx6qdl_icore.h
include/configs/imx6qdl_icore_rqs.h
include/configs/imx6ul_geam.h
include/configs/imx6ul_isiot.h
include/configs/ipam390.h
include/configs/legoev3.h
include/configs/omapl138_lcdk.h
include/configs/sandbox.h
include/configs/socfpga_common.h
include/configs/tegra-common.h
include/configs/ti_armv7_keystone2.h
include/configs/xtfpga.h
include/hash.h
scripts/config_whitelist.txt
tools/kwbimage.c

diff --git a/README b/README
index 9d351ec5ad8c2d51760ca0c43571586e8527d265..77d46d2b42e0856d92e8c3280e1172c3f608f4c3 100644 (file)
--- a/README
+++ b/README
@@ -827,7 +827,6 @@ The following options need to be configured:
                CONFIG_CMD_BOOTI        * ARM64 Linux kernel Image support
                CONFIG_CMD_CACHE        * icache, dcache
                CONFIG_CMD_CONSOLE        coninfo
-               CONFIG_CMD_CRC32        * crc32
                CONFIG_CMD_DHCP         * DHCP support
                CONFIG_CMD_DIAG         * Diagnostics
                CONFIG_CMD_ECHO           echo arguments
@@ -889,8 +888,6 @@ The following options need to be configured:
                CONFIG_CMD_SETGETDCR      Support for DCR Register access
                                          (4xx only)
                CONFIG_CMD_SF           * Read/write/erase SPI NOR flash
-               CONFIG_CMD_SHA1SUM      * print sha1 memory digest
-                                         (requires CONFIG_CMD_MEMORY)
                CONFIG_CMD_SOFTSWITCH   * Soft switch setting command for BF60x
                CONFIG_CMD_SOURCE         "source" command Support
                CONFIG_CMD_SPI          * SPI serial bus support
@@ -2679,15 +2676,6 @@ The following options need to be configured:
                A better solution is to properly configure the firewall,
                but sometimes that is not allowed.
 
-- Hashing support:
-               CONFIG_HASH_VERIFY
-
-               Enable the hash verify command (hash -v). This adds to code
-               size a little.
-
-               Note: There is also a sha1sum command, which should perhaps
-               be deprecated in favour of 'hash sha1'.
-
 - bootcount support:
                CONFIG_BOOTCOUNT_LIMIT
 
index 02e887ac86cfdacc5131c60a066ce0a4aa56f59e..e0e4e8486c067467bfb44d1e044cecf5fe6a0a04 100644 (file)
@@ -70,12 +70,14 @@ config SANDBOX
        select DM_SPI
        select DM_GPIO
        select DM_MMC
+       imply CRC32_VERIFY
        imply CMD_GETTIME
        imply CMD_HASH
        imply CMD_IO
        imply CMD_IOTRACE
        imply LZMA
        imply CMD_LZMADEC
+       imply HASH_VERIFY
 
 config SH
        bool "SuperH architecture"
index 91f50b063778148a2dbd5c419c90e2fbfe418d8d..a8118ce0dfbdd0505869e61986dc9806579e9ac2 100644 (file)
@@ -495,15 +495,19 @@ config TARGET_VEXPRESS_CA9X4
 config TARGET_BCM23550_W1D
        bool "Support bcm23550_w1d"
        select CPU_V7
+       imply CRC32_VERIFY
 
 config TARGET_BCM28155_AP
        bool "Support bcm28155_ap"
        select CPU_V7
+       imply CRC32_VERIFY
 
 config TARGET_BCMCYGNUS
        bool "Support bcmcygnus"
        select CPU_V7
+       imply CRC32_VERIFY
        imply CMD_HASH
+       imply HASH_VERIFY
 
 config TARGET_BCMNSP
        bool "Support bcmnsp"
@@ -629,6 +633,7 @@ config ARCH_SOCFPGA
        select ARCH_MISC_INIT
        select SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION
        select SYS_THUMB_BUILD
+       imply CRC32_VERIFY
 
 config ARCH_SUNXI
        bool "Support sunxi (Allwinner) SoCs"
index 85761afb748ab1279d51264d7d876ebcca27ddec..5f06252e4e24a55207b0801bc3c6d9e643362675 100644 (file)
 };
 
 &eth0 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&rgmii_pins>;
        status = "okay";
        phy-mode = "rgmii";
 };
 
 &i2c0 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&i2c1_pins>;
        status = "okay";
 };
 
 
 &spi0 {
        status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&spi_quad_pins>;
 
        spi-flash@0 {
                #address-cells = <1>;
 
 /* Exported on the micro USB connector CON32 through an FTDI */
 &uart0 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&uart1_pins>;
        status = "okay";
 };
 
index 5bea63b9837a2e1ac8eedeeb17f0adb52e1bf70c..690234234b5e3e47ab5173e2bd744131d727a8c0 100644 (file)
                                status = "disabled";
                        };
 
+                       pinctrl_nb: pinctrl-nb@13800 {
+                               compatible = "marvell,armada3710-nb-pinctrl",
+                               "syscon", "simple-mfd";
+                               reg = <0x13800 0x100>, <0x13C00 0x20>;
+                               gpionb: gpionb {
+                                       #gpio-cells = <2>;
+                                       gpio-ranges = <&pinctrl_nb 0 0 36>;
+                                       gpio-controller;
+                                       interrupts =
+                                       <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>;
+
+                               };
+
+                               spi_quad_pins: spi-quad-pins {
+                                       groups = "spi_quad";
+                                       function = "spi";
+                               };
+
+                               i2c1_pins: i2c1-pins {
+                                       groups = "i2c1";
+                                       function = "i2c";
+                               };
+
+                               i2c2_pins: i2c2-pins {
+                                       groups = "i2c2";
+                                       function = "i2c";
+                               };
+
+                               uart1_pins: uart1-pins {
+                                       groups = "uart1";
+                                       function = "uart";
+                               };
+
+                               uart2_pins: uart2-pins {
+                                       groups = "uart2";
+                                       function = "uart";
+                               };
+                       };
+
+                       pinctrl_sb: pinctrl-sb@18800 {
+                               compatible = "marvell,armada3710-sb-pinctrl",
+                               "syscon", "simple-mfd";
+                               reg = <0x18800 0x100>, <0x18C00 0x20>;
+                               gpiosb: gpiosb {
+                                       #gpio-cells = <2>;
+                                       gpio-ranges = <&pinctrl_sb 0 0 29>;
+                                       gpio-controller;
+                                       interrupts =
+                                       <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 159 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 158 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH>;
+                               };
+
+                               rgmii_pins: mii-pins {
+                                       groups = "rgmii";
+                                       function = "mii";
+                               };
+
+                       };
+
                        usb3: usb@58000 {
                                compatible = "marvell,armada3700-xhci",
                                "generic-xhci";
index b140b3476e751c94bbe7019549b2d100ef9605fc..cfd2b4baf34d8b91cb4a9a74b1d676a5f4a85496 100644 (file)
        };
 
        phy2 {
-               phy-type = <PHY_TYPE_SGMII0>;
-               phy-speed = <PHY_SPEED_1_25G>;
+               phy-type = <PHY_TYPE_SFI>;
        };
 
        phy3 {
        status = "okay";
 };
 
+&cpm_eth0 {
+       status = "okay";
+       phy-mode = "sfi"; /* lane-2 */
+};
+
 &cpm_eth1 {
        status = "okay";
        phy = <&phy0>;
index 5b6c5ea328be546a581f7b4abb9ff88b1d8ca15c..c57935e44d1d2135b17a46c5f8c4581526b6db55 100644 (file)
@@ -18,7 +18,9 @@ config ARCH_EXYNOS5
        select CPU_V7
        select BOARD_EARLY_INIT_F
        select SHA_HW_ACCEL
+       imply CRC32_VERIFY
        imply CMD_HASH
+       imply HASH_VERIFY
        help
          Samsung Exynos5 SoC family are based on ARM Cortex-A15 CPU (and
          Cortex-A7 CPU in big.LITTLE configuration). There are multiple SoCs
index c2c176e3d44f5274dc81c31c87ee7bdf01895d30..69cb21d0525b13d673f6c6fe7787d733282b39af 100644 (file)
@@ -46,76 +46,18 @@ const struct mbus_dram_target_info *mvebu_mbus_dram_info(void)
 
 /* DRAM init code ... */
 
-static const void *get_memory_reg_prop(const void *fdt, int *lenp)
+int dram_init_banksize(void)
 {
-       int offset;
-
-       offset = fdt_path_offset(fdt, "/memory");
-       if (offset < 0)
-               return NULL;
+       fdtdec_setup_memory_banksize();
 
-       return fdt_getprop(fdt, offset, "reg", lenp);
+       return 0;
 }
 
 int dram_init(void)
 {
-       const void *fdt = gd->fdt_blob;
-       const fdt32_t *val;
-       int ac, sc, len;
-
-       ac = fdt_address_cells(fdt, 0);
-       sc = fdt_size_cells(fdt, 0);
-       if (ac < 0 || sc < 1 || sc > 2) {
-               printf("invalid address/size cells\n");
-               return -EINVAL;
-       }
-
-       val = get_memory_reg_prop(fdt, &len);
-       if (len / sizeof(*val) < ac + sc)
+       if (fdtdec_setup_memory_size() != 0)
                return -EINVAL;
 
-       val += ac;
-
-       gd->ram_size = fdtdec_get_number(val, sc);
-
-       debug("DRAM size = %08lx\n", (unsigned long)gd->ram_size);
-
-       return 0;
-}
-
-int dram_init_banksize(void)
-{
-       const void *fdt = gd->fdt_blob;
-       const fdt32_t *val;
-       int ac, sc, cells, len, i;
-
-       val = get_memory_reg_prop(fdt, &len);
-       if (len < 0)
-               return -ENXIO;
-
-       ac = fdt_address_cells(fdt, 0);
-       sc = fdt_size_cells(fdt, 0);
-       if (ac < 1 || ac > 2 || sc < 1 || sc > 2) {
-               printf("invalid address/size cells\n");
-               return -ENXIO;
-       }
-
-       cells = ac + sc;
-
-       len /= sizeof(*val);
-
-       for (i = 0; i < CONFIG_NR_DRAM_BANKS && len >= cells;
-            i++, len -= cells) {
-               gd->bd->bi_dram[i].start = fdtdec_get_number(val, ac);
-               val += ac;
-               gd->bd->bi_dram[i].size = fdtdec_get_number(val, sc);
-               val += sc;
-
-               debug("DRAM bank %d: start = %08lx, size = %08lx\n",
-                     i, (unsigned long)gd->bd->bi_dram[i].start,
-                     (unsigned long)gd->bd->bi_dram[i].size);
-       }
-
        return 0;
 }
 
index 940257b5ecfbe724342440cb8e4c6d789da01fb0..89d2a499e48b1f711b4f726cd487525e0f726916 100644 (file)
@@ -38,6 +38,7 @@ config TEGRA_COMMON
        select OF_CONTROL
        select VIDCONSOLE_AS_LCD if DM_VIDEO
        select BOARD_EARLY_INIT_F
+       imply CRC32_VERIFY
 
 config TEGRA_NO_BPMP
        bool "Tegra common options for SoCs without BPMP"
index 2773f5957e6e101321aa4d7990624c60555db5c1..3a8257cac32e2d7b2875e9060272696d167eab50 100644 (file)
@@ -131,8 +131,12 @@ int board_init(void)
        /* Toggle GPIO41 to reset onboard switch and phy */
        clrbits_le32(MVEBU_GPIO1_BASE + 0x0, BIT(9));
        clrbits_le32(MVEBU_GPIO1_BASE + 0x4, BIT(9));
+       /* GPIO 19 on ClearFog rev 2.1 controls the uSOM onboard phy reset */
+       clrbits_le32(MVEBU_GPIO0_BASE + 0x0, BIT(19));
+       clrbits_le32(MVEBU_GPIO0_BASE + 0x4, BIT(19));
        mdelay(1);
        setbits_le32(MVEBU_GPIO1_BASE + 0x0, BIT(9));
+       setbits_le32(MVEBU_GPIO0_BASE + 0x0, BIT(19));
        mdelay(10);
 
        /* Init I2C IO expanders */
index 1187cf54337f7d8b6a9e864a13c6937b0744cf69..e35afa0e512d8a160cff05eb014d0b3da9a590f6 100644 (file)
@@ -18,6 +18,7 @@ config TI_COMMON_CMD_OPTIONS
        bool "Enable cmd options on TI platforms"
        imply CMD_ASKENV
        imply CMD_BOOTZ
+       imply CRC32_VERIFY if ARCH_KEYSTONE
        imply CMD_DFU if USB_GADGET_DOWNLOAD
        imply CMD_DHCP
        imply CMD_EEPROM
index 5ee52f62cc140a4419bed705c8c46e08dfe387d4..6f75b86e255626ebc7a86052f4e8fe3d76f4300d 100644 (file)
@@ -355,6 +355,12 @@ config CMD_CRC32
        help
          Compute CRC32.
 
+config CRC32_VERIFY
+       bool "crc32 -v"
+       depends on CMD_CRC32
+       help
+         Add -v option to verify data against a crc32 checksum.
+
 config CMD_EEPROM
        bool "eeprom - EEPROM subsystem"
        help
@@ -410,13 +416,25 @@ config CMD_MD5SUM
        help
          Compute MD5 checksum.
 
-config MD5SUM_VERFIY
+config MD5SUM_VERIFY
        bool "md5sum -v"
        default n
        depends on CMD_MD5SUM
        help
          Add -v option to verify data against an MD5 checksum.
 
+config CMD_SHA1SUM
+       bool "sha1sum"
+       select SHA1
+       help
+         Compute SHA1 checksum.
+
+config SHA1SUM_VERIFY
+       bool "sha1sum -v"
+       depends on CMD_SHA1SUM
+       help
+         Add -v option to verify data against a SHA1 checksum.
+
 config LOOPW
        bool "loopw"
        help
@@ -1068,6 +1086,12 @@ config CMD_HASH
          saved to memory or to an environment variable. It is also possible
          to verify a hash against data in memory.
 
+config HASH_VERIFY
+       bool "hash -v"
+       depends on CMD_HASH
+       help
+         Add -v option to verify data against a hash.
+
 config CMD_TPM
        bool "Enable the 'tpm' command"
        depends on TPM
index b6e200b97c09dca26897fcce4306ad5e5eaaa1c1..27075e54a91255b1661fc478da6a707513942392 100644 (file)
--- a/cmd/mem.c
+++ b/cmd/mem.c
@@ -1160,7 +1160,7 @@ static int do_mem_crc(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
        av = argv + 1;
        ac = argc - 1;
-#ifdef CONFIG_HASH_VERIFY
+#ifdef CONFIG_CRC32_VERIFY
        if (strcmp(*av, "-v") == 0) {
                flags |= HASH_FLAG_VERIFY | HASH_FLAG_ENV;
                av++;
@@ -1238,7 +1238,7 @@ U_BOOT_CMD(
 
 #ifdef CONFIG_CMD_CRC32
 
-#ifndef CONFIG_HASH_VERIFY
+#ifndef CONFIG_CRC32_VERIFY
 
 U_BOOT_CMD(
        crc32,  4,      1,      do_mem_crc,
@@ -1246,7 +1246,7 @@ U_BOOT_CMD(
        "address count [addr]\n    - compute CRC32 checksum [save at addr]"
 );
 
-#else  /* CONFIG_HASH_VERIFY */
+#else  /* CONFIG_CRC32_VERIFY */
 
 U_BOOT_CMD(
        crc32,  5,      1,      do_mem_crc,
@@ -1255,7 +1255,7 @@ U_BOOT_CMD(
        "-v address count crc\n    - verify crc of memory area"
 );
 
-#endif /* CONFIG_HASH_VERIFY */
+#endif /* CONFIG_CRC32_VERIFY */
 
 #endif
 
index a0eded98d063d6fad98dac679c7d2be7626ce135..771d8fa87f9424521ce0b5d3ceb465f079404ea8 100644 (file)
@@ -178,16 +178,9 @@ static struct hash_algo hash_algo[] = {
        },
 };
 
-#if defined(CONFIG_SHA256) || defined(CONFIG_CMD_SHA1SUM)
-#define MULTI_HASH
-#endif
-
-#if defined(CONFIG_HASH_VERIFY) || defined(CONFIG_CMD_HASH)
-#define MULTI_HASH
-#endif
-
 /* Try to minimize code size for boards that don't want much hashing */
-#ifdef MULTI_HASH
+#if defined(CONFIG_SHA256) || defined(CONFIG_CMD_SHA1SUM) || \
+       defined(CONFIG_CRC32_VERIFY) || defined(CONFIG_CMD_HASH)
 #define multi_hash()   1
 #else
 #define multi_hash()   0
@@ -424,7 +417,8 @@ int hash_command(const char *algo_name, int flags, cmd_tbl_t *cmdtp, int flag,
                unmap_sysmem(buf);
 
                /* Try to avoid code bloat when verify is not needed */
-#ifdef CONFIG_HASH_VERIFY
+#if defined(CONFIG_CRC32_VERIFY) || defined(CONFIG_SHA1SUM_VERIFY) || \
+       defined(CONFIG_HASH_VERIFY)
                if (flags & HASH_FLAG_VERIFY) {
 #else
                if (0) {
index f586773761ef4e2d0cf9c0c0ce8df3586a71488d..c712cf91dfe85110f39ab0d523324d82158f11cf 100644 (file)
@@ -24,6 +24,7 @@ CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_XIMG is not set
 CONFIG_CMD_ASKENV=y
+CONFIG_CRC32_VERIFY=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_I2C=y
index 42abbbd49d535592445841a666bc56bbd43a65b4..f5f4e3de7f4aaed682e804923f3384320bfca8a5 100644 (file)
@@ -17,6 +17,7 @@ CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_XIMG is not set
 CONFIG_CMD_ASKENV=y
+CONFIG_CRC32_VERIFY=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_I2C=y
index 18f0d02e550b23642e9583bbe4768caadff735c1..0de47fe360f40e6c49b025a405897358810ffa4f 100644 (file)
@@ -17,6 +17,7 @@ CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_XIMG is not set
 CONFIG_CMD_ASKENV=y
+CONFIG_CRC32_VERIFY=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_I2C=y
index c2713c61fa886e462ff7f0d8cf268f720b218c05..67e18b6268091f3d32fadc9fe6e3e0e75995abbc 100644 (file)
@@ -13,7 +13,9 @@ CONFIG_CMD_ASKENV=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_TIME=y
+CONFIG_CRC32_VERIFY=y
 CONFIG_CMD_HASH=y
+CONFIG_HASH_VERIFY=y
 CONFIG_CMD_FAT=y
 # CONFIG_MMC is not set
 CONFIG_SYS_NS16550=y
index 489d85fc4f128746f72c3aa6115acb7aada5a65b..48422ddffecefc16eadddeb7ff32ee056edc1745 100644 (file)
@@ -10,6 +10,7 @@ CONFIG_SYS_PROMPT="Calimain > "
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_STOP_STR="\x0b"
 CONFIG_CMD_ASKENV=y
+CONFIG_CRC32_VERIFY=y
 CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
index 1264871e832457c7e7a13086dafbb33c95c87438..097506872d66cecdcdd17554ad4648325d815cfd 100644 (file)
@@ -8,14 +8,13 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="armada-388-clearfog"
+CONFIG_DISTRO_DEFAULTS=y
 CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_SPL=y
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x141
 CONFIG_SPL_I2C_SUPPORT=y
-CONFIG_HUSH_PARSER=y
-CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_MMC=y
@@ -25,15 +24,8 @@ CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_TFTPPUT=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_TIME=y
-CONFIG_CMD_EXT2=y
-CONFIG_CMD_EXT4=y
-CONFIG_CMD_FAT=y
-CONFIG_CMD_FS_GENERIC=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_PARTITION_UUIDS is not set
 # CONFIG_SPL_PARTITION_UUIDS is not set
index 6c105767fcb33a18dd89c4e1fd312c5e50984ecd..fcb7c537970102ae49f065142b498f4b99d932f4 100644 (file)
@@ -24,6 +24,7 @@ CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_XIMG is not set
 CONFIG_CMD_ASKENV=y
+CONFIG_CRC32_VERIFY=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_I2C=y
index bd2ac24d4a4442b8bfa3949b069bc4ed73e01d58..fbf9306eeb167db7abc5ae1270013b11029304e8 100644 (file)
@@ -17,6 +17,7 @@ CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_XIMG is not set
 CONFIG_CMD_ASKENV=y
+CONFIG_CRC32_VERIFY=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_I2C=y
index bb92c438fb9b56f8d925bdaaf4a6c1ce99ff9f37..74b3f0398d6749b9fa0548d14eebb45997ab9d95 100644 (file)
@@ -17,6 +17,7 @@ CONFIG_SPL_BOARD_INIT=y
 CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_ASKENV=y
+CONFIG_CRC32_VERIFY=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SF=y
index 1120182052b34031ca8e73258f9aaffad805fe5e..3745b859ed278962065acc7b9d8dd68deab75201 100644 (file)
@@ -19,6 +19,7 @@ CONFIG_SYS_PROMPT="U-Boot > "
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_ASKENV=y
+CONFIG_CRC32_VERIFY=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SF=y
index 1e17ce736a67dee248f8e5771a5ea411f185c293..99543d39e1de6bf17c529c37ede42017d577d6c2 100644 (file)
@@ -10,6 +10,7 @@ CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="U-Boot > "
 CONFIG_CMD_ASKENV=y
+CONFIG_CRC32_VERIFY=y
 CONFIG_CMD_SF=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
index be48626b3cc391c382fc5f051c9abf83ad1cd133..4ee7d5aac15912df59ec6f186ca88b9b818272c2 100644 (file)
@@ -15,6 +15,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="ea20 > "
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_ASKENV=y
+CONFIG_CRC32_VERIFY=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_SF=y
 CONFIG_CMD_SPI=y
index b6b1b4bc04db84c1763ca883d160df7a5b3df3ed..851dba2c2645e16f778b565a98f4cf8faaad6030 100644 (file)
@@ -21,6 +21,7 @@ CONFIG_SPL_EXT_SUPPORT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="icorem6qdl> "
 # CONFIG_CMD_IMLS is not set
+CONFIG_CRC32_VERIFY=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_I2C=y
index 08e6784b4cc3052a2e1a17ee20636207a7c70502..b6a43ae77ccf52d4d2ad6cc4aef1bb3cdce07aad 100644 (file)
@@ -20,6 +20,7 @@ CONFIG_SPL_EXT_SUPPORT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="icorem6qdl-rqs> "
 # CONFIG_CMD_IMLS is not set
+CONFIG_CRC32_VERIFY=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_I2C=y
index 8751a36e27312efd9a91f41d422ec9c29968f528..acaed604b147e43cd448d6393ffdb38ecb675138 100644 (file)
@@ -19,6 +19,7 @@ CONFIG_SPL_EXT_SUPPORT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="geam6ul> "
 # CONFIG_CMD_IMLS is not set
+CONFIG_CRC32_VERIFY=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_I2C=y
index 704c0c037494a3da7fe26dd33485ed495d55dc75..baf1a739c3cace26f961a23e4662b1d3647289c1 100644 (file)
@@ -18,6 +18,7 @@ CONFIG_SPL_DMA_SUPPORT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="geam6ul> "
 # CONFIG_CMD_IMLS is not set
+CONFIG_CRC32_VERIFY=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_NAND=y
index 1f501cb0210613d9d44d46d7095c63b83d386105..4b429c256d98187b77f37d00141e54ceb47744b9 100644 (file)
@@ -19,6 +19,7 @@ CONFIG_SPL_EXT_SUPPORT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="isiotmx6ul> "
 # CONFIG_CMD_IMLS is not set
+CONFIG_CRC32_VERIFY=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_GPIO=y
index 5214479dcc24ae45466df79e38e26d05efbae3d8..424089c0e4480316ff8212ffc4354d3b233c21d6 100644 (file)
@@ -19,6 +19,7 @@ CONFIG_SPL_EXT_SUPPORT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="isiotmx6ul> "
 # CONFIG_CMD_IMLS is not set
+CONFIG_CRC32_VERIFY=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_I2C=y
index 1b28336f36e5533badd3bfb5d4f081fa03c0de7c..fb2bef9a9bca13066473280ada9c665a5636a170 100644 (file)
@@ -18,6 +18,7 @@ CONFIG_SPL_DMA_SUPPORT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="isiotmx6ul> "
 # CONFIG_CMD_IMLS is not set
+CONFIG_CRC32_VERIFY=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_NAND=y
index 705236eb7bb679eb3d67aa3616f337da6e041edb..3c32a6b0ecc17b1086ea7b0ee8020780d962ec33 100644 (file)
@@ -17,6 +17,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="U-Boot > "
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_ASKENV=y
+CONFIG_CRC32_VERIFY=y
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
index 86ff6a150ddd241aed9943971600af94a226c612..589e8cf880be8a0cac59aa42e3e020b1ad6a4880 100644 (file)
@@ -12,6 +12,7 @@ CONFIG_AUTOBOOT_PROMPT="Autoboot in %d seconds - press 'l' to stop...\n"
 CONFIG_AUTOBOOT_STOP_STR="l"
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_ASKENV=y
+CONFIG_CRC32_VERIFY=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SF=y
index 4ea142cc2f05ed1088e22ae3fb7d19ade8c9e631..349c2ce18feaadd14c1de6b1cb0638050ea7865e 100644 (file)
@@ -19,6 +19,7 @@ CONFIG_CMD_SPI=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_FPGA is not set
+CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_TFTPPUT=y
 CONFIG_CMD_DHCP=y
@@ -35,6 +36,8 @@ CONFIG_MAC_PARTITION=y
 CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
 CONFIG_BLOCK_CACHE=y
+CONFIG_DM_GPIO=y
+# CONFIG_MVEBU_GPIO is not set
 CONFIG_DM_I2C=y
 CONFIG_MISC=y
 CONFIG_DM_MMC=y
@@ -47,6 +50,8 @@ CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_MVEBU_COMPHY_SUPPORT=y
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_ARMADA_37XX=y
 # CONFIG_SPL_SERIAL_PRESENT is not set
 CONFIG_DEBUG_UART=y
 CONFIG_DEBUG_MVEBU_A3700_UART=y
index d86c18ed0806644f9e7deba9b4b8869f895d5908..8d48cb64c4181c5c7c8f4d24140dc0d9e3303ded 100644 (file)
@@ -7,7 +7,6 @@ CONFIG_SMBIOS_PRODUCT_NAME=""
 CONFIG_AHCI=y
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
-CONFIG_BOARD_LATE_INIT=y
 # CONFIG_DISPLAY_CPUINFO is not set
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_ARCH_EARLY_INIT_R=y
@@ -16,12 +15,12 @@ CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_MMC=y
+CONFIG_CMD_NAND=y
 CONFIG_CMD_PART=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_SPI=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y
-CONFIG_CMD_NAND=y
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_TFTPPUT=y
@@ -31,6 +30,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_TIME=y
 CONFIG_CMD_MVEBU_BUBT=y
+CONFIG_MVEBU_NAND_BOOT=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
@@ -45,18 +45,18 @@ CONFIG_MISC=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_XENON=y
+CONFIG_NAND_PXA3XX=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_MVEBU_NAND_BOOT=y
-CONFIG_NAND_PXA3XX=y
 CONFIG_PHYLIB=y
 CONFIG_PCI=y
 CONFIG_DM_PCI=y
 CONFIG_PCIE_DW_MVEBU=y
 CONFIG_MVEBU_COMPHY_SUPPORT=y
 CONFIG_PINCTRL=y
+CONFIG_PINCTRL_ARMADA_8K=y
 # CONFIG_SPL_SERIAL_PRESENT is not set
 CONFIG_DEBUG_UART=y
 CONFIG_DEBUG_UART_BASE=0xf0512000
index 797eabbfabc1962f22b937759ff8a1267c962a43..9f7b2c4dd07d1d02383395e612d19e5033a91d41 100644 (file)
@@ -54,6 +54,7 @@ CONFIG_DM_PCI=y
 CONFIG_PCIE_DW_MVEBU=y
 CONFIG_MVEBU_COMPHY_SUPPORT=y
 CONFIG_PINCTRL=y
+CONFIG_PINCTRL_ARMADA_8K=y
 # CONFIG_SPL_SERIAL_PRESENT is not set
 CONFIG_DEBUG_UART=y
 CONFIG_DEBUG_UART_BASE=0xf0512000
index 046da09786f06bf7482f745627084a2fdd8ef7df..c21c977ae8a834a4baeddb5ca036e1a77313292a 100644 (file)
@@ -54,6 +54,7 @@ CONFIG_DM_PCI=y
 CONFIG_PCIE_DW_MVEBU=y
 CONFIG_MVEBU_COMPHY_SUPPORT=y
 CONFIG_PINCTRL=y
+CONFIG_PINCTRL_ARMADA_8K=y
 # CONFIG_SPL_SERIAL_PRESENT is not set
 CONFIG_DEBUG_UART=y
 CONFIG_DEBUG_UART_BASE=0xf0512000
index 72549201d14cc28b4662cda394ef1a856966de0f..4a7c5927f4230463c80001ff64a9f3a41b0d01eb 100644 (file)
@@ -57,6 +57,7 @@ CONFIG_DM_PCI=y
 CONFIG_PCIE_DW_MVEBU=y
 CONFIG_MVEBU_COMPHY_SUPPORT=y
 CONFIG_PINCTRL=y
+CONFIG_PINCTRL_ARMADA_8K=y
 CONFIG_DM_REGULATOR_FIXED=y
 # CONFIG_SPL_SERIAL_PRESENT is not set
 CONFIG_DEBUG_UART=y
index ff5e06de299d0c6102731abece0975548d475686..354438e1ef0dbf489309195afc1911902a3598fd 100644 (file)
@@ -17,6 +17,7 @@ CONFIG_SPL_BOARD_INIT=y
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0xb5
 CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_IMLS is not set
+CONFIG_CRC32_VERIFY=y
 # CONFIG_CMD_EEPROM is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_GPIO is not set
index c797c257d0a0210d75ccfa1e7875d1947df0c858..9f85d63965ad41294183ff02ca561030646c1528 100644 (file)
@@ -8,6 +8,7 @@ CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press <SPACE> to stop\n"
 CONFIG_AUTOBOOT_STOP_STR=" "
 CONFIG_CMD_ASKENV=y
+CONFIG_CRC32_VERIFY=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_DIAG=y
index 1e5c4257c4da02ed8f9798ee4962d14ad83dae47..64da7c608b017b4335372b6731d4aa5d41a14e26 100644 (file)
@@ -17,7 +17,7 @@ obj-$(CONFIG_PINCTRL_UNIPHIER)        += uniphier/
 obj-$(CONFIG_PINCTRL_PIC32)    += pinctrl_pic32.o
 obj-$(CONFIG_PINCTRL_EXYNOS)   += exynos/
 obj-$(CONFIG_PINCTRL_MESON)    += meson/
-obj-$(CONFIG_PINCTRL_MVEBU)    += mvebu/
+obj-$(CONFIG_ARCH_MVEBU)       += mvebu/
 obj-$(CONFIG_PINCTRL_SINGLE)   += pinctrl-single.o
 obj-$(CONFIG_PINCTRL_STI)      += pinctrl-sti.o
 obj-$(CONFIG_PINCTRL_STM32)    += pinctrl_stm32.o
index cf9c299f13a98ffe3abc9f41547f484a33aba3e1..a9388ff7e2626ddf78fff559004933ba8e645e4e 100644 (file)
@@ -1,7 +1,17 @@
-config PINCTRL_MVEBU
-       depends on ARCH_MVEBU
-       bool
-       default y
+if ARCH_MVEBU
+
+config PINCTRL_ARMADA_37XX
+       depends on ARMADA_3700
+       bool "Armada 37xx pin control driver"
+       help
+          Support pin multiplexing and pin configuration control on
+          Marvell's Armada-37xx SoC.
+
+config PINCTRL_ARMADA_8K
+       depends on ARMADA_8K
+       bool "Armada 7k/8k pin control driver"
        help
           Support pin multiplexing and pin configuration control on
           Marvell's Armada-8K SoC.
+
+endif
index f4f78640b95c98f62604e38049d348a3dfca03f8..13a38d5a1ab63e5d9b76c92da6ecb60622d4ba68 100644 (file)
@@ -4,4 +4,5 @@
 # SPDX-License-Identifier:     GPL-2.0
 # https://spdx.org/licenses
 
-obj-$(CONFIG_PINCTRL_MVEBU)    += pinctrl-mvebu.o
+obj-$(CONFIG_PINCTRL_ARMADA_37XX) += pinctrl-armada-37xx.o
+obj-$(CONFIG_PINCTRL_ARMADA_8K)        += pinctrl-mvebu.o
diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
new file mode 100644 (file)
index 0000000..630cedf
--- /dev/null
@@ -0,0 +1,631 @@
+/*
+ * U-Boot Marvell 37xx SoC pinctrl driver
+ *
+ * Copyright (C) 2017 Stefan Roese <sr@denx.de>
+ *
+ * This driver is based on the Linux driver version, which is:
+ * Copyright (C) 2017 Marvell
+ * Gregory CLEMENT <gregory.clement@free-electrons.com>
+ *
+ * Additionally parts are derived from the Meson U-Boot pinctrl driver,
+ * which is:
+ * (C) Copyright 2016 - Beniamino Galvani <b.galvani@gmail.com>
+ * Based on code from Linux kernel:
+ * Copyright (C) 2016 Endless Mobile, Inc.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ * https://spdx.org/licenses
+ */
+
+#include <common.h>
+#include <config.h>
+#include <dm.h>
+#include <dm/device-internal.h>
+#include <dm/lists.h>
+#include <dm/pinctrl.h>
+#include <dm/root.h>
+#include <errno.h>
+#include <fdtdec.h>
+#include <regmap.h>
+#include <asm/gpio.h>
+#include <asm/system.h>
+#include <asm/io.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+#define OUTPUT_EN      0x0
+#define INPUT_VAL      0x10
+#define OUTPUT_VAL     0x18
+#define OUTPUT_CTL     0x20
+#define SELECTION      0x30
+
+#define IRQ_EN         0x0
+#define IRQ_POL                0x08
+#define IRQ_STATUS     0x10
+#define IRQ_WKUP       0x18
+
+#define NB_FUNCS 2
+#define GPIO_PER_REG   32
+
+/**
+ * struct armada_37xx_pin_group: represents group of pins of a pinmux function.
+ * The pins of a pinmux groups are composed of one or two groups of contiguous
+ * pins.
+ * @name:      Name of the pin group, used to lookup the group.
+ * @start_pins:        Index of the first pin of the main range of pins belonging to
+ *             the group
+ * @npins:     Number of pins included in the first range
+ * @reg_mask:  Bit mask matching the group in the selection register
+ * @extra_pins:        Index of the first pin of the optional second range of pins
+ *             belonging to the group
+ * @npins:     Number of pins included in the second optional range
+ * @funcs:     A list of pinmux functions that can be selected for this group.
+ * @pins:      List of the pins included in the group
+ */
+struct armada_37xx_pin_group {
+       const char      *name;
+       unsigned int    start_pin;
+       unsigned int    npins;
+       u32             reg_mask;
+       u32             val[NB_FUNCS];
+       unsigned int    extra_pin;
+       unsigned int    extra_npins;
+       const char      *funcs[NB_FUNCS];
+       unsigned int    *pins;
+};
+
+struct armada_37xx_pin_data {
+       u8                              nr_pins;
+       char                            *name;
+       struct armada_37xx_pin_group    *groups;
+       int                             ngroups;
+};
+
+struct armada_37xx_pmx_func {
+       const char              *name;
+       const char              **groups;
+       unsigned int            ngroups;
+};
+
+struct armada_37xx_pinctrl {
+       void __iomem                    *base;
+       const struct armada_37xx_pin_data       *data;
+       struct udevice                  *dev;
+       struct pinctrl_dev              *pctl_dev;
+       struct armada_37xx_pin_group    *groups;
+       unsigned int                    ngroups;
+       struct armada_37xx_pmx_func     *funcs;
+       unsigned int                    nfuncs;
+};
+
+#define PIN_GRP(_name, _start, _nr, _mask, _func1, _func2)     \
+       {                                       \
+               .name = _name,                  \
+               .start_pin = _start,            \
+               .npins = _nr,                   \
+               .reg_mask = _mask,              \
+               .val = {0, _mask},              \
+               .funcs = {_func1, _func2}       \
+       }
+
+#define PIN_GRP_GPIO(_name, _start, _nr, _mask, _func1)        \
+       {                                       \
+               .name = _name,                  \
+               .start_pin = _start,            \
+               .npins = _nr,                   \
+               .reg_mask = _mask,              \
+               .val = {0, _mask},              \
+               .funcs = {_func1, "gpio"}       \
+       }
+
+#define PIN_GRP_GPIO_2(_name, _start, _nr, _mask, _val1, _val2, _func1)   \
+       {                                       \
+               .name = _name,                  \
+               .start_pin = _start,            \
+               .npins = _nr,                   \
+               .reg_mask = _mask,              \
+               .val = {_val1, _val2},          \
+               .funcs = {_func1, "gpio"}       \
+       }
+
+#define PIN_GRP_EXTRA(_name, _start, _nr, _mask, _v1, _v2, _start2, _nr2, \
+                     _f1, _f2)                         \
+       {                                               \
+               .name = _name,                          \
+               .start_pin = _start,                    \
+               .npins = _nr,                           \
+               .reg_mask = _mask,                      \
+               .val = {_v1, _v2},                      \
+               .extra_pin = _start2,                   \
+               .extra_npins = _nr2,                    \
+               .funcs = {_f1, _f2}                     \
+       }
+
+static struct armada_37xx_pin_group armada_37xx_nb_groups[] = {
+       PIN_GRP_GPIO("jtag", 20, 5, BIT(0), "jtag"),
+       PIN_GRP_GPIO("sdio0", 8, 3, BIT(1), "sdio"),
+       PIN_GRP_GPIO("emmc_nb", 27, 9, BIT(2), "emmc"),
+       PIN_GRP_GPIO("pwm0", 11, 1, BIT(3), "pwm"),
+       PIN_GRP_GPIO("pwm1", 12, 1, BIT(4), "pwm"),
+       PIN_GRP_GPIO("pwm2", 13, 1, BIT(5), "pwm"),
+       PIN_GRP_GPIO("pwm3", 14, 1, BIT(6), "pwm"),
+       PIN_GRP_GPIO("pmic1", 17, 1, BIT(7), "pmic"),
+       PIN_GRP_GPIO("pmic0", 16, 1, BIT(8), "pmic"),
+       PIN_GRP_GPIO("i2c2", 2, 2, BIT(9), "i2c"),
+       PIN_GRP_GPIO("i2c1", 0, 2, BIT(10), "i2c"),
+       PIN_GRP_GPIO("spi_cs1", 17, 1, BIT(12), "spi"),
+       PIN_GRP_GPIO_2("spi_cs2", 18, 1, BIT(13) | BIT(19), 0, BIT(13), "spi"),
+       PIN_GRP_GPIO_2("spi_cs3", 19, 1, BIT(14) | BIT(19), 0, BIT(14), "spi"),
+       PIN_GRP_GPIO("onewire", 4, 1, BIT(16), "onewire"),
+       PIN_GRP_GPIO("uart1", 25, 2, BIT(17), "uart"),
+       PIN_GRP_GPIO("spi_quad", 15, 2, BIT(18), "spi"),
+       PIN_GRP_EXTRA("uart2", 9, 2, BIT(13) | BIT(14) | BIT(19),
+                     BIT(13) | BIT(14), BIT(19), 18, 2, "gpio", "uart"),
+       PIN_GRP_GPIO("led0_od", 11, 1, BIT(20), "led"),
+       PIN_GRP_GPIO("led1_od", 12, 1, BIT(21), "led"),
+       PIN_GRP_GPIO("led2_od", 13, 1, BIT(22), "led"),
+       PIN_GRP_GPIO("led3_od", 14, 1, BIT(23), "led"),
+
+};
+
+static struct armada_37xx_pin_group armada_37xx_sb_groups[] = {
+       PIN_GRP_GPIO("usb32_drvvbus0", 0, 1, BIT(0), "drvbus"),
+       PIN_GRP_GPIO("usb2_drvvbus1", 1, 1, BIT(1), "drvbus"),
+       PIN_GRP_GPIO("sdio_sb", 24, 5, BIT(2), "sdio"),
+       PIN_GRP_EXTRA("rgmii", 6, 14, BIT(3), 0, BIT(3), 23, 1, "mii", "gpio"),
+       PIN_GRP_GPIO("pcie1", 3, 2, BIT(4), "pcie"),
+       PIN_GRP_GPIO("ptp", 20, 3, BIT(5), "ptp"),
+       PIN_GRP("ptp_clk", 21, 1, BIT(6), "ptp", "mii"),
+       PIN_GRP("ptp_trig", 22, 1, BIT(7), "ptp", "mii"),
+       PIN_GRP("mii_col", 23, 1, BIT(8), "mii", "mii_err"),
+};
+
+const struct armada_37xx_pin_data armada_37xx_pin_nb = {
+       .nr_pins = 36,
+       .name = "GPIO1",
+       .groups = armada_37xx_nb_groups,
+       .ngroups = ARRAY_SIZE(armada_37xx_nb_groups),
+};
+
+const struct armada_37xx_pin_data armada_37xx_pin_sb = {
+       .nr_pins = 29,
+       .name = "GPIO2",
+       .groups = armada_37xx_sb_groups,
+       .ngroups = ARRAY_SIZE(armada_37xx_sb_groups),
+};
+
+static inline void armada_37xx_update_reg(unsigned int *reg,
+                                         unsigned int offset)
+{
+       /* We never have more than 2 registers */
+       if (offset >= GPIO_PER_REG) {
+               offset -= GPIO_PER_REG;
+               *reg += sizeof(u32);
+       }
+}
+
+static int armada_37xx_get_func_reg(struct armada_37xx_pin_group *grp,
+                                   const char *func)
+{
+       int f;
+
+       for (f = 0; f < NB_FUNCS; f++)
+               if (!strcmp(grp->funcs[f], func))
+                       return f;
+
+       return -ENOTSUPP;
+}
+
+static int armada_37xx_pmx_get_groups_count(struct udevice *dev)
+{
+       struct armada_37xx_pinctrl *info = dev_get_priv(dev);
+
+       return info->ngroups;
+}
+
+static const char *armada_37xx_pmx_dummy_name = "_dummy";
+
+static const char *armada_37xx_pmx_get_group_name(struct udevice *dev,
+                                                 unsigned selector)
+{
+       struct armada_37xx_pinctrl *info = dev_get_priv(dev);
+
+       if (!info->groups[selector].name)
+               return armada_37xx_pmx_dummy_name;
+
+       return info->groups[selector].name;
+}
+
+static int armada_37xx_pmx_get_funcs_count(struct udevice *dev)
+{
+       struct armada_37xx_pinctrl *info = dev_get_priv(dev);
+
+       return info->nfuncs;
+}
+
+static const char *armada_37xx_pmx_get_func_name(struct udevice *dev,
+                                                unsigned selector)
+{
+       struct armada_37xx_pinctrl *info = dev_get_priv(dev);
+
+       return info->funcs[selector].name;
+}
+
+static int armada_37xx_pmx_set_by_name(struct udevice *dev,
+                                      const char *name,
+                                      struct armada_37xx_pin_group *grp)
+{
+       struct armada_37xx_pinctrl *info = dev_get_priv(dev);
+       unsigned int reg = SELECTION;
+       unsigned int mask = grp->reg_mask;
+       int func, val;
+
+       dev_dbg(info->dev, "enable function %s group %s\n",
+               name, grp->name);
+
+       func = armada_37xx_get_func_reg(grp, name);
+
+       if (func < 0)
+               return func;
+
+       val = grp->val[func];
+
+       clrsetbits_le32(info->base + reg, mask, val);
+
+       return 0;
+}
+
+static int armada_37xx_pmx_group_set(struct udevice *dev,
+                                    unsigned group_selector,
+                                    unsigned func_selector)
+{
+       struct armada_37xx_pinctrl *info = dev_get_priv(dev);
+       struct armada_37xx_pin_group *grp = &info->groups[group_selector];
+       const char *name = info->funcs[func_selector].name;
+
+       return armada_37xx_pmx_set_by_name(dev, name, grp);
+}
+
+/**
+ * armada_37xx_add_function() - Add a new function to the list
+ * @funcs: array of function to add the new one
+ * @funcsize: size of the remaining space for the function
+ * @name: name of the function to add
+ *
+ * If it is a new function then create it by adding its name else
+ * increment the number of group associated to this function.
+ */
+static int armada_37xx_add_function(struct armada_37xx_pmx_func *funcs,
+                                   int *funcsize, const char *name)
+{
+       int i = 0;
+
+       if (*funcsize <= 0)
+               return -EOVERFLOW;
+
+       while (funcs->ngroups) {
+               /* function already there */
+               if (strcmp(funcs->name, name) == 0) {
+                       funcs->ngroups++;
+
+                       return -EEXIST;
+               }
+               funcs++;
+               i++;
+       }
+
+       /* append new unique function */
+       funcs->name = name;
+       funcs->ngroups = 1;
+       (*funcsize)--;
+
+       return 0;
+}
+
+/**
+ * armada_37xx_fill_group() - complete the group array
+ * @info: info driver instance
+ *
+ * Based on the data available from the armada_37xx_pin_group array
+ * completes the last member of the struct for each function: the list
+ * of the groups associated to this function.
+ *
+ */
+static int armada_37xx_fill_group(struct armada_37xx_pinctrl *info)
+{
+       int n, num = 0, funcsize = info->data->nr_pins;
+
+       for (n = 0; n < info->ngroups; n++) {
+               struct armada_37xx_pin_group *grp = &info->groups[n];
+               int i, j, f;
+
+               grp->pins = devm_kzalloc(info->dev,
+                                        (grp->npins + grp->extra_npins) *
+                                        sizeof(*grp->pins), GFP_KERNEL);
+               if (!grp->pins)
+                       return -ENOMEM;
+
+               for (i = 0; i < grp->npins; i++)
+                       grp->pins[i] = grp->start_pin + i;
+
+               for (j = 0; j < grp->extra_npins; j++)
+                       grp->pins[i+j] = grp->extra_pin + j;
+
+               for (f = 0; f < NB_FUNCS; f++) {
+                       int ret;
+                       /* check for unique functions and count groups */
+                       ret = armada_37xx_add_function(info->funcs, &funcsize,
+                                           grp->funcs[f]);
+                       if (ret == -EOVERFLOW)
+                               dev_err(info->dev,
+                                       "More functions than pins(%d)\n",
+                                       info->data->nr_pins);
+                       if (ret < 0)
+                               continue;
+                       num++;
+               }
+       }
+
+       info->nfuncs = num;
+
+       return 0;
+}
+
+/**
+ * armada_37xx_fill_funcs() - complete the funcs array
+ * @info: info driver instance
+ *
+ * Based on the data available from the armada_37xx_pin_group array
+ * completes the last two member of the struct for each group:
+ * - the list of the pins included in the group
+ * - the list of pinmux functions that can be selected for this group
+ *
+ */
+static int armada_37xx_fill_func(struct armada_37xx_pinctrl *info)
+{
+       struct armada_37xx_pmx_func *funcs = info->funcs;
+       int n;
+
+       for (n = 0; n < info->nfuncs; n++) {
+               const char *name = funcs[n].name;
+               const char **groups;
+               int g;
+
+               funcs[n].groups = devm_kzalloc(info->dev, funcs[n].ngroups *
+                                              sizeof(*(funcs[n].groups)),
+                                              GFP_KERNEL);
+               if (!funcs[n].groups)
+                       return -ENOMEM;
+
+               groups = funcs[n].groups;
+
+               for (g = 0; g < info->ngroups; g++) {
+                       struct armada_37xx_pin_group *gp = &info->groups[g];
+                       int f;
+
+                       for (f = 0; f < NB_FUNCS; f++) {
+                               if (strcmp(gp->funcs[f], name) == 0) {
+                                       *groups = gp->name;
+                                       groups++;
+                               }
+                       }
+               }
+       }
+       return 0;
+}
+
+static int armada_37xx_gpio_get(struct udevice *dev, unsigned int offset)
+{
+       struct armada_37xx_pinctrl *info = dev_get_priv(dev->parent);
+       unsigned int reg = INPUT_VAL;
+       unsigned int val, mask;
+
+       armada_37xx_update_reg(&reg, offset);
+       mask = BIT(offset);
+
+       val = readl(info->base + reg);
+
+       return (val & mask) != 0;
+}
+
+static int armada_37xx_gpio_set(struct udevice *dev, unsigned int offset,
+                               int value)
+{
+       struct armada_37xx_pinctrl *info = dev_get_priv(dev->parent);
+       unsigned int reg = OUTPUT_VAL;
+       unsigned int mask, val;
+
+       armada_37xx_update_reg(&reg, offset);
+       mask = BIT(offset);
+       val = value ? mask : 0;
+
+       clrsetbits_le32(info->base + reg, mask, val);
+
+       return 0;
+}
+
+static int armada_37xx_gpio_get_direction(struct udevice *dev,
+                                         unsigned int offset)
+{
+       struct armada_37xx_pinctrl *info = dev_get_priv(dev->parent);
+       unsigned int reg = OUTPUT_EN;
+       unsigned int val, mask;
+
+       armada_37xx_update_reg(&reg, offset);
+       mask = BIT(offset);
+       val = readl(info->base + reg);
+
+       if (val & mask)
+               return GPIOF_OUTPUT;
+       else
+               return GPIOF_INPUT;
+}
+
+static int armada_37xx_gpio_direction_input(struct udevice *dev,
+                                           unsigned int offset)
+{
+       struct armada_37xx_pinctrl *info = dev_get_priv(dev->parent);
+       unsigned int reg = OUTPUT_EN;
+       unsigned int mask;
+
+       armada_37xx_update_reg(&reg, offset);
+       mask = BIT(offset);
+
+       clrbits_le32(info->base + reg, mask);
+
+       return 0;
+}
+
+static int armada_37xx_gpio_direction_output(struct udevice *dev,
+                                            unsigned int offset, int value)
+{
+       struct armada_37xx_pinctrl *info = dev_get_priv(dev->parent);
+       unsigned int reg = OUTPUT_EN;
+       unsigned int mask;
+
+       armada_37xx_update_reg(&reg, offset);
+       mask = BIT(offset);
+
+       setbits_le32(info->base + reg, mask);
+
+       /* And set the requested value */
+       return armada_37xx_gpio_set(dev, offset, value);
+}
+
+static int armada_37xx_gpio_probe(struct udevice *dev)
+{
+       struct armada_37xx_pinctrl *info = dev_get_priv(dev->parent);
+       struct gpio_dev_priv *uc_priv;
+
+       uc_priv = dev_get_uclass_priv(dev);
+       uc_priv->bank_name = info->data->name;
+       uc_priv->gpio_count = info->data->nr_pins;
+
+       return 0;
+}
+
+static const struct dm_gpio_ops armada_37xx_gpio_ops = {
+       .set_value = armada_37xx_gpio_set,
+       .get_value = armada_37xx_gpio_get,
+       .get_function = armada_37xx_gpio_get_direction,
+       .direction_input = armada_37xx_gpio_direction_input,
+       .direction_output = armada_37xx_gpio_direction_output,
+};
+
+static struct driver armada_37xx_gpio_driver = {
+       .name   = "armada-37xx-gpio",
+       .id     = UCLASS_GPIO,
+       .probe  = armada_37xx_gpio_probe,
+       .ops    = &armada_37xx_gpio_ops,
+};
+
+static int armada_37xx_gpiochip_register(struct udevice *parent,
+                                        struct armada_37xx_pinctrl *info)
+{
+       const void *blob = gd->fdt_blob;
+       int node = dev_of_offset(parent);
+       struct uclass_driver *drv;
+       struct udevice *dev;
+       int ret = -ENODEV;
+       int subnode;
+       char *name;
+
+       /* Lookup GPIO driver */
+       drv = lists_uclass_lookup(UCLASS_GPIO);
+       if (!drv) {
+               puts("Cannot find GPIO driver\n");
+               return -ENOENT;
+       }
+
+       fdt_for_each_subnode(subnode, blob, node) {
+               if (!fdtdec_get_bool(blob, subnode, "gpio-controller")) {
+                       ret = 0;
+                       break;
+               }
+       };
+       if (ret)
+               return ret;
+
+       name = calloc(1, 32);
+       sprintf(name, "armada-37xx-gpio");
+
+       /* Create child device UCLASS_GPIO and bind it */
+       device_bind(parent, &armada_37xx_gpio_driver, name, NULL, subnode,
+                   &dev);
+       dev_set_of_offset(dev, subnode);
+
+       return 0;
+}
+
+const struct pinctrl_ops armada_37xx_pinctrl_ops  = {
+       .get_groups_count = armada_37xx_pmx_get_groups_count,
+       .get_group_name = armada_37xx_pmx_get_group_name,
+       .get_functions_count = armada_37xx_pmx_get_funcs_count,
+       .get_function_name = armada_37xx_pmx_get_func_name,
+       .pinmux_group_set = armada_37xx_pmx_group_set,
+       .set_state = pinctrl_generic_set_state,
+};
+
+int armada_37xx_pinctrl_probe(struct udevice *dev)
+{
+       struct armada_37xx_pinctrl *info = dev_get_priv(dev);
+       const struct armada_37xx_pin_data *pin_data;
+       int ret;
+
+       info->data = (struct armada_37xx_pin_data *)dev_get_driver_data(dev);
+       pin_data = info->data;
+
+       info->base = (void __iomem *)dev_get_addr(dev);
+       if (!info->base) {
+               error("unable to find regmap\n");
+               return -ENODEV;
+       }
+
+       info->groups = pin_data->groups;
+       info->ngroups = pin_data->ngroups;
+
+       /*
+        * we allocate functions for number of pins and hope there are
+        * fewer unique functions than pins available
+        */
+       info->funcs = devm_kzalloc(info->dev, pin_data->nr_pins *
+                          sizeof(struct armada_37xx_pmx_func), GFP_KERNEL);
+       if (!info->funcs)
+               return -ENOMEM;
+
+
+       ret = armada_37xx_fill_group(info);
+       if (ret)
+               return ret;
+
+       ret = armada_37xx_fill_func(info);
+       if (ret)
+               return ret;
+
+       ret = armada_37xx_gpiochip_register(dev, info);
+       if (ret)
+               return ret;
+
+       return 0;
+}
+
+static const struct udevice_id armada_37xx_pinctrl_of_match[] = {
+       {
+               .compatible = "marvell,armada3710-sb-pinctrl",
+               .data = (ulong)&armada_37xx_pin_sb,
+       },
+       {
+               .compatible = "marvell,armada3710-nb-pinctrl",
+               .data = (ulong)&armada_37xx_pin_nb,
+       },
+       { /* sentinel */ }
+};
+
+U_BOOT_DRIVER(armada_37xx_pinctrl) = {
+       .name = "armada-37xx-pinctrl",
+       .id = UCLASS_PINCTRL,
+       .of_match = of_match_ptr(armada_37xx_pinctrl_of_match),
+       .probe = armada_37xx_pinctrl_probe,
+       .priv_auto_alloc_size = sizeof(struct armada_37xx_pinctrl),
+       .ops = &armada_37xx_pinctrl_ops,
+};
index 9220d04e7984db3a0c99b1d176c1212f4bfc0dbb..83a09153b4cdb6275912e354302135cc033982f6 100644 (file)
 
 #define CONFIG_SUPPORT_RAW_INITRD
 
-#define CONFIG_CRC32_VERIFY
-
 #endif /* __CONFIG_H */
index 77d6e6aa3906088af754298d15c2b59d40407568..9a36a4c5d75027ede84b38dc86be79fe15fbdeac 100644 (file)
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_LONGHELP
 
-#define CONFIG_CRC32_VERIFY
 #define CONFIG_MX_CYCLIC
 
 /* Initial upstream - boot to cmd prompt only */
index 03f4ca0338c953bc7aa0926dcd3479f6db27aaad..bb61e5b8c8c6a40683452451824019df151ec369 100644 (file)
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_LONGHELP
 
-#define CONFIG_CRC32_VERIFY
 #define CONFIG_MX_CYCLIC
 
 /* Initial upstream - boot to cmd prompt only */
index 957cd9e0ba89aefe01ec58fa89e99a3a5d628508..fa7eff54289660e985a9bca0feb0a8903d7e6ddf 100644 (file)
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_LONGHELP
 
-#define CONFIG_CRC32_VERIFY
 #define CONFIG_MX_CYCLIC
 
 /* Commands */
 #define CONFIG_FAT_WRITE
 
-/* SHA hashing */
-#define CONFIG_HASH_VERIFY
-
 /* Enable Time Command */
 
 /* Misc utility code */
 #define CONFIG_BOUNCE_BUFFER
-#define CONFIG_CRC32_VERIFY
 
 #endif /* __BCM_EP_BOARD_H */
index f5d108e3595b86b58a133f1c457ff86765d5dcf2..29d3bdacacbb75ceca848002135e46e6b6c17f23 100644 (file)
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_LONGHELP
-#define CONFIG_CRC32_VERIFY
 #define CONFIG_MX_CYCLIC
 
 /*
index 3397aaf2eb77bf4acd30f51c357603ca6e93f7fb..77c2493e66523863953bf0442cb1b504bcbac8bb 100644 (file)
@@ -79,7 +79,7 @@
 #define CONFIG_SYS_ALT_MEMTEST
 
 /* Keep device tree and initrd in lower memory so the kernel can access them */
-#define CONFIG_EXTRA_ENV_SETTINGS      \
+#define RELOCATION_LIMITS_ENV_SETTINGS \
        "fdt_high=0x10000000\0"         \
        "initrd_high=0x10000000\0"
 
  */
 #include "mv-common.h"
 
+/* Include the common distro boot environment */
+#ifndef CONFIG_SPL_BUILD
+#include <config_distro_defaults.h>
+
+#ifdef CONFIG_MMC
+#define BOOT_TARGET_DEVICES_MMC(func) func(MMC, mmc, 0)
+#else
+#define BOOT_TARGET_DEVICES_MMC(func)
+#endif
+
+#ifdef CONFIG_USB_STORAGE
+#define BOOT_TARGET_DEVICES_USB(func) func(USB, usb, 0)
+#else
+#define BOOT_TARGET_DEVICES_USB(func)
+#endif
+
+#define BOOT_TARGET_DEVICES(func) \
+       BOOT_TARGET_DEVICES_MMC(func) \
+       BOOT_TARGET_DEVICES_USB(func) \
+       func(PXE, pxe, na) \
+       func(DHCP, dhcp, na)
+
+#define KERNEL_ADDR_R  __stringify(0x800000)
+#define FDT_ADDR_R     __stringify(0x100000)
+#define RAMDISK_ADDR_R __stringify(0x1800000)
+#define SCRIPT_ADDR_R  __stringify(0x200000)
+#define PXEFILE_ADDR_R __stringify(0x300000)
+
+#define LOAD_ADDRESS_ENV_SETTINGS \
+       "kernel_addr_r=" KERNEL_ADDR_R "\0" \
+       "fdt_addr_r=" FDT_ADDR_R "\0" \
+       "ramdisk_addr_r=" RAMDISK_ADDR_R "\0" \
+       "scriptaddr=" SCRIPT_ADDR_R "\0" \
+       "pxefile_addr_r=" PXEFILE_ADDR_R "\0"
+
+#include <config_distro_bootcmd.h>
+
+#define CONFIG_EXTRA_ENV_SETTINGS \
+       RELOCATION_LIMITS_ENV_SETTINGS \
+       LOAD_ADDRESS_ENV_SETTINGS \
+       "fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
+       "console=ttyS0,115200\0" \
+       BOOTENV
+
+#endif /* CONFIG_SPL_BUILD */
+
 #endif /* _CONFIG_CLEARFOG_H */
index 0882ef8f89755662627be98237de898ae3b3e727..8f4022a1348ba5c1ebd1961675f152568dc232e9 100644 (file)
 
 #define CONFIG_SUPPORT_RAW_INITRD
 
-#define CONFIG_CRC32_VERIFY
-
 #endif /* __CONFIG_H */
index e0bbf94f0e1661f583bf3bac78716ecbb23627f3..f46f46619678635ee959f2fabd630327f5dd472c 100644 (file)
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_LONGHELP
-#define CONFIG_CRC32_VERIFY
 #define CONFIG_MX_CYCLIC
 
 /*
index 53ee1adc0b43509e3db9d6782609745513f7ac4e..fc0f5e60177a59d63a4d00b9ab7eb858072c7fec 100644 (file)
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_LONGHELP
-#define CONFIG_CRC32_VERIFY
 #define CONFIG_MX_CYCLIC
 
 /*
index 6915dc1a48104948872fad904087383a22a155ed..378219d83a3b8ee21db0a2ede30fdf2a6baddc90 100644 (file)
 #define CONFIG_ENV_SROM_BANK           1
 #endif /*CONFIG_CMD_NET*/
 
-/* SHA hashing */
-#define CONFIG_HASH_VERIFY
-
 /* Enable Time Command */
 
 /* USB */
index 741bdfa80750e66d014005e17ab7f3afc9e3f899..13fc48fa3a6a4197e1ef8fe46a4ba43fa46b4392 100644 (file)
 
 /* FIT */
 #ifdef CONFIG_FIT
-# define CONFIG_HASH_VERIFY
 # define CONFIG_IMAGE_FORMAT_LEGACY
 #endif
 
index f52865b5a07dedb1e563a63439c99903e2c147e4..a588823da0e7e67f4d641b7a8794eedd44c367a5 100644 (file)
 
 /* FIT */
 #ifdef CONFIG_FIT
-# define CONFIG_HASH_VERIFY
 # define CONFIG_IMAGE_FORMAT_LEGACY
 #endif
 
index 2e12b977676ffb75a69362403d03e978dd8a0b63..1d48726086531c85d30f533a7139ce1366a4d259 100644 (file)
 
 /* FIT */
 #ifdef CONFIG_FIT
-# define CONFIG_HASH_VERIFY
 # define CONFIG_IMAGE_FORMAT_LEGACY
 #endif
 
index 76ae159da3c97e6c3b4df1289701b942c09cddc8..a0eb6e25feab75cb75019d3b24c0e1b24da855bd 100644 (file)
 
 /* FIT */
 #ifdef CONFIG_FIT
-# define CONFIG_HASH_VERIFY
 # define CONFIG_IMAGE_FORMAT_LEGACY
 #endif
 
index a3c0cfa60a3468bbecdcfc05ff476994a7437bb7..127e7e73962246831f68d26d2ac8984c9b977dba 100644 (file)
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_LONGHELP
-#define CONFIG_CRC32_VERIFY
 #define CONFIG_MX_CYCLIC
 
 /*
index c5e7d629ab0eb0046f87bf7b81c408f7b2729f90..f230f40d76e9fe51db088d1eb72d1d2147d14754 100644 (file)
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_LONGHELP
-#define CONFIG_CRC32_VERIFY
 #define CONFIG_MX_CYCLIC
 
 /*
index 9db4eeb54edfba79c543d04111366c390fa21cfd..8904cd5cc772aa8bd5c0ae7fd1116fe2107bd49e 100644 (file)
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_LONGHELP
-#define CONFIG_CRC32_VERIFY
 #define CONFIG_MX_CYCLIC
 
 /*
index c62b45e51cf1c10ee5c8c60b778e8b6d6fd82aad..fbbd6cd99b8e7405abfd1902d9fb809e1d47f6d8 100644 (file)
@@ -98,8 +98,6 @@
 #define CONFIG_BOOTP_SERVERIP
 #define CONFIG_IP_DEFRAG
 
-#define CONFIG_HASH_VERIFY
-
 #define CONFIG_CMD_SANDBOX
 
 #define CONFIG_BOOTARGS ""
index bdc65129591e91584f20b2c169d83baa3267e79f..fd18ae5f5d229766f3e35c8adc14bcb75201c4da 100644 (file)
@@ -15,8 +15,6 @@
 #define CONFIG_DISPLAY_BOARDINFO_LATE
 #define CONFIG_CLOCKS
 
-#define CONFIG_CRC32_VERIFY
-
 #define CONFIG_SYS_BOOTMAPSZ           (64 * 1024 * 1024)
 
 #define CONFIG_TIMESTAMP               /* Print image info with timestamp */
index 6982eaa1af42be6ea5cf5ca600e2a65116a2c6fc..7ca5c0b9dac22589dc2228530b68f3a6f29dfef8 100644 (file)
@@ -96,7 +96,6 @@
 
 /* Misc utility code */
 #define CONFIG_BOUNCE_BUFFER
-#define CONFIG_CRC32_VERIFY
 
 #ifndef CONFIG_SPL_BUILD
 #include <config_distro_defaults.h>
index 3161c50abb1442a7f5f0e5248e73c2b113964ecf..06b9bba80c41822152d9cd9adae2fc7f46219ad0 100644 (file)
 
 /* U-Boot general configuration */
 #define CONFIG_MISC_INIT_R
-#define CONFIG_CRC32_VERIFY
 #define CONFIG_MX_CYCLIC
 #define CONFIG_TIMESTAMP
 
index 7b15f311fe4de825d229970e7e22b0e41cecd2e9..7d7d9bb98313412c9cb4f2b8ebf8c47723f466c9 100644 (file)
 #define CONFIG_AUTO_COMPLETE                   /* Support tab autocompletion */
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_LONGHELP
-#define CONFIG_CRC32_VERIFY
 #define CONFIG_MX_CYCLIC
 #define CONFIG_SHOW_BOOT_PROGRESS
 
index d81433772fc83e444a91111bf2ec9dd313dddaf6..4f9a8cf1db7dcd21afece64a0c5642d59c33e453 100644 (file)
@@ -17,10 +17,6 @@ enum {
        HASH_FLAG_ENV           = 1 << 1,       /* Allow env vars */
 };
 
-#if defined(CONFIG_SHA1SUM_VERIFY) || defined(CONFIG_CRC32_VERIFY)
-#define CONFIG_HASH_VERIFY
-#endif
-
 struct hash_algo {
        const char *name;                       /* Name of algorithm */
        int digest_size;                        /* Length of digest */
index e8f49ebe5df74941c3ae6e9b4855a1e435210ee2..ee95359d7926733c37054a2bd2ef712c0e2db0cc 100644 (file)
@@ -507,7 +507,6 @@ CONFIG_CP_CLK_FREQ
 CONFIG_CQSPI_DECODER
 CONFIG_CQSPI_REF_CLK
 CONFIG_CRC32
-CONFIG_CRC32_VERIFY
 CONFIG_CS8900
 CONFIG_CS8900_BASE
 CONFIG_CS8900_BUS16
@@ -1074,7 +1073,6 @@ CONFIG_H264_FREQ
 CONFIG_H8300
 CONFIG_HALEAKALA
 CONFIG_HARD_SPI
-CONFIG_HASH_VERIFY
 CONFIG_HAS_DATAFLASH
 CONFIG_HAS_ETH0
 CONFIG_HAS_ETH1
@@ -2416,7 +2414,6 @@ CONFIG_SH7780_PCI_BAR
 CONFIG_SH7780_PCI_LAR
 CONFIG_SH7780_PCI_LSR
 CONFIG_SH7785LCR
-CONFIG_SHA1SUM_VERIFY
 CONFIG_SHARP_16x9
 CONFIG_SHARP_LM8V31
 CONFIG_SHARP_LQ035Q7DH06
index 8c0e730e7bbb6f04934417764bfb448676baf08d..edef560faf3643c2700b273969328fb6b6ba86d9 100644 (file)
@@ -1476,47 +1476,6 @@ static int image_get_version(void)
        return e->version;
 }
 
-static int image_version_file(const char *input)
-{
-       FILE *fcfg;
-       int version;
-       int ret;
-
-       fcfg = fopen(input, "r");
-       if (!fcfg) {
-               fprintf(stderr, "Could not open input file %s\n", input);
-               return -1;
-       }
-
-       image_cfg = malloc(IMAGE_CFG_ELEMENT_MAX *
-                          sizeof(struct image_cfg_element));
-       if (!image_cfg) {
-               fprintf(stderr, "Cannot allocate memory\n");
-               fclose(fcfg);
-               return -1;
-       }
-
-       memset(image_cfg, 0,
-              IMAGE_CFG_ELEMENT_MAX * sizeof(struct image_cfg_element));
-       rewind(fcfg);
-
-       ret = image_create_config_parse(fcfg);
-       fclose(fcfg);
-       if (ret) {
-               free(image_cfg);
-               return -1;
-       }
-
-       version = image_get_version();
-       /* Fallback to version 0 is no version is provided in the cfg file */
-       if (version == -1)
-               version = 0;
-
-       free(image_cfg);
-
-       return version;
-}
-
 static void kwbimage_set_header(void *ptr, struct stat *sbuf, int ifd,
                                struct image_tool_params *params)
 {
@@ -1657,18 +1616,62 @@ static int kwbimage_verify_header(unsigned char *ptr, int image_size,
 static int kwbimage_generate(struct image_tool_params *params,
                             struct image_type_params *tparams)
 {
+       FILE *fcfg;
        int alloc_len;
+       int version;
        void *hdr;
-       int version = 0;
+       int ret;
 
-       version = image_version_file(params->imagename);
-       if (version == 0) {
+       fcfg = fopen(params->imagename, "r");
+       if (!fcfg) {
+               fprintf(stderr, "Could not open input file %s\n",
+                       params->imagename);
+               exit(EXIT_FAILURE);
+       }
+
+       image_cfg = malloc(IMAGE_CFG_ELEMENT_MAX *
+                          sizeof(struct image_cfg_element));
+       if (!image_cfg) {
+               fprintf(stderr, "Cannot allocate memory\n");
+               fclose(fcfg);
+               exit(EXIT_FAILURE);
+       }
+
+       memset(image_cfg, 0,
+              IMAGE_CFG_ELEMENT_MAX * sizeof(struct image_cfg_element));
+       rewind(fcfg);
+
+       ret = image_create_config_parse(fcfg);
+       fclose(fcfg);
+       if (ret) {
+               free(image_cfg);
+               exit(EXIT_FAILURE);
+       }
+
+       version = image_get_version();
+       switch (version) {
+               /*
+                * Fallback to version 0 if no version is provided in the
+                * cfg file
+                */
+       case -1:
+       case 0:
                alloc_len = sizeof(struct main_hdr_v0) +
                        sizeof(struct ext_hdr_v0);
-       } else {
+               break;
+
+       case 1:
                alloc_len = image_headersz_v1(NULL);
+               break;
+
+       default:
+               fprintf(stderr, "Unsupported version %d\n", version);
+               free(image_cfg);
+               exit(EXIT_FAILURE);
        }
 
+       free(image_cfg);
+
        hdr = malloc(alloc_len);
        if (!hdr) {
                fprintf(stderr, "%s: malloc return failure: %s\n",