April 2020 - U-Boot

[PATCH] tools: fw_env: use erasesize from MEMGETINFO ioctl
by Rasmus Villemoes 28 Apr '20

28 Apr '20

We have a board with several revisions. The older ones use a nor flash with 64k erase size, while the newer have a flash with 4k sectors. The environment size is 8k. Currently, we have to put a column containing 0x10000 (64k) in fw_env.config in order for it to work on the older boards. But that ends up wasting quite a lot of time on the newer boards that could just erase the 8k occupied by the environment - strace says the 64k erase takes 0.405 seconds. With this patch, as expected, that's about an 8-fold better, at 0.043 seconds. Having different fw_env.config files for the different revisions is highly impractical, and the correct information is already available right at our fingertips. So use the erasesize returned by the MEMGETINFO ioctl when the fourth column is absent or contains a 0. As I'm only testing this on a NOR flash, I'm only changing the logic for that case, though I think it should be possible for the other types as well. Signed-off-by: Rasmus Villemoes <rasmus.villemoes(a)prevas.dk> --- tools/env/fw_env.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c index 381739d28d..87c3504315 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -1647,6 +1647,8 @@ static int check_device_config(int dev) goto err; } DEVTYPE(dev) = mtdinfo.type; + if (DEVESIZE(dev) == 0 && mtdinfo.type == MTD_NORFLASH) + DEVESIZE(dev) = mtdinfo.erasesize; if (DEVESIZE(dev) == 0) /* Assume the erase size is the same as the env-size */ DEVESIZE(dev) = ENVSIZE(dev); -- 2.23.0

3 5

[PATCH] CMD: random: fix return code
by Eugeniy Paltsev 28 Apr '20

28 Apr '20

As of today 'random' command return 1 (CMD_RET_FAILURE) in case of successful execution and 0 (CMD_RET_SUCCESS) in case of bad arguments. Fix that. NOTE: we remove printing usage information from command body so it won't print twice. Signed-off-by: Eugeniy Paltsev <Eugeniy.Paltsev(a)synopsys.com> --- cmd/mem.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/cmd/mem.c b/cmd/mem.c index 6d54f195272..6b4897dfd94 100644 --- a/cmd/mem.c +++ b/cmd/mem.c @@ -1102,10 +1102,8 @@ static int do_random(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) unsigned char *buf8; unsigned int i; - if (argc < 3 || argc > 4) { - printf("usage: %s <addr> <len> [<seed>]\n", argv[0]); - return 0; - } + if (argc < 3 || argc > 4) + return CMD_RET_USAGE; len = simple_strtoul(argv[2], NULL, 16); addr = simple_strtoul(argv[1], NULL, 16); @@ -1132,7 +1130,8 @@ static int do_random(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) unmap_sysmem(start); printf("%lu bytes filled with random data\n", len); - return 1; + + return CMD_RET_SUCCESS; } #endif -- 2.21.1

3 3

[PULL] u-boot-mips
by Daniel Schwierzeck 28 Apr '20

28 Apr '20

