Re: [U-Boot] [PATCH 1/2] sunxi: add proper device tree for Lichee Pi One
On Thu, Dec 22, 2016 at 04:07:57AM +0800, Icenowy Zheng wrote: > Signed-off-by: Icenowy Zheng A commit log would be welcome. Once done, Acked-by: Maxime Ripard Thanks, Maxime -- Maxime Ripard, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com signature.asc Description: PGP signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] sunxi: add an environment variable for boot media
On Thu, Dec 22, 2016 at 05:53:26AM +0800, Icenowy Zheng wrote:
> Some board features different medias available for boot, for example, a
> MicroSD slot and an eMMC or two MicroSD slots.
>
> Add an environment variable which indicates the boot media during boot,
> so that the boot script can choose the kernel parameter, device tree
> property, etc. according to this environment variable.
>
> Tested on Lichee Pi One, which features two MicroSD slots (MMC0 and
> MMC2)
>
> Signed-off-by: Icenowy Zheng
> ---
> board/sunxi/board.c | 18 ++
> 1 file changed, 18 insertions(+)
>
> diff --git a/board/sunxi/board.c b/board/sunxi/board.c
> index 53656383d5..81ca27e16b 100644
> --- a/board/sunxi/board.c
> +++ b/board/sunxi/board.c
> @@ -694,8 +694,26 @@ int misc_init_r(void)
> /* determine if we are running in FEL mode */
> if (!is_boot0_magic(SPL_ADDR + 4)) { /* eGON.BT0 */
> setenv("fel_booted", "1");
> + setenv("boot_media", "fel");
> parse_spl_header(SPL_ADDR);
> }
> + else switch (readb(SPL_ADDR + 0x28)) {
> + case SUNXI_BOOTED_FROM_MMC0:
> + setenv("boot_media", "mmc0");
> + break;
> + case SUNXI_BOOTED_FROM_NAND:
> + setenv("boot_media", "nand");
> + break;
> + case SUNXI_BOOTED_FROM_MMC2:
> + setenv("boot_media", "mmc2");
> + break;
> + case SUNXI_BOOTED_FROM_SPI:
> + setenv("boot_media", "spi");
> + break;
> + default:
> + setenv("boot_media", "unknown");
> + break;
> + }
There's really nothing really sunxi-specific about that. This is
something that should be made generic, and is kind of redundant with
spl_boot_device. I think a good solution could reuse that function to
set that variable.
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
signature.asc
Description: PGP signature
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 2/2] sunxi: add support for Lichee Pi One device
On Thu, Dec 22, 2016 at 04:07:58AM +0800, Icenowy Zheng wrote: > Lichee Pi One is a low-cost Allwinner A13 based development board, with > two SD slots, a USB2.0 OTG port, a USB2.0 host port (or onboard Wi-Fi > card), optional headers for LCD and CSI and two GPIO headers. > > Add support for this board. > > Signed-off-by: Icenowy Zheng Can't that be squashed together with the first patch? > --- > configs/LicheePi_One_defconfig | 26 ++ > 1 file changed, 26 insertions(+) > create mode 100644 configs/LicheePi_One_defconfig > > diff --git a/configs/LicheePi_One_defconfig b/configs/LicheePi_One_defconfig > new file mode 100644 > index 00..ba8894c9ce > --- /dev/null > +++ b/configs/LicheePi_One_defconfig > @@ -0,0 +1,26 @@ > +CONFIG_ARM=y > +CONFIG_ARCH_SUNXI=y > +CONFIG_SPL_I2C_SUPPORT=y > +CONFIG_MACH_SUN5I=y > +CONFIG_DRAM_CLK=408 > +CONFIG_DRAM_MBUS_CLK=204 > +CONFIG_DRAM_ZQ=121 > +CONFIG_DRAM_ODT_EN=y > +CONFIG_MMC_SUNXI_SLOT_EXTRA=2 > +CONFIG_USB0_VBUS_PIN="PC12" > +CONFIG_USB0_VBUS_DET="PG1" > +CONFIG_USB0_ID_DET="PG2" > +CONFIG_AXP_GPIO=y > +# CONFIG_VIDEO is not set > +CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-licheepi-one" > +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set > +CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2" > +CONFIG_CONSOLE_MUX=y Why do you need CONSOLE_MUX? Maxime -- Maxime Ripard, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com signature.asc Description: PGP signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v6 02/13] binman: Add basic entry types for U-Boot
On 17 December 2016 at 20:41, Bin Meng wrote: > On Sat, Nov 26, 2016 at 11:15 AM, Simon Glass wrote: >> Add entries to support some standard U-Boot binaries, such as u-boot.bin, >> u-boot.dtb, etc. Also add some tests for these. >> >> Signed-off-by: Simon Glass >> --- >> >> Changes in v6: None >> Changes in v5: None >> Changes in v4: None >> Changes in v3: None >> Changes in v2: None >> >> tools/binman/entry_test.py | 27 + >> tools/binman/etype/_testing.py | 26 + >> tools/binman/etype/blob.py | 37 ++ >> tools/binman/etype/u_boot.py | 17 + >> tools/binman/etype/u_boot_dtb.py | 17 + >> tools/binman/etype/u_boot_nodtb.py | 17 + >> tools/binman/etype/u_boot_spl.py | 17 + >> tools/binman/func_test.py | 542 >> + >> tools/binman/test/01_invalid.dts | 5 + >> tools/binman/test/02_missing_node.dts | 6 + >> tools/binman/test/03_empty.dts | 9 + >> tools/binman/test/04_invalid_entry.dts | 11 + >> tools/binman/test/05_simple.dts| 11 + >> tools/binman/test/06_dual_image.dts| 22 + >> tools/binman/test/07_bad_align.dts | 12 + >> tools/binman/test/08_pack.dts | 30 ++ >> tools/binman/test/09_pack_extra.dts| 35 ++ >> tools/binman/test/10_pack_align_power2.dts | 12 + >> tools/binman/test/11_pack_align_size_power2.dts| 12 + >> tools/binman/test/12_pack_inv_align.dts| 13 + >> tools/binman/test/13_pack_inv_size_align.dts | 13 + >> tools/binman/test/14_pack_overlap.dts | 16 + >> tools/binman/test/15_pack_overflow.dts | 12 + >> tools/binman/test/16_pack_image_overflow.dts | 13 + >> tools/binman/test/17_pack_image_size.dts | 13 + >> tools/binman/test/18_pack_image_align.dts | 13 + >> tools/binman/test/19_pack_inv_image_align.dts | 14 + >> .../binman/test/20_pack_inv_image_align_power2.dts | 13 + >> tools/binman/test/21_image_pad.dts | 16 + >> tools/binman/test/22_image_name.dts| 21 + >> tools/binman/test/23_blob.dts | 12 + >> tools/binman/test/24_sorted.dts| 17 + >> tools/binman/test/25_pack_zero_size.dts| 15 + >> tools/binman/test/26_pack_u_boot_dtb.dts | 14 + >> 34 files changed, 1080 insertions(+) >> create mode 100644 tools/binman/entry_test.py >> create mode 100644 tools/binman/etype/_testing.py >> create mode 100644 tools/binman/etype/blob.py >> create mode 100644 tools/binman/etype/u_boot.py >> create mode 100644 tools/binman/etype/u_boot_dtb.py >> create mode 100644 tools/binman/etype/u_boot_nodtb.py >> create mode 100644 tools/binman/etype/u_boot_spl.py >> create mode 100644 tools/binman/func_test.py >> create mode 100644 tools/binman/test/01_invalid.dts >> create mode 100644 tools/binman/test/02_missing_node.dts >> create mode 100644 tools/binman/test/03_empty.dts >> create mode 100644 tools/binman/test/04_invalid_entry.dts >> create mode 100644 tools/binman/test/05_simple.dts >> create mode 100644 tools/binman/test/06_dual_image.dts >> create mode 100644 tools/binman/test/07_bad_align.dts >> create mode 100644 tools/binman/test/08_pack.dts >> create mode 100644 tools/binman/test/09_pack_extra.dts >> create mode 100644 tools/binman/test/10_pack_align_power2.dts >> create mode 100644 tools/binman/test/11_pack_align_size_power2.dts >> create mode 100644 tools/binman/test/12_pack_inv_align.dts >> create mode 100644 tools/binman/test/13_pack_inv_size_align.dts >> create mode 100644 tools/binman/test/14_pack_overlap.dts >> create mode 100644 tools/binman/test/15_pack_overflow.dts >> create mode 100644 tools/binman/test/16_pack_image_overflow.dts >> create mode 100644 tools/binman/test/17_pack_image_size.dts >> create mode 100644 tools/binman/test/18_pack_image_align.dts >> create mode 100644 tools/binman/test/19_pack_inv_image_align.dts >> create mode 100644 tools/binman/test/20_pack_inv_image_align_power2.dts >> create mode 100644 tools/binman/test/21_image_pad.dts >> create mode 100644 tools/binman/test/22_image_name.dts >> create mode 100644 tools/binman/test/23_blob.dts >> create mode 100644 tools/binman/test/24_sorted.dts >> create mode 100644 tools/binman/test/25_pack_zero_size.dts >> create mode 100644 tools/binman/test/26_pack_u_boot_dtb.dts >> > > Tested-by: Bin Meng Applied to u-boot-dm and now in mainline. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v6 01/13] binman: Introduce binman, a tool for building binary images
On 17 December 2016 at 20:41, Bin Meng wrote: > On Sat, Nov 26, 2016 at 11:15 AM, Simon Glass wrote: >> This adds the basic code for binman, including command parsing, processing >> of entries and generation of images. >> >> So far no entry types are supported. These will be added in future commits >> as examples of how to add new types. >> >> See the README for documentation. >> >> Signed-off-by: Simon Glass >> --- >> >> Changes in v6: >> - Use __import__() when importlib is not available >> >> Changes in v5: >> - Add instructions on how to generate html code coverage >> - Print 'binman' before all errors >> - Remove commented-out PYTHONPATH code which is not needed now >> >> Changes in v4: None >> Changes in v3: None >> Changes in v2: >> - Add test for code coverage >> - Fix the -b option >> - drop the unused __len__() method >> >> tools/binman/.gitignore | 1 + >> tools/binman/README | 491 >> >> tools/binman/binman | 1 + >> tools/binman/binman.py | 114 ++ >> tools/binman/cmdline.py | 53 + >> tools/binman/control.py | 118 +++ >> tools/binman/etype/entry.py | 200 ++ >> tools/binman/fdt_test.py| 48 + >> tools/binman/image.py | 229 + >> 9 files changed, 1255 insertions(+) >> create mode 100644 tools/binman/.gitignore >> create mode 100644 tools/binman/README >> create mode 12 tools/binman/binman >> create mode 100755 tools/binman/binman.py >> create mode 100644 tools/binman/cmdline.py >> create mode 100644 tools/binman/control.py >> create mode 100644 tools/binman/etype/entry.py >> create mode 100644 tools/binman/fdt_test.py >> create mode 100644 tools/binman/image.py >> > > Tested-by: Bin Meng Applied to u-boot-dm and now in mainline. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v6 05/13] binman: Add support for building x86 ROMs with SPL
On 17 December 2016 at 20:41, Bin Meng wrote: > On Sat, Nov 26, 2016 at 11:15 AM, Simon Glass wrote: >> When building for 64-bit x86 we need an SPL binary in the ROM. Add support >> for this. Also increase entry test code coverage to 100%. >> >> Signed-off-by: Simon Glass >> --- >> >> Changes in v6: >> - Deal with optional microcode in SPL >> >> Changes in v5: >> - Add a new for optional microcode >> >> Changes in v4: None >> Changes in v3: None >> Changes in v2: None >> >> tools/binman/etype/u_boot_dtb_with_ucode.py | 4 +- >> tools/binman/etype/u_boot_spl_bss_pad.py | 26 +++ >> tools/binman/etype/u_boot_spl_with_ucode_ptr.py | 28 >> tools/binman/etype/x86_start16_spl.py| 17 + >> tools/binman/func_test.py| 88 >> +++ >> tools/binman/test/37_x86_no_ucode.dts| 20 ++ >> tools/binman/test/38_x86_ucode_missing_node.dts | 26 +++ >> tools/binman/test/39_x86_ucode_missing_node2.dts | 23 ++ >> tools/binman/test/40_x86_ucode_not_in_image.dts | 28 >> tools/binman/test/41_unknown_pos_size.dts| 11 +++ >> tools/binman/test/44_x86_optional_ucode.dts | 30 >> tools/binman/test/u_boot_no_ucode_ptr| Bin 0 -> 4182 bytes >> tools/binman/test/u_boot_no_ucode_ptr.c | 15 >> 13 files changed, 315 insertions(+), 1 deletion(-) >> create mode 100644 tools/binman/etype/u_boot_spl_bss_pad.py >> create mode 100644 tools/binman/etype/u_boot_spl_with_ucode_ptr.py >> create mode 100644 tools/binman/etype/x86_start16_spl.py >> create mode 100644 tools/binman/test/37_x86_no_ucode.dts >> create mode 100644 tools/binman/test/38_x86_ucode_missing_node.dts >> create mode 100644 tools/binman/test/39_x86_ucode_missing_node2.dts >> create mode 100644 tools/binman/test/40_x86_ucode_not_in_image.dts >> create mode 100644 tools/binman/test/41_unknown_pos_size.dts >> create mode 100644 tools/binman/test/44_x86_optional_ucode.dts >> create mode 100755 tools/binman/test/u_boot_no_ucode_ptr >> create mode 100644 tools/binman/test/u_boot_no_ucode_ptr.c >> > > Tested-by: Bin Meng Applied to u-boot-dm and now in mainline. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v6 04/13] binman: Add support for u-boot.img as an input binary
On 17 December 2016 at 20:41, Bin Meng wrote: > On Sat, Nov 26, 2016 at 11:15 AM, Simon Glass wrote: >> Add an entry type for u-boot.img (a legacy U-Boot image) and a simple test. >> >> Signed-off-by: Simon Glass >> --- >> >> Changes in v6: None >> Changes in v5: None >> Changes in v4: None >> Changes in v3: None >> Changes in v2: None >> >> tools/binman/etype/u_boot_img.py| 17 + >> tools/binman/func_test.py | 5 + >> tools/binman/test/36_u_boot_img.dts | 11 +++ >> 3 files changed, 33 insertions(+) >> create mode 100644 tools/binman/etype/u_boot_img.py >> create mode 100644 tools/binman/test/36_u_boot_img.dts >> > > Tested-by: Bin Meng Applied to u-boot-dm and now in mainline. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v6 03/13] binman: Add support for building x86 ROMs
On 17 December 2016 at 20:41, Bin Meng wrote: > On Sat, Nov 26, 2016 at 11:15 AM, Simon Glass wrote: >> The structure of x86 ROMs is pretty complex. There are various binary blobs >> to place in the image. Microcode requires special handling so that it is >> available to very early code and can be used without any memory whatsoever. >> >> Add support for the various entry types that are currently needed, along >> with some tests. >> >> Signed-off-by: Simon Glass >> --- >> >> Changes in v6: None >> Changes in v5: >> - Add documentation for the 'optional-ucode' property >> - Add missing 'descriptor.bin' file >> - Allow microcode to be optional >> - Allow the compiled device tree to be returned from _DoReadFileDtb() >> - Put the code to calculate dtb total length in a function >> >> Changes in v4: >> - Fix incorrect comments at the top of intel_*.py >> >> Changes in v3: None >> Changes in v2: None >> >> tools/binman/README | 11 ++ >> tools/binman/etype/intel_descriptor.py | 55 + >> tools/binman/etype/intel_me.py | 17 +++ >> tools/binman/etype/intel_mrc.py | 17 +++ >> tools/binman/etype/intel_vga.py | 17 +++ >> tools/binman/etype/u_boot_dtb_with_ucode.py | 76 >> tools/binman/etype/u_boot_ucode.py | 84 + >> tools/binman/etype/u_boot_with_ucode_ptr.py | 87 ++ >> tools/binman/etype/x86_start16.py | 17 +++ >> tools/binman/func_test.py | 179 >> +++- >> tools/binman/test/27_pack_4gb_no_size.dts | 18 +++ >> tools/binman/test/28_pack_4gb_outside.dts | 19 +++ >> tools/binman/test/29_x86-rom.dts| 19 +++ >> tools/binman/test/30_x86-rom-me-no-desc.dts | 15 +++ >> tools/binman/test/31_x86-rom-me.dts | 18 +++ >> tools/binman/test/32_intel-vga.dts | 13 ++ >> tools/binman/test/33_x86-start16.dts| 13 ++ >> tools/binman/test/34_x86_ucode.dts | 29 + >> tools/binman/test/35_x86_single_ucode.dts | 26 >> tools/binman/test/descriptor.bin| Bin 0 -> 4096 bytes >> tools/binman/test/u_boot_ucode_ptr | Bin 0 -> 4175 bytes >> tools/binman/test/u_boot_ucode_ptr.c| 15 +++ >> tools/binman/test/u_boot_ucode_ptr.lds | 18 +++ >> 23 files changed, 760 insertions(+), 3 deletions(-) >> create mode 100644 tools/binman/etype/intel_descriptor.py >> create mode 100644 tools/binman/etype/intel_me.py >> create mode 100644 tools/binman/etype/intel_mrc.py >> create mode 100644 tools/binman/etype/intel_vga.py >> create mode 100644 tools/binman/etype/u_boot_dtb_with_ucode.py >> create mode 100644 tools/binman/etype/u_boot_ucode.py >> create mode 100644 tools/binman/etype/u_boot_with_ucode_ptr.py >> create mode 100644 tools/binman/etype/x86_start16.py >> create mode 100644 tools/binman/test/27_pack_4gb_no_size.dts >> create mode 100644 tools/binman/test/28_pack_4gb_outside.dts >> create mode 100644 tools/binman/test/29_x86-rom.dts >> create mode 100644 tools/binman/test/30_x86-rom-me-no-desc.dts >> create mode 100644 tools/binman/test/31_x86-rom-me.dts >> create mode 100644 tools/binman/test/32_intel-vga.dts >> create mode 100644 tools/binman/test/33_x86-start16.dts >> create mode 100644 tools/binman/test/34_x86_ucode.dts >> create mode 100644 tools/binman/test/35_x86_single_ucode.dts >> create mode 100644 tools/binman/test/descriptor.bin >> create mode 100755 tools/binman/test/u_boot_ucode_ptr >> create mode 100644 tools/binman/test/u_boot_ucode_ptr.c >> create mode 100644 tools/binman/test/u_boot_ucode_ptr.lds >> > > Tested-by: Bin Meng Applied to u-boot-dm and now in mainline. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v6 06/13] binman: Add support for building x86 images with FSP/CMC
On 17 December 2016 at 20:41, Bin Meng wrote: > On Sat, Nov 26, 2016 at 11:15 AM, Simon Glass wrote: >> Add support for two more from the inexhaustible supply of x86 binary blob >> types. >> >> Signed-off-by: Simon Glass >> --- >> >> Changes in v6: None >> Changes in v5: None >> Changes in v4: >> - Add new patch to support building x86 images with FSP/CMC >> >> Changes in v3: None >> Changes in v2: None >> >> tools/binman/etype/intel_cmc.py| 17 + >> tools/binman/etype/intel_fsp.py| 17 + >> tools/binman/func_test.py | 14 ++ >> tools/binman/test/42_intel-fsp.dts | 13 + >> tools/binman/test/43_intel-cmc.dts | 13 + >> 5 files changed, 74 insertions(+) >> create mode 100644 tools/binman/etype/intel_cmc.py >> create mode 100644 tools/binman/etype/intel_fsp.py >> create mode 100644 tools/binman/test/42_intel-fsp.dts >> create mode 100644 tools/binman/test/43_intel-cmc.dts >> > > Tested-by: Bin Meng Applied to u-boot-dm and now in mainline. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v6 07/13] binman: Add a build rule for binman
On 17 December 2016 at 20:41, Bin Meng wrote: > On Sat, Nov 26, 2016 at 11:15 AM, Simon Glass wrote: >> Add a standard command definition for binman so that it can be used in >> makefiles. >> >> Signed-off-by: Simon Glass >> --- >> >> Changes in v6: None >> Changes in v5: None >> Changes in v4: None >> Changes in v3: None >> Changes in v2: None >> >> Makefile | 6 ++ >> 1 file changed, 6 insertions(+) >> > > Reviewed-by: Bin Meng > Tested-by: Bin Meng Applied to u-boot-dm and now in mainline. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v6 10/13] tegra: Use a U-Boot-specific .dtsi file
On 25 November 2016 at 20:16, Simon Glass wrote: > With the new device-tree rules it is possible to put device-tree changes > needed by U-Boot into their own file. As an example of this approach, move > Tegra over to use it. > > Signed-off-by: Simon Glass > --- > > Changes in v6: > - Drop unwanted root-node properties from tegra20-u-boot.dtsi > > Changes in v5: > - Add a new tegra patch to use an automatically included .dtsi file > > Changes in v4: None > Changes in v3: None > Changes in v2: None > > arch/arm/dts/tegra124-nyan-big-u-boot.dtsi | 15 +++ > arch/arm/dts/tegra124-nyan-big.dts | 2 -- > arch/arm/dts/tegra20-u-boot.dtsi | 8 > arch/arm/dts/tegra20.dtsi | 2 -- > 4 files changed, 23 insertions(+), 4 deletions(-) > create mode 100644 arch/arm/dts/tegra124-nyan-big-u-boot.dtsi > create mode 100644 arch/arm/dts/tegra20-u-boot.dtsi Applied to u-boot-dm and now in mainline. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v6 08/13] binman: Allow configuration options to be used in .dts files
On 17 December 2016 at 20:41, Bin Meng wrote: > On Sat, Nov 26, 2016 at 11:15 AM, Simon Glass wrote: >> It is sometimes useful to be able to reference configuration options in a >> device tree source file. Add the necessary includes so that this works. >> >> Signed-off-by: Simon Glass >> --- >> >> Changes in v6: None >> Changes in v5: None >> Changes in v4: None >> Changes in v3: None >> Changes in v2: None >> >> scripts/Makefile.lib | 5 + >> 1 file changed, 5 insertions(+) >> > > Reviewed-by: Bin Meng > Tested-by: Bin Meng Applied to u-boot-dm and now in mainline. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v6 09/13] binman: Automatically include a U-Boot .dtsi file
On 17 December 2016 at 20:41, Bin Meng wrote: > On Sat, Nov 26, 2016 at 11:15 AM, Simon Glass wrote: >> For boards that need U-Boot-specific additions to the device tree, it is >> a minor annoyance to have to add these each time the tree is synced with >> upstream. >> >> Add a means to include a file (e.g. u-boot.dtsi) automatically into the .dts >> file before it is compiled. >> >> The file uses is the first one that exists in this list: >> >>arch//dts/-u-boot.dtsi >>arch//dts/-u-boot.dtsi >>arch//dts/-u-boot.dtsi >>arch//dts/-u-boot.dtsi >>arch//dts/u-boot.dtsi >> >> Signed-off-by: Simon Glass >> Suggested-by: Tom Rini >> --- >> >> Changes in v6: None >> Changes in v5: >> - Add a Makefile 'warning' line for debugging >> - Add documentation for this feature >> - Change the Makefile variable from binman_... to u_boot_... >> >> Changes in v4: >> - Add an option to bring in an soc .dtsi file also >> >> Changes in v3: >> - Add a new patch to automatically include a U-Boot .dtsi file >> >> Changes in v2: None >> >> scripts/Makefile.lib | 20 +++- >> tools/binman/README | 39 +++ >> 2 files changed, 58 insertions(+), 1 deletion(-) >> > > Reviewed-by: Bin Meng > Tested-by: Bin Meng Applied to u-boot-dm and now in mainline. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot,v6,11/13] sunxi: Use binman for sunxi boards
On 18 December 2016 at 19:48, Tom Rini wrote: > On Fri, Nov 25, 2016 at 08:16:01PM -0700, Simon Glass wrote: > >> Move sunxi boards to use binman. This involves adding the image definition >> to the device tree and using it in the Makefile. >> >> Signed-off-by: Simon Glass > > Reviewed-by: Tom Rini > > -- > Tom Applied to u-boot-dm and now in mainline. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v6 12/13] x86: Use binman all x86 boards
On 17 December 2016 at 20:41, Bin Meng wrote: > On Sat, Nov 26, 2016 at 11:16 AM, Simon Glass wrote: >> Change x86 boards to use binman to produce the ROM. This involves adding the >> image definition to the device tree and using it in the Makefile. The >> existing ifdtool features are no-longer needed. >> >> Note that the u-boot.dtsi file is common and is used for all x86 boards which >> use microcode. A separate emulation-u-boot-dtsi is used for the others. >> >> Signed-off-by: Simon Glass >> --- >> >> Changes in v6: None >> Changes in v5: None >> Changes in v4: >> - Remove RFC tag >> - Use binman for all x86 boards >> >> Changes in v3: >> - Put the binman definition in u-boot.dtsi >> >> Changes in v2: >> - Add automated test coverage >> - Put the binman definition in a common file for x86 >> - Various changes and improvements based on using this tool for a while >> >> Makefile | 45 ++- >> arch/x86/dts/emulation-u-boot.dtsi | 18 +++ >> arch/x86/dts/u-boot.dtsi | 62 >> ++ >> 3 files changed, 83 insertions(+), 42 deletions(-) >> create mode 100644 arch/x86/dts/emulation-u-boot.dtsi >> create mode 100644 arch/x86/dts/u-boot.dtsi >> > > Reviewed-by: Bin Meng > Tested-by: Bin Meng Applied to u-boot-dm and now in mainline. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v6 13/13] binman: Drop microcode features from ifdtool
On 17 December 2016 at 20:41, Bin Meng wrote: > On Sat, Nov 26, 2016 at 11:16 AM, Simon Glass wrote: >> Now that binman supports creating images with microcode, drop the code from >> ifdtool. >> >> Signed-off-by: Simon Glass >> --- >> >> Changes in v6: None >> Changes in v5: >> - Add a new patch to drop microcode features from ifdtool >> >> Changes in v4: None >> Changes in v3: None >> Changes in v2: None >> >> tools/ifdtool.c | 254 >> ++-- >> 1 file changed, 5 insertions(+), 249 deletions(-) >> > > Reviewed-by: Bin Meng > Tested-by: Bin Meng Applied to u-boot-dm and now in mainline. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/2] sunxi: power: add AXP803 support
The A64 uses the AXP803 as its PMIC.
Signed-off-by: Icenowy Zheng
---
arch/arm/mach-sunxi/Makefile | 3 +
arch/arm/mach-sunxi/pmic_bus.c | 6 +-
arch/arm/mach-sunxi/rsb.c | 2 +-
board/sunxi/board.c| 31 ++---
drivers/power/Kconfig | 87 --
drivers/power/Makefile | 1 +
drivers/power/axp803.c | 255 +
drivers/power/axp818.c | 2 +-
include/axp803.h | 73
include/axp_pmic.h | 3 +
10 files changed, 413 insertions(+), 50 deletions(-)
create mode 100644 drivers/power/axp803.c
create mode 100644 include/axp803.h
diff --git a/arch/arm/mach-sunxi/Makefile b/arch/arm/mach-sunxi/Makefile
index 128091e4e6..dcf2b5245d 100644
--- a/arch/arm/mach-sunxi/Makefile
+++ b/arch/arm/mach-sunxi/Makefile
@@ -19,9 +19,11 @@ endif
obj-$(CONFIG_MACH_SUN6I) += prcm.o
obj-$(CONFIG_MACH_SUN8I) += prcm.o
obj-$(CONFIG_MACH_SUN9I) += prcm.o
+obj-$(CONFIG_MACH_SUN50I) += prcm.o
obj-$(CONFIG_MACH_SUN6I) += p2wi.o
obj-$(CONFIG_MACH_SUN8I) += rsb.o
obj-$(CONFIG_MACH_SUN9I) += rsb.o
+obj-$(CONFIG_MACH_SUN50I) += rsb.o
obj-$(CONFIG_MACH_SUN4I) += clock_sun4i.o
obj-$(CONFIG_MACH_SUN5I) += clock_sun4i.o
obj-$(CONFIG_MACH_SUN6I) += clock_sun6i.o
@@ -37,6 +39,7 @@ obj-$(CONFIG_MACH_SUN9I) += clock_sun9i.o gtbus_sun9i.o
obj-$(CONFIG_AXP152_POWER) += pmic_bus.o
obj-$(CONFIG_AXP209_POWER) += pmic_bus.o
obj-$(CONFIG_AXP221_POWER) += pmic_bus.o
+obj-$(CONFIG_AXP803_POWER) += pmic_bus.o
obj-$(CONFIG_AXP809_POWER) += pmic_bus.o
obj-$(CONFIG_AXP818_POWER) += pmic_bus.o
diff --git a/arch/arm/mach-sunxi/pmic_bus.c b/arch/arm/mach-sunxi/pmic_bus.c
index 7c57f02792..0ac64a97cf 100644
--- a/arch/arm/mach-sunxi/pmic_bus.c
+++ b/arch/arm/mach-sunxi/pmic_bus.c
@@ -36,7 +36,7 @@ int pmic_bus_init(void)
if (!needs_init)
return 0;
-#if defined CONFIG_AXP221_POWER || defined CONFIG_AXP809_POWER || defined
CONFIG_AXP818_POWER
+#if defined CONFIG_AXP221_POWER || defined CONFIG_AXP803_POWER || defined
CONFIG_AXP809_POWER || defined CONFIG_AXP818_POWER
# ifdef CONFIG_MACH_SUN6I
p2wi_init();
ret = p2wi_change_to_p2wi_mode(AXP221_CHIP_ADDR, AXP221_CTRL_ADDR,
@@ -62,7 +62,7 @@ int pmic_bus_read(u8 reg, u8 *data)
return i2c_read(AXP152_I2C_ADDR, reg, 1, data, 1);
#elif defined CONFIG_AXP209_POWER
return i2c_read(AXP209_I2C_ADDR, reg, 1, data, 1);
-#elif defined CONFIG_AXP221_POWER || defined CONFIG_AXP809_POWER || defined
CONFIG_AXP818_POWER
+#elif defined CONFIG_AXP221_POWER || defined CONFIG_AXP803_POWER || defined
CONFIG_AXP809_POWER || defined CONFIG_AXP818_POWER
# ifdef CONFIG_MACH_SUN6I
return p2wi_read(reg, data);
# else
@@ -77,7 +77,7 @@ int pmic_bus_write(u8 reg, u8 data)
return i2c_write(AXP152_I2C_ADDR, reg, 1, &data, 1);
#elif defined CONFIG_AXP209_POWER
return i2c_write(AXP209_I2C_ADDR, reg, 1, &data, 1);
-#elif defined CONFIG_AXP221_POWER || defined CONFIG_AXP809_POWER || defined
CONFIG_AXP818_POWER
+#elif defined CONFIG_AXP221_POWER || defined CONFIG_AXP803_POWER || defined
CONFIG_AXP809_POWER || defined CONFIG_AXP818_POWER
# ifdef CONFIG_MACH_SUN6I
return p2wi_write(reg, data);
# else
diff --git a/arch/arm/mach-sunxi/rsb.c b/arch/arm/mach-sunxi/rsb.c
index 6fd11f1529..28d05e962a 100644
--- a/arch/arm/mach-sunxi/rsb.c
+++ b/arch/arm/mach-sunxi/rsb.c
@@ -20,7 +20,7 @@ static int rsb_set_device_mode(void);
static void rsb_cfg_io(void)
{
-#ifdef CONFIG_MACH_SUN8I
+#if defined CONFIG_MACH_SUN8I || defined CONFIG_MACH_SUN50I
sunxi_gpio_set_cfgpin(SUNXI_GPL(0), SUN8I_GPL_R_RSB);
sunxi_gpio_set_cfgpin(SUNXI_GPL(1), SUN8I_GPL_R_RSB);
sunxi_gpio_set_pull(SUNXI_GPL(0), 1);
diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index 53656383d5..3435b80c14 100644
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -487,26 +487,27 @@ void sunxi_board_init(void)
#endif
#if defined CONFIG_AXP152_POWER || defined CONFIG_AXP209_POWER || \
- defined CONFIG_AXP221_POWER || defined CONFIG_AXP809_POWER || \
- defined CONFIG_AXP818_POWER
+ defined CONFIG_AXP221_POWER || defined CONFIG_AXP803_POWER || \
+ defined CONFIG_AXP809_POWER || defined CONFIG_AXP818_POWER
power_failed = axp_init();
-#if defined CONFIG_AXP221_POWER || defined CONFIG_AXP809_POWER || \
- defined CONFIG_AXP818_POWER
+#if defined CONFIG_AXP221_POWER || defined CONFIG_AXP803_POWER || \
+ defined CONFIG_AXP809_POWER || defined CONFIG_AXP818_POWER
power_failed |= axp_set_dcdc1(CONFIG_AXP_DCDC1_VOLT);
#endif
power_failed |= axp_set_dcdc2(CONFIG_AXP_DCDC2_VOLT);
power_failed |= axp_set_dcdc3(CONFIG_AXP_DCDC3_VOLT);
-#if !defined(CONFIG_AXP209_POWER) && !defined(CONFIG_AXP818_POWER)
+#if !defined(CONFIG_AXP209_POWER) && !defined(CONFIG_AXP803_
[U-Boot] please pull u-boot-samsung master
Dear Tom, The following changes since commit 0d92f2141ac5ef5c80d13e9501890f914525d43c: arm64: mvebu: Fix A8K memory mapping and add documentation (2016-12-21 09:52:35 +0100) are available in the git repository at: git://git.denx.de/u-boot-samsung.git master for you to fetch changes up to 9e26834f4945f7b1deb16bea1c06e7e0faaad848: configs: enable the DM_PMIC and DM_I2C_GPIO for max8998 pmic (2016-12-22 13:34:02 +0900) Jaehoon Chung (3): power: pmic: add the max8998 controller for DM arm: dts: s5pc1xx-goni: add the pmic node for using DM configs: enable the DM_PMIC and DM_I2C_GPIO for max8998 pmic arch/arm/dts/s5pc1xx-goni.dts | 165 + configs/s5p_goni_defconfig|3 + drivers/power/pmic/Kconfig|7 ++ drivers/power/pmic/Makefile |1 + drivers/power/pmic/max8998.c | 61 +++ 5 files changed, 237 insertions(+), 0 deletions(-) create mode 100644 drivers/power/pmic/max8998.c -- from. prom. www.promsoft.net ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] please pull u-boot-samsung master
On Sat, Dec 24, 2016 at 12:07:01AM +0900, Minkyu Kang wrote: > Dear Tom, > > The following changes since commit 0d92f2141ac5ef5c80d13e9501890f914525d43c: > > > arm64: mvebu: Fix A8K memory mapping and add documentation (2016-12-21 > 09:52:35 +0100) > > > are available in the git repository at: > > > git://git.denx.de/u-boot-samsung.git master > > > for you to fetch changes up to 9e26834f4945f7b1deb16bea1c06e7e0faaad848: > > > configs: enable the DM_PMIC and DM_I2C_GPIO for max8998 pmic (2016-12-22 > 13:34:02 +0900) > > Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Pull request: u-boot-sunxi/master
Hi Tom, Please pull this fix. thanks! Jagan. The following changes since commit 4cf5c5f1e60e6541630ae829b5fa2db704c268f0: Prepare v2017.01-rc2 (2016-12-19 16:08:57 -0500) are available in the git repository at: git://git.denx.de/u-boot-sunxi.git master for you to fetch changes up to c23749dbf2601986a23e2654d153e0d66a9804ba: sunxi: fix SID read on H3 (2016-12-23 13:07:04 +0100) Icenowy Zheng (1): sunxi: fix SID read on H3 arch/arm/include/asm/arch-sunxi/cpu_sun4i.h | 1 + arch/arm/mach-sunxi/cpu_info.c | 44 + 2 files changed, 45 insertions(+) ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] spi: Zap armada100_spi.c and env
On Wed, Dec 21, 2016 at 12:18 PM, Jagan Teki wrote: > On Fri, Nov 25, 2016 at 6:06 AM, Ajay Bhargav > wrote: >> I will update driver and submit. Thanks for notification. > > Any further update? I'm going with this and submit the dm driver > whenever possible. Applied to u-boot-spi/master thanks! -- Jagan Teki Free Software Engineer | www.openedev.com U-Boot, Linux | Upstream Maintainer Hyderabad, India. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] spi: Zap mpc52xx_spi.c, config and related code
On Thu, Dec 15, 2016 at 5:36 PM, Jagan Teki wrote: > armada100_spi.c, related config options and related codes > are zapping becuase of "no DM conversion". > > Cc: Werner Pfister > Signed-off-by: Jagan Teki > Reviewed-by: Tom Rini Applied to u-boot-spi/master thanks! -- Jagan Teki Free Software Engineer | www.openedev.com U-Boot, Linux | Upstream Maintainer Hyderabad, India. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Pull request: u-boot-spi/master
Hi Tom, Please pull this PR. thanks! Jagan. The following changes since commit 4cf5c5f1e60e6541630ae829b5fa2db704c268f0: Prepare v2017.01-rc2 (2016-12-19 16:08:57 -0500) are available in the git repository at: git://git.denx.de/u-boot-spi.git master for you to fetch changes up to b98fa02e8a1480eeab6c7e10eb1a2a9971a11497: spi: Zap armada100_spi.c and env (2016-12-23 11:13:04 +0100) Jagan Teki (2): spi: Zap mpc52xx_spi.c, config and related code spi: Zap armada100_spi.c and env board/intercontrol/digsy_mtc/Makefile| 2 +- board/intercontrol/digsy_mtc/cmd_mtc.c | 369 --- board/intercontrol/digsy_mtc/cmd_mtc.h | 45 board/intercontrol/digsy_mtc/digsy_mtc.c | 9 - configs/digsy_mtc_RAMBOOT_defconfig | 1 - configs/digsy_mtc_defconfig | 1 - configs/digsy_mtc_rev5_RAMBOOT_defconfig | 1 - configs/digsy_mtc_rev5_defconfig | 1 - configs/gplugd_defconfig | 5 - drivers/spi/Makefile | 2 - drivers/spi/armada100_spi.c | 203 - drivers/spi/mpc52xx_spi.c| 90 include/configs/digsy_mtc.h | 6 - include/configs/gplugd.h | 9 +- scripts/config_whitelist.txt | 2 - 15 files changed, 2 insertions(+), 744 deletions(-) delete mode 100644 board/intercontrol/digsy_mtc/cmd_mtc.c delete mode 100644 board/intercontrol/digsy_mtc/cmd_mtc.h delete mode 100644 drivers/spi/armada100_spi.c delete mode 100644 drivers/spi/mpc52xx_spi.c ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request: u-boot-spi/master
On Sat, Dec 24, 2016 at 12:39:22AM +0100, Jagan Teki wrote: > Hi Tom, > > Please pull this PR. > > thanks! > Jagan. > > The following changes since commit 4cf5c5f1e60e6541630ae829b5fa2db704c268f0: > > Prepare v2017.01-rc2 (2016-12-19 16:08:57 -0500) > > are available in the git repository at: > > git://git.denx.de/u-boot-spi.git master > > for you to fetch changes up to b98fa02e8a1480eeab6c7e10eb1a2a9971a11497: > > spi: Zap armada100_spi.c and env (2016-12-23 11:13:04 +0100) > Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [linux-sunxi] [PATCH] sunxi: fix SID read on H3
On Tue, 20 Dec 2016 02:03:36 +0800
Icenowy Zheng wrote:
> H3 SID controller has some bug, which makes the initial SID value at
> SUNXI_SID_BASE wrong when boot.
>
> Change the SID retrieve code to call the SID Controller directly on H3,
> which can get the correct value, and also fix the SID value at
> SUNXI_SID_BASE, so that it can be used by further operations.
>
> Signed-off-by: Icenowy Zheng
> ---
> arch/arm/include/asm/arch-sunxi/cpu_sun4i.h | 1 +
> arch/arm/mach-sunxi/cpu_info.c | 44
> +
> 2 files changed, 45 insertions(+)
>
> diff --git a/arch/arm/include/asm/arch-sunxi/cpu_sun4i.h
> b/arch/arm/include/asm/arch-sunxi/cpu_sun4i.h
> index 7232f6d927..3c852224e6 100644
> --- a/arch/arm/include/asm/arch-sunxi/cpu_sun4i.h
> +++ b/arch/arm/include/asm/arch-sunxi/cpu_sun4i.h
> @@ -97,6 +97,7 @@
> #if defined(CONFIG_MACH_SUN8I_A83T) || defined(CONFIG_MACH_SUN8I_H3) || \
> defined(CONFIG_MACH_SUN50I)
> /* SID address space starts at 0x01c1400, but e-fuse is at offset 0x200 */
> +#define SUNXI_SIDC_BASE 0x01c14000
> #define SUNXI_SID_BASE 0x01c14200
> #else
> #define SUNXI_SID_BASE 0x01c23800
> diff --git a/arch/arm/mach-sunxi/cpu_info.c b/arch/arm/mach-sunxi/cpu_info.c
> index 76b6719d99..f1f6fd5ba4 100644
> --- a/arch/arm/mach-sunxi/cpu_info.c
> +++ b/arch/arm/mach-sunxi/cpu_info.c
> @@ -99,10 +99,54 @@ int print_cpuinfo(void)
> }
> #endif
>
> +#ifdef CONFIG_MACH_SUN8I_H3
> +
> +#define SIDC_PRCTL 0x40
> +#define SIDC_RDKEY 0x60
> +
> +#define SIDC_OP_LOCK 0xAC
> +
> +uint32_t sun8i_efuse_read(uint32_t offset)
> +{
> + uint32_t reg_val;
> +
> + reg_val = readl(SUNXI_SIDC_BASE + SIDC_PRCTL);
> + reg_val &= ~(((0x1ff) << 16) | 0x3);
> + reg_val |= (offset << 16);
> + writel(reg_val, SUNXI_SIDC_BASE + SIDC_PRCTL);
Normally clrsetbits_le32() is used for this kind of code in U-Boot.
> +
> + reg_val &= ~(((0xff) << 8) | 0x3);
> + reg_val |= (SIDC_OP_LOCK << 8) | 0x2;
> + writel(reg_val, SUNXI_SIDC_BASE + SIDC_PRCTL);
> +
> + while (readl(SUNXI_SIDC_BASE + SIDC_PRCTL) & 0x2);
> +
> + reg_val &= ~(((0x1ff) << 16) | ((0xff) << 8) | 0x3);
> + writel(reg_val, SUNXI_SIDC_BASE + SIDC_PRCTL);
Same here.
> +
> + reg_val = readl(SUNXI_SIDC_BASE + SIDC_RDKEY);
> + return reg_val;
> +}
> +#endif
> +
> int sunxi_get_sid(unsigned int *sid)
> {
> #ifdef CONFIG_AXP221_POWER
> return axp_get_sid(sid);
> +#elif defined CONFIG_MACH_SUN8I_H3
> + /*
> + * H3 SID controller has a bug, which makes the initial value of
> + * SUNXI_SID_BASE at boot wrong.
> + * Read the value directly from SID controller, in order to get
> + * the correct value, and also refresh the wrong value at
> + * SUNXI_SID_BASE.
> + */
> + int i;
> +
> + for (i = 0; i< 4; i++)
> + sid[i] = sun8i_efuse_read(i * 4);
> +
> + return 0;
> #elif defined SUNXI_SID_BASE
> int i;
>
Thanks for this workaround. This problem has buggered some people
since a while ago. It's good that you took time to investigate and
fix it.
--
Best regards,
Siarhei Siamashka
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] relocate-rela: use compiler.h endian macros
Any objections to this?
On Sun, Dec 11, 2016 at 02:51:13PM +1100, Jonathan Gray wrote:
> Use the endian macros from u-boot's compiler.h instead of duplicating
> the definitions.
>
> This also avoids a build error on OpenBSD by removing swap64 which
> collides with a system definition in endian.h pulled in by inttypes.h.
>
> Signed-off-by: Jonathan Gray
> ---
> tools/relocate-rela.c | 41 -
> 1 file changed, 4 insertions(+), 37 deletions(-)
>
> diff --git a/tools/relocate-rela.c b/tools/relocate-rela.c
> index 670b9fd..3c9d134 100644
> --- a/tools/relocate-rela.c
> +++ b/tools/relocate-rela.c
> @@ -15,6 +15,7 @@
> #include
> #include
> #include
> +#include "compiler.h"
>
> #ifndef R_AARCH64_RELATIVE
> #define R_AARCH64_RELATIVE 1027
> @@ -50,40 +51,6 @@ static bool supported_rela(Elf64_Rela *rela)
> }
> }
>
> -static inline uint64_t swap64(uint64_t val)
> -{
> - return ((val >> 56) & 0x00ffULL) |
> -((val >> 40) & 0xff00ULL) |
> -((val >> 24) & 0x00ffULL) |
> -((val >> 8) & 0xff00ULL) |
> -((val << 8) & 0x00ffULL) |
> -((val << 24) & 0xff00ULL) |
> -((val << 40) & 0x00ffULL) |
> -((val << 56) & 0xff00ULL);
> -}
> -
> -#if __BYTE_ORDER == __LITTLE_ENDIAN
> -static inline uint64_t be64(uint64_t val)
> -{
> - return swap64(val);
> -}
> -
> -static inline uint64_t le64(uint64_t val)
> -{
> - return val;
> -}
> -#else
> -static inline uint64_t le64(uint64_t val)
> -{
> - return swap64(val);
> -}
> -
> -static inline uint64_t be64(uint64_t val)
> -{
> - return val;
> -}
> -#endif
> -
> static bool read_num(const char *str, uint64_t *num)
> {
> char *endptr;
> @@ -148,9 +115,9 @@ int main(int argc, char **argv)
> return 4;
> }
>
> - swrela.r_offset = le64(rela.r_offset);
> - swrela.r_info = le64(rela.r_info);
> - swrela.r_addend = le64(rela.r_addend);
> + swrela.r_offset = cpu_to_le64(rela.r_offset);
> + swrela.r_info = cpu_to_le64(rela.r_info);
> + swrela.r_addend = cpu_to_le64(rela.r_addend);
>
> if (!supported_rela(&swrela))
> continue;
> --
> 2.10.2
>
> ___
> U-Boot mailing list
> U-Boot@lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
