November 2018 - U-Boot

[U-Boot] [PATCH] spl: implement CRC check on U-Boot uImage
by Simon Goldschmidt 28 Nov '18

28 Nov '18

SPL currently does not check uImage CRCs when loading U-Boot. This patch adds checking the uImage CRC when SPL loads U-Boot. It does this by reusing the existing config option SPL_CRC32_SUPPORT to allow leaving out the CRC check on boards where the additional code size or boot time is a problem (adding the CRC check currently adds ~1.4 kByte to flash). The SPL_CRC32_SUPPORT config option now gets enabled by default if SPL support for legacy images is enabled to check the CRC on all boards that don't actively take countermeasures. Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt(a)gmail.com> --- common/spl/Kconfig | 12 ++++++------ common/spl/spl.c | 30 +++++++++++++++++++++++++++++- include/spl.h | 5 +++++ 3 files changed, 40 insertions(+), 7 deletions(-) diff --git a/common/spl/Kconfig b/common/spl/Kconfig index d0564621d4..29f365de16 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -207,13 +207,13 @@ config SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION_TYPE config SPL_CRC32_SUPPORT bool "Support CRC32" - depends on SPL_FIT + default y if SPL_LEGACY_IMAGE_SUPPORT help - Enable this to support CRC32 in FIT images within SPL. This is a - 32-bit checksum value that can be used to verify images. This is - the least secure type of checksum, suitable for detected - accidental image corruption. For secure applications you should - consider SHA1 or SHA256. + Enable this to support CRC32 in uImages or FIT images within SPL. + This is a 32-bit checksum value that can be used to verify images. + For FIT images, this is the least secure type of checksum, suitable + for detected accidental image corruption. For secure applications you + should consider SHA1 or SHA256. config SPL_MD5_SUPPORT bool "Support MD5" diff --git a/common/spl/spl.c b/common/spl/spl.c index 12f9359c0a..2e88c09fc0 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -236,6 +236,14 @@ int spl_parse_image_header(struct spl_image_info *spl_image, #ifdef CONFIG_SPL_LEGACY_IMAGE_SUPPORT u32 header_size = sizeof(struct image_header); + if (CONFIG_IS_ENABLED(CRC32_SUPPORT)) { + /* check uImage header CRC */ + if (!image_check_hcrc(header)) { + puts("SPL: Image header CRC check failed!\n"); + return -EINVAL; + } + } + if (spl_image->flags & SPL_COPY_PAYLOAD_ONLY) { /* * On some system (e.g. powerpc), the load-address and @@ -253,6 +261,13 @@ int spl_parse_image_header(struct spl_image_info *spl_image, spl_image->size = image_get_data_size(header) + header_size; } +#if CONFIG_IS_ENABLED(CRC32_SUPPORT) + /* store uImage data length and CRC to check later */ + spl_image->dcrc_data = image_get_load(header); + spl_image->dcrc_length = image_get_data_size(header); + spl_image->dcrc = image_get_dcrc(header); +#endif + spl_image->os = image_get_os(header); spl_image->name = image_get_name(header); debug("spl: payload image: %32s load addr: 0x%lx size: %d\n", @@ -424,12 +439,25 @@ static struct spl_image_loader *spl_ll_find_loader(uint boot_device) static int spl_load_image(struct spl_image_info *spl_image, struct spl_image_loader *loader) { + int ret; struct spl_boot_device bootdev; bootdev.boot_device = loader->boot_device; bootdev.boot_device_name = NULL; - return loader->load_image(spl_image, &bootdev); + ret = loader->load_image(spl_image, &bootdev); +#if CONFIG_IS_ENABLED(CRC32_SUPPORT) + if (!ret && spl_image->dcrc_length) { + /* check data crc */ + ulong dcrc = crc32_wd(0, (unsigned char *)spl_image->dcrc_data, + spl_image->dcrc_length, CHUNKSZ_CRC32); + if (dcrc != spl_image->dcrc) { + puts("SPL: Image data CRC check failed!\n"); + ret = -EINVAL; + } + } +#endif + return ret; } /** diff --git a/include/spl.h b/include/spl.h index 9a439f468b..7fccdce64b 100644 --- a/include/spl.h +++ b/include/spl.h @@ -33,6 +33,11 @@ struct spl_image_info { u32 size; u32 flags; void *arg; +#if CONFIG_IS_ENABLED(CRC32_SUPPORT) + ulong dcrc_data; + ulong dcrc_length; + ulong dcrc; +#endif }; /* -- 2.17.1