Hi Tom, please pull MIPS updates for 2020.07, thanks. https://gitlab.denx.de/u-boot/custodians/u-boot-mips/pipelines/2966 https://travis-ci.org/github/danielschwierzeck/u-boot/builds/680241185 The following changes since commit d16d37bcd4087b8ea0f66cb76a73edad182d151a: Merge tag 'video-for-v2020.07-rc1' of https://gitlab.denx.de/u-boot/custodians/u-boot-video (2020-04-27 09:41:51 -0400) are available in the Git repository at: git://git.denx.de/u-boot-mips.git tags/mips-pull-2020-04-27 for you to fetch changes up to 3fd023143237a5271a21ccec4b94440df257a5a7: mips: Add support for SoM "VoCore2". (2020-04-27 20:30:14 +0200) ---------------------------------------------------------------- - brcmnand: fix missing code path from Linux driver - bmips: fix build error when disabling USB - mips: add option to restore original exception vector base - mips: fix off-by-one error when clearing gd_data - mips: minor fixes for compatibility with generic SPL framework - spl: refactor legacy image loading - spl: add LZMA decompression support for legacy images - Makefile: add target to build LZMA compressed U-Boot images - mtmips: refactor and rewrite low-level init code - mtmips: add and enable SPL support with LZMA - mtmips: add support for MT7628 reference board - mtmips: add support for VoCore/VoCore2 board ---------------------------------------------------------------- Mauro Condarelli (1): mips: Add support for SoM "VoCore2". Stefan Roese (9): mips: spl: Flush cache before jumping to U-Boot proper spl: Extract legacy image handling into separate file spl: spl_legacy: Use IS_ENABLED() to remove #ifdef spl: spl_nor: Move legacy image loading into spl_legacy.c spl: spl_nor: Remove unused variable 'ret' warning mips: mtmips: Increase CONFIG_SPL_SYS_MALLOC_F_LEN mips: mt76x8: ddr_cal: Rename dqs_test_valid() to dqs_test_error() mips: mt76x8: ddr_cal: Change types from u32 to int in dqs_find_min/max mips: mt76x8: ddr_cal: Correct dqs_find_min/max implementations Weijie Gao (19): mips: add support to restore exception vector base before booting linux configs: enable CONFIG_RESTORE_EXCEPTION_VECTOR_BASE for all mtmips boards mips: mtmips: add predefined i-cache/d-cache size and linesize mips: start.S: avoid overwriting outside gd when clearing global data in stack mips: enable support for appending dtb to spl binary mips: add an option to enable u_boot_list section for SPL loaders in u-boot-spl.lds sysreset: add reset controller based reboot driver mips: mtmips: make use of sysreset-resetctrl for mt7628 soc mips: add a mtmips-specific field to architecture-specific global data dts: mtmips: add alternative pinmux node for uart2 lib: enable lzma decompression support for SPL build Makefile: add support to generate LZMA compressed u-boot image spl: spl_legacy: Add lzma decompression support for legacy image mips: add an option to support initialize SRAM for initial stack mips: add a option to support not reserving malloc space on initial stack mips: mtmips: rewrite lowlevel codes of mt7628 mips: mtmips: add SPL support mips: mtmips: enable SPL for all boards mips: mtmips: add support for mt7628-rfb Álvaro Fernández Rojas (2): nand: brcmnand: return without disabling clock bmips: allow disabling usb support Makefile | 13 + arch/mips/Kconfig | 64 ++++ arch/mips/cpu/start.S | 16 +- arch/mips/cpu/u-boot-spl.lds | 4 +- arch/mips/dts/Makefile | 2 + arch/mips/dts/mediatek,mt7628-rfb.dts | 67 +++++ arch/mips/dts/mt7628-u-boot.dtsi | 38 +++ arch/mips/dts/mt7628a.dtsi | 17 +- arch/mips/dts/vocore_vocore2.dts | 85 ++++++ arch/mips/include/asm/global_data.h | 3 + arch/mips/include/asm/u-boot-mips.h | 2 + arch/mips/lib/Makefile | 1 + arch/mips/lib/bootm.c | 3 + arch/mips/lib/spl.c | 21 ++ arch/mips/lib/traps.c | 19 ++ arch/mips/mach-mtmips/Kconfig | 142 ++++----- arch/mips/mach-mtmips/Makefile | 8 +- arch/mips/mach-mtmips/cpu.c | 58 +--- arch/mips/mach-mtmips/ddr_cal.c | 205 +++++++++++++ arch/mips/mach-mtmips/ddr_calibrate.c | 309 ------------------- arch/mips/mach-mtmips/ddr_init.c | 194 ++++++++++++ arch/mips/mach-mtmips/include/mach/ddr.h | 52 ++++ arch/mips/mach-mtmips/include/mach/mc.h | 180 +++++++++++ arch/mips/mach-mtmips/include/mach/serial.h | 13 + arch/mips/mach-mtmips/lowlevel_init.S | 328 --------------------- arch/mips/mach-mtmips/mt7628/Makefile | 6 + arch/mips/mach-mtmips/mt7628/ddr.c | 173 +++++++++++ arch/mips/mach-mtmips/mt7628/init.c | 109 +++++++ arch/mips/mach-mtmips/mt7628/lowlevel_init.S | 161 ++++++++++ arch/mips/mach-mtmips/mt7628/mt7628.h | 104 +++++++ arch/mips/mach-mtmips/mt7628/serial.c | 34 +++ arch/mips/mach-mtmips/mt76xx.h | 32 -- arch/mips/mach-mtmips/spl.c | 44 +++ board/gardena/smart-gateway-mt7688/board.c | 2 + board/mediatek/mt7628/Kconfig | 12 + board/mediatek/mt7628/MAINTAINERS | 7 + board/mediatek/mt7628/Makefile | 3 + board/mediatek/mt7628/board.c | 8 + board/vocore/vocore2/Kconfig | 12 + board/vocore/vocore2/MAINTAINERS | 7 + board/vocore/vocore2/Makefile | 3 + board/vocore/vocore2/board.c | 6 + common/spl/Makefile | 1 + common/spl/spl.c | 56 +--- common/spl/spl_legacy.c | 131 ++++++++ common/spl/spl_nor.c | 27 +- configs/gardena-smart-gateway-mt7688-ram_defconfig | 74 ----- configs/gardena-smart-gateway-mt7688_defconfig | 17 +- configs/linkit-smart-7688-ram_defconfig | 65 ---- configs/linkit-smart-7688_defconfig | 17 +- configs/mt7628_rfb_defconfig | 47 +++ configs/vocore2_defconfig | 101 +++++++ drivers/mtd/nand/raw/brcmnand/brcmnand.c | 9 +- drivers/sysreset/Kconfig | 6 + drivers/sysreset/Makefile | 1 + drivers/sysreset/sysreset_resetctl.c | 48 +++ include/configs/bmips_bcm6318.h | 2 + include/configs/bmips_bcm63268.h | 2 + include/configs/bmips_bcm6328.h | 2 + include/configs/bmips_bcm6348.h | 2 + include/configs/bmips_bcm6358.h | 2 + include/configs/bmips_bcm6362.h | 2 + include/configs/bmips_bcm6368.h | 2 + include/configs/gardena-smart-gateway-mt7688.h | 21 +- include/configs/linkit-smart-7688.h | 22 +- include/configs/mt7628.h | 56 ++++ include/configs/vocore2.h | 54 ++++ include/spl.h | 13 + lib/Kconfig | 5 + lib/Makefile | 1 + 70 files changed, 2320 insertions(+), 1033 deletions(-) create mode 100644 arch/mips/dts/mediatek,mt7628-rfb.dts create mode 100644 arch/mips/dts/mt7628-u-boot.dtsi create mode 100644 arch/mips/dts/vocore_vocore2.dts create mode 100644 arch/mips/lib/spl.c create mode 100644 arch/mips/mach-mtmips/ddr_cal.c delete mode 100644 arch/mips/mach-mtmips/ddr_calibrate.c create mode 100644 arch/mips/mach-mtmips/ddr_init.c create mode 100644 arch/mips/mach-mtmips/include/mach/ddr.h create mode 100644 arch/mips/mach-mtmips/include/mach/mc.h create mode 100644 arch/mips/mach-mtmips/include/mach/serial.h delete mode 100644 arch/mips/mach-mtmips/lowlevel_init.S create mode 100644 arch/mips/mach-mtmips/mt7628/Makefile create mode 100644 arch/mips/mach-mtmips/mt7628/ddr.c create mode 100644 arch/mips/mach-mtmips/mt7628/init.c create mode 100644 arch/mips/mach-mtmips/mt7628/lowlevel_init.S create mode 100644 arch/mips/mach-mtmips/mt7628/mt7628.h create mode 100644 arch/mips/mach-mtmips/mt7628/serial.c delete mode 100644 arch/mips/mach-mtmips/mt76xx.h create mode 100644 arch/mips/mach-mtmips/spl.c create mode 100644 board/mediatek/mt7628/Kconfig create mode 100644 board/mediatek/mt7628/MAINTAINERS create mode 100644 board/mediatek/mt7628/Makefile create mode 100644 board/mediatek/mt7628/board.c create mode 100644 board/vocore/vocore2/Kconfig create mode 100644 board/vocore/vocore2/MAINTAINERS create mode 100644 board/vocore/vocore2/Makefile create mode 100644 board/vocore/vocore2/board.c create mode 100644 common/spl/spl_legacy.c delete mode 100644 configs/gardena-smart-gateway-mt7688-ram_defconfig delete mode 100644 configs/linkit-smart-7688-ram_defconfig create mode 100644 configs/mt7628_rfb_defconfig create mode 100644 configs/vocore2_defconfig create mode 100644 drivers/sysreset/sysreset_resetctl.c create mode 100644 include/configs/mt7628.h create mode 100644 include/configs/vocore2.h

2 1

[PATCH v2 0/2] test/py: vboot: fix signature check on config node
by Philippe Reynes 28 Apr '20

28 Apr '20

The signature check of config node is broken when used on fit with padding. We didn't see it before because this case is not covered by vboot test. When check the signature for a config nde, u-boot uses all the properties of the node referenced in the config node, except the property data. When padding is used on fit, the property data is replaced by two properties: data-offset and data-size, and u-boot uses those properties when checking the signature. To fix this signature check, we simply ignore the properties data-offset and data_size. The first commit add some vboot tests that check signature on fit with padding. The second commit fixes the signature check on config node for fit with padding. Philippe Reynes (2): test/py: vboot: add a test to check fit signature on fit with padding rsa: sig: fix config signature check for fit with padding Changelog: v2: - fix spelling in commit message (thanks Simon) common/image-sig.c | 2 +- test/py/tests/test_vboot.py | 42 ++++++++++++++++++++++++++++-------------- 2 files changed, 29 insertions(+), 15 deletions(-) -- 2.7.4

