summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* cmd: fastboot: Enable FASTBOOT_FLASH_NAND for SUNXI_NAND devicesBenjamin Young2017-10-251-0/+10
| | | | | | | | | | Encountered an issue where fastboot can't write to NAND on a CHIP_pro, the symbol was neither present in the board's config header, nor the Kconfig, this patch puts it in the Kconfig and defaults on when SUNXI_NAND is selected. Signed-off-by: Ben Young <computermouth@crunchbangplusplus.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
* sunxi: clk: fix N formula for CPUX clocksQuentin Schulz2017-10-251-1/+1
| | | | | | | | | | | | | | | | | As explained in arch/arm/mach-sunxi/clock_sun8i_a83t.c, clk for CPU clusters is computed as clk = 24*n. However, the current formula is clk = 24*(n-1). This results in a clock set to a frequency that isn't specified as possible for CPUs. Let's use the correct formula. Fixes: f542948b1e8c ("sunxi: clk: add basic clocks for A83T") Signed-off-by: Quentin Schulz <quentin.schulz@free-electrons.com> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> Reviewed-by: Jagan Teki <jagan@openedev.com>
* SPL: SPI: select SPL_SPI_FLASH_SUPPORT on SPL_SPI_SUNXIAndre Przywara2017-10-253-2/+1
| | | | | | | | | | | | | | The Allwinner SPI flash SPL boot support is guarded by the SPL_SPI_SUNXI symbol. But despite its generic name, the actual only use case for this is to provide SPI flash support to the SPL, which requires CONFIG_SPL_SPI_FLASH_SUPPORT to be defined. Select this symbol from the SPL_SPI_SUNXI Kconfig definition. This avoids doing this explicitly in the defconfig, and fixes SPI booting on the Pine64 SoPine (and -LTS version) and the OrangePi Win board (both with SPI flash). Signed-off-by: Andre Przywara <andre.przywara@arm.com> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
* Kconfig: add CONFIG_BROKENHeinrich Schuchardt2017-10-231-0/+6
| | | | | | | | | | | | Provide a Kconfig option that we can use as dependency for features that are broken. This allows to easily disable them without removing the code. As no short text is supplied the option will not appear in menuconfig. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Reviewed-by: Simon Glass <sjg@chromium.org>
* doc: verified-boot: fix crypto algorithm examplesMasahiro Yamada2017-10-231-2/+2
| | | | | | | | As you see in crypto_algos in common/image-sig.c, the algorithm should be either "rsa2048" or "rsa4096". "rs2048" is a typo. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* tools: image: fix node name of signature node in FITMasahiro Yamada2017-10-231-1/+1
| | | | | | | | Both "conf_name" and "sig_name" point to the name of config node. The latter should be the name of the signature node. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* test/py: fix typos in README.mdMasahiro Yamada2017-10-231-3/+3
| | | | | Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Stephen Warren <swarren@nvidia.com>
* cmd: gpt: solve issue for swap and rename commandPatrick Delaunay2017-10-232-16/+12
| | | | | | | | | | | | don't use prettyprint_part_size() in create_gpt_partitions_list() that avoid to align offset and size to 1 MiB and increase precision for start and size. This patch avoid the risk to change partition size and lost data during rename or swap. Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com> Acked-by: Stephen Warren <swarren@nvidia.com> Tested-by: Stephen Warren <swarren@nvidia.com>
* test/py: gpt: test start LBA for sub-command rename and swapPatrick Delaunay2017-10-231-4/+12
| | | | | | | | | | | | | | | | | Add test of first and last LBA in gpt for rename and swap. Only the name is expected to change, so test 3 columns for part command 1: first LBA (start) 2: last LBA (end) 3: partition name After rename, the last LBA change and it is a error in current U-Boot code + "first" = 0x7ff : invalid value (<start) + "second" = 0x17ff => size increasing ! Acked-by: Stephen Warren <swarren@nvidia.com> Tested-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
* test/py: gpt: add test for sub-command writePatrick Delaunay2017-10-231-0/+20
| | | | | | | | | + test write for one partition on all the device (size=0) + test write with disk uuid and 2 partitions Acked-by: Stephen Warren <swarren@nvidia.com> Tested-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
* disk: efi: correct the overlap check on GPT header and PTEPatrick Delaunay2017-10-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the partition starting at 0x4400 is refused with overlap error: $> gpt write mmc 0 "name=test,start=0x4400,size=0" Writing GPT: Partition overlap error! even if the 0x4400 is the first available offset for LBA35 with default value: - MBR=LBA1 - GPT header=LBA2 - PTE= 32 LBAs (128 entry), 3 to 34 And the command to have one partition for all the disk failed also : $> gpt write mmc 0 "name=test,size=0" After the patch : $> gpt write mmc 0 "name=test,size=0" Writing GPT: success! $> part list mmc 0 Partition Map for MMC device 0 -- Partition Type: EFI Part Start LBA End LBA Name Attributes Type GUID Partition GUID 1 0x00000022 0x01ce9fde "test" attrs: 0x0000000000000000 type: ebd0a0a2-b9e5-4433-87c0-68b6b72699c7 type: data guid: b4b84b8a-04e3-4000-0036-aff5c9c495b1 And 0x22 = 34 LBA => offset = 0x4400 is accepted as expected Reviewed-by: Ɓukasz Majewski <lukma@denx.de> Tested-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
* test/py: gpt: add test for sub-command read and verifyPatrick Delaunay2017-10-231-2/+29
| | | | | | | | | | | | | add sandbox test for some gpt sub-command - gpt read / part list : read the gpt partition created by sgdisk on host test start, size, LBA and name output - gpt verify : verify the gpt partition create by sgdisk on host PS: persistent data test_gpt_disk_image.bin are udpated Acked-by: Stephen Warren <swarren@nvidia.com> Tested-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
* test/py: gpt: copy persistent filePatrick Delaunay2017-10-231-9/+14
| | | | | | | | | copy the persistent gpt binary file as it can be modified during the test that avoid issue if the test fail: the test always restart with clean file Acked-by: Stephen Warren <swarren@nvidia.com> Tested-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
* rtc: mc146818: Correct alarm message for day alarmBin Meng2017-10-231-1/+1
| | | | | | | RTC_CONFIG_D register contains the day within the month to generate an alarm, not the month. This corrects the printf to indicate it. Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
* chiliboard config: use CONFIG_DEFAULT_FDT_FILE as env variableMichal Oleszczyk2017-10-232-1/+2
| | | | | | | Remove hardcoded ftd file name from environment variables. Use CONFIG_DEFAULT_FDT_FILE macro instead. Signed-off-by: Michal Oleszczyk <m.oleszczyk@grinn-global.com>
* simple-bus: remove DECLARE_GLOBAL_DATA_PTRMasahiro Yamada2017-10-231-2/+0
| | | | | | | No global pointer is used in this file. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
* mtd: remove MTDDEBUG() and CONFIG_MTD_DEBUGMasahiro Yamada2017-10-233-35/+0
| | | | | | | | | | | | All users of this macro have been converted. Remove MTDDEBUG and related CONFIG options. ubifs_dbg_msg_key() is kept. It is silent unless DEBUG is defined. I am not touching scripts/config_whitelist.txt. The deprecated options will be dropped by the next resync. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
* mtd: replace MTDDEBUG() with pr_debug()Masahiro Yamada2017-10-236-59/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In old days, the MTD subsystem in Linux had debug facility like DEBUG(MTD_DEBUG_LEVEL1, ...). They were all replaced with pr_debug() until Linux 3.2. See Linux commit 289c05222172 ("mtd: replace DEBUG() with pr_debug()"). U-Boot still uses similar macros. Covert all of them for easier sync. Done with the help of Coccinelle. The semantic patch I used is as follows: // <smpl> @@ expression e1, e2; @@ -MTDDEBUG(e1, e2) +pr_debug(e2) @@ expression e1, e2; @@ -MTDDEBUG(e1, e2, +pr_debug(e2, ...) // </smpl> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
* Merge git://git.denx.de/u-boot-uniphierTom Rini2017-10-2227-157/+370
|\
| * ARM: uniphier: use pr_*() more where appropriateMasahiro Yamada2017-10-231-8/+10
| | | | | | | | | | | | | | Commit dd74b945af2e ("ARM: uniphier: use pr_() instead of printf() where appropriate"), but I missed to update this file for some reason. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * doc: uniphier: add simple guide to Verified BootMasahiro Yamada2017-10-231-1/+226
| | | | | | | | | | | | | | Add a simple documentation about how to use the Verified Boot on UniPhier boards. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * ARM: uniphier: remove verify=n from environmentsMasahiro Yamada2017-10-231-1/+0
| | | | | | | | | | | | | | If the environment "verify" is set to n, the image verification is entirely skipped. Remove it as a preparation for verified boot. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * ARM: uniphier: increase CONFIG_SYS_BOOTM_LEN to 32MBMasahiro Yamada2017-10-231-0/+1
| | | | | | | | | | | | | | | | | | | | The default value of CONFIG_SYS_BOOTM_LEN, 0x800000, causes error when uncompressing Image.gz out of FIT image. Uncompressing Kernel Image ... Error: inflate() returned -5 Image too large: increase CONFIG_SYS_BOOTM_LEN Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * ARM: dts: uniphier: sync DT with Linux 4.14-rc5Masahiro Yamada2017-10-237-0/+74
| | | | | | | | Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * ARM: uniphier: split u-boot,dm-pre-reloc out to uniphier-v7-u-boot.dtsiMasahiro Yamada2017-10-2316-135/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | UniPhier 32-bit SoCs use CONFIG_SPL_OF_CONTROL. So, many nodes must be marked as dm-pre-reloc to prevent fdtgrep from stripping them off. Sprinkling U-Boot-specific properties all over the place is painful because DT files are synced with Linux from time to time. Split u-boot,dm-pre-reloc out to uniphier-v7-u-boot.dtsi, which is appended to UniPhier V7 DTS before the build. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Jagan Teki <jagan@openedev.com>
| * ARM: uniphier: remove CONFIG_UNIPHIER_ETHMasahiro Yamada2017-10-233-18/+0
| | | | | | | | | | | | | | | | | | | | The option is never enabled by anyone. Remove the code surrounded by its ifdef. This should be handled by the clock/reset drivers. CONFIG_UNIPHIER_ETH in scripts/config_whitelist.txt will be dropped by the next resync. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * ARM: uniphier: enable DWC3 xHCI driver reallyMasahiro Yamada2017-10-231-0/+2
|/ | | | | | | | I thought commit d37d31849c6a ("ARM: uniphier: enable DWC3 xHCI driver") enabled CONFIG_USB_DWC3_UNIPHIER, but CONFIG_USB_XHCI_DWC3 was missing in uniphier_v7_defconfig. Re-add. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
* uniphier_ld4_sld8: Re-add SMC911X_BASE addressTom Rini2017-10-211-0/+1
| | | | | | This was dropped by accident in the Kconfig conversion. Signed-off-by: Tom Rini <trini@konsulko.com>
* net: Add SMC911X driver to Kconfig, convertAdam Ford2017-10-2070-184/+174
| | | | | | | | | | | | | We add the various SMC91XX symbols to drivers/net/Kconfig and then this converts the following to Kconfig: CONFIG_SMC911X CONFIG_SMC911X_BASE CONFIG_SMC911X_16_BIT CONFIG_SMC911X_32_BIT Signed-off-by: Adam Ford <aford173@gmail.com> [trini: Apply to the rest of the tree, re-squash old and new patch] Signed-off-by: Tom Rini <trini@konsulko.com>
* Convert CONFIG_NAND_OMAP_GPMC et al and CONFIG_NAND_MXC to KconfigAdam Ford2017-10-20106-128/+166
| | | | | | | | | | | | | | | | | This converts the following to Kconfig: CONFIG_NAND_MXC CONFIG_NAND_OMAP_GPMC CONFIG_NAND_OMAP_GPMC_PREFETCH CONFIG_NAND_OMAP_ELM CONFIG_SPL_NAND_AM33XX_BCH CONFIG_SPL_NAND_SIMPLE CONFIG_SYS_NAND_BUSWIDTH_16BIT Signed-off-by: Adam Ford <aford173@gmail.com> Reviewed-by: Heiko Schocher <hs@denx.de> [trini: Finish migration of CONFIG_SPL_NAND_SIMPLE, fix some build issues, add CONFIG_NAND_MXC so we can do CONFIG_SYS_NAND_BUSWIDTH_16BIT] Signed-off-by: Tom Rini <trini@konsulko.com>
* Merge git://git.denx.de/u-boot-x86Tom Rini2017-10-1916-179/+206
|\
| * x86: conga-qeval20-qa3-e3845-internal-uart_defconfig: Add ACPI resume supportStefan Roese2017-10-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | I've missed to add the ACPI resume support to this x86 build target. This patch adds the ACPI resume support enabling S3 suspend / resume. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Bin Meng <bmeng.cn@gmail.com> Cc: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
| * x86: provide CONFIG_BUILD_ROMHeinrich Schuchardt2017-10-195-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Up to now we depended on an exported variable to build u-boot.rom. We should be able to specify it in the configuration file, too. With this patch this becomes possible using the new Kconfig option CONFIG_BUILD_ROM. This option depends on CONFIG_X86 and is selected in qemu-x86_defconfig and qemu-x86_64_defconfig. Cc: Simon Glass <sjg@chromium.org> Cc: Bin Meng <bmeng.cn@gmail.com> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
| * x86: baytrail: fsp: Move Azalia update codes to boardBin Meng2017-10-192-109/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | Azalia configuration may be different across boards, hence it's not appropriate to do that in the SoC level. Instead, let's make the SoC update_fsp_azalia_configs() routine as a weak version, and do the actual work in the board codes. So far it seems only som-db5800-som-6867 board enables the Azalia. Move the original codes into som-db5800-som-6867.c. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Stefan Roese <sr@denx.de>
| * x86: baytrail: fsp: Use a function to update the Azalia config pointerBin Meng2017-10-192-3/+14
| | | | | | | | | | | | | | | | At present we directly pass the Azalia config pointer to the FSP UPD. This updates to use a function to do the stuff, like Braswell does. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Stefan Roese <sr@denx.de>
| * x86: fsp: Consolidate Azalia header fileBin Meng2017-10-195-72/+46
| | | | | | | | | | | | | | | | | | | | | | | | So far there are two copies of Azalia struct defines with one in baytrail and the other one in braswell. This consolidates these two into one, put it in the common place, and remove the prefix pch_ to these structs to make their names more generic. This also corrects reset_wait_timer from us to ms. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Stefan Roese <sr@denx.de>
| * x86: Turn off running VGA ROM during S3 resumeBin Meng2017-10-191-1/+0
| | | | | | | | | | | | | | | | | | | | This is only needed when graphics console is used. For kernel with native graphics driver, this can be turned off to speed up. Change this option's default to n in the Kconfig. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Stefan Roese <sr@denx.de>
| * x86: baytrail: Fix unstable ACPI S3 resumeBin Meng2017-10-191-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was observed that when booting a Ubuntu 16.04 kernel, doing ACPI S3 suspend/resume sometimes causes the Ubuntu kernel hang forever. The issue is however not reproduced with a kernel built from i386/ x86_64 defconfig configuration. The unstability is actually caused by unexpected interrupts being generated during the S3 resume. For some unknown reason, FSP (gold4) for BayTrail configures the GPIO DFX5 PAD to enable level interrupt (bit 24 and 25). As this pin keeps generating interrupts during an S3 resume, and there is no IRQ requester in the kernel to handle it, the kernel seems to hang and does not continue resuming. Clear the mysterious interrupt bits for this pin. Reported-by: Stefan Roese <sr@denx.de> Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Tested-by: Stefan Roese <sr@denx.de> Reviewed-by: Stefan Roese <sr@denx.de>
| * x86: minnowmax: Adjust VGA rom addressBin Meng2017-10-192-1/+2
|/ | | | | | | | Adjust VGA rom address to 0xfffb0000 so that u-boot.rom image can be built again. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Stefan Roese <sr@denx.de>
* Merge git://git.denx.de/u-boot-i2cTom Rini2017-10-182-13/+6
|\
| * i2c: stm32f7_i2c: fix usage of useless local variablePatrice Chotard2017-10-171-8/+2
| | | | | | | | | | | | | | Remove useless local variable "s" and use directly function's parameter "output" Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
| * i2c: stm32f7_i2c: fix data abortChristophe Kerello2017-10-171-10/+11
| | | | | | | | | | | | | | | | | | | | As "v" is a local variable in stm32_i2c_choose_solution() "v" has to be copied into "s" to avoid data abort in stm32_i2c_compute_timing(). Signed-off-by: Christophe Kerello <christophe.kerello@st.com> Reviewed-by: Patrick DELAUNAY <patrick.delaunay@st.com> Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
| * i2c: remove DECLARE_GLOBAL_DATA_PTR from i2c-uclassMasahiro Yamada2017-10-171-2/+0
| | | | | | | | | | | | | | No global pointer is used in this file. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Heiko Schocher <hs@denx.de>
* | Merge git://git.denx.de/u-boot-spiTom Rini2017-10-182-7/+65
|\ \ | |/ |/|
| * sf: bar: Clean BA24 Bank Address Register bit after read/write/erase operationLukasz Majewski2017-09-271-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The content of Bank Address Register (BAR) is volatile. It is cleared after power cycle or reset command (RESET F0h). Some memories (like e.g. s25fl256s) use it to access memory larger than 0x1000000 (16 MiB). The problem shows up when one: 1. Reads/writes/erases memory > 16 MiB 2. Calls "reset" u-boot command (which is not causing BAR to be cleared) In the above scenario, the SoC ROM sends 0x000000 address to read SPL. Unfortunately, the BA24 bit is still set and hence it receives content from 0x1000000 (16 MiB) memory address. As a result the SoC aborts and we hang. Only power cycle can take the SoC out of this state. How to reproduce/test: sf probe; sf erase 0x1200000 0x800000; reset sf probe; sf erase 0x1200000 0x800000; sf write 0x11000000 0x1200000 0x800000; reset sf probe; sf read 0x11000000 0x1200000 0x800000; reset Signed-off-by: Lukasz Majewski <lukma@denx.de> [Fixed comment text on clean_bar function] Signed-off-by: Jagan Teki <jagan@openedev.com> Reviewed-by: Jagan Teki <jagan@openedev.com>
| * SPL: SPI: sunxi: add SPL FIT image supportAndre Przywara2017-09-271-7/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | The sunxi-specific SPI load routine only knows how to load a legacy U-Boot image. Teach it how to handle FIT images as well, simply by providing the existing SPL FIT loader with the right loader routine to access the SPI NOR flash. Signed-off-by: Andre Przywara <andre.przywara@arm.com> Reported-by: Peter Kosa <kope@madnet.sk> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> Reviewed-by: Jagan Teki <jagan@openedev.com>
* | Prepare v2017.11-rc2v2017.11-rc2Tom Rini2017-10-161-1/+1
| | | | | | | | Signed-off-by: Tom Rini <trini@konsulko.com>
* | configs: Resync with savedefconfigTom Rini2017-10-1660-151/+52
| | | | | | | | | | | | Rsync all defconfig files using moveconfig.py Signed-off-by: Tom Rini <trini@konsulko.com>
* | test/py/tests/test_sleep.py: test time approximatelyHeinrich Schuchardt2017-10-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | On qemu errors like assert 2.999650001525879 >= 3 occur. According to the comment in the code the test is meant to be approximate. So we should accept some milliseconds less. Cc: Stephen Warren <swarren@nvidia.com> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Reviewed-by: Stephen Warren <swarren@nvidia.com>
* | scripts/get_maintainer.pl: update to current versionHeinrich Schuchardt2017-10-161-46/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the script to version 0.26 (as of Linux v4.14-rc1) Keep our "penguin_chief". Keep our top_of_kernel_tree. The negative forms of the command line parameters are described when using --help. New options are --git-blame-signatures => when used with --git-blame, also include all commit signers --r => include reviewer(s) if any --letters => print all matching 'letter' types from all matching sections File .get_maintainer.ignore can be used to specify email addressees that shall be ignored. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>