4 8

[U-Boot] [PULL] u-boot-usb/master
by Marek Vasut 28 Nov '18

28 Nov '18

The following changes since commit 6b21502229035779059493b2193fd790448fe85e: Merge branch '2018-11-25-master-imports' (2018-11-26 12:40:22 -0500) are available in the Git repository at: git://git.denx.de/u-boot-usb.git master for you to fetch changes up to 1af9bfd334a5c92cb3123be7c8da3ba0f522cf4a: usb: storage: s/CONFIG_BLK/CONFIG_IS_ENABLED(BLK)/ (2018-11-26 21:19:04 +0100) ---------------------------------------------------------------- Sven Schwermer (5): usb: Introduce CONFIG_SPL_DM_USB usb: am335x_evm: Disable CONFIG_SPL_DM_USB usb: Remove CMD_USB dependency for common code usb: s/CONFIG_DM_USB/CONFIG_IS_ENABLED(DM_USB)/ usb: storage: s/CONFIG_BLK/CONFIG_IS_ENABLED(BLK)/ common/Makefile | 2 +- common/usb.c | 14 +++++++------- common/usb_hub.c | 16 ++++++++-------- common/usb_kbd.c | 4 ++-- common/usb_storage.c | 34 +++++++++++++++++----------------- configs/am335x_evm_defconfig | 3 ++- drivers/usb/Kconfig | 5 +++++ drivers/usb/common/Makefile | 2 +- drivers/usb/dwc3/core.c | 2 +- drivers/usb/dwc3/core.h | 2 +- drivers/usb/eth/usb_ether.c | 2 +- drivers/usb/gadget/ci_udc.c | 2 +- drivers/usb/gadget/ether.c | 8 ++++---- drivers/usb/host/Makefile | 4 ++-- drivers/usb/host/dwc2.c | 12 ++++++------ drivers/usb/host/ehci-atmel.c | 2 +- drivers/usb/host/ehci-fsl.c | 12 ++++++------ drivers/usb/host/ehci-hcd.c | 12 ++++++------ drivers/usb/host/ehci-marvell.c | 4 ++-- drivers/usb/host/ehci-mx6.c | 2 +- drivers/usb/host/ehci-pci.c | 8 ++++---- drivers/usb/host/ehci-vf.c | 2 +- drivers/usb/host/ohci-hcd.c | 10 +++++----- drivers/usb/host/ohci.h | 4 ++-- drivers/usb/host/xhci-dwc3.c | 2 +- drivers/usb/host/xhci-fsl.c | 4 ++-- drivers/usb/host/xhci-mem.c | 6 +++--- drivers/usb/host/xhci.c | 12 ++++++------ drivers/usb/host/xhci.h | 2 +- drivers/usb/musb-new/musb_uboot.c | 12 ++++++------ drivers/usb/musb-new/omap2430.c | 4 ++-- drivers/usb/musb-new/ti-musb.c | 4 ++-- drivers/usb/musb-new/usb-compat.h | 2 +- include/usb.h | 12 ++++++------ 34 files changed, 117 insertions(+), 111 deletions(-)

2 5

[U-Boot] [PATCH v5 0/4] RISC-V S-mode support
by Anup Patel 28 Nov '18

28 Nov '18