2 3

[PATCH 1/1] .dockerignore: remove .git/ from build context
by Heinrich Schuchardt 28 Apr '20

28 Apr '20

We do not need .git in the build context. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- .dockerignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..bbaab15 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,2 @@ +# ignore .git folder +.git -- 2.25.0

3 2

[U-Boot] Please pull more ARC changes for v2020.07-rc1
by Alexey Brodkin 28 Apr '20

28 Apr '20

Hi Tom, The following changes since commit d202f67db0771247de562af5d6a5df778702857b: Merge branch '2020-04-25-master-imports' (2020-04-25 08:20:22 -0400) are available in the Git repository at: git@gitlab.denx.de:u-boot/custodians/u-boot-arc.git tags/arc-more-fixes-for-2020.07-rc1 for you to fetch changes up to 73b3c23e4818334f1e4ca3901358a228cab7e736: ARC: AXS10x: cleanup kconfig (2020-04-27 15:04:42 +0300) ---------------------------------------------------------------- Here we introduce new development platfrom for ARC: HSDK 4xD. That's pretty much the same base-board as in HSDK but with very recent quad-core ARC HS47D in the ASIC. Thus we try to re-use existing code as much as possible while inevitably add some pieces needed for the new ASIC. Also we drop selection of bounce buffers on AXS10x as there's no use of them any longer. ---------------------------------------------------------------- Eugeniy Paltsev (15): ARC: ARCv2: handle DSP presence in HW ARC: HSDK: CGU: add support for timer clock ARC: HSDK-4xD: add initial board support ARC: HSDK: split HSDK and HSDK-4xD DTS ARC: HSDK-4xD: use active low polarity of cpu_start pulse ARC: HSDK-4xD: fix headerize script for HSDK-4xD compatibility ARC: HSDK-4xD: print info about HDMI clocks ARC: HSDK-4xD: drop additional GPU clock info ARC: HSDK-4xD: print timer clock value ARC: HSDK-4xD: add support for SLC enable/disable ARC: HSDK-4xD: add CSM configuration support ARC: HSDK-4xD: tweak memory map ARC: HSDK-4xD: use separate config file ARC: HSDK-4xD: make init status resistant to U-boot reloading ARC: AXS10x: cleanup kconfig arch/arc/Kconfig | 4 +-- arch/arc/dts/Makefile | 2 +- arch/arc/dts/hsdk-4xd.dts | 12 +++++++++ arch/arc/dts/hsdk-common.dtsi | 152 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arc/dts/hsdk.dts | 145 +++--------------------------------------------------------------------------------------------------------- arch/arc/include/asm/arcregs.h | 4 +++ arch/arc/lib/start.S | 15 ++++++++++++ board/synopsys/hsdk/Kconfig | 20 ++++++++++++++- board/synopsys/hsdk/MAINTAINERS | 5 +++- board/synopsys/hsdk/config.mk | 16 ++++++++++++ board/synopsys/hsdk/headerize-hsdk.py | 2 +- board/synopsys/hsdk/hsdk.c | 251 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------- configs/hsdk_4xd_defconfig | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/clk/clk-hsdk-cgu.c | 9 ++++--- include/configs/hsdk-4xd.h | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ include/dt-bindings/clock/snps,hsdk-cgu.h | 5 ++-- 16 files changed, 657 insertions(+), 172 deletions(-) create mode 100644 arch/arc/dts/hsdk-4xd.dts create mode 100644 arch/arc/dts/hsdk-common.dtsi create mode 100644 configs/hsdk_4xd_defconfig create mode 100644 include/configs/hsdk-4xd.h Regards, Alexey

2 4

Please pull u-boot-dm
by Simon Glass 28 Apr '20

28 Apr '20

