December 2019 - U-Boot

[U-Boot] [PATCH] cmd: pxe: execute the cls command only when supported
by Patrick Delaunay 23 Jan '20

23 Jan '20

Execute the command cls (for clear screen), when the "menu background" keyword is present in extlinux.conf file, only if the command is supported. This patch avoid the warning "Unknown command 'cls'" with "menu background" in extlinux.conf when CONFIG_CMD_BMP is activated and CONFIG_CMD_CLS not activated (default for CONFIG_DM_VIDEO). Signed-off-by: Patrick Delaunay <patrick.delaunay(a)st.com> --- cmd/pxe.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmd/pxe.c b/cmd/pxe.c index 2059975446..b62cb79b3a 100644 --- a/cmd/pxe.c +++ b/cmd/pxe.c @@ -1592,7 +1592,8 @@ static void handle_pxe_menu(cmd_tbl_t *cmdtp, struct pxe_menu *cfg) /* display BMP if available */ if (cfg->bmp) { if (get_relfile(cmdtp, cfg->bmp, load_addr)) { - run_command("cls", 0); + if (CONFIG_IS_ENABLED(CMD_CLS)) + run_command("cls", 0); bmp_display(load_addr, BMP_ALIGN_CENTER, BMP_ALIGN_CENTER); } else { -- 2.17.1

3 2

[U-Boot] [PATCH v2] spl: Allow cache drivers to be used in SPL
by Ley Foon Tan 23 Jan '20

23 Jan '20

Add an option for building cache drivers in SPL. Signed-off-by: Ley Foon Tan <ley.foon.tan(a)intel.com> --- v2: - Added "depends on CACHE" to SPL_CACHE. - Change to use $(CONFIG_$(SPL_TPL_)CACHE) to enable cache DM build. --- common/spl/Kconfig | 6 ++++++ drivers/Makefile | 1 + drivers/cache/Makefile | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 1f122833a7..ce119d1cc6 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -714,6 +714,12 @@ config SPL_UBI README.ubispl for more info. if SPL_DM +config SPL_CACHE + depends on CACHE + bool "Support cache drivers in SPL" + help + Enable support for cache drivers in SPL. + config SPL_DM_SPI bool "Support SPI DM drivers in SPL" help diff --git a/drivers/Makefile b/drivers/Makefile index 0befeddfcb..aed591c614 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0+ +obj-$(CONFIG_$(SPL_TPL_)CACHE) += cache/ obj-$(CONFIG_$(SPL_TPL_)CLK) += clk/ obj-$(CONFIG_$(SPL_TPL_)DM) += core/ obj-$(CONFIG_$(SPL_TPL_)DFU) += dfu/ diff --git a/drivers/cache/Makefile b/drivers/cache/Makefile index 4a6458c602..924217044a 100644 --- a/drivers/cache/Makefile +++ b/drivers/cache/Makefile @@ -1,5 +1,5 @@ -obj-$(CONFIG_CACHE) += cache-uclass.o +obj-$(CONFIG_$(SPL_TPL_)CACHE) += cache-uclass.o obj-$(CONFIG_SANDBOX) += sandbox_cache.o obj-$(CONFIG_L2X0_CACHE) += cache-l2x0.o obj-$(CONFIG_V5L2_CACHE) += cache-v5l2.o -- 2.19.0

3 3

[PATCH 00/11] rk3399: SPI boot support (fixes, updates)
by Jagan Teki 23 Jan '20

23 Jan '20

This series support SPI boot on rk3399 in ROC-PC-RK3399 as an example board. Series introduces rk_spi fixes, sf distroboot, SPI boot support on ROC-PC-RK3399 board. SPI Boot log: ------------ Channel 0: LPDDR4, 50MHz BW=32 Col=10 Bk=8 CS0 Row=15 CS1 Row=15 CS=2 Die BW=16 Size=2048MB Channel 1: LPDDR4, 50MHz BW=32 Col=10 Bk=8 CS0 Row=15 CS1 Row=15 CS=2 Die BW=16 Size=2048MB 256B stride 256B stride lpddr4_set_rate: change freq to 400000000 mhz 0, 1 lpddr4_set_rate: change freq to 800000000 mhz 1, 0 U-Boot SPL 2020.01-rc4-00241-g9c3e7e925f (Dec 18 2019 - 19:54:46 +0530) Trying to boot from SPI U-Boot 2020.01-rc4-00241-g9c3e7e925f (Dec 18 2019 - 19:54:46 +0530) Model: Firefly ROC-RK3399-PC Board DRAM: 3.9 GiB PMIC: RK808 MMC: dwmmc@fe320000: 1, sdhci@fe330000: 0 Loading Environment from SPI Flash... SF: Detected w25q128 with page size 256 Bytes, erase size 4 KiB, total 16 MiB *** Warning - bad CRC, using default environment In: serial@ff1a0000 Out: serial@ff1a0000 Err: serial@ff1a0000 Model: Firefly ROC-RK3399-PC Board rockchip_dnl_key_pressed: adc_channel_single_shot fail! Net: Error: ethernet@fe300000 address not set. No ethernet found. Hit any key to stop autoboot: 0 => Any inputs? Jagan. Jagan Teki (11): spi: rk: Limit transfers to (64K - 1) bytes distro_bootcmd: Add SF support rockchip: Include SF on distrocmd devices rk3399: Add boot flash script offet, size rk3399: Check MMC env while defining it env: kconfig: Restrict rockchip env for MMC env: Enable SPI flash env for rockchip rockchip: dts: Sync ROC-RK3399-PC changes from Linux roc-pc-rk3399: Enable SPI Flash rockpro-rk3399: Enable SPI Flash roc-rk3399-pc: Add SPI boot support arch/arm/dts/rk3399-roc-pc-u-boot.dtsi | 16 +- arch/arm/dts/rk3399-roc-pc.dts | 673 +----------------- arch/arm/dts/rk3399-roc-pc.dtsi | 813 ++++++++++++++++++++++ arch/arm/dts/rk3399-rockpro64-u-boot.dtsi | 4 + board/rockchip/evb_rk3399/MAINTAINERS | 2 + configs/roc-pc-rk3399-spi_defconfig | 62 ++ configs/roc-pc-rk3399_defconfig | 2 + configs/rockpro64-rk3399_defconfig | 2 + drivers/spi/rk_spi.c | 10 +- env/Kconfig | 8 +- include/config_distro_bootcmd.h | 35 + include/configs/evb_rk3399.h | 4 +- include/configs/rk3399_common.h | 2 + include/configs/rockchip-common.h | 7 + 14 files changed, 964 insertions(+), 676 deletions(-) create mode 100644 arch/arm/dts/rk3399-roc-pc.dtsi create mode 100644 configs/roc-pc-rk3399-spi_defconfig -- 2.18.0.321.gffc6fa0e3

6 44

[U-Boot] [PATCH v4 0/6] rsa: extend rsa_verify() for UEFI secure boot
by AKASHI Takahiro 22 Jan '20

22 Jan '20

# This patch set is a prerequisite for UEFI secure boot. The current rsa_verify() requires five parameters for a RSA public key for efficiency while RSA, in theory, requires only two. In addition, those parameters are expected to come from FIT image. So this function won't fit very well when we want to use it for the purpose of implementing UEFI secure boot, in particular, image authentication as well as variable authentication, where the essential two parameters are set to be retrieved from one of X509 certificates in signature database. So, in this patch, additional three parameters will be calculated on the fly when rsa_verify() is called without fdt which should contain parameters above. This calculation heavily relies on "big-number (or multi-precision) library." Therefore some routines from BearSSL[1] under MIT license are imported in this implementation. See Patch#4. # Please let me know if this is not appropriate. Prerequisite: * public key parser in my "import x509/pkcs7 parser" patch[2] # Checkpatch will complain with lots of warnings/errors, but # I intentionally don't fix them for maximum maintainability. [1] https://bearssl.org/ [2] https://lists.denx.de/pipermail/u-boot/2019-November/390127.html Changes in v4 (Nov 21, 2019) * rebased to v2020.01-rc3 * change a function prototype of rsa_gen_key_prop() to return an error code (patch#4,#5) * re-order include files in alphabetical order (patch#6) * add some comments per Simon's review comments Changes in v3 (Nov 13, 2019) * remove RSA_VERIFY_WITH_PKEY, which is to be added in patch#2 (patch#1) * modify unit test Kconfg due to removal of test/lib/Kconfig (patch#6) Changes in v2 (Oct 29, 2019) * fix build errors at Travis CI * not include linux/kconfig.h (patch#1) * add a separate patch for adding CONFIG_RSA_VERIFY_WITH_PKEY (patch#2) * take a prerequisite patch from my "secure boot patch" (patch#3) * add a dependency on RSA_PUBLIC_KEY_PARSER (patch#4) * remove "inline" directives (patch#4) * add function descriptions, which mostly come from BearSSL's src/inner.h (patch#4) * improve Kconfig help text after Simon's comment (patch#5) * add function description of rsa_verify_with_pkey() (patch#5) * modify rsa_verify() to use "if (CONFIG_IS_ENABLED(...) " style rather than "#ifdef CONFIG_..." (patch#5) * add function tests (patch#6) Changes in v1 (Oct 9, 2019) * fix a build error on pine64-lts_defconfig (reported by Heinrich) by defining FIT_IMAGE_ENABLE_VERIFY flag and adding SPL_RSA_VERIFY config (patch#1) * remove FIT-specific code from image-sig.c and put them to new image-fit-sig.c to allow us to disable CONFIG_FIT_SIGNATURE (patch#1) * compile rsa-keyprop.c only if necessary (i.e. if CONFIG_RSA_VERIFY_WITH_PKEY) (patch#2) * add SPDX license identifier in rsa-keyprop.c (patch#2) * include <common.h> instead of <stdio.h> (patch#2) * use U-Boot's byteorder helper functions instead of BearSSL's (patch#2) AKASHI Takahiro (6): lib: rsa: decouple rsa from FIT image verification rsa: add CONFIG_RSA_VERIFY_WITH_PKEY config include: image.h: add key info to image_sign_info lib: rsa: generate additional parameters for public key lib: rsa: add rsa_verify_with_pkey() test: add rsa_verify() unit test Kconfig | 1 + common/Makefile | 3 +- common/image-fit-sig.c | 417 ++++++++++++++++++++ common/image-fit.c | 6 +- common/image-sig.c | 396 ------------------- include/image.h | 20 +- include/u-boot/rsa-mod-exp.h | 23 ++ lib/rsa/Kconfig | 27 ++ lib/rsa/Makefile | 3 +- lib/rsa/rsa-keyprop.c | 725 +++++++++++++++++++++++++++++++++++ lib/rsa/rsa-verify.c | 137 +++++-- test/Kconfig | 12 + test/lib/Makefile | 1 + test/lib/rsa.c | 206 ++++++++++ tools/Makefile | 2 +- 15 files changed, 1544 insertions(+), 435 deletions(-) create mode 100644 common/image-fit-sig.c create mode 100644 lib/rsa/rsa-keyprop.c create mode 100644 test/lib/rsa.c -- 2.21.0

3 29

[U-Boot] [PATCH] fs: fat: handle deleted directory entries correctly
by AKASHI Takahiro 21 Jan '20

21 Jan '20

Unlink test for FAT file system seems to fail at test_unlink2. (When I added this test, I haven't seen any errors though.) for example, ===8<=== fs_obj_unlink = ['fat', '/home/akashi/tmp/uboot_sandbox_test/128MB.fat32.img'] def test_unlink2(self, u_boot_console, fs_obj_unlink): """ Test Case 2 - delete many files """ fs_type,fs_img = fs_obj_unlink with u_boot_console.log.section('Test Case 2 - unlink (many)'): output = u_boot_console.run_command('host bind 0 %s' % fs_img) for i in range(0, 20): output = u_boot_console.run_command_list([ '%srm host 0:0 dir2/0123456789abcdef%02x' % (fs_type, i), '%sls host 0:0 dir2/0123456789abcdef%02x' % (fs_type, i)]) assert('' == ''.join(output)) output = u_boot_console.run_command( '%sls host 0:0 dir2' % fs_type) > assert('0 file(s), 2 dir(s)' in output) E AssertionError: assert '0 file(s), 2 dir(s)' in ' ./\r\r\n ../\r\r\n 0 0123456789abcdef11\r\r\n\r\r\n1 file(s), 2 dir(s)' test/py/tests/test_fs/test_unlink.py:52: AssertionError ===>8=== This can happen when fat_itr_next() wrongly detects an already- deleted directory entry. File deletion, which was added in the commit f8240ce95d64 ("fs: fat: support unlink"), is implemented by marking its entry for a short name with DELETED_FLAG, but related entry slots for a long file name are kept unmodified. (So entries will never be actually deleted from media.) To handle this case correctly, an additional check for a directory slot will be needed in fat_itr_next(). In addition, I added extra comments about long file name and short file name format in FAT file system. Although they are not directly related to the issue, I hope it will be helpful for better understandings in general. Signed-off-by: AKASHI Takahiro <takahiro.akashi(a)linaro.org> --- fs/fat/fat.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/fs/fat/fat.c b/fs/fat/fat.c index 9e1b842dac6b..68ce65838678 100644 --- a/fs/fat/fat.c +++ b/fs/fat/fat.c @@ -869,6 +869,14 @@ static dir_entry *extract_vfat_name(fat_itr *itr) return NULL; } + /* + * We are now at the short file name entry. + * If it is marked as deleted, just skip it. + */ + if (dent->name[0] == DELETED_FLAG || + dent->name[0] == aRING) + return NULL; + itr->l_name[n] = '\0'; chksum = mkcksum(dent->name, dent->ext); @@ -898,6 +906,16 @@ static int fat_itr_next(fat_itr *itr) itr->name = NULL; + /* + * One logical directory entry consist of following slots: + * name[0] Attributes + * dent[N - N]: LFN[N - 1] N|0x40 ATTR_VFAT + * ... + * dent[N - 2]: LFN[1] 2 ATTR_VFAT + * dent[N - 1]: LFN[0] 1 ATTR_VFAT + * dent[N]: SFN ATTR_ARCH + */ + while (1) { dent = next_dent(itr); if (!dent) @@ -910,7 +928,17 @@ static int fat_itr_next(fat_itr *itr) if (dent->attr & ATTR_VOLUME) { if ((dent->attr & ATTR_VFAT) == ATTR_VFAT && (dent->name[0] & LAST_LONG_ENTRY_MASK)) { + /* long file name */ dent = extract_vfat_name(itr); + /* + * If succeeded, dent has a valid short file + * name entry for the current entry. + * If failed, itr points to a current bogus + * entry. So after fetching a next one, + * it may have a short file name entry + * for this bogus entry so that we can still + * check for a short name. + */ if (!dent) continue; itr->name = itr->l_name; @@ -919,8 +947,11 @@ static int fat_itr_next(fat_itr *itr) /* Volume label or VFAT entry, skip */ continue; } - } + } else if (!(dent->attr & ATTR_ARCH) && + !(dent->attr & ATTR_DIR)) + continue; + /* short file name */ break; } -- 2.24.0

4 26

[U-Boot] [PATCH V3 1/2] power: domain: add dev_power_domain_on
by Peng Fan 21 Jan '20

21 Jan '20

Add this new API to power on multiple domains attached to a device. Signed-off-by: Peng Fan <peng.fan(a)nxp.com> Reviewed-by: Lokesh Vutla <lokeshvutla(a)ti.com> Reviewed-by: Simon Glass <sjg(a)chromium.org> --- V3: Fix build break Add R-b tag V2: create dev_power_domain_on drivers/power/domain/power-domain-uclass.c | 22 ++++++++++++++++++++++ include/power-domain.h | 17 +++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/drivers/power/domain/power-domain-uclass.c b/drivers/power/domain/power-domain-uclass.c index 2ea0ff24c7..6eb4267de3 100644 --- a/drivers/power/domain/power-domain-uclass.c +++ b/drivers/power/domain/power-domain-uclass.c @@ -107,6 +107,28 @@ int power_domain_off(struct power_domain *power_domain) return ops->off(power_domain); } + +#if (CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)) +int dev_power_domain_on(struct udevice *dev) +{ + struct power_domain pd; + int i, count, ret; + + count = dev_count_phandle_with_args(dev, "power-domains", + "#power-domain-cells"); + for (i = 0; i < count; i++) { + ret = power_domain_get_by_index(dev, &pd, i); + if (ret) + return ret; + ret = power_domain_on(&pd); + if (ret) + return ret; + } + + return 0; +} +#endif + UCLASS_DRIVER(power_domain) = { .id = UCLASS_POWER_DOMAIN, .name = "power_domain", diff --git a/include/power-domain.h b/include/power-domain.h index ef15dc9f60..490fedbb12 100644 --- a/include/power-domain.h +++ b/include/power-domain.h @@ -155,4 +155,21 @@ static inline int power_domain_off(struct power_domain *power_domain) } #endif +/** + * dev_power_domain_on - Enable power domains for a device . + * + * @dev: The client device. + * + * @return 0 if OK, or a negative error code. + */ +#if (CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)) && \ + CONFIG_IS_ENABLED(POWER_DOMAIN) +int dev_power_domain_on(struct udevice *dev); +#else +static inline int dev_power_domain_on(struct udevice *dev) +{ + return 0; +} +#endif + #endif -- 2.16.4

4 16

[U-Boot] [RESEND PATCH] common: add blkcache init
by Angelo Dureghello 21 Jan '20

21 Jan '20

From: Angelo Durgehello <angelo.dureghello(a)timesys.com> On m68k, block_cache list is relocated, but next and prev list pointers are not adjusted to the relocated struct list_head address, so the first iteration over the block_cache list hangs. This patch initializes the block_cache list after relocation. Signed-off-by: Angelo Durgehello <angelo.dureghello(a)timesys.com> --- common/board_r.c | 12 ++++++++++++ drivers/block/blkcache.c | 7 ++++++- include/blk.h | 6 ++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/common/board_r.c b/common/board_r.c index 65720849cd..13e70a5ffb 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -628,6 +628,15 @@ static int initr_bedbug(void) } #endif +#ifdef CONFIG_BLOCK_CACHE +static int initr_blkcache(void) +{ + blkcache_init(); + + return 0; +} +#endif + static int run_main_loop(void) { #ifdef CONFIG_SANDBOX @@ -832,6 +841,9 @@ static init_fnc_t init_sequence_r[] = { #endif #if defined(CONFIG_PRAM) initr_mem, +#endif +#ifdef CONFIG_BLOCK_CACHE + initr_blkcache, #endif run_main_loop, }; diff --git a/drivers/block/blkcache.c b/drivers/block/blkcache.c index 1fa64989d3..bf0fa1ea6f 100644 --- a/drivers/block/blkcache.c +++ b/drivers/block/blkcache.c @@ -21,13 +21,18 @@ struct block_cache_node { char *cache; }; -static LIST_HEAD(block_cache); +static struct list_head block_cache; static struct block_cache_stats _stats = { .max_blocks_per_entry = 8, .max_entries = 32 }; +void blkcache_init(void) +{ + INIT_LIST_HEAD(&block_cache); +} + static struct block_cache_node *cache_find(int iftype, int devnum, lbaint_t start, lbaint_t blkcnt, unsigned long blksz) diff --git a/include/blk.h b/include/blk.h index d0c033aece..7070fd6af3 100644 --- a/include/blk.h +++ b/include/blk.h @@ -113,6 +113,12 @@ struct blk_desc { (PAD_SIZE(size, blk_desc->blksz)) #if CONFIG_IS_ENABLED(BLOCK_CACHE) + +/** + * blkcache_init() - initialize the block cache list pointers + */ +void blkcache_init(void); + /** * blkcache_read() - attempt to read a set of blocks from cache * -- 2.24.0

2 2

[U-Boot] [PATCH] cmd/gpt: Address error cases during gpt rename more correctly
by Tom Rini 20 Jan '20

20 Jan '20

New analysis by the tool has shown that we have some cases where we weren't handling the error exit condition correctly. When we ran into the ENOMEM case we wouldn't exit the function and thus incorrect things could happen. Rework the unwinding such that we don't need a helper function now and free what we may have allocated. Fixes: 18030d04d25d ("GPT: fix memory leaks identified by Coverity") Reported-by: Coverity (CID: 275475, 275476) Cc: Alison Chaiken <alison(a)she-devel.com> Signed-off-by: Tom Rini <trini(a)konsulko.com> --- cmd/gpt.c | 35 ++++++++--------------------------- 1 file changed, 8 insertions(+), 27 deletions(-) diff --git a/cmd/gpt.c b/cmd/gpt.c index 0c4349f4b249..2da8df60dca3 100644 --- a/cmd/gpt.c +++ b/cmd/gpt.c @@ -633,21 +633,6 @@ static int do_disk_guid(struct blk_desc *dev_desc, char * const namestr) } #ifdef CONFIG_CMD_GPT_RENAME -/* - * There are 3 malloc() calls in set_gpt_info() and there is no info about which - * failed. - */ -static void set_gpt_cleanup(char **str_disk_guid, - disk_partition_t **partitions) -{ -#ifdef CONFIG_RANDOM_UUID - if (str_disk_guid) - free(str_disk_guid); -#endif - if (partitions) - free(partitions); -} - static int do_rename_gpt_parts(struct blk_desc *dev_desc, char *subcomm, char *name1, char *name2) { @@ -699,11 +684,7 @@ static int do_rename_gpt_parts(struct blk_desc *dev_desc, char *subcomm, &new_partitions, &part_count); if (ret < 0) { del_gpt_info(); - free(partitions_list); - if (ret == -ENOMEM) - set_gpt_cleanup(&str_disk_guid, &new_partitions); - else - goto out; + goto out; } if (!strcmp(subcomm, "swap")) { @@ -768,11 +749,7 @@ static int do_rename_gpt_parts(struct blk_desc *dev_desc, char *subcomm, */ if (ret < 0) { del_gpt_info(); - free(partitions_list); - if (ret == -ENOMEM) - set_gpt_cleanup(&str_disk_guid, &new_partitions); - else - goto out; + goto out; } debug("Writing new partition table\n"); @@ -797,8 +774,12 @@ static int do_rename_gpt_parts(struct blk_desc *dev_desc, char *subcomm, print_gpt_info(); del_gpt_info(); out: - free(new_partitions); - free(str_disk_guid); +#ifdef CONFIG_RANDOM_UUID + if (str_disk_guid) + free(str_disk_guid); +#endif + if (new_partitions) + free(new_partitions); free(partitions_list); return ret; } -- 2.17.1

2 2

[PATCH v2 00/35] common: Further reduce size of common.h even more
by Simon Glass 20 Jan '20

20 Jan '20

2 70

[U-Boot] [PATCH] omap34xx: SPL: enable MMC raw boot with u-boot.img
by Denis 'GNUtoo' Carikli 20 Jan '20

20 Jan '20

The following commit enabled raw SPL booting: 22d90d560a omap3: Use raw SPL by default for mmc1 but it was reverted by the following commit: 821c89d38c Revert "omap3: Use raw SPL by default for mmc1" because SPL is unable to distinguish between RAW images and garbage. However if CONFIG_SPL_RAW_IMAGE_SUPPORT is disabled, SPL does identify if there is a valid image with spl_parse_image_header. With this change, and CONFIG_SPL_RAW_IMAGE_SUPPORT disabled, raw MMC boot will be tried first, and if it fails, it FS will be tried. The two scenarios have been tested on a BeagleBoard XM Revision C1. Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo(a)cyberdimension.org> --- arch/arm/mach-omap2/boot-common.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c index 734fa9d9e6..a48244e1c5 100644 --- a/arch/arm/mach-omap2/boot-common.c +++ b/arch/arm/mach-omap2/boot-common.c @@ -132,8 +132,10 @@ void save_omap_boot_params(void) (boot_device <= MMC_BOOT_DEVICES_END)) { switch (boot_device) { case BOOT_DEVICE_MMC1: +#ifdef CONFIG_SPL_RAW_IMAGE_SUPPORT boot_mode = MMCSD_MODE_FS; break; +#endif case BOOT_DEVICE_MMC2: boot_mode = MMCSD_MODE_RAW; break; -- 2.24.0

2 2