This patchset allows us runing u-boot in S-mode which is useful on platforms where M-mode runtime firmware is an independent firmware and u-boot is used as last stage OS bootloader. The patchset based upon git://git.denx.de/u-boot-riscv.git and is tested on QEMU in both M-mode and S-mode. For S-mode testing, we have used u-boot.bin as payload of latest BBL (at commit 6ebd0f2a46255d0c76dad3c05b16c1d154795d26) applied with following changes: diff --git a/machine/emulation.c b/machine/emulation.c index 132e977..def75e1 100644 --- a/machine/emulation.c +++ b/machine/emulation.c @@ -162,6 +162,12 @@ static inline int emulate_read_csr(int num, uintptr_t mstatus, uintptr_t* result switch (num) { + case CSR_MISA: + *result = read_csr(misa); + return 0; + case CSR_MHARTID: + *result = read_csr(mhartid); + return 0; case CSR_CYCLE: if (!((counteren >> (CSR_CYCLE - CSR_CYCLE)) & 1)) return -1; Changes since v4: - Rebased series based on commit 52923c6db7f00e0197ec894c8c1bb8a7681974bb of git://git.denx.de/u-boot-riscv.git - Added a patch to remove redundant a2 store on DRAM base. This store was creating problem booting U-Boot in S-mode using BBL. Changes since v3: - Replaced 'u-boot' with 'U-Boot' in commit message - Dropped 'an' in RISCV_SMODE kconfig option help message - Added appropriate #ifdef in arch/riscv/lib/interrupts.c Changes since v2: - Dropped 'default n" from RISCV_SMODE kconfig option - Replaced '-smode_' in defconfig names with '_smode_' Changes since v1: - Rebased upon latest git://git.denx.de/u-boot-riscv.git - Add details in cover letter for running u-boot in S-mode using BBL Anup Patel (4): riscv: Add kconfig option to run U-Boot in S-mode riscv: qemu: Use different SYS_TEXT_BASE for S-mode riscv: Add S-mode defconfigs for QEMU virt machine riscv: Remove redundant a2 store on DRAM base in start.S arch/riscv/Kconfig | 5 ++++ arch/riscv/cpu/start.S | 35 +++++++++++++++++++++++-- arch/riscv/include/asm/encoding.h | 2 ++ arch/riscv/lib/interrupts.c | 36 +++++++++++++++++++------- board/emulation/qemu-riscv/Kconfig | 3 ++- board/emulation/qemu-riscv/MAINTAINERS | 2 ++ configs/qemu-riscv32_smode_defconfig | 10 +++++++ configs/qemu-riscv64_smode_defconfig | 11 ++++++++ 8 files changed, 92 insertions(+), 12 deletions(-) create mode 100644 configs/qemu-riscv32_smode_defconfig create mode 100644 configs/qemu-riscv64_smode_defconfig -- 2.17.1

3 7

[U-Boot] 4 byte addres on SPI flash
by Ramon Fried 28 Nov '18

28 Nov '18

Hi. I see that there's no support for 4 bytes SPI flash addressing. I'm up to the tasks to add this support. do you know if anyone is working on it? don't want to waste my time. Thanks, Ramon.

1 0

[U-Boot] [PATCH] mpc83xx: Add support for -msingle-pic-base
by Joakim Tjernlund 28 Nov '18

28 Nov '18

-msingle-pic-base is a new gcc(from 4.6) option for ppc and it reduces the size of my u-boot with about 4 KB. While at it, add -fno-jump-tables too to save a few more bytes. Signed-off-by: Joakim Tjernlund <joakim.tjernlund(a)infinera.com> --- I think all PowerPC's can use this but I have only tested 83xx so just enable for this cpu for now. arch/powerpc/cpu/mpc83xx/config.mk | 1 + arch/powerpc/cpu/mpc83xx/start.S | 3 +++ 2 files changed, 4 insertions(+) diff --git a/arch/powerpc/cpu/mpc83xx/config.mk b/arch/powerpc/cpu/mpc83xx/config.mk index 14870eec4d..a07df4d389 100644 --- a/arch/powerpc/cpu/mpc83xx/config.mk +++ b/arch/powerpc/cpu/mpc83xx/config.mk @@ -3,3 +3,4 @@ # Copyright 2004 Freescale Semiconductor, Inc. PLATFORM_CPPFLAGS += -DCONFIG_E300 -msoft-float +PLATFORM_RELFLAGS += -msingle-pic-base -fno-jump-tables diff --git a/arch/powerpc/cpu/mpc83xx/start.S b/arch/powerpc/cpu/mpc83xx/start.S index a3bacf138c..c00bb31363 100644 --- a/arch/powerpc/cpu/mpc83xx/start.S +++ b/arch/powerpc/cpu/mpc83xx/start.S @@ -288,6 +288,9 @@ in_flash: /*------------------------------------------------------*/ GET_GOT /* initialize GOT access */ + /* Needed for -msingle-pic-base */ + bl _GLOBAL_OFFSET_TABLE_@local-4 + mflr r30 /* r3: IMMR */ lis r3, CONFIG_SYS_IMMR@h -- 2.18.1