Hi Tom, https://gitlab.denx.de/u-boot/custodians/u-boot-dm/pipelines/2949 The following changes since commit d202f67db0771247de562af5d6a5df778702857b: Merge branch '2020-04-25-master-imports' (2020-04-25 08:20:22 -0400) are available in the Git repository at: git://git.denx.de/u-boot-dm.git tags/dm-pull-27apr20 for you to fetch changes up to c1f39edc62adc81775e750957aa557bcf994e607: log: remove useless cast (2020-04-26 14:25:21 -0600) ---------------------------------------------------------------- Move Python tools to use absolute paths Minor buildman fixes for new features Make libfdt code more similar to upsteam ---------------------------------------------------------------- Heinrich Schuchardt (1): log: remove useless cast Masahiro Yamada (3): libfdt: migrate fdt_ro.c to a wrapper of scripts/dtc/libfdt/fdt_ro.c fdt_region: move fdt_region.c to common/ from lib/libfdt/ libfdt: split fdt_region declarations out to <fdt_region.h> Simon Glass (19): buildman: Fix test for new 9.2 kernel buildman: Correct operation of -A flag buildman: Make sure that -o is given with -w buildman: Use out-env for environment output buildman: Write output files when using -w patman: Rename the main module rmboard: Move to Python 3 patman: Drop references to __future__ patman: Drop Python 2 StringIO code buildman: Rename the main module dtoc: Rename the main module binman: Rename the main module Add a 'make tcheck' option to test tools patman: Drop the python2 code in test coverage patman: Move test running/reporting to test_util buildman: Move to absolute imports binman: Move to absolute imports patman: Move to absolute imports patman: Tidy up sys.path changes Makefile | 6 +- common/Makefile | 1 + {lib/libfdt => common}/fdt_region.c | 1 + common/image-fit-sig.c | 1 + common/log.c | 2 +- include/fdt_region.h | 304 ++++++++++++ include/linux/libfdt.h | 299 ----------- lib/libfdt/Makefile | 9 +- lib/libfdt/fdt_ro.c | 925 +---------------------------------- test/run | 26 +- tools/Makefile | 13 +- tools/binman/binman | 2 +- tools/binman/cbfs_util.py | 8 +- tools/binman/cbfs_util_test.py | 12 +- tools/binman/control.py | 20 +- tools/binman/elf.py | 8 +- tools/binman/elf_test.py | 10 +- tools/binman/entry.py | 22 +- tools/binman/entry_test.py | 12 +- tools/binman/etype/__init__.py | 0 tools/binman/etype/_testing.py | 6 +- tools/binman/etype/blob.py | 8 +- tools/binman/etype/blob_dtb.py | 6 +- tools/binman/etype/blob_named_by_arg.py | 4 +- tools/binman/etype/cbfs.py | 10 +- tools/binman/etype/cros_ec_rw.py | 2 +- tools/binman/etype/fdtmap.py | 10 +- tools/binman/etype/files.py | 8 +- tools/binman/etype/fill.py | 6 +- tools/binman/etype/fmap.py | 10 +- tools/binman/etype/gbb.py | 8 +- tools/binman/etype/image_header.py | 4 +- tools/binman/etype/intel_cmc.py | 4 +- tools/binman/etype/intel_descriptor.py | 4 +- tools/binman/etype/intel_fit.py | 2 +- tools/binman/etype/intel_fit_ptr.py | 2 +- tools/binman/etype/intel_fsp.py | 4 +- tools/binman/etype/intel_fsp_m.py | 4 +- tools/binman/etype/intel_fsp_s.py | 4 +- tools/binman/etype/intel_fsp_t.py | 4 +- tools/binman/etype/intel_ifwi.py | 8 +- tools/binman/etype/intel_me.py | 4 +- tools/binman/etype/intel_mrc.py | 4 +- tools/binman/etype/intel_refcode.py | 4 +- tools/binman/etype/intel_vbt.py | 4 +- tools/binman/etype/intel_vga.py | 4 +- tools/binman/etype/powerpc_mpc85xx_bootpg_resetvec.py | 4 +- tools/binman/etype/section.py | 10 +- tools/binman/etype/text.py | 6 +- tools/binman/etype/u_boot.py | 4 +- tools/binman/etype/u_boot_dtb.py | 4 +- tools/binman/etype/u_boot_dtb_with_ucode.py | 10 +- tools/binman/etype/u_boot_elf.py | 8 +- tools/binman/etype/u_boot_img.py | 4 +- tools/binman/etype/u_boot_nodtb.py | 4 +- tools/binman/etype/u_boot_spl.py | 7 +- tools/binman/etype/u_boot_spl_bss_pad.py | 10 +- tools/binman/etype/u_boot_spl_dtb.py | 4 +- tools/binman/etype/u_boot_spl_elf.py | 4 +- tools/binman/etype/u_boot_spl_nodtb.py | 4 +- tools/binman/etype/u_boot_spl_with_ucode_ptr.py | 6 +- tools/binman/etype/u_boot_tpl.py | 7 +- tools/binman/etype/u_boot_tpl_dtb.py | 4 +- tools/binman/etype/u_boot_tpl_dtb_with_ucode.py | 5 +- tools/binman/etype/u_boot_tpl_elf.py | 4 +- tools/binman/etype/u_boot_tpl_with_ucode_ptr.py | 10 +- tools/binman/etype/u_boot_ucode.py | 6 +- tools/binman/etype/u_boot_with_ucode_ptr.py | 12 +- tools/binman/etype/vblock.py | 6 +- tools/binman/etype/x86_reset16.py | 4 +- tools/binman/etype/x86_reset16_spl.py | 4 +- tools/binman/etype/x86_reset16_tpl.py | 4 +- tools/binman/etype/x86_start16.py | 4 +- tools/binman/etype/x86_start16_spl.py | 4 +- tools/binman/etype/x86_start16_tpl.py | 4 +- tools/binman/fdt_test.py | 8 +- tools/binman/fmap_util.py | 2 +- tools/binman/ftest.py | 49 +- tools/binman/image.py | 18 +- tools/binman/image_test.py | 2 +- tools/binman/{binman.py => main.py} | 110 +---- tools/binman/state.py | 10 +- tools/buildman/README | 3 +- tools/buildman/builder.py | 17 +- tools/buildman/builderthread.py | 37 +- tools/buildman/buildman | 2 +- tools/buildman/cmdline.py | 3 +- tools/buildman/control.py | 26 +- tools/buildman/func_test.py | 35 +- tools/buildman/{buildman.py => main.py} | 27 +- tools/buildman/test.py | 25 +- tools/buildman/toolchain.py | 8 +- tools/dtoc/dtb_platdata.py | 6 +- tools/dtoc/dtoc | 2 +- tools/dtoc/fdt.py | 4 +- tools/dtoc/fdt_util.py | 4 +- tools/dtoc/{dtoc.py => main.py} | 10 +- tools/dtoc/test_dtoc.py | 12 +- tools/dtoc/test_fdt.py | 17 +- tools/fdtgrep.c | 1 + tools/genboardscfg.py | 3 +- tools/image-host.c | 1 + tools/libfdt/fdt_ro.c | 2 + tools/moveconfig.py | 8 +- tools/patman/checkpatch.py | 8 +- tools/patman/command.py | 5 +- tools/patman/func_test.py | 15 +- tools/patman/get_maintainer.py | 5 +- tools/patman/gitutil.py | 12 +- tools/patman/{patman.py => main.py} | 27 +- tools/patman/patchstream.py | 8 +- tools/patman/patman | 2 +- tools/patman/project.py | 2 +- tools/patman/series.py | 12 +- tools/patman/settings.py | 13 +- tools/patman/terminal.py | 2 - tools/patman/test.py | 10 +- tools/patman/test_util.py | 125 ++++- tools/patman/tools.py | 6 +- tools/patman/tout.py | 4 +- tools/rmboard.py | 7 +- 121 files changed, 896 insertions(+), 1805 deletions(-) rename {lib/libfdt => common}/fdt_region.c (99%) create mode 100644 include/fdt_region.h delete mode 100644 tools/binman/etype/__init__.py rename tools/binman/{binman.py => main.py} (54%) rename tools/buildman/{buildman.py => main.py} (76%) rename tools/dtoc/{dtoc.py => main.py} (94%) create mode 100644 tools/libfdt/fdt_ro.c rename tools/patman/{patman.py => main.py} (93%) Regards, Simon

2 1

[PATCH 3/3][v2] board: freescale: Remove LS2080A_SIMU support
by Priyanka Jain 28 Apr '20

28 Apr '20