1 0

Re: [U-Boot] [PATCH] imx: hab: extend hab_auth_img to calculate ivt_offset
by Parthiban Nallathambi 28 Nov '18

28 Nov '18

Hi Quentin Grembert, On 11/27/18 3:12 PM, Quentin Grembert wrote: > Hi, > > I don't know how to publish on U-Boot mailing list, so i'm writing directly > to you. > > I am using hab_auth_img to authentificate other files than Linux image, > like *.dtb or others. So you have dtb and other images signed without combining them into a single image like fitimage? You can still use the previous method of using hab_auth_img with ivt if you are providing the ivt at fixed offset. > > The patch you submitted may broke the compatibility with our use : > https://lists.denx.de/pipermail/u-boot/2018-November/348563.html > > Regards, > Quentin Grembert > -- Thanks, Parthiban N DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-22 Fax: (+49)-8142-66989-80 Email: pn(a)denx.de

3 3

Re: [U-Boot] [PATCH v2] tools: env: support skip leading zero of env
by Wolfgang Denk 28 Nov '18

28 Nov '18

Dear 庄秋彬, In message <CAHaqGhZq+qLNNUbS1UnPjQDYepf=aUqkdLUeZ0g+B0kYNNg96A(a)mail.gmail.com> you wrote: > > I try to use uboot envtools in allwinner's platform, then found that the > env in allwinner's SDK have some leading zero, that prevent envtools to > parse it. Finally I add these code to fix it. This is the wrong approach. Either you misunderstand the format (for example in case of a redundant environment where you have to take the flag byte into consideration), or there is a bug in the implementation of the Allwinner SDK if it creates such a an environment. In any case, it is not legal for the U-Boot environment to have any leading zeros. By definition, a sequence of two NUL-Bytes will mark the end of the environment. You should fix the cause of the problem, and not modify the code to work on random / incorrect data. Naked-by: Wolfgang Denk <wd(a)denx.de> Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd(a)denx.de Anyone can count the seeds in an apple. No one can count the apples in a seed.

1 0

[U-Boot] [PATCH 0/4] ARM: chiliboard: move towards driver model and device-tree boot
by Marcin Niestroj 27 Nov '18

27 Nov '18

Hi, Currently on master branch we are no longer able to boot Linux on chiliboard. This is due to issue described at [1]. This series makes the boot to Linux working once again. This patch moves board support code to use driver model where possible and device-tree bot. As part of that we import DTS files from Linux v4.19. [1] https://lists.denx.de/pipermail/u-boot/2018-November/348558.html Marcin Niestroj (4): ARM: dts: am335x-chili*: add chiliSOM and chiliboard DTS files ARM: dts: am335x-chiliboard: add /chosen/stdout-path ARM: chiliboard: move towards driver model and device-tree boot ARM: chiliboard: remove dead !CONFIG_DM_SERIAL code arch/arm/dts/Makefile | 3 +- arch/arm/dts/am335x-chiliboard-u-boot.dtsi | 11 ++ arch/arm/dts/am335x-chiliboard.dts | 200 +++++++++++++++++++++ arch/arm/dts/am335x-chilisom.dtsi | 178 ++++++++++++++++++ board/grinn/chiliboard/board.c | 61 ------- configs/chiliboard_defconfig | 12 +- 6 files changed, 401 insertions(+), 64 deletions(-) create mode 100644 arch/arm/dts/am335x-chiliboard-u-boot.dtsi create mode 100644 arch/arm/dts/am335x-chiliboard.dts create mode 100644 arch/arm/dts/am335x-chilisom.dtsi -- 2.19.1

2 12

[U-Boot] [PATCH] configs: Remove CONFIG_MARVELL
by Chris Packham 27 Nov '18

27 Nov '18

This option is defined by a few boards but doesn't guard any code. Remove it from the boards and config_whitelist.txt. Signed-off-by: Chris Packham <judge.packham(a)gmail.com> --- include/configs/edminiv2.h | 1 - include/configs/km/km_arm.h | 1 - include/configs/mv-common.h | 1 - scripts/config_whitelist.txt | 1 - 4 files changed, 4 deletions(-) diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h index 89aa11c0ed43..645fc3ffb81c 100644 --- a/include/configs/edminiv2.h +++ b/include/configs/edminiv2.h @@ -29,7 +29,6 @@ * High Level Configuration Options (easy to change) */ -#define CONFIG_MARVELL 1 #define CONFIG_FEROCEON 1 /* CPU Core subversion */ #define CONFIG_88F5182 1 /* SOC Name */ diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index e2585171afb9..0de83f6723c5 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -22,7 +22,6 @@ /* * High Level Configuration Options (easy to change) */ -#define CONFIG_MARVELL #define CONFIG_FEROCEON_88FR131 /* CPU Core subversion */ #define CONFIG_KW88F6281 /* SOC Name */ diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h index 5eeb5a162494..a80309316351 100644 --- a/include/configs/mv-common.h +++ b/include/configs/mv-common.h @@ -19,7 +19,6 @@ /* * High Level Configuration Options (easy to change) */ -#define CONFIG_MARVELL 1 /* * Custom CONFIG_SYS_TEXT_BASE can be done in <board>.h diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index abfb0ff89fa9..2d5cad986897 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1200,7 +1200,6 @@ CONFIG_MALLOC_F_ADDR CONFIG_MALTA CONFIG_MARCO_MEMSET CONFIG_MARUBUN_PCCARD -CONFIG_MARVELL CONFIG_MARVELL_GPIO CONFIG_MARVELL_MFP CONFIG_MASK_AER_AO -- 2.19.1

3 2

[U-Boot] [PATCH v2] ARM: vexpress_*_defconfig: Enable CMD_UBI support
by Otavio Salvador 27 Nov '18

27 Nov '18