Remove LS2080A_SIMU as it was pre-silicon board and is no longer Maintained. Signed-off-by: Priyanka Jain <priyanka.jain(a)nxp.com> --- Changes for v2: Add 2/3 patch in series arch/arm/Kconfig | 12 --- arch/arm/cpu/armv8/Kconfig | 2 +- board/freescale/ls2080a/Kconfig | 17 ---- board/freescale/ls2080a/MAINTAINERS | 2 - configs/ls2080a_simu_defconfig | 45 --------- drivers/i2c/Kconfig | 2 - include/configs/ls2080a_simu.h | 147 ---------------------------- 7 files changed, 1 insertion(+), 226 deletions(-) delete mode 100644 configs/ls2080a_simu_defconfig delete mode 100644 include/configs/ls2080a_simu.h diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index e4b29e92c8..108c22b597 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1134,18 +1134,6 @@ config TARGET_VEXPRESS64_JUNO select ARM64 select PL01X_SERIAL -config TARGET_LS2080A_SIMU - bool "Support ls2080a_simu" - select ARCH_LS2080A - select ARM64 - select ARMV8_MULTIENTRY - select BOARD_LATE_INIT - help - Support for Freescale LS2080A_SIMU platform. - The LS2080A Development System (QDS) is a pre silicon - development platform that supports the QorIQ LS2080A - Layerscape Architecture processor. - config TARGET_LS1088AQDS bool "Support ls1088aqds" select ARCH_LS1088A diff --git a/arch/arm/cpu/armv8/Kconfig b/arch/arm/cpu/armv8/Kconfig index 006453921e..bbed71be43 100644 --- a/arch/arm/cpu/armv8/Kconfig +++ b/arch/arm/cpu/armv8/Kconfig @@ -98,7 +98,7 @@ config PSCI_RESET default y select ARM_SMCCC if OF_CONTROL depends on !ARCH_EXYNOS7 && !ARCH_BCM283X && \ - !TARGET_LS2080A_SIMU && !TARGET_LS2080AQDS && \ + !TARGET_LS2080AQDS && \ !TARGET_LS2080ARDB && \ !TARGET_LS1088ARDB && !TARGET_LS1088AQDS && \ !TARGET_LS1012ARDB && !TARGET_LS1012AFRDM && \ diff --git a/board/freescale/ls2080a/Kconfig b/board/freescale/ls2080a/Kconfig index f85c547b61..b756548179 100644 --- a/board/freescale/ls2080a/Kconfig +++ b/board/freescale/ls2080a/Kconfig @@ -16,20 +16,3 @@ source "board/freescale/common/Kconfig" endif -if TARGET_LS2080A_SIMU - -config SYS_BOARD - default "ls2080a" - -config SYS_VENDOR - default "freescale" - -config SYS_SOC - default "fsl-layerscape" - -config SYS_CONFIG_NAME - default "ls2080a_simu" - -source "board/freescale/common/Kconfig" - -endif diff --git a/board/freescale/ls2080a/MAINTAINERS b/board/freescale/ls2080a/MAINTAINERS index 3afaab9c77..b228f4dd59 100644 --- a/board/freescale/ls2080a/MAINTAINERS +++ b/board/freescale/ls2080a/MAINTAINERS @@ -3,5 +3,3 @@ M: Prabhakar Kushwaha <prabhakar.kushwaha(a)nxp.com> M: Priyanka Jain <priyanka.jain(a)nxp.com> S: Maintained F: board/freescale/ls2080a/ -F: include/configs/ls2080a_simu.h -F: configs/ls2080a_simu_defconfig diff --git a/configs/ls2080a_simu_defconfig b/configs/ls2080a_simu_defconfig deleted file mode 100644 index ccf71179e0..0000000000 --- a/configs/ls2080a_simu_defconfig +++ /dev/null @@ -1,45 +0,0 @@ -CONFIG_ARM=y -CONFIG_TARGET_LS2080A_SIMU=y -CONFIG_SYS_TEXT_BASE=0x30100000 -CONFIG_ENV_SIZE=0x1000 -CONFIG_NR_DRAM_BANKS=3 -CONFIG_IDENT_STRING=" LS2080A-SIMU" -CONFIG_FIT=y -CONFIG_FIT_VERBOSE=y -CONFIG_OF_BOARD_SETUP=y -CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="SIMU" -CONFIG_BOOTDELAY=10 -CONFIG_USE_BOOTARGS=y -CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 ramdisk_size=0x2000000 default_hugepagesz=2m hugepagesz=2m hugepages=256" -# CONFIG_USE_BOOTCOMMAND is not set -# CONFIG_DISPLAY_BOARDINFO is not set -# CONFIG_CMD_CONSOLE is not set -# CONFIG_CMD_XIMG is not set -# CONFIG_CMD_EDITENV is not set -CONFIG_CMD_GREPENV=y -CONFIG_CMD_I2C=y -# CONFIG_CMD_LOADS is not set -CONFIG_CMD_MMC=y -CONFIG_CMD_NAND=y -# CONFIG_CMD_ITEST is not set -# CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NFS is not set -CONFIG_CMD_CACHE=y -# CONFIG_CMD_MISC is not set -CONFIG_MP=y -# CONFIG_ISO_PARTITION is not set -# CONFIG_EFI_PARTITION is not set -CONFIG_SYS_RELOC_GD_ENV_ADDR=y -CONFIG_NET_RANDOM_ETHADDR=y -CONFIG_FSL_CAAM=y -CONFIG_FSL_ESDHC=y -CONFIG_MTD=y -CONFIG_MTD_NOR_FLASH=y -CONFIG_FLASH_CFI_DRIVER=y -CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y -CONFIG_SYS_FLASH_CFI=y -CONFIG_MTD_RAW_NAND=y -CONFIG_SYS_NS16550=y -CONFIG_OF_LIBFDT=y -CONFIG_EFI_LOADER_BOUNCE_BUFFER=y diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig index 02a74eb136..b981d47e67 100644 --- a/drivers/i2c/Kconfig +++ b/drivers/i2c/Kconfig @@ -214,7 +214,6 @@ endif if SYS_I2C_MXC_I2C1 config SYS_MXC_I2C1_SPEED int "I2C Channel 1 speed" - default 40000000 if TARGET_LS2080A_SIMU default 100000 help MXC I2C Channel 1 speed @@ -229,7 +228,6 @@ endif if SYS_I2C_MXC_I2C2 config SYS_MXC_I2C2_SPEED int "I2C Channel 2 speed" - default 40000000 if TARGET_LS2080A_SIMU default 100000 help MXC I2C Channel 2 speed diff --git a/include/configs/ls2080a_simu.h b/include/configs/ls2080a_simu.h deleted file mode 100644 index ab46df7600..0000000000 --- a/include/configs/ls2080a_simu.h +++ /dev/null @@ -1,147 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright (C) 2014 Freescale Semiconductor - */ - -#ifndef __LS2_SIMU_H -#define __LS2_SIMU_H - -#include "ls2080a_common.h" - -#define CONFIG_SYS_CLK_FREQ 100000000 -#define CONFIG_DDR_CLK_FREQ 133333333 - -#define CONFIG_DIMM_SLOTS_PER_CTLR 1 -#define CONFIG_CHIP_SELECTS_PER_CTRL 4 -#ifdef CONFIG_SYS_FSL_HAS_DP_DDR -#define CONFIG_DP_DDR_DIMM_SLOTS_PER_CTLR 1 -#endif - -/* SMSC 91C111 ethernet configuration */ -#define CONFIG_SMC91111 -#define CONFIG_SMC91111_BASE (0x2210000) - -#define CONFIG_SYS_NOR0_CSPR_EXT (0x0) -#define CONFIG_SYS_NOR_AMASK IFC_AMASK(128*1024*1024) - -#ifdef CONFIG_MTD_NOR_FLASH -#define CONFIG_SYS_FLASH_QUIET_TEST -#endif - -/* - * NOR Flash Timing Params - */ -#define CONFIG_SYS_NOR0_CSPR \ - (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS) | \ - CSPR_PORT_SIZE_16 | \ - CSPR_MSEL_NOR | \ - CSPR_V) -#define CONFIG_SYS_NOR0_CSPR_EARLY \ - (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS_EARLY) | \ - CSPR_PORT_SIZE_16 | \ - CSPR_MSEL_NOR | \ - CSPR_V) -#define CONFIG_SYS_NOR_CSOR CSOR_NOR_ADM_SHIFT(12) -#define CONFIG_SYS_NOR_FTIM0 (FTIM0_NOR_TACSE(0x1) | \ - FTIM0_NOR_TEADC(0x1) | \ - FTIM0_NOR_TEAHC(0x1)) -#define CONFIG_SYS_NOR_FTIM1 (FTIM1_NOR_TACO(0x1) | \ - FTIM1_NOR_TRAD_NOR(0x1)) -#define CONFIG_SYS_NOR_FTIM2 (FTIM2_NOR_TCS(0x0) | \ - FTIM2_NOR_TCH(0x0) | \ - FTIM2_NOR_TWP(0x1)) -#define CONFIG_SYS_NOR_FTIM3 0x04000000 -#define CONFIG_SYS_IFC_CCR 0x01000000 - -#ifdef CONFIG_MTD_NOR_FLASH -#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ - -#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* number of banks */ -#define CONFIG_SYS_MAX_FLASH_SECT 1024 /* sectors per device */ -#define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ -#define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ - -#define CONFIG_SYS_FLASH_EMPTY_INFO -#define CONFIG_SYS_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE } -#endif - -#define CONFIG_NAND_FSL_IFC -#define CONFIG_SYS_NAND_MAX_ECCPOS 256 -#define CONFIG_SYS_NAND_MAX_OOBFREE 2 - -#define CONFIG_SYS_NAND_CSPR_EXT (0x0) -#define CONFIG_SYS_NAND_CSPR (CSPR_PHYS_ADDR(CONFIG_SYS_NAND_BASE_PHYS) \ - | CSPR_PORT_SIZE_8 /* Port Size = 8 bit */ \ - | CSPR_MSEL_NAND /* MSEL = NAND */ \ - | CSPR_V) -#define CONFIG_SYS_NAND_AMASK IFC_AMASK(64 * 1024) - -#define CONFIG_SYS_NAND_CSOR (CSOR_NAND_ECC_ENC_EN /* ECC on encode */ \ - | CSOR_NAND_ECC_DEC_EN /* ECC on decode */ \ - | CSOR_NAND_ECC_MODE_4 /* 4-bit ECC */ \ - | CSOR_NAND_RAL_3 /* RAL = 2Byes */ \ - | CSOR_NAND_PGS_2K /* Page Size = 2K */ \ - | CSOR_NAND_SPRZ_64/* Spare size = 64 */ \ - | CSOR_NAND_PB(64)) /*Pages Per Block = 64*/ - -#define CONFIG_SYS_NAND_ONFI_DETECTION - -/* ONFI NAND Flash mode0 Timing Params */ -#define CONFIG_SYS_NAND_FTIM0 (FTIM0_NAND_TCCST(0x07) | \ - FTIM0_NAND_TWP(0x18) | \ - FTIM0_NAND_TWCHT(0x07) | \ - FTIM0_NAND_TWH(0x0a)) -#define CONFIG_SYS_NAND_FTIM1 (FTIM1_NAND_TADLE(0x32) | \ - FTIM1_NAND_TWBE(0x39) | \ - FTIM1_NAND_TRR(0x0e) | \ - FTIM1_NAND_TRP(0x18)) -#define CONFIG_SYS_NAND_FTIM2 (FTIM2_NAND_TRAD(0x0f) | \ - FTIM2_NAND_TREH(0x0a) | \ - FTIM2_NAND_TWHRE(0x1e)) -#define CONFIG_SYS_NAND_FTIM3 0x0 - -#define CONFIG_SYS_NAND_BASE_LIST { CONFIG_SYS_NAND_BASE } -#define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_MTD_NAND_VERIFY_WRITE - -#define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024) - -#define CONFIG_SYS_CSPR0_EXT CONFIG_SYS_NOR0_CSPR_EXT -#define CONFIG_SYS_CSPR0 CONFIG_SYS_NOR0_CSPR_EARLY -#define CONFIG_SYS_CSPR0_FINAL CONFIG_SYS_NOR0_CSPR -#define CONFIG_SYS_AMASK0 CONFIG_SYS_NOR_AMASK -#define CONFIG_SYS_CSOR0 CONFIG_SYS_NOR_CSOR -#define CONFIG_SYS_CS0_FTIM0 CONFIG_SYS_NOR_FTIM0 -#define CONFIG_SYS_CS0_FTIM1 CONFIG_SYS_NOR_FTIM1 -#define CONFIG_SYS_CS0_FTIM2 CONFIG_SYS_NOR_FTIM2 -#define CONFIG_SYS_CS0_FTIM3 CONFIG_SYS_NOR_FTIM3 -#define CONFIG_SYS_CSPR1_EXT CONFIG_SYS_NAND_CSPR_EXT -#define CONFIG_SYS_CSPR1 CONFIG_SYS_NAND_CSPR -#define CONFIG_SYS_AMASK1 CONFIG_SYS_NAND_AMASK -#define CONFIG_SYS_CSOR1 CONFIG_SYS_NAND_CSOR -#define CONFIG_SYS_CS1_FTIM0 CONFIG_SYS_NAND_FTIM0 -#define CONFIG_SYS_CS1_FTIM1 CONFIG_SYS_NAND_FTIM1 -#define CONFIG_SYS_CS1_FTIM2 CONFIG_SYS_NAND_FTIM2 -#define CONFIG_SYS_CS1_FTIM3 CONFIG_SYS_NAND_FTIM3 - -/* MMC */ -#ifdef CONFIG_MMC -#define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 -#endif - -/* Debug Server firmware */ -#define CONFIG_SYS_DEBUG_SERVER_FW_IN_NOR -#define CONFIG_SYS_DEBUG_SERVER_FW_ADDR 0x580C00000ULL - -/* MC firmware */ -#define CONFIG_SYS_LS_MC_DPL_IN_NOR -#define CONFIG_SYS_LS_MC_DPL_ADDR 0x5806C0000ULL - -#define CONFIG_SYS_LS_MC_DPC_IN_NOR -#define CONFIG_SYS_LS_MC_DPC_ADDR 0x5806F8000ULL - -#define CONFIG_SYS_LS_MC_BOOT_TIMEOUT_MS 200000 - -/* Store environment at top of flash */ - -#endif /* __LS2_SIMU_H */ -- 2.17.1