This allow for convenient use of QEMU machine to test loading of UBI filesystem. There are a couple of changes made together of this which are required: 1) The malloc must be at least 512 KiB to allow the use of UBI filesystem. We are going to enable it in a next patch. 2) MTD_DEVICE must be enabled, otherwise we get missing symbols during the build Following configs were change: - vexpress_aemv8a_dram_defconfig - vexpress_aemv8a_juno_defconfig - vexpress_aemv8a_semi_defconfig - vexpress_ca15_tc2_defconfig - vexpress_ca5x2_defconfig - vexpress_ca9x4_defconfig Signed-off-by: Otavio Salvador <otavio(a)ossystems.com.br> --- Changes in v2: - Add env size to the malloc size (Liviu Dudau) configs/vexpress_aemv8a_dram_defconfig | 2 ++ configs/vexpress_aemv8a_juno_defconfig | 2 ++ configs/vexpress_aemv8a_semi_defconfig | 2 ++ configs/vexpress_ca15_tc2_defconfig | 2 ++ configs/vexpress_ca5x2_defconfig | 2 ++ configs/vexpress_ca9x4_defconfig | 2 ++ include/configs/vexpress_common.h | 2 +- 7 files changed, 13 insertions(+), 1 deletion(-) diff --git a/configs/vexpress_aemv8a_dram_defconfig b/configs/vexpress_aemv8a_dram_defconfig index 9848f96293..0f0f138303 100644 --- a/configs/vexpress_aemv8a_dram_defconfig +++ b/configs/vexpress_aemv8a_dram_defconfig @@ -23,12 +23,14 @@ CONFIG_CMD_ARMFLASH=y # CONFIG_CMD_NFS is not set CONFIG_CMD_CACHE=y # CONFIG_CMD_MISC is not set +CONFIG_CMD_UBI=y # CONFIG_ISO_PARTITION is not set # CONFIG_EFI_PARTITION is not set CONFIG_ENV_IS_IN_FLASH=y CONFIG_DM=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_DEVICE=y CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y CONFIG_SYS_FLASH_PROTECTION=y diff --git a/configs/vexpress_aemv8a_juno_defconfig b/configs/vexpress_aemv8a_juno_defconfig index ef38915955..ed611fea7c 100644 --- a/configs/vexpress_aemv8a_juno_defconfig +++ b/configs/vexpress_aemv8a_juno_defconfig @@ -23,12 +23,14 @@ CONFIG_CMD_ARMFLASH=y # CONFIG_CMD_NFS is not set CONFIG_CMD_CACHE=y # CONFIG_CMD_MISC is not set +CONFIG_CMD_UBI=y # CONFIG_ISO_PARTITION is not set # CONFIG_EFI_PARTITION is not set CONFIG_ENV_IS_IN_FLASH=y CONFIG_DM=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_DEVICE=y CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y CONFIG_SYS_FLASH_PROTECTION=y diff --git a/configs/vexpress_aemv8a_semi_defconfig b/configs/vexpress_aemv8a_semi_defconfig index a4d1233cd5..0b3bb65ee6 100644 --- a/configs/vexpress_aemv8a_semi_defconfig +++ b/configs/vexpress_aemv8a_semi_defconfig @@ -23,12 +23,14 @@ CONFIG_CMD_ARMFLASH=y # CONFIG_CMD_NFS is not set CONFIG_CMD_CACHE=y # CONFIG_CMD_MISC is not set +CONFIG_CMD_UBI=y # CONFIG_ISO_PARTITION is not set # CONFIG_EFI_PARTITION is not set CONFIG_ENV_IS_IN_FLASH=y CONFIG_DM=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_DEVICE=y CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y CONFIG_SYS_FLASH_PROTECTION=y diff --git a/configs/vexpress_ca15_tc2_defconfig b/configs/vexpress_ca15_tc2_defconfig index f4d555be48..cabc0c4577 100644 --- a/configs/vexpress_ca15_tc2_defconfig +++ b/configs/vexpress_ca15_tc2_defconfig @@ -18,8 +18,10 @@ CONFIG_CMD_MMC=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NFS is not set # CONFIG_CMD_MISC is not set +CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_DEVICE=y CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y CONFIG_SYS_FLASH_PROTECTION=y diff --git a/configs/vexpress_ca5x2_defconfig b/configs/vexpress_ca5x2_defconfig index bdacc60c2c..dc4411d6f5 100644 --- a/configs/vexpress_ca5x2_defconfig +++ b/configs/vexpress_ca5x2_defconfig @@ -17,8 +17,10 @@ CONFIG_CMD_MMC=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NFS is not set # CONFIG_CMD_MISC is not set +CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_DEVICE=y CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y CONFIG_SYS_FLASH_PROTECTION=y diff --git a/configs/vexpress_ca9x4_defconfig b/configs/vexpress_ca9x4_defconfig index 7a90831918..9390cf61d1 100644 --- a/configs/vexpress_ca9x4_defconfig +++ b/configs/vexpress_ca9x4_defconfig @@ -17,8 +17,10 @@ CONFIG_CMD_MMC=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NFS is not set # CONFIG_CMD_MISC is not set +CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_DEVICE=y CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y CONFIG_SYS_FLASH_PROTECTION=y diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h index 267b230fda..47ea89df66 100644 --- a/include/configs/vexpress_common.h +++ b/include/configs/vexpress_common.h @@ -120,7 +120,7 @@ #define CONFIG_INITRD_TAG 1 /* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128 * 1024) +#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 512 * 1024) /* >= 512 KiB */ #define SCTL_BASE V2M_SYSCTL #define VEXPRESS_FLASHPROG_FLVPPEN (1 << 0) -- 2.19.1

3 3