1 0

Image too large: increase CONFIG_SYS_BOOTM_LEN
by Meghavi Parikh 28 Apr '20

28 Apr '20

Hi, I am trying to prepare Verified U-BOOT on a BeagleBone Black. Briefly these are the steps I am following: make ARCH=arm CROSS_COMPILE=${CC} am335x_evm_defconfig make ARCH=arm CROSS_COMPILE=${CC} all then, make sandbox_defconfig tools-only For the Linux Kernel, I am trying (from BBB's official repo: https://github.com/beagleboard/linux): make bb.org_defconfig make uImage dtbs LOADADDR=80008000 -j 4 Then, after uploading these files to the BBB, I am facing the following error: Booting using the fdt blob at 0x82aae18c Uncompressing Kernel Image Image too large: increase CONFIG_SYS_BOOTM_LEN Must RESET board to recover resetting ... Then, I modified the source code https://github.com/u-boot/u-boot/blob/d16d37bcd4087b8ea0f66cb76a73edad182d1… to print the size by adding one line. printf("Image too large: increase CONFIG_SYS_BOOTM_LEN: 0x%lx\nRequired Size minimum: 0x%lx\n", CONFIG_SYS_BOOTM_LEN, uncomp_size); At this point, I have already set: #define CONFIG_SYS_BOOTM_LEN 0x1A7D8C0 And this is the error I am getting: Booting using the fdt blob at 0x82aae18c Uncompressing Kernel Image Image too large: increase CONFIG_SYS_BOOTM_LEN: 0x1000000 Required Size minimum: 0x1000000 Must RESET board to recover resetting ... You can follow the issue that I have raised on github with the beaglebone team on this link to get exact details for the problem: https://github.com/beagleboard/linux/issues/231 Is there some mistake that I am doing here? Why is the size showing 0x1000000 when I am setting it to 0x1A7D8C0? The size of the uncompressed Image that is created is around 20MB which is larger than 0x1000000. Thanks, Meghavi Parikh

1 0

[PATCH 1/3][v2] board: freescale: Remove LS2080A_EMU support
by Priyanka Jain 28 Apr '20

28 Apr '20

Remove LS2080A_EMU as it was pre-silicon board and is no longer Maintained. Signed-off-by: Priyanka Jain <priyanka.jain(a)nxp.com> --- Changes for v2: Add 2/3 patch in series arch/arm/Kconfig | 12 ----- arch/arm/cpu/armv8/Kconfig | 2 +- board/freescale/ls2080a/Kconfig | 18 ------- board/freescale/ls2080a/MAINTAINERS | 2 - configs/ls2080a_emu_defconfig | 37 ------------- drivers/i2c/Kconfig | 4 +- include/configs/ls2080a_emu.h | 80 ----------------------------- 7 files changed, 3 insertions(+), 152 deletions(-) delete mode 100644 configs/ls2080a_emu_defconfig delete mode 100644 include/configs/ls2080a_emu.h diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 1bcf345028..e4b29e92c8 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1134,18 +1134,6 @@ config TARGET_VEXPRESS64_JUNO select ARM64 select PL01X_SERIAL -config TARGET_LS2080A_EMU - bool "Support ls2080a_emu" - select ARCH_LS2080A - select ARM64 - select ARMV8_MULTIENTRY - select FSL_DDR_SYNC_REFRESH - help - Support for Freescale LS2080A_EMU platform. - The LS2080A Development System (EMULATOR) is a pre-silicon - development platform that supports the QorIQ LS2080A - Layerscape Architecture processor. - config TARGET_LS2080A_SIMU bool "Support ls2080a_simu" select ARCH_LS2080A diff --git a/arch/arm/cpu/armv8/Kconfig b/arch/arm/cpu/armv8/Kconfig index 16c83e8614..006453921e 100644 --- a/arch/arm/cpu/armv8/Kconfig +++ b/arch/arm/cpu/armv8/Kconfig @@ -99,7 +99,7 @@ config PSCI_RESET select ARM_SMCCC if OF_CONTROL depends on !ARCH_EXYNOS7 && !ARCH_BCM283X && \ !TARGET_LS2080A_SIMU && !TARGET_LS2080AQDS && \ - !TARGET_LS2080ARDB && !TARGET_LS2080A_EMU && \ + !TARGET_LS2080ARDB && \ !TARGET_LS1088ARDB && !TARGET_LS1088AQDS && \ !TARGET_LS1012ARDB && !TARGET_LS1012AFRDM && \ !TARGET_LS1012A2G5RDB && !TARGET_LS1012AQDS && \ diff --git a/board/freescale/ls2080a/Kconfig b/board/freescale/ls2080a/Kconfig index b5033511b5..6015b8f930 100644 --- a/board/freescale/ls2080a/Kconfig +++ b/board/freescale/ls2080a/Kconfig @@ -1,21 +1,3 @@ -if TARGET_LS2080A_EMU - -config SYS_BOARD - default "ls2080a" - -config SYS_VENDOR - default "freescale" - -config SYS_SOC - default "fsl-layerscape" - -config SYS_CONFIG_NAME - default "ls2080a_emu" - -source "board/freescale/common/Kconfig" - -endif - if TARGET_LS2080A_SIMU config SYS_BOARD diff --git a/board/freescale/ls2080a/MAINTAINERS b/board/freescale/ls2080a/MAINTAINERS index e0e4e3f83e..3afaab9c77 100644 --- a/board/freescale/ls2080a/MAINTAINERS +++ b/board/freescale/ls2080a/MAINTAINERS @@ -3,7 +3,5 @@ M: Prabhakar Kushwaha <prabhakar.kushwaha(a)nxp.com> M: Priyanka Jain <priyanka.jain(a)nxp.com> S: Maintained F: board/freescale/ls2080a/ -F: include/configs/ls2080a_emu.h -F: configs/ls2080a_emu_defconfig F: include/configs/ls2080a_simu.h F: configs/ls2080a_simu_defconfig diff --git a/configs/ls2080a_emu_defconfig b/configs/ls2080a_emu_defconfig deleted file mode 100644 index 7927e3838f..0000000000 --- a/configs/ls2080a_emu_defconfig +++ /dev/null @@ -1,37 +0,0 @@ -CONFIG_ARM=y -CONFIG_TARGET_LS2080A_EMU=y -CONFIG_SYS_TEXT_BASE=0x30100000 -CONFIG_ENV_SIZE=0x1000 -CONFIG_NR_DRAM_BANKS=3 -CONFIG_IDENT_STRING=" LS2080A-EMU" -CONFIG_FIT=y -CONFIG_FIT_VERBOSE=y -CONFIG_OF_BOARD_SETUP=y -CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="EMU" -CONFIG_BOOTDELAY=10 -CONFIG_USE_BOOTARGS=y -CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 ramdisk_size=0x2000000 default_hugepagesz=2m hugepagesz=2m hugepages=256" -# CONFIG_USE_BOOTCOMMAND is not set -# CONFIG_DISPLAY_BOARDINFO is not set -# CONFIG_CMD_CONSOLE is not set -# CONFIG_CMD_XIMG is not set -# CONFIG_CMD_EDITENV is not set -CONFIG_CMD_GREPENV=y -CONFIG_CMD_I2C=y -# CONFIG_CMD_LOADS is not set -# CONFIG_CMD_ITEST is not set -# CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NFS is not set -CONFIG_CMD_CACHE=y -# CONFIG_CMD_MISC is not set -CONFIG_MP=y -# CONFIG_DOS_PARTITION is not set -# CONFIG_ISO_PARTITION is not set -# CONFIG_EFI_PARTITION is not set -CONFIG_SYS_RELOC_GD_ENV_ADDR=y -CONFIG_FSL_CAAM=y -# CONFIG_MMC is not set -CONFIG_SYS_NS16550=y -CONFIG_OF_LIBFDT=y -CONFIG_EFI_LOADER_BOUNCE_BUFFER=y diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig index e42b6516bf..02a74eb136 100644 --- a/drivers/i2c/Kconfig +++ b/drivers/i2c/Kconfig @@ -214,7 +214,7 @@ endif if SYS_I2C_MXC_I2C1 config SYS_MXC_I2C1_SPEED int "I2C Channel 1 speed" - default 40000000 if TARGET_LS2080A_SIMU || TARGET_LS2080A_EMU + default 40000000 if TARGET_LS2080A_SIMU default 100000 help MXC I2C Channel 1 speed @@ -229,7 +229,7 @@ endif if SYS_I2C_MXC_I2C2 config SYS_MXC_I2C2_SPEED int "I2C Channel 2 speed" - default 40000000 if TARGET_LS2080A_SIMU || TARGET_LS2080A_EMU + default 40000000 if TARGET_LS2080A_SIMU default 100000 help MXC I2C Channel 2 speed diff --git a/include/configs/ls2080a_emu.h b/include/configs/ls2080a_emu.h deleted file mode 100644 index 3e0ad48dda..0000000000 --- a/include/configs/ls2080a_emu.h +++ /dev/null @@ -1,80 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright 2014 Freescale Semiconductor - */ - -#ifndef __LS2_EMU_H -#define __LS2_EMU_H - -#include "ls2080a_common.h" - -#define CONFIG_SYS_CLK_FREQ 100000000 -#define CONFIG_DDR_CLK_FREQ 133333333 - -#define CONFIG_DDR_SPD -#define CONFIG_SYS_FSL_DDR_EMU /* Support emulator */ -#define SPD_EEPROM_ADDRESS1 0x51 -#define SPD_EEPROM_ADDRESS2 0x52 -#define SPD_EEPROM_ADDRESS3 0x53 -#define SPD_EEPROM_ADDRESS SPD_EEPROM_ADDRESS1 -#define CONFIG_SYS_SPD_BUS_NUM 1 /* SPD on I2C bus 1 */ -#define CONFIG_DIMM_SLOTS_PER_CTLR 1 -#define CONFIG_CHIP_SELECTS_PER_CTRL 4 -#ifdef CONFIG_SYS_FSL_HAS_DP_DDR -#define CONFIG_DP_DDR_DIMM_SLOTS_PER_CTLR 1 -#endif - -#define CONFIG_SYS_NOR0_CSPR_EXT (0x0) -#define CONFIG_SYS_NOR_AMASK IFC_AMASK(128*1024*1024) -/* - * NOR Flash Timing Params - */ -#define CONFIG_SYS_NOR0_CSPR \ - (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS) | \ - CSPR_PORT_SIZE_16 | \ - CSPR_MSEL_NOR | \ - CSPR_V) -#define CONFIG_SYS_NOR0_CSPR_EARLY \ - (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS_EARLY) | \ - CSPR_PORT_SIZE_16 | \ - CSPR_MSEL_NOR | \ - CSPR_V) -#define CONFIG_SYS_NOR_CSOR CSOR_NOR_ADM_SHIFT(12) -#define CONFIG_SYS_NOR_FTIM0 (FTIM0_NOR_TACSE(0x1) | \ - FTIM0_NOR_TEADC(0x1) | \ - FTIM0_NOR_TEAHC(0x1)) -#define CONFIG_SYS_NOR_FTIM1 (FTIM1_NOR_TACO(0x1) | \ - FTIM1_NOR_TRAD_NOR(0x1)) -#define CONFIG_SYS_NOR_FTIM2 (FTIM2_NOR_TCS(0x0) | \ - FTIM2_NOR_TCH(0x0) | \ - FTIM2_NOR_TWP(0x1)) -#define CONFIG_SYS_NOR_FTIM3 0x04000000 -#define CONFIG_SYS_IFC_CCR 0x01000000 - -#define CONFIG_SYS_CSPR0_EXT CONFIG_SYS_NOR0_CSPR_EXT -#define CONFIG_SYS_CSPR0 CONFIG_SYS_NOR0_CSPR_EARLY -#define CONFIG_SYS_CSPR0_FINAL CONFIG_SYS_NOR0_CSPR -#define CONFIG_SYS_AMASK0 CONFIG_SYS_NOR_AMASK -#define CONFIG_SYS_CSOR0 CONFIG_SYS_NOR_CSOR -#define CONFIG_SYS_CS0_FTIM0 CONFIG_SYS_NOR_FTIM0 -#define CONFIG_SYS_CS0_FTIM1 CONFIG_SYS_NOR_FTIM1 -#define CONFIG_SYS_CS0_FTIM2 CONFIG_SYS_NOR_FTIM2 -#define CONFIG_SYS_CS0_FTIM3 CONFIG_SYS_NOR_FTIM3 - -/* Debug Server firmware */ -#define CONFIG_SYS_DEBUG_SERVER_FW_IN_NOR -#define CONFIG_SYS_DEBUG_SERVER_FW_ADDR 0x580C00000ULL - -/* - * This trick allows users to load MC images into DDR directly without - * copying from NOR flash. It dramatically improves speed. - */ -#define CONFIG_SYS_LS_MC_FW_IN_DDR -#define CONFIG_SYS_LS_MC_DPL_IN_DDR -#define CONFIG_SYS_LS_MC_DPC_IN_DDR - -#define CONFIG_SYS_LS_MC_BOOT_TIMEOUT_MS 200000 - -/* Store environment at top of flash */ - -#endif /* __LS2_EMU_H */ -- 2.17.1

1 2