Re: [U-Boot] [PATCH v7 5/5] imx6: SPL support for iMX6 SabreSD
Hi John,
On 12/11/2014 23:27, John Tobias wrote:
> This patch will enable the support for SPL on iMX6 SabreSD.
> It tested on SD2 and SD3 mmc port (Switch 1 or 2 of SW6)
>
> Signed-off-by: John Tobias
> ---
> board/freescale/mx6sabresd/mx6sabresd.c | 186
> +++-
> 1 file changed, 184 insertions(+), 2 deletions(-)
>
> diff --git a/board/freescale/mx6sabresd/mx6sabresd.c
> b/board/freescale/mx6sabresd/mx6sabresd.c
> index 3d81fff..eda8497 100644
> --- a/board/freescale/mx6sabresd/mx6sabresd.c
> +++ b/board/freescale/mx6sabresd/mx6sabresd.c
> @@ -27,8 +27,12 @@
> #include
> #include
> #include
> +#include
> +
> DECLARE_GLOBAL_DATA_PTR;
>
> +#define BOOT_CFG 0x020D8004
> +
> #define UART_PAD_CTRL (PAD_CTL_PUS_100K_UP |\
> PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | \
> PAD_CTL_SRE_FAST | PAD_CTL_HYS)
> @@ -55,8 +59,7 @@ DECLARE_GLOBAL_DATA_PTR;
>
> int dram_init(void)
> {
> - gd->ram_size = get_ram_size((void *)PHYS_SDRAM, PHYS_SDRAM_SIZE);
> -
> + gd->ram_size = imx_ddr_size();
> return 0;
> }
>
> @@ -253,6 +256,7 @@ int board_mmc_getcd(struct mmc *mmc)
>
> int board_mmc_init(bd_t *bis)
> {
> +#ifndef CONFIG_SPL_BUILD
> s32 status = 0;
> int i;
>
> @@ -293,6 +297,43 @@ int board_mmc_init(bd_t *bis)
> }
>
> return status;
> +#else
> + unsigned reg = readl(BOOT_CFG) >> 11;
> + /*
> + * Upon reading BOOT_CFG register the following map is done:
> + * Bit 11 and 12 of BOOT_CFG register can determine the current
> + * mmc port
> + * 0x1 SD1
> + * 0x2 SD2
> + * 0x3 SD4
> + */
> +
> + switch (reg & 0x3) {
> + case 0x1:
> + imx_iomux_v3_setup_multiple_pads(
> + usdhc2_pads, ARRAY_SIZE(usdhc2_pads));
> + usdhc_cfg[0].esdhc_base = USDHC2_BASE_ADDR;
> + usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK);
> + gd->arch.sdhc_clk = usdhc_cfg[0].sdhc_clk;
> + break;
> + case 0x2:
> + imx_iomux_v3_setup_multiple_pads(
> + usdhc3_pads, ARRAY_SIZE(usdhc3_pads));
> + usdhc_cfg[0].esdhc_base = USDHC3_BASE_ADDR;
> + usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK);
> + gd->arch.sdhc_clk = usdhc_cfg[0].sdhc_clk;
> + break;
> + case 0x3:
> + imx_iomux_v3_setup_multiple_pads(
> + usdhc4_pads, ARRAY_SIZE(usdhc4_pads));
> + usdhc_cfg[0].esdhc_base = USDHC4_BASE_ADDR;
> + usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC4_CLK);
> + gd->arch.sdhc_clk = usdhc_cfg[0].sdhc_clk;
> + break;
> + }
> +
> + return fsl_esdhc_initialize(bis, &usdhc_cfg[0]);
> +#endif
> }
> #endif
>
> @@ -607,3 +648,144 @@ int checkboard(void)
> puts("Board: MX6-SabreSD\n");
> return 0;
> }
> +
> +#ifdef CONFIG_SPL_BUILD
> +#include
> +#include
> +
> +const struct mx6dq_iomux_ddr_regs mx6_ddr_ioregs = {
> + .dram_sdclk_0 = 0x00020030,
> + .dram_sdclk_1 = 0x00020030,
> + .dram_cas = 0x00020030,
> + .dram_ras = 0x00020030,
> + .dram_reset = 0x00020030,
> + .dram_sdcke0 = 0x3000,
> + .dram_sdcke1 = 0x3000,
> + .dram_sdba2 = 0x,
> + .dram_sdodt0 = 0x3030,
> + .dram_sdodt1 = 0x3030,
> + .dram_sdqs0 = 0x0030,
> + .dram_sdqs1 = 0x0030,
> + .dram_sdqs2 = 0x0030,
> + .dram_sdqs3 = 0x0030,
> + .dram_sdqs4 = 0x0030,
> + .dram_sdqs5 = 0x0030,
> + .dram_sdqs6 = 0x0030,
> + .dram_sdqs7 = 0x0030,
> + .dram_dqm0 = 0x00020030,
> + .dram_dqm1 = 0x00020030,
> + .dram_dqm2 = 0x00020030,
> + .dram_dqm3 = 0x00020030,
> + .dram_dqm4 = 0x00020030,
> + .dram_dqm5 = 0x00020030,
> + .dram_dqm6 = 0x00020030,
> + .dram_dqm7 = 0x00020030,
> +};
> +
> +const struct mx6dq_iomux_grp_regs mx6_grp_ioregs = {
> + .grp_ddr_type = 0x000C,
> + .grp_ddrmode_ctl = 0x0002,
> + .grp_ddrpke = 0x,
> + .grp_addds = 0x0030,
> + .grp_ctlds = 0x0030,
> + .grp_ddrmode = 0x0002,
> + .grp_b0ds = 0x0030,
> + .grp_b1ds = 0x0030,
> + .grp_b2ds = 0x0030,
> + .grp_b3ds = 0x0030,
> + .grp_b4ds = 0x0030,
> + .grp_b5ds = 0x0030,
> + .grp_b6ds = 0x0030,
> + .grp_b7ds = 0x0030,
> +};
> +
> +const struct mx6_mmdc_calibration mx6_mmcd_calib = {
> + .p0_mpwldectrl0 = 0x001F001F,
> + .p0_mpwldectrl1 = 0x001F001F,
> + .p1_mpwldectrl0 = 0x00440044,
> + .p1_mpwldectrl1 = 0x00440044,
> + .p0_mpdgctrl0 = 0x434B0350,
> + .p0_mpdgctrl1 = 0x034C0359,
> + .p1_mpdgctrl0 = 0x434B0350,
> + .p1_mpdgctrl1 = 0x03650348,
> + .p0_mprddlctl = 0x4436383B,
> + .p1_mp
Re: [U-Boot] [PATCH v7 2/3] Odroid-XU3: Add support for Odroid-XU3
On 11/13/2014 10:32 AM, Hyungwon Hwang wrote:
> This patch adds support for Odroid-XU3.
>
> Signed-off-by: Hyungwon Hwang
> Tested-by: Lukasz Majewski
> Acked-by: Lukasz Majewski
> Cc: Minkyu Kang
> Cc: Lukasz Majewski
> ---
> Changes for v3:
> - Remove unnecessary node from DT file
> - Remove unnecessary features from config file
> - Remove unnecessary macros from board-specific header file
> - Fix some trivial typos in comments
>
> Changes for v4:
> - Add MMC FIFO buffer's configuration to DT file
> - Make CONFIG_OF_CONTROL be set by the target information
> - Add basic document to doc/README.odroid-xu3
> - Add CONFIG_CMD_EXT4 to config file
> - Add environment size and offset to config file
> - Add extra default environment to make bootable without modification
> - Remove unnecessary features from config file
>
> Changes for v5:
> - Convert /include/ to #include in DT file
>
> Changes for v6:
> - Separate out the documentation to new commit
> - Remove unnecessary header file inclusions from the board-specific setup file
> - Make the function board_clock_init be declared, only when
> CONFIG_BOARD_EARLY_INIT_F is defined
>
> Changes for v7:
> - Remove OF_CONTROL dependency from !SPL_BUILD
>
> arch/arm/cpu/armv7/exynos/Kconfig | 5 ++
> arch/arm/dts/Makefile | 3 +-
> arch/arm/dts/exynos5422-odroidxu3.dts | 60 ++
> board/samsung/odroid-xu3/Kconfig | 12 +++
> board/samsung/odroid-xu3/MAINTAINERS | 6 ++
> board/samsung/odroid-xu3/Makefile | 7 ++
> board/samsung/odroid-xu3/odroid-xu3.c | 122
> board/samsung/odroid-xu3/setup.h | 95 ++
> configs/odroid-xu3_defconfig | 4 +
> include/configs/odroid_xu3.h | 144
> ++
> 10 files changed, 457 insertions(+), 1 deletion(-)
> create mode 100644 arch/arm/dts/exynos5422-odroidxu3.dts
> create mode 100644 board/samsung/odroid-xu3/Kconfig
> create mode 100644 board/samsung/odroid-xu3/MAINTAINERS
> create mode 100644 board/samsung/odroid-xu3/Makefile
> create mode 100644 board/samsung/odroid-xu3/odroid-xu3.c
> create mode 100644 board/samsung/odroid-xu3/setup.h
> create mode 100644 configs/odroid-xu3_defconfig
> create mode 100644 include/configs/odroid_xu3.h
>
> diff --git a/arch/arm/cpu/armv7/exynos/Kconfig
> b/arch/arm/cpu/armv7/exynos/Kconfig
> index 13dbd95..16c9a0e 100644
> --- a/arch/arm/cpu/armv7/exynos/Kconfig
> +++ b/arch/arm/cpu/armv7/exynos/Kconfig
> @@ -24,6 +24,10 @@ config TARGET_TRATS2
> config TARGET_ODROID
> bool "Exynos4412 Odroid board"
>
> +config TARGET_ODROID_XU3
> + bool "Exynos5422 Odroid board"
> + select OF_CONTROL
> +
> config TARGET_ARNDALE
> bool "Exynos5250 Arndale board"
> select SUPPORT_SPL
> @@ -65,6 +69,7 @@ source "board/samsung/universal_c210/Kconfig"
> source "board/samsung/origen/Kconfig"
> source "board/samsung/trats2/Kconfig"
> source "board/samsung/odroid/Kconfig"
> +source "board/samsung/odroid-xu3/Kconfig"
> source "board/samsung/arndale/Kconfig"
> source "board/samsung/smdk5250/Kconfig"
> source "board/samsung/smdk5420/Kconfig"
> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> index 2b9bd93..d984f34 100644
> --- a/arch/arm/dts/Makefile
> +++ b/arch/arm/dts/Makefile
> @@ -12,7 +12,8 @@ dtb-$(CONFIG_EXYNOS5) += exynos5250-arndale.dtb \
> exynos5250-smdk5250.dtb \
> exynos5420-smdk5420.dtb \
> exynos5420-peach-pit.dtb \
> - exynos5800-peach-pi.dtb
> + exynos5800-peach-pi.dtb \
> + exynos5422-odroidxu3.dtb
> dtb-$(CONFIG_TEGRA) += tegra20-harmony.dtb \
> tegra20-medcom-wide.dtb \
> tegra20-paz00.dtb \
> diff --git a/arch/arm/dts/exynos5422-odroidxu3.dts
> b/arch/arm/dts/exynos5422-odroidxu3.dts
> new file mode 100644
> index 000..52199d9
> --- /dev/null
> +++ b/arch/arm/dts/exynos5422-odroidxu3.dts
> @@ -0,0 +1,60 @@
> +/*
> + * Odroid XU3 device tree source
> + *
> + * Copyright (c) 2014 Samsung Electronics Co., Ltd.
> + * http://www.samsung.com
> + *
> + * SPDX-License-Identifier: GPL-2.0+
> + */
> +
> +/dts-v1/;
> +#include "exynos54xx.dtsi"
> +
> +/ {
> + model = "Odroid XU3 based on EXYNOS5422";
> + compatible = "samsung,odroidxu3", "samsung,exynos5";
> +
> + aliases {
> + serial0 = "/serial@12C0";
> + console = "/serial@12C2";
> + };
> +
> + memory {
> + device_type = "memory";
> + reg = <0x4000 0x1000
> + 0x5000 0x1000
> + 0x6000 0x1000
> + 0x7000 0x1000
> + 0x8000 0x1000
> + 0x9000 0x1000
> + 0xa000 0x1000
> + 0xb000 0xea0>;
> + };
> +
> + serial@12C2 {
> + status="okay";
> + };
> +
> + mmc@1220 {
> + samsung,
Re: [U-Boot] [PATCH v7 4/5] imx6: add spl in the header file
On 12/11/2014 23:27, John Tobias wrote: > add the spl info in the header file. > Also, added a macro statement in m6sabre_common.h to avoid compiler > warning. > > Signed-off-by: John Tobias > --- > include/configs/mx6sabre_common.h | 2 ++ > include/configs/mx6sabresd.h | 6 ++ > 2 files changed, 8 insertions(+) > > diff --git a/include/configs/mx6sabre_common.h > b/include/configs/mx6sabre_common.h > index c81e9e9..e4d0d14 100644 > --- a/include/configs/mx6sabre_common.h > +++ b/include/configs/mx6sabre_common.h > @@ -95,7 +95,9 @@ > #define CONFIG_BOOTDELAY 1 > > #define CONFIG_LOADADDR0x1200 > +#ifndef CONFIG_SYS_TEXT_BASE > #define CONFIG_SYS_TEXT_BASE 0x1780 > +#endif > Why is that needed ? SPL does not use it, because it use CONFIG_SPL_TEXT_BASE, and this is defined in imx6_spl.h. And you do not redefine it, meaning that overwriting the value is not necessary at all, as we expect. Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] x86: Fix a warning with gcc 4.4.4
Simon Glass writes:
> This warning appears even though it seems that the compiler could work it
> out. Fix it.
>
> Signed-off-by: Simon Glass
> ---
>
> arch/x86/cpu/cpu.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c
> index a4e639d..3583619 100644
> --- a/arch/x86/cpu/cpu.c
> +++ b/arch/x86/cpu/cpu.c
> @@ -238,6 +238,7 @@ static void identify_cpu(struct cpu_device_id *cpu)
> int i;
>
> vendor_name[0] = '\0'; /* Unset */
> + cpu->device = 0; /* fix gcc 4.4.4 warning */
>
> /* Find the id and vendor_name */
> if (!has_cpuid()) {
> --
Do other gcc versions warn as well? 4.4 is old and worse than both 4.3
and 4.5 in many ways, so there's very little reason to be using it. If
more sensible gcc versions do not warn, it's better leaving it as is to
avoid real errors creeping in unnoticed.
--
Måns Rullgård
m...@mansr.com
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] x86: Fix a warning with gcc 4.4.4
On Thu, Nov 13, 2014 at 5:00 PM, Måns Rullgård wrote:
> Simon Glass writes:
>
>> This warning appears even though it seems that the compiler could work it
>> out. Fix it.
>>
>> Signed-off-by: Simon Glass
>> ---
>>
>> arch/x86/cpu/cpu.c | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c
>> index a4e639d..3583619 100644
>> --- a/arch/x86/cpu/cpu.c
>> +++ b/arch/x86/cpu/cpu.c
>> @@ -238,6 +238,7 @@ static void identify_cpu(struct cpu_device_id *cpu)
>> int i;
>>
>> vendor_name[0] = '\0'; /* Unset */
>> + cpu->device = 0; /* fix gcc 4.4.4 warning */
>>
>> /* Find the id and vendor_name */
>> if (!has_cpuid()) {
>> --
>
> Do other gcc versions warn as well? 4.4 is old and worse than both 4.3
> and 4.5 in many ways, so there's very little reason to be using it. If
> more sensible gcc versions do not warn, it's better leaving it as is to
> avoid real errors creeping in unnoticed.
>
> --
I am using 4.7.2 which does not generate this warning.
Regards,
Bin
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] ARM: remove unused CPU directory
There is no board with CPU "arm_intcm".
Signed-off-by: Masahiro Yamada
Cc: Albert Aribaud
---
arch/arm/cpu/arm_intcm/Makefile | 9 -
arch/arm/cpu/arm_intcm/config.mk | 8
arch/arm/cpu/arm_intcm/cpu.c | 36 --
arch/arm/cpu/arm_intcm/start.S | 79
4 files changed, 132 deletions(-)
delete mode 100644 arch/arm/cpu/arm_intcm/Makefile
delete mode 100644 arch/arm/cpu/arm_intcm/config.mk
delete mode 100644 arch/arm/cpu/arm_intcm/cpu.c
delete mode 100644 arch/arm/cpu/arm_intcm/start.S
diff --git a/arch/arm/cpu/arm_intcm/Makefile b/arch/arm/cpu/arm_intcm/Makefile
deleted file mode 100644
index 3279f12..000
--- a/arch/arm/cpu/arm_intcm/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# (C) Copyright 2000-2006
-# Wolfgang Denk, DENX Software Engineering, w...@denx.de.
-#
-# SPDX-License-Identifier: GPL-2.0+
-#
-
-extra-y= start.o
-obj-y = cpu.o
diff --git a/arch/arm/cpu/arm_intcm/config.mk b/arch/arm/cpu/arm_intcm/config.mk
deleted file mode 100644
index 438668d..000
--- a/arch/arm/cpu/arm_intcm/config.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# (C) Copyright 2002
-# Gary Jennejohn, DENX Software Engineering,
-#
-# SPDX-License-Identifier: GPL-2.0+
-#
-
-PLATFORM_CPPFLAGS += -march=armv4
diff --git a/arch/arm/cpu/arm_intcm/cpu.c b/arch/arm/cpu/arm_intcm/cpu.c
deleted file mode 100644
index 0d00e4b..000
--- a/arch/arm/cpu/arm_intcm/cpu.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * (C) Copyright 2002
- * Sysgo Real-Time Solutions, GmbH
- * Marius Groeger
- *
- * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering,
- *
- * SPDX-License-Identifier:GPL-2.0+
- */
-
-/*
- * CPU specific code for an unknown cpu
- * - hence fairly empty..
- */
-
-#include
-#include
-
-int cleanup_before_linux (void)
-{
- /*
-* this function is called just before we call linux
-* it prepares the processor for linux
-*
-* we turn off caches etc ...
-*/
-
- disable_interrupts ();
-
- /* Since the CM has unknown processor we do not support
-* cache operations
-*/
-
- return (0);
-}
diff --git a/arch/arm/cpu/arm_intcm/start.S b/arch/arm/cpu/arm_intcm/start.S
deleted file mode 100644
index c0c07b6..000
--- a/arch/arm/cpu/arm_intcm/start.S
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * armboot - Startup Code for ARM926EJS CPU-core
- *
- * Copyright (c) 2003 Texas Instruments
- *
- * - Adapted for OMAP1610 OMAP730 from ARM925t code --
- *
- * Copyright (c) 2001 Marius Gröger
- * Copyright (c) 2002 Alex Züpke
- * Copyright (c) 2002 Gary Jennejohn
- * Copyright (c) 2003 Richard Woodruff
- * Copyright (c) 2003 Kshitij
- *
- * SPDX-License-Identifier:GPL-2.0+
- */
-
-#include
-#include
-#include
-
-/*
- *
- *
- * Startup Code (reset vector)
- *
- * do important init only if we don't start from memory!
- * setup memory and board specific bits prior to relocation.
- * relocate armboot to ram
- * setup stack
- *
- *
- */
-
- .globl reset
-
-reset:
- /*
-* set the cpu to SVC32 mode
-*/
- mrs r0,cpsr
- bic r0,r0,#0x1f
- orr r0,r0,#0xd3
- msr cpsr,r0
-
- /*
-* we do sys-critical inits only at reboot,
-* not when booting from ram!
-*/
-#ifndef CONFIG_SKIP_LOWLEVEL_INIT
- bl cpu_init_crit
-#endif
-
- bl _main
-
-/*--*/
-
- .globl c_runtime_cpu_setup
-c_runtime_cpu_setup:
-
- mov pc, lr
-
-/*
- *
- *
- * CPU_init_critical registers
- *
- * setup important registers
- * setup memory timing
- *
- *
- */
-
-#ifndef CONFIG_SKIP_LOWLEVEL_INIT
-cpu_init_crit:
- /* arm_int_generic assumes the ARM boot monitor, or user software,
-* has initialized the platform
-*/
- mov pc, lr /* back to my caller */
-#endif
--
1.9.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] config: remove redundant CONFIG_SYS_PROMPT defines
Since commit 0defddc851ed (config: Add a default CONFIG_SYS_PROMPT), each board header does not need to define CONFIG_SYS_PROMPT as long as it uses the default prompt "=> ". Signed-off-by: Masahiro Yamada --- include/configs/T1040QDS.h | 1 - include/configs/T104xRDB.h | 1 - include/configs/T208xQDS.h | 1 - include/configs/T208xRDB.h | 1 - include/configs/ids8313.h| 1 - include/configs/ls1021aqds.h | 1 - include/configs/ls1021atwr.h | 1 - include/configs/udoo.h | 1 - 8 files changed, 8 deletions(-) diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index 1d0664d..2178f9d 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -730,7 +730,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_CMDLINE_EDITING /* Command-line editing */ #define CONFIG_AUTO_COMPLETE /* add autocompletion support */ #define CONFIG_SYS_LOAD_ADDR 0x200 /* default load address */ -#define CONFIG_SYS_PROMPT "=> " /* Monitor Command Prompt */ #ifdef CONFIG_CMD_KGDB #define CONFIG_SYS_CBSIZE 1024/* Console I/O Buffer Size */ #else diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 2bb86e4..216f34f 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -745,7 +745,6 @@ #define CONFIG_CMDLINE_EDITING /* Command-line editing */ #define CONFIG_AUTO_COMPLETE /* add autocompletion support */ #define CONFIG_SYS_LOAD_ADDR 0x200 /* default load address */ -#define CONFIG_SYS_PROMPT "=> " /* Monitor Command Prompt */ #ifdef CONFIG_CMD_KGDB #define CONFIG_SYS_CBSIZE 1024/* Console I/O Buffer Size */ #else diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 2733358..2f381e7 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -791,7 +791,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_CMDLINE_EDITING /* Command-line editing */ #define CONFIG_AUTO_COMPLETE /* add autocompletion support */ #define CONFIG_SYS_LOAD_ADDR 0x200 /* default load address */ -#define CONFIG_SYS_PROMPT "=> " /* Monitor Command Prompt */ #ifdef CONFIG_CMD_KGDB #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ #else diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 400d979..47b3bd5 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -750,7 +750,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_CMDLINE_EDITING /* Command-line editing */ #define CONFIG_AUTO_COMPLETE /* add autocompletion support */ #define CONFIG_SYS_LOAD_ADDR 0x200 /* default load address */ -#define CONFIG_SYS_PROMPT "=> " /* Monitor Command Prompt */ #ifdef CONFIG_CMD_KGDB #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ #else diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h index 3e55247..f084834 100644 --- a/include/configs/ids8313.h +++ b/include/configs/ids8313.h @@ -484,7 +484,6 @@ * Miscellaneous configurable options */ #define CONFIG_SYS_LONGHELP -#define CONFIG_SYS_PROMPT "=> " #define CONFIG_SYS_CBSIZE 1024 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE \ + sizeof(CONFIG_SYS_PROMPT)+16) diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index d1f6ea7..b19a60f 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -344,7 +344,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_LONGHELP/* undef to save memory */ #define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ #define CONFIG_SYS_PROMPT_HUSH_PS2 "> " -#define CONFIG_SYS_PROMPT "=> " #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ #define CONFIG_SYS_PBSIZE \ diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 3c73af8..e98e102 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -245,7 +245,6 @@ #define CONFIG_SYS_LONGHELP/* undef to save memory */ #define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ #define CONFIG_SYS_PROMPT_HUSH_PS2 "> " -#define CONFIG_SYS_PROMPT "=> " #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ #define CONFIG_SYS_PBSIZE \ diff --git a/include/configs/udoo.h b/include/configs/udoo.h index 700e9c1..b4a6245 100644 --- a/include/configs/udoo.h +++ b/include/configs/udoo.h @@ -191,7 +191,6 @@ /* Miscellaneous configurable options */ #define CONFIG_SYS_LONGHELP #define CONFIG_SYS_HUSH_PARSER -#define CONFIG_SYS_PROMPT "=> " #define CONFIG_AUTO_COMPLE
Re: [U-Boot] [ANN] U-Boot v2015.01-rc1 released
Hi Marek, On 10/11/2014 22:29, Tom Rini wrote: > Hey all, > > I've pushed v2015.01-rc1 out to the repository and tarballs should exist > soon. > > The merge window is now closed. Per both the min-summit and the follow > up emails, I'm going to try and get into the every 2 week RC tagging > groove. And, I'm going to be relying on everyones best judgement about > what level of changes they're going to put into a pull request to me. > > When I do a buildman of most things I see: > blackfin: + ip04 >arm: + Ippo_q8h_v5 novena openrd_base maxbcm openrd_ultimate > openrd_client tricorder db-mv784mp-gp Linksprite_pcDuino3_fdt tricorder_flash > cm_t3517 I confirm the issue with novena after pulling mainline into u-boot-imx. It looks like that CONFIG_SPL_LDSCRIPT is somewhere unset (I do not why, gw_ventana is built fine). Marek, can you take a look at it ? Thanks ! Stefano -- = DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] arm: mx6: Fix missing Kconfig option for Novena
Add two missing Kconfig options for Novena and drop the SPL from the Novena config. Signed-off-by: Marek Vasut Cc: Stefano Babic Cc: Sean Cross Cc: Marek Vasut Cc: Fabio Estevam --- arch/arm/Kconfig | 2 ++ configs/novena_defconfig | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 22eb2d5..5cd621a 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -629,6 +629,8 @@ config TARGET_HUMMINGBOARD config TARGET_KOSAGI_NOVENA bool "Support Kosagi Novena" + select CPU_V7 + select SUPPORT_SPL config TARGET_TQMA6 bool "TQ Systems TQMa6 board" diff --git a/configs/novena_defconfig b/configs/novena_defconfig index a560afb..cadf461 100644 --- a/configs/novena_defconfig +++ b/configs/novena_defconfig @@ -1,4 +1,4 @@ CONFIG_SPL=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/kosagi/novena/setup.cfg,MX6Q,SPL" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/kosagi/novena/setup.cfg,MX6Q" +S:CONFIG_ARM=y +S:CONFIG_TARGET_KOSAGI_NOVENA=y -- 2.0.0 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [ANN] U-Boot v2015.01-rc1 released
On Thursday, November 13, 2014 at 10:46:16 AM, Stefano Babic wrote: > Hi Marek, > > On 10/11/2014 22:29, Tom Rini wrote: > > Hey all, > > > > I've pushed v2015.01-rc1 out to the repository and tarballs should exist > > soon. > > > > The merge window is now closed. Per both the min-summit and the follow > > up emails, I'm going to try and get into the every 2 week RC tagging > > groove. And, I'm going to be relying on everyones best judgement about > > what level of changes they're going to put into a pull request to me. > > > > When I do a buildman of most things I see: > > blackfin: + ip04 > > > >arm: + Ippo_q8h_v5 novena openrd_base maxbcm openrd_ultimate > >openrd_client tricorder db-mv784mp-gp Linksprite_pcDuino3_fdt > >tricorder_flash cm_t3517 > > I confirm the issue with novena after pulling mainline into u-boot-imx. > It looks like that CONFIG_SPL_LDSCRIPT is somewhere unset (I do not why, > gw_ventana is built fine). > > Marek, can you take a look at it ? Yes, you have an email fixing this. Best regards, Marek Vasut ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] putc
Am Mittwoch, 12. November 2014, 19:32:21 schrieben Sie: > Hi Martin, > > On 30 October 2014 00:45, Martin Dorwig wrote: > > Am Mittwoch, 29. Oktober 2014, 13:03:41 schrieben Sie: > >> Hi Martin, > >> > >> On 28 October 2014 07:23, Martin Dorwig wrote: > >> > Hello, > >> > after updating u-boot from git v2014.10 > >> > i just noticed that my standalone application outputs garbage using > >> > putc. > >> > after some investigation i found that the gd->jt[XF_putc] is assigned a > >> > dev->putc pointer in "common/console.c function console_setfile" > >> > > >> > the dev->putc is declared in include/stdio_dev.h as > >> > void (*putc)(struct stdio_dev *dev, const char c); > >> > > >> > int include/exports.h this function is declared as > >> > void putc(const char); > >> > > >> > this was introduced with commit id > >> > 709ea543b92489e7729d2d7ddd6c9f451e52158c > >> > >> That's unfortunate. Is the stdio device pointer available in the > >> standalone application? > >> > >> Perhaps gd->jt should point to a structure of strongly-typed > >> functions? Then we would get a build error in this case. > >> > >> Regards, > >> Simon > > > > What is the motivation to override the jumptable slots ? > > Why can't they be untouched like this > > gd->jt[XF_getc] = getc; > > gd->jt[XF_tstc] = tstc; > > gd->jt[XF_putc] = putc; > > gd->jt[XF_puts] = puts; > > redirection of the console to another device is honored in the > > implementation of the functions themselves. > > for example the putc function: > > it calls pre_console_putc before a console is present > > if GD_FLG_DEVINIT is set, it calls fputc(stdout,c) which calls > > console_putc(stdout,c) which in turn calls stdio_devices[stdout]- > > > >>putc(stdio_devices[file], c); > >> > > else it calls serial_putc(c) > > I have taken a bit of a look at this. > > I have not actually touched the jumptable slots. The one you mention > was assigned to dev->putc() before and after. The problem is that now > dev->putc() has two parameters, the first being 'dev'. > > dev->putc() is the device's putc function - typically the serial port > or a display. > > The putc() function you mention is the console out, that outputs to > all stdout devices. > > So yes we could change the bahaviour so that it calls putc(). I think > this will work, and it probably isn't going to result in a change in > behaviour for many boards since they only have a single stdout. > > Alternatively we could require the stdio device parameter to be passed > in. I'm not sure that will work though - how will the external program > get at it? > > In any case, teh void *gd->jt[] is not serving our purpose here - it > should be changed to proper function pointer types so that the > compiler can check that this sort of thing doesn't happen. > > Please let me know what you think should be done here. > > Regards, > Simon The jumptable is initialized once, and i don't see any reason to overwrite it. Adding a parameter to these exported functions will break backward compatibility of existing standalone apps Regards, Martin ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 3/4] commands: add more command entries in Kconfig
This commit adds some of command entries (CONFIG_CMD_*) to cover include/config_cmd_default.h and a little extra. Because U-Boot supports lots of commands, they should be categorized according to their usage. Signed-off-by: Masahiro Yamada --- I know lots of commands are missing. Since I am not familiar with all the commands, volunteers are very very welcome. - Please check if the added Kconfig options (prompt, help message, categorization) are reasonable. - Please send patches to add more. common/Kconfig | 283 +++-- 1 file changed, 274 insertions(+), 9 deletions(-) diff --git a/common/Kconfig b/common/Kconfig index 7f8359d..fd84fa0 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -18,34 +18,299 @@ config SYS_HUSH_PARSER help Backward compatibility. +comment "Commands" + +menu "Info commands" + +config CMD_BDI + bool "bdinfo" + help + Print board info + +config CMD_CONSOLE + bool "coninfo" + help + Print console devices and information. + +config CMD_LICENSE + bool "license" + help + Print GPL license text + +endmenu + +menu "Boot commands" + +config CMD_BOOTD + bool "bootd" + help + Run the command stored in the environment "bootcmd", i.e. + "bootd" does the same thing as "run bootcmd". + config CMD_BOOTM - bool "Enable bootm command" + bool "bootm" default y help Boot an application image from the memory. -config CMD_CRC32 - bool "Enable crc32 command" +config CMD_GO + bool "go" default y help - Compute CRC32. + Start an application at a given address. + +config CMD_RUN + bool "run" + help + Run the command in the given environment variable. + +config CMD_IMI + bool "iminfo" + help + Print header information for application image. + +config CMD_IMLS + bool "imls" + help + List all images found in flash + +config CMD_XIMG + bool "imxtract" + help + Extract a part of a multi-image. + +endmenu + +menu "Environment commands" config CMD_EXPORTENV - bool "Enable env export command" + bool "env export" default y help Export environments. config CMD_IMPORTENV - bool "Enable env import command" + bool "env import" default y help Import environments. -config CMD_GO - bool "Enable go command" +config CMD_EDITENV + bool "editenv" + help + Edit environment variable. + +config CMD_SAVEENV + bool "saveenv" + help + Run the command in the given environment variable. + +endmenu + +menu "Memory commands" + +config CMD_MEMORY + bool "md, mm, nm, mw, cp, cmp, base, loop" + help + Memeory commands. + md - memory display + mm - memory modify (auto-incrementing address) + nm - memory modify (constant address) + mw - memory write (fill) + cp - memory copy + cmp - memory compare + base - print or set address offset + loop - initinite loop on address range + +config CMD_CRC32 + bool "crc32" default y help - Start an application at a given address. + Compute CRC32. + +config LOOPW + bool "loopw" + help + Infinite write loop on address range + +config CMD_MEMTEST + bool "crc32" + help + Simple RAM read/write test. + +config CMD_MX_CYCLIC + bool "mdc, mwc" + help + mdc - memory display cyclic + mwc - memory write cyclic + +config CMD_MEMINFO + bool "meminfo" + help + Display memory information. + +endmenu + +menu "Device access commands" + +config CMD_LOADB + bool "loadb" + help + Load a binary file over serial line. + +config CMD_LOADS + bool "loads" + help + Load an S-Record file over serial line + +config CMD_FLASH + bool "flinfo, erase, protect" + help + NOR flash support. + flinfo - print FLASH memory information + erase - FLASH memory + protect - enable or disable FLASH write protection + +config CMD_NAND + bool "nand" + help + NAND support. + +config CMD_SPI + bool "sspi" + help + SPI utility command. + +config CMD_I2C + bool "i2c" + help + I2C support. + +config CMD_USB + bool "usb" + help + USB support. + +config CMD_FPGA + bool "fpga" + help + FPGA support. + +endmenu + + +menu "Shell scripting commands" + +config CMD_ECHO + bool "echo" + help + Echo args to console + +config CMD_ITEST + bool "itest" + help + Return true/false on integer compare. + +config CMD_SOURCE + bool "source" + help +
[U-Boot] [PATCH 0/4] Add more boolean configs to Kconfig
We need to move configs although it is a very tedious work. First, we have to create entries in Kconfig. 1/4: add some FIT options 2/4: add Hush option 3/4: add various commands options I know there is still more to work on, but I believe every big work is done step by step. I am not an expert of all the areas of U-Boot, so I need your help. - Please check if the added Kconfig options (prompt, help message, categorization) are reasonable - Add more options in follow-up patches Masahiro Yamada (4): FIT: add some FIT configurations to Kconfig hush: add CONFIG_HUSH_PARSER to Kconfig commands: add more command entries in Kconfig spl: fix descending condition to drivers/mtd/nand/ Kconfig | 22 README | 12 --- common/Kconfig | 300 +-- scripts/Makefile.spl | 2 +- 4 files changed, 314 insertions(+), 22 deletions(-) -- 1.9.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 4/4] spl: fix descending condition to drivers/mtd/nand/
SPL should not reference CONFIG_CMD_NAND to decide whether or not it should build drivers/mtd/nand. CONFIG_CMD_NAND should be only used to select the NAND utility command on the command parser. Signed-off-by: Masahiro Yamada --- scripts/Makefile.spl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index 7afe437..0625b2c 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -80,7 +80,7 @@ libs-y += fs/ libs-$(CONFIG_SPL_LIBGENERIC_SUPPORT) += lib/ libs-$(CONFIG_SPL_POWER_SUPPORT) += drivers/power/ drivers/power/pmic/ libs-$(CONFIG_SPL_MTD_SUPPORT) += drivers/mtd/ -libs-$(if $(CONFIG_CMD_NAND),$(CONFIG_SPL_NAND_SUPPORT)) += drivers/mtd/nand/ +libs-$(CONFIG_SPL_NAND_SUPPORT) += drivers/mtd/nand/ libs-$(CONFIG_SPL_DRIVERS_MISC_SUPPORT) += drivers/misc/ libs-$(CONFIG_SPL_ONENAND_SUPPORT) += drivers/mtd/onenand/ libs-$(CONFIG_SPL_DMA_SUPPORT) += drivers/dma/ -- 1.9.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/4] FIT: add some FIT configurations to Kconfig
Signed-off-by: Masahiro Yamada --- Kconfig | 22 ++ 1 file changed, 22 insertions(+) diff --git a/Kconfig b/Kconfig index f34f341..9b16d66 100644 --- a/Kconfig +++ b/Kconfig @@ -93,6 +93,28 @@ config TPL help If you want to build TPL as well as the normal image and SPL, say Y. +config FIT + bool "Support Flattened Image Tree" + depends on !SPL_BUILD + help + This option allows to boot the new uImage structrure, + Flattened Image Tree. FIT is formally a FDT, which can include + images of various types (kernel, FDT blob, ramdisk, etc.) + in a single blob. To boot this new uImage structure, + pass the the address of the blob to the "bootm" command. + +config FIT_VERBOSE + bool "Display verbose messages on FIT boot" + depends on FIT + +config FIT_SIGNATURE + bool "Enabel signature verification of FIT uImages" + depends on FIT + help + This option enables signature verification of FIT uImages, + using a hash signed and verified using RSA. + See doc/uImage.FIT/signature.txt for more details. + config SYS_EXTRA_OPTIONS string "Extra Options (DEPRECATED)" depends on !SPL_BUILD -- 1.9.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 2/4] hush: add CONFIG_HUSH_PARSER to Kconfig
The README file states that the macros beginning with "CONFIG_SYS_"
depend on the hardware etc. and should not be meddled with if you do
not what you're doing.
We have already screwed up with this policy; we have given the prefix
"CONFIG_SYS_" to many user-selectable configurations.
Here, "CONFIG_SYS_HUSH_PARSER" is one of them. Users can enable it
if they want to use a more powerful command line parser, or disable it
if they only need a simple one.
This commit attempts to rename CONFIG_SYS_HUSH_PARSER to
CONFIG_HUSH_PARSER and move it to Kconfig.
Every board maintainer is expected to enable CONFIG_HUSH_PARSER
(= add "CONFIG_HUSH_PARSER=y" to his defconfig file) and remove
"#define CONFIG_SYS_HUSH_PARSER" from his header file.
Signed-off-by: Masahiro Yamada
---
README | 12
common/Kconfig | 17 +
2 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/README b/README
index c3a9dfc..66ec1cb 100644
--- a/README
+++ b/README
@@ -2834,18 +2834,6 @@ CBFS (Coreboot Filesystem) support
Enable auto completion of commands using TAB.
- CONFIG_SYS_HUSH_PARSER
-
- Define this variable to enable the "hush" shell (from
- Busybox) as command line interpreter, thus enabling
- powerful command line syntax like
- if...then...else...fi conditionals or `&&' and '||'
- constructs ("shell scripts").
-
- If undefined, you get the old, much simpler behaviour
- with a somewhat smaller memory footprint.
-
-
CONFIG_SYS_PROMPT_HUSH_PS2
This defines the secondary prompt string, which is
diff --git a/common/Kconfig b/common/Kconfig
index 216a8de..7f8359d 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -1,6 +1,23 @@
menu "Command line interface"
depends on !SPL_BUILD
+config HUSH_PARSER
+ bool "Use hush shell"
+ select SYS_HUSH_PARSER
+ help
+ This option enables the "hush" shell (from Busybox) as command line
+ interpreter, thus enabling powerful command line syntax like
+ if...then...else...fi conditionals or `&&' and '||'
+ constructs ("shell scripts").
+
+ If disabled, you get the old, much simpler behaviour with a somewhat
+ smaller memory footprint.
+
+config SYS_HUSH_PARSER
+ bool
+ help
+ Backward compatibility.
+
config CMD_BOOTM
bool "Enable bootm command"
default y
--
1.9.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 0/2] spl: MMC U-Boot image load from raw partition
Hello Tom, On Mon, 10 Nov 2014 13:46:09 -0500, Tom Rini wrote: > On Sat, Nov 08, 2014 at 11:19:23PM +0100, Albert ARIBAUD wrote: > > Hello Paul, > > > > On Sat, 8 Nov 2014 23:14:54 +0100, Paul Kocialkowski > > wrote: > > > This is a first attempt at adding support for U-Boot image load from raw > > > partitions. It does not support OS boot as I cannot test it on my current > > > setup. > > > > > > This is going to be useful for the Optimus Black port (please do not > > > consider > > > this as dead code because no board is using it right now, there will be > > > one > > > soon)! > > > > Well... Why don't you just post these two patches a little later, as > > part of the upcoming series which will add support for the Optimus > > Black? > > So to me the "dead code" thing is starting to get a lot more ambiguous > since with Kconfig we'll need need every single possible choice enabled > in some defconfig, just some way to turn it on, on a possibly relevant > board. In this case, any OMAP3+ board would be a fine place to try this > out, IFF it's done as a Kconfig choice. Not sure I'm understanding you right, but it seems to me we're in sync: as long as the code is enabled somewhere on some target, it is not dead code. I'm precisely asking that the code here be submitted along with the target that uses it. Or did I miss something? > Tom Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3 01/14] arm: spl: Avoid setting up a duplicate global data structure
Hello Simon,
On Mon, 10 Nov 2014 17:16:41 -0700, Simon Glass wrote:
> This is already set up in crt0.S. We don't need a new structure and don't
> really want one in the 'data' section of the image, since it will be empty
> and crt0.S's changes will be ignored.
>
> Signed-off-by: Simon Glass
> ---
>
> Changes in v3: None
> Changes in v2: None
>
> arch/arm/lib/spl.c | 4
> 1 file changed, 4 deletions(-)
>
> diff --git a/arch/arm/lib/spl.c b/arch/arm/lib/spl.c
> index 75ab546..6361a62 100644
> --- a/arch/arm/lib/spl.c
> +++ b/arch/arm/lib/spl.c
> @@ -13,10 +13,6 @@
> #include
> #include
>
> -/* Pointer to as well as the global data structure for SPL */
> -DECLARE_GLOBAL_DATA_PTR;
> -gd_t gdata __attribute__ ((section(".data")));
> -
> /*
> * In the context of SPL, board_init_f must ensure that any clocks/etc for
> * DDR are enabled, ensure that the stack pointer is valid, clear the BSS
> --
> 2.1.0.rc2.206.gedb03e5
>
Acked-by: Albert ARIBAUD
Amicalement,
--
Albert.
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 0/2] mtd: denali: Use SELF_INIT to fix up registers after nand_scan_ident()
This patch series is here because Scott Wood recommended me to use CONFIG_SYS_NAND_SELF_INIT to solve my problem: http://patchwork.ozlabs.org/patch/402462/ Changes in v2: - Use &nand_info[0] instead of nand_info - Print a warning message if initialization fails Masahiro Yamada (2): mtd: denali: use CONFIG_SYS_NAND_SELF_INIT mtd: denali: set some registers after nand_scan_ident() drivers/mtd/nand/Kconfig | 7 +++ drivers/mtd/nand/denali.c | 132 +- drivers/mtd/nand/denali.h | 5 +- 3 files changed, 104 insertions(+), 40 deletions(-) -- 1.9.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 2/2] mtd: denali: set some registers after nand_scan_ident()
Some but not all of implementations of the Denali NAND controller have hardware circuits to detect the device parameters such as page_size, erase_size, etc. Even on those SoCs with such hardware supported, the hardware is known to detect wrong parameters for some nasty (almost buggy) NAND devices. The device parameters detected during nand_scan_ident() are more trustworthy. This commit sets some hardware registers to mtd->pagesize, mtd->oobsize, etc. in the code between nand_scan_ident() and nand_scan_tail(). Signed-off-by: Masahiro Yamada Cc: Scott Wood Cc: Chin Liang See --- Changes in v2: None drivers/mtd/nand/denali.c | 11 +++ 1 file changed, 11 insertions(+) diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c index 24bc0ab..9e0429a 100644 --- a/drivers/mtd/nand/denali.c +++ b/drivers/mtd/nand/denali.c @@ -1209,6 +1209,17 @@ static int denali_init(struct denali_nand_info *denali) nand_oob.eccbytes = denali->nand.ecc.bytes; denali->nand.ecc.layout = &nand_oob; + writel(denali->mtd->erasesize / denali->mtd->writesize, + denali->flash_reg + PAGES_PER_BLOCK); + writel(denali->nand.options & NAND_BUSWIDTH_16 ? 1 : 0, + denali->flash_reg + DEVICE_WIDTH); + writel(denali->mtd->writesize, + denali->flash_reg + DEVICE_MAIN_AREA_SIZE); + writel(denali->mtd->oobsize, + denali->flash_reg + DEVICE_SPARE_AREA_SIZE); + if (readl(denali->flash_reg + DEVICES_CONNECTED) == 0) + writel(1, denali->flash_reg + DEVICES_CONNECTED); + /* override the default operations */ denali->nand.ecc.read_page = denali_read_page; denali->nand.ecc.read_page_raw = denali_read_page_raw; -- 1.9.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 1/2] mtd: denali: use CONFIG_SYS_NAND_SELF_INIT
Some variants of the Denali NAND controller need some registers
set up based on the device information that has been detected during
nand_scan_ident().
CONFIG_SYS_NAND_SELF_INIT has to be defined to insert code between
nand_scan_ident() and nand_scan_tail(). It is also helpful to reduce
the difference between this driver and its Linux counterpart because
this driver was ported from Linux. Moreover, doc/README.nand recommends
to use CONFIG_SYS_NAND_SELF_INIT.
Signed-off-by: Masahiro Yamada
Cc: Scott Wood
Cc: Chin Liang See
---
Changes in v2:
- Use &nand_info[0] instead of nand_info
- Print a warning message if initialization fails
drivers/mtd/nand/Kconfig | 7 +++
drivers/mtd/nand/denali.c | 121 --
drivers/mtd/nand/denali.h | 5 +-
3 files changed, 93 insertions(+), 40 deletions(-)
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 75c2c06..c242214 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -1,9 +1,16 @@
menu "NAND Device Support"
+config SYS_NAND_SELF_INIT
+ bool
+ help
+ This option, if enabled, provides more flexible and linux-like
+ NAND initialization process.
+
if !SPL_BUILD
config NAND_DENALI
bool "Support Denali NAND controller"
+ select SYS_NAND_SELF_INIT
help
Enable support for the Denali NAND controller.
diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
index 308b784..24bc0ab 100644
--- a/drivers/mtd/nand/denali.c
+++ b/drivers/mtd/nand/denali.c
@@ -44,7 +44,7 @@ static int onfi_timing_mode = NAND_DEFAULT_TIMINGS;
* this macro allows us to convert from an MTD structure to our own
* device context (denali) structure.
*/
-#define mtd_to_denali(m) (((struct nand_chip *)mtd->priv)->priv)
+#define mtd_to_denali(m) container_of(m->priv, struct denali_nand_info, nand)
/* These constants are defined by the driver to enable common driver
* configuration options. */
@@ -1144,70 +1144,117 @@ static void denali_hw_init(struct denali_nand_info
*denali)
static struct nand_ecclayout nand_oob;
-static int denali_nand_init(struct nand_chip *nand)
+static int denali_init(struct denali_nand_info *denali)
{
- struct denali_nand_info *denali;
+ int ret;
- denali = malloc(sizeof(*denali));
- if (!denali)
- return -ENOMEM;
+ denali_hw_init(denali);
- nand->priv = denali;
+ denali->mtd->name = "denali-nand";
+ denali->mtd->owner = THIS_MODULE;
+ denali->mtd->priv = &denali->nand;
- denali->flash_reg = (void __iomem *)CONFIG_SYS_NAND_REGS_BASE;
- denali->flash_mem = (void __iomem *)CONFIG_SYS_NAND_DATA_BASE;
+ /* register the driver with the NAND core subsystem */
+ denali->nand.select_chip = denali_select_chip;
+ denali->nand.cmdfunc = denali_cmdfunc;
+ denali->nand.read_byte = denali_read_byte;
+ denali->nand.read_buf = denali_read_buf;
+ denali->nand.waitfunc = denali_waitfunc;
+
+ /*
+* scan for NAND devices attached to the controller
+* this is the first stage in a two step process to register
+* with the nand subsystem
+*/
+ if (nand_scan_ident(denali->mtd, denali->max_banks, NULL)) {
+ ret = -ENXIO;
+ goto fail;
+ }
#ifdef CONFIG_SYS_NAND_USE_FLASH_BBT
/* check whether flash got BBT table (located at end of flash). As we
* use NAND_BBT_NO_OOB, the BBT page will start with
* bbt_pattern. We will have mirror pattern too */
- nand->bbt_options |= NAND_BBT_USE_FLASH;
+ denali->nand.bbt_options |= NAND_BBT_USE_FLASH;
/*
* We are using main + spare with ECC support. As BBT need ECC support,
* we need to ensure BBT code don't write to OOB for the BBT pattern.
* All BBT info will be stored into data area with ECC support.
*/
- nand->bbt_options |= NAND_BBT_NO_OOB;
+ denali->nand.bbt_options |= NAND_BBT_NO_OOB;
#endif
- nand->ecc.mode = NAND_ECC_HW;
- nand->ecc.size = CONFIG_NAND_DENALI_ECC_SIZE;
- nand->ecc.read_oob = denali_read_oob;
- nand->ecc.write_oob = denali_write_oob;
- nand->ecc.read_page = denali_read_page;
- nand->ecc.read_page_raw = denali_read_page_raw;
- nand->ecc.write_page = denali_write_page;
- nand->ecc.write_page_raw = denali_write_page_raw;
+ denali->nand.ecc.mode = NAND_ECC_HW;
+ denali->nand.ecc.size = CONFIG_NAND_DENALI_ECC_SIZE;
+
/*
* Tell driver the ecc strength. This register may be already set
* correctly. So we read this value out.
*/
- nand->ecc.strength = readl(denali->flash_reg + ECC_CORRECTION);
- switch (nand->ecc.size) {
+ denali->nand.ecc.strength = readl(denali->flash_reg + ECC_CORRECTION);
+ switch (denali->nand.ecc.size) {
case 512:
-
Re: [U-Boot] [PATCH] arm: mx6: Fix missing Kconfig option for Novena
Hi Marek, (ccing Tom) I posted a patch a week ago to fix this and some other boards http://patchwork.ozlabs.org/patch/407286/ but it looks like Tom has not checked this bug fix patch. My patch is intended to go directly to Tom's repo, whereas I guess yours is going to u-boot-imx repo. I don't think it is a good idea to fix one problem by two patches in two places. Unfortunately, both are imperfect. The board/kosagi/novena/Kconfig fix is missing from yours and "select SUPPORT_SPL" is missing from mine. So, how shall we sort out this? Would you send v2 dropping redudant lines from board/kosagi/novena/Kconfig and shall I send v3 omitting Kosagi stuff? Best Regards Masahiro Yamada On Thu, 13 Nov 2014 11:06:21 +0100 Marek Vasut wrote: > Add two missing Kconfig options for Novena and drop the SPL > from the Novena config. > > Signed-off-by: Marek Vasut > Cc: Stefano Babic > Cc: Sean Cross > Cc: Marek Vasut > Cc: Fabio Estevam > --- > arch/arm/Kconfig | 2 ++ > configs/novena_defconfig | 2 +- > 2 files changed, 3 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig > index 22eb2d5..5cd621a 100644 > --- a/arch/arm/Kconfig > +++ b/arch/arm/Kconfig > @@ -629,6 +629,8 @@ config TARGET_HUMMINGBOARD > > config TARGET_KOSAGI_NOVENA > bool "Support Kosagi Novena" > + select CPU_V7 > + select SUPPORT_SPL > > config TARGET_TQMA6 > bool "TQ Systems TQMa6 board" > diff --git a/configs/novena_defconfig b/configs/novena_defconfig > index a560afb..cadf461 100644 > --- a/configs/novena_defconfig > +++ b/configs/novena_defconfig > @@ -1,4 +1,4 @@ > CONFIG_SPL=y > -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/kosagi/novena/setup.cfg,MX6Q,SPL" > +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/kosagi/novena/setup.cfg,MX6Q" > +S:CONFIG_ARM=y > +S:CONFIG_TARGET_KOSAGI_NOVENA=y > -- > 2.0.0 > > ___ > 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
Re: [U-Boot] arm: socfpga: set skew settings for ethernet phy
Hi!
> From: Dinh Nguyen
>
> Set the PHY skew settings for the ethernet phy on the SOCFPGA
> devkit.
Should the timing configuration be done in the config file...?
Marek disliked getting the values from the environment, and I'm not
sure if that is neccessary. It can be removed if needed.
Signed-off-by: Pavel Machek
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
index 507b9a3..06a31b0 100644
--- a/drivers/net/phy/micrel.c
+++ b/drivers/net/phy/micrel.c
@@ -112,17 +112,46 @@ static int ksz9021_phy_extwrite(struct phy_device
*phydev, int addr,
return ksz9021_phy_extended_write(phydev, regnum, val);
}
+
+
/* Micrel ksz9021 */
static int ksz9021_config(struct phy_device *phydev)
{
unsigned ctrl1000 = 0;
const unsigned master = CTRL1000_PREFER_MASTER |
- CTRL1000_CONFIG_MASTER | CTRL1000_MANUAL_CONFIG;
+ CTRL1000_CONFIG_MASTER | CTRL1000_MANUAL_CONFIG;
unsigned features = phydev->drv->features;
+ printf("ksz9021: configuring\n");
+
+ printf("Configuring PHY skew timing for %s\n",
+ phydev->drv->name);
+
+ /* min rx data delay */
+ if (ksz9021_phy_extended_write(phydev,
+ MII_KSZ9021_EXT_RGMII_RX_DATA_SKEW,
+
getenv_ulong(CONFIG_KSZ9021_DATA_SKEW_ENV, 16,
+
CONFIG_KSZ9021_DATA_SKEW_VAL)) < 0)
+ return -1;
+ /* min tx data delay */
+ if (ksz9021_phy_extended_write(phydev,
+ MII_KSZ9021_EXT_RGMII_TX_DATA_SKEW,
+
getenv_ulong(CONFIG_KSZ9021_DATA_SKEW_ENV, 16,
+
CONFIG_KSZ9021_DATA_SKEW_VAL)) < 0)
+ return -1;
+ /* max rx/tx clock delay, min rx/tx control */
+ if (ksz9021_phy_extended_write(phydev,
+ MII_KSZ9021_EXT_RGMII_CLOCK_SKEW,
+
getenv_ulong(CONFIG_KSZ9021_CLK_SKEW_ENV, 16,
+
CONFIG_KSZ9021_CLK_SKEW_VAL)) < 0)
+ return -1;
+
+
+
+
if (getenv("disable_giga"))
features &= ~(SUPPORTED_1000baseT_Half |
- SUPPORTED_1000baseT_Full);
+ SUPPORTED_1000baseT_Full);
/* force master mode for 1000BaseT due to chip errata */
if (features & SUPPORTED_1000baseT_Half)
ctrl1000 |= ADVERTISE_1000HALF | master;
diff --git a/include/configs/socfpga_cyclone5.h
b/include/configs/socfpga_cyclone5.h
index 8d54bf89..53a3d71 100644
--- a/include/configs/socfpga_cyclone5.h
+++ b/include/configs/socfpga_cyclone5.h
@@ -53,19 +56,29 @@
/* Ethernet on SoC (EMAC) */
#if defined(CONFIG_CMD_NET)
-#define CONFIG_EMAC_BASE SOCFPGA_EMAC0_ADDRESS
+#define CONFIG_EMAC_BASE SOCFPGA_EMAC1_ADDRESS
#define CONFIG_PHY_INTERFACE_MODE PHY_INTERFACE_MODE_RGMII
-#define CONFIG_EPHY0_PHY_ADDR 0
-
-/* PHY */
#define CONFIG_EPHY1_PHY_ADDR 4
+
#define CONFIG_PHY_MICREL
#define CONFIG_PHY_MICREL_KSZ9021
-#define CONFIG_KSZ9021_CLK_SKEW_ENV"micrel-ksz9021-clk-skew"
-#define CONFIG_KSZ9021_CLK_SKEW_VAL0xf0f0
-#define CONFIG_KSZ9021_DATA_SKEW_ENV "micrel-ksz9021-data-skew"
-#define CONFIG_KSZ9021_DATA_SKEW_VAL 0x0
+/* phy */
+#define CONFIG_EPHY0_PHY_ADDR 0
+#define CONFIG_EPHY1_PHY_ADDR 4
+#define CONFIG_KSZ9021_CLK_SKEW_ENV"micrel-ksz9021-clk-skew"
+#define CONFIG_KSZ9021_CLK_SKEW_VAL0xf0f0
+#define CONFIG_KSZ9021_DATA_SKEW_ENV "micrel-ksz9021-data-skew"
+#define CONFIG_KSZ9021_DATA_SKEW_VAL 0x0
+/* Type of PHY available */
+#define SOCFPGA_PHYSEL_ENUM_GMII 0x0
+#define SOCFPGA_PHYSEL_ENUM_MII0x1
+#define SOCFPGA_PHYSEL_ENUM_RGMII 0x2
+#define SOCFPGA_PHYSEL_ENUM_RMII 0x3
+
+
+#else
+#error Youll need ethernet :-)
#endif
/* Extra Environment */
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures)
http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] arm: socfpga: set skew settings for ethernet phy
Dear Pavel Machek,
In message <20141113120956.GB30779@amd> you wrote:
>
> diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
> index 507b9a3..06a31b0 100644
> --- a/drivers/net/phy/micrel.c
> +++ b/drivers/net/phy/micrel.c
> @@ -112,17 +112,46 @@ static int ksz9021_phy_extwrite(struct phy_device
> *phydev, int addr,
> return ksz9021_phy_extended_write(phydev, regnum, val);
> }
>
> +
> +
Please don't add excessive white space / blank lines.
> + printf("ksz9021: configuring\n");
> +
> + printf("Configuring PHY skew timing for %s\n",
> +phydev->drv->name);
Should these eventually be changed into debug() ?
Output gets really noisy otherwise.
> if (getenv("disable_giga"))
Should we not rather use the standard "hwconf" approach here?
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de
There is a time in the tides of men, Which, taken at its flood, leads
on to success. On the other hand, don't count on it. - T. K. Lawson
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] zynq: zybo: Move CONFIG_DEFAULT_DEVICE_TREE to defconfig
Move CONFIG_DEFAULT_DEVICE_TREE from board config directly to defconfig. This patch removes compilation warning: include/configs/zynq_zybo.h:24:0: warning: "CONFIG_DEFAULT_DEVICE_TREE" redefined [enabled by default] #define CONFIG_DEFAULT_DEVICE_TREE zynq-zybo Signed-off-by: Michal Simek --- configs/zynq_zybo_defconfig | 2 ++ include/configs/zynq_zybo.h | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig index a00f4fcea5b7..12311cd83b50 100644 --- a/configs/zynq_zybo_defconfig +++ b/configs/zynq_zybo_defconfig @@ -2,3 +2,5 @@ CONFIG_SPL=y +S:CONFIG_ARM=y +S:CONFIG_ZYNQ=y +S:CONFIG_TARGET_ZYNQ_ZYBO=y +CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="zynq-zybo" diff --git a/include/configs/zynq_zybo.h b/include/configs/zynq_zybo.h index ce1527fafc51..191f2a5f301e 100644 --- a/include/configs/zynq_zybo.h +++ b/include/configs/zynq_zybo.h @@ -21,7 +21,6 @@ #define CONFIG_ZYNQ_SDHCI0 #define CONFIG_ZYNQ_BOOT_FREEBSD -#define CONFIG_DEFAULT_DEVICE_TREE zynq-zybo /* Define ZYBO PS Clock Frequency to 50MHz */ #define CONFIG_ZYNQ_PS_CLK_FREQ5000UL -- 1.8.2.3 pgpPDbP8DdyNB.pgp Description: PGP signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [GIT PULL] Zynq patches
On 11/11/2014 09:47 PM, Tom Rini wrote: > On Tue, Nov 11, 2014 at 11:22:43AM +0100, Michal Simek wrote: > >> Hi Tom, [cc: Albert] >> >> please pull these 4 patches to your tree. >> It adds support for Zybo board and add support for new ps7_init_gpl file. >> >> Thanks, >> Michal >> >> >> The following changes since commit 11ada9225a16ed2d8ddbf0715a2416245a777cbc: >> >> Merge branch 'rmobile' of git://www.denx.de/git/u-boot-sh (2014-11-05 >> 13:11:18 -0500) >> >> are available in the git repository at: >> >> >> git://www.denx.de/git/u-boot-microblaze.git zynq >> >> for you to fetch changes up to 61eb3cf2d5ef174b5a3008df6f7530b21f393261: >> >> kconfig: zynq: Add ZYBO board (2014-11-11 11:02:52 +0100) >> > > OK, this doesn't build for me, the new zybo board blows up: > +(zynq_zybo) common/built-in.o: In function `show_model_r': > +(zynq_zybo) common/board_r.c:510: undefined reference to `checkboard' > w+(zynq_zybo,zynq_zybo) include/configs/zynq_zybo.h:24:0: warning: > "CONFIG_DEFAULT_DEVICE_TREE" redefined [enabled by default]In file > included from include/config.h:4:0 > > Please fix, you can add it on top of the current PR, thanks! you are right. Not sure why I have missed it. I remember I was running MAKEALL but maybe before rebase. :-( Anyway I have sent one more patch to fix this. Thanks, Michal -- Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/ Maintainer of Linux kernel - Xilinx Zynq ARM architecture Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform signature.asc Description: OpenPGP digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] arm: socfpga: set skew settings for ethernet phy
Hi!
On Thu 2014-11-13 13:20:52, Wolfgang Denk wrote:
> Dear Pavel Machek,
>
> In message <20141113120956.GB30779@amd> you wrote:
> >
> > diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
> > index 507b9a3..06a31b0 100644
> > --- a/drivers/net/phy/micrel.c
> > +++ b/drivers/net/phy/micrel.c
> > @@ -112,17 +112,46 @@ static int ksz9021_phy_extwrite(struct phy_device
> > *phydev, int addr,
> > return ksz9021_phy_extended_write(phydev, regnum, val);
> > }
> >
> > +
> > +
>
> Please don't add excessive white space / blank lines.
>
> > + printf("ksz9021: configuring\n");
> > +
> > + printf("Configuring PHY skew timing for %s\n",
> > + phydev->drv->name);
>
> Should these eventually be changed into debug() ?
>
> Output gets really noisy otherwise.
>
> > if (getenv("disable_giga"))
>
> Should we not rather use the standard "hwconf" approach here?
Comments accepted (this was just a test patch I hand edited it, thats
why it was so ugly), but we need to decide, first, which approach to
take. (Configuration in environment vs. configuration in config file
vs. hardcoded configuration in .c file.). Then, clean patch can be
prepared.
I wanted to sign it off, so that it is clear it can be used as a basis
for better patch, but I was aware it is not clean enough for merging
-- how do I do that?
Thanks,
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures)
http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] arm: socfpga: set skew settings for ethernet phy
Hello Pavel, > I wanted to sign it off, so that it is clear it can be used as a basis > for better patch, but I was aware it is not clean enough for merging > -- how do I do that? Why not simply tag it [RFC]? > Thanks, > Pavel > -- > (english) http://www.livejournal.com/~pavelmachek > (cesky, pictures) > http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v7 4/5] imx6: add spl in the header file
Hi John, On Thu, Nov 13, 2014 at 6:58 AM, Stefano Babic wrote: >> #define CONFIG_LOADADDR0x1200 >> +#ifndef CONFIG_SYS_TEXT_BASE >> #define CONFIG_SYS_TEXT_BASE 0x1780 >> +#endif >> > > Why is that needed ? SPL does not use it, because it use > CONFIG_SPL_TEXT_BASE, and this is defined in imx6_spl.h. And you do not > redefine it, meaning that overwriting the value is not necessary at all, > as we expect. Stefano is right. You can simply remove this piece: --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -95,9 +95,6 @@ #define CONFIG_BOOTDELAY 1 #define CONFIG_LOADADDR0x1200 -#ifndef CONFIG_SYS_TEXT_BASE -#define CONFIG_SYS_TEXT_BASE 0x1780 -#endif #ifdef CONFIG_SUPPORT_EMMC_BOOT #define EMMC_ENV \ and the build will succeed as expected. Thanks ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] arm: socfpga: set skew settings for ethernet phy
On Thu 2014-11-13 13:32:26, Albert ARIBAUD wrote: > Hello Pavel, > > > I wanted to sign it off, so that it is clear it can be used as a basis > > for better patch, but I was aware it is not clean enough for merging > > -- how do I do that? > > Why not simply tag it [RFC]? Well, dunno, I was not asking for code review at that point. There was a patch submitted, and I was asking if maybe different approach is better. Subject already said "Re: ...", that is usually disussion, not a patch that needs to be reviewed. Best regards, Pavel -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v7 4/5] imx6: add spl in the header file
On Thu, Nov 13, 2014 at 10:41 AM, Fabio Estevam wrote: > Hi John, > > On Thu, Nov 13, 2014 at 6:58 AM, Stefano Babic wrote: > >>> #define CONFIG_LOADADDR0x1200 >>> +#ifndef CONFIG_SYS_TEXT_BASE >>> #define CONFIG_SYS_TEXT_BASE 0x1780 >>> +#endif >>> >> >> Why is that needed ? SPL does not use it, because it use >> CONFIG_SPL_TEXT_BASE, and this is defined in imx6_spl.h. And you do not >> redefine it, meaning that overwriting the value is not necessary at all, >> as we expect. > > Stefano is right. > > You can simply remove this piece: > > --- a/include/configs/mx6sabre_common.h > +++ b/include/configs/mx6sabre_common.h > @@ -95,9 +95,6 @@ > #define CONFIG_BOOTDELAY 1 > > #define CONFIG_LOADADDR0x1200 > -#ifndef CONFIG_SYS_TEXT_BASE > -#define CONFIG_SYS_TEXT_BASE 0x1780 > -#endif Sorry, I meant to remove only the ifdef: --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -95,9 +95,7 @@ #define CONFIG_BOOTDELAY 1 #define CONFIG_LOADADDR0x1200 -#ifndef CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_TEXT_BASE 0x1780 -#endif ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] arm: socfpga: set skew settings for ethernet phy
On Thursday, November 13, 2014 at 01:48:41 PM, Pavel Machek wrote: > On Thu 2014-11-13 13:32:26, Albert ARIBAUD wrote: > > Hello Pavel, > > > > > I wanted to sign it off, so that it is clear it can be used as a basis > > > for better patch, but I was aware it is not clean enough for merging > > > -- how do I do that? > > > > Why not simply tag it [RFC]? > > Well, dunno, I was not asking for code review at that point. There was > a patch submitted, and I was asking if maybe different approach is > better. > > Subject already said "Re: ...", that is usually disussion, not a patch > that needs to be reviewed. This discussion is moot, let's stick to the subject guys, thanks! Best regards, Marek Vasut ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] arm: mx6: Fix missing Kconfig option for Novena
On Thursday, November 13, 2014 at 12:48:45 PM, Masahiro Yamada wrote: > Hi Marek, > (ccing Tom) Hi! > I posted a patch a week ago to fix this and some other boards > http://patchwork.ozlabs.org/patch/407286/ > but it looks like Tom has not checked this bug fix patch. > > My patch is intended to go directly to Tom's repo, whereas > I guess yours is going to u-boot-imx repo. > > I don't think it is a good idea to fix one problem by two patches in two > places. > > Unfortunately, both are imperfect. > > The board/kosagi/novena/Kconfig fix is missing from yours and > "select SUPPORT_SPL" is missing from mine. > > So, how shall we sort out this? > > > Would you send v2 dropping redudant lines from board/kosagi/novena/Kconfig > and shall I send v3 omitting Kosagi stuff? Given you're the Kconfig guru, I would gladly leave it up to you if that is not too much inconvenience, and test your result. Best regards, Marek Vasut ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] ARM: remove unused CPU directory
Hello Masahiro,
On Thu, 13 Nov 2014 18:40:07 +0900, Masahiro Yamada
wrote:
> There is no board with CPU "arm_intcm".
>
> Signed-off-by: Masahiro Yamada
> Cc: Albert Aribaud
> ---
>
> arch/arm/cpu/arm_intcm/Makefile | 9 -
> arch/arm/cpu/arm_intcm/config.mk | 8
> arch/arm/cpu/arm_intcm/cpu.c | 36 --
> arch/arm/cpu/arm_intcm/start.S | 79
>
> 4 files changed, 132 deletions(-)
> delete mode 100644 arch/arm/cpu/arm_intcm/Makefile
> delete mode 100644 arch/arm/cpu/arm_intcm/config.mk
> delete mode 100644 arch/arm/cpu/arm_intcm/cpu.c
> delete mode 100644 arch/arm/cpu/arm_intcm/start.S
>
> diff --git a/arch/arm/cpu/arm_intcm/Makefile b/arch/arm/cpu/arm_intcm/Makefile
> deleted file mode 100644
> index 3279f12..000
> --- a/arch/arm/cpu/arm_intcm/Makefile
> +++ /dev/null
> @@ -1,9 +0,0 @@
> -#
> -# (C) Copyright 2000-2006
> -# Wolfgang Denk, DENX Software Engineering, w...@denx.de.
> -#
> -# SPDX-License-Identifier: GPL-2.0+
> -#
> -
> -extra-y = start.o
> -obj-y= cpu.o
> diff --git a/arch/arm/cpu/arm_intcm/config.mk
> b/arch/arm/cpu/arm_intcm/config.mk
> deleted file mode 100644
> index 438668d..000
> --- a/arch/arm/cpu/arm_intcm/config.mk
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -#
> -# (C) Copyright 2002
> -# Gary Jennejohn, DENX Software Engineering,
> -#
> -# SPDX-License-Identifier: GPL-2.0+
> -#
> -
> -PLATFORM_CPPFLAGS += -march=armv4
> diff --git a/arch/arm/cpu/arm_intcm/cpu.c b/arch/arm/cpu/arm_intcm/cpu.c
> deleted file mode 100644
> index 0d00e4b..000
> --- a/arch/arm/cpu/arm_intcm/cpu.c
> +++ /dev/null
> @@ -1,36 +0,0 @@
> -/*
> - * (C) Copyright 2002
> - * Sysgo Real-Time Solutions, GmbH
> - * Marius Groeger
> - *
> - * (C) Copyright 2002
> - * Gary Jennejohn, DENX Software Engineering,
> - *
> - * SPDX-License-Identifier: GPL-2.0+
> - */
> -
> -/*
> - * CPU specific code for an unknown cpu
> - * - hence fairly empty..
> - */
> -
> -#include
> -#include
> -
> -int cleanup_before_linux (void)
> -{
> - /*
> - * this function is called just before we call linux
> - * it prepares the processor for linux
> - *
> - * we turn off caches etc ...
> - */
> -
> - disable_interrupts ();
> -
> - /* Since the CM has unknown processor we do not support
> - * cache operations
> - */
> -
> - return (0);
> -}
> diff --git a/arch/arm/cpu/arm_intcm/start.S b/arch/arm/cpu/arm_intcm/start.S
> deleted file mode 100644
> index c0c07b6..000
> --- a/arch/arm/cpu/arm_intcm/start.S
> +++ /dev/null
> @@ -1,79 +0,0 @@
> -/*
> - * armboot - Startup Code for ARM926EJS CPU-core
> - *
> - * Copyright (c) 2003 Texas Instruments
> - *
> - * - Adapted for OMAP1610 OMAP730 from ARM925t code --
> - *
> - * Copyright (c) 2001 Marius Gröger
> - * Copyright (c) 2002 Alex Züpke
> - * Copyright (c) 2002 Gary Jennejohn
> - * Copyright (c) 2003 Richard Woodruff
> - * Copyright (c) 2003 Kshitij
> - *
> - * SPDX-License-Identifier: GPL-2.0+
> - */
> -
> -#include
> -#include
> -#include
> -
> -/*
> - *
> - *
> - * Startup Code (reset vector)
> - *
> - * do important init only if we don't start from memory!
> - * setup memory and board specific bits prior to relocation.
> - * relocate armboot to ram
> - * setup stack
> - *
> - *
> - */
> -
> - .globl reset
> -
> -reset:
> - /*
> - * set the cpu to SVC32 mode
> - */
> - mrs r0,cpsr
> - bic r0,r0,#0x1f
> - orr r0,r0,#0xd3
> - msr cpsr,r0
> -
> - /*
> - * we do sys-critical inits only at reboot,
> - * not when booting from ram!
> - */
> -#ifndef CONFIG_SKIP_LOWLEVEL_INIT
> - bl cpu_init_crit
> -#endif
> -
> - bl _main
> -
> -/*--*/
> -
> - .globl c_runtime_cpu_setup
> -c_runtime_cpu_setup:
> -
> - mov pc, lr
> -
> -/*
> - *
> - *
> - * CPU_init_critical registers
> - *
> - * setup important registers
> - * setup memory timing
> - *
> - *
> - */
> -
> -#ifndef CONFIG_SKIP_LOWLEVEL_INIT
> -cpu_init_crit:
> - /* arm_int_generic assumes the ARM boot monitor, or user software,
> - * has initialized the platform
> - */
> - mov pc, lr /* back to my caller */
> -#endif
> --
> 1.9.1
>
Applied to u-boot-arm/master, thanks!
Amicalement,
--
Albert.
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Updated: Pull request: u-boot-arm/master
Hello Tom, This PR replaces the one posted today at 08:54. The following changes since commit 63f7af9a4cfb4a3b9136674c6612c6d13957c2cd: Merge branch 'master' of git://git.denx.de/u-boot-uniphier (2014-11-11 15:49:10 -0500) are available in the git repository at: git://git.denx.de/u-boot-arm master for you to fetch changes up to 18900401abf54182a56d8ff6dc38c7421402920b: ARM: remove unused CPU directory (2014-11-13 12:35:17 +0100) Masahiro Yamada (1): ARM: remove unused CPU directory Thierry Reding (3): ARM: cache_v7: Various minor cleanups ARM: cache-cp15: Use more accurate types malloc: Output region when debugging Valentin Longchamp (1): km_arm: convert the km_arm boards to the generic board support arch/arm/cpu/arm_intcm/Makefile | 9 - arch/arm/cpu/arm_intcm/config.mk | 8 arch/arm/cpu/arm_intcm/cpu.c | 36 arch/arm/cpu/arm_intcm/start.S | 79 --- arch/arm/cpu/armv7/cache_v7.c| 14 +++--- arch/arm/include/asm/system.h| 2 +- arch/arm/lib/cache-cp15.c| 6 +++--- common/dlmalloc.c| 3 +++ include/configs/km/km_arm.h | 2 ++ 9 files changed, 16 insertions(+), 143 deletions(-) delete mode 100644 arch/arm/cpu/arm_intcm/Makefile delete mode 100644 arch/arm/cpu/arm_intcm/config.mk delete mode 100644 arch/arm/cpu/arm_intcm/cpu.c delete mode 100644 arch/arm/cpu/arm_intcm/start.S Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] arm: ls102xa: Enable snooping for CCI-400 S0 slave interface
CAAM is connected to CCI-400 S0 slave interface. Disable snooping for S0 will cause CAAM self test failure. This patch is to enable snooping for S0 slave interface. Signed-off-by: Alison Wang --- board/freescale/ls1021aqds/ls1021aqds.c | 3 +-- board/freescale/ls1021atwr/ls1021atwr.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/board/freescale/ls1021aqds/ls1021aqds.c b/board/freescale/ls1021aqds/ls1021aqds.c index 4dda5e3..e5dea5d 100644 --- a/board/freescale/ls1021aqds/ls1021aqds.c +++ b/board/freescale/ls1021aqds/ls1021aqds.c @@ -202,10 +202,9 @@ int board_early_init_f(void) CCI400_DVM_MESSAGE_REQ_EN | CCI400_SNOOP_REQ_EN); /* -* Set CCI-400 Slave interface S0, S1, S2 Shareable Override Register +* Set CCI-400 Slave interface S1, S2 Shareable Override Register * All transactions are treated as non-shareable */ - out_le32(&cci->slave[0].sha_ord, CCI400_SHAORD_NON_SHAREABLE); out_le32(&cci->slave[1].sha_ord, CCI400_SHAORD_NON_SHAREABLE); out_le32(&cci->slave[2].sha_ord, CCI400_SHAORD_NON_SHAREABLE); diff --git a/board/freescale/ls1021atwr/ls1021atwr.c b/board/freescale/ls1021atwr/ls1021atwr.c index 0629d1c..2c8afc0 100644 --- a/board/freescale/ls1021atwr/ls1021atwr.c +++ b/board/freescale/ls1021atwr/ls1021atwr.c @@ -419,10 +419,9 @@ int board_init(void) struct ccsr_cci400 *cci = (struct ccsr_cci400 *)CONFIG_SYS_CCI400_ADDR; /* -* Set CCI-400 Slave interface S0, S1, S2 Shareable Override Register +* Set CCI-400 Slave interface S1, S2 Shareable Override Register * All transactions are treated as non-shareable */ - out_le32(&cci->slave[0].sha_ord, CCI400_SHAORD_NON_SHAREABLE); out_le32(&cci->slave[1].sha_ord, CCI400_SHAORD_NON_SHAREABLE); out_le32(&cci->slave[2].sha_ord, CCI400_SHAORD_NON_SHAREABLE); out_le32(0x1185000, 0x3); -- 2.1.0.27.g96db324 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v7 4/5] imx6: add spl in the header file
Hi Stefano, On Thu, Nov 13, 2014 at 10:49 AM, Fabio Estevam wrote: > Sorry, I meant to remove only the ifdef: > > --- a/include/configs/mx6sabre_common.h > +++ b/include/configs/mx6sabre_common.h > @@ -95,9 +95,7 @@ > #define CONFIG_BOOTDELAY 1 > > #define CONFIG_LOADADDR0x1200 > -#ifndef CONFIG_SYS_TEXT_BASE > #define CONFIG_SYS_TEXT_BASE 0x1780 > -#endif Should John resend the series again with this change or can you remove the ifndef manually while applying it? Thanks, Fabio Estevam ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v7 4/5] imx6: add spl in the header file
Hi Fabio, John, On 13/11/2014 15:39, Fabio Estevam wrote: > Hi Stefano, > > On Thu, Nov 13, 2014 at 10:49 AM, Fabio Estevam wrote: > >> Sorry, I meant to remove only the ifdef: >> >> --- a/include/configs/mx6sabre_common.h >> +++ b/include/configs/mx6sabre_common.h >> @@ -95,9 +95,7 @@ >> #define CONFIG_BOOTDELAY 1 >> >> #define CONFIG_LOADADDR0x1200 >> -#ifndef CONFIG_SYS_TEXT_BASE >> #define CONFIG_SYS_TEXT_BASE 0x1780 >> -#endif > > Should John resend the series again with this change or can you remove > the ifndef manually while applying it? > We already agree about the changes. There is no need to resend the patchset, I will fix it when I apply the patchset. Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v7 4/5] imx6: add spl in the header file
On Thu, Nov 13, 2014 at 12:42 PM, Stefano Babic wrote: > We already agree about the changes. There is no need to resend the > patchset, I will fix it when I apply the patchset. Excellent! Thanks, Stefano ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Please pull u-boot-sunxi/master into master
Hi Tom,
Please pull u-boot-sunxi/master into master, highlights:
1) sun6i dram init / SPL support, allowing full-boot of sun6i SoCs with just
u-boot + linux
2) sun6i ehci support
3) A bugfix for the gmac on the bananapi
The following changes since commit 63f7af9a4cfb4a3b9136674c6612c6d13957c2cd:
Merge branch 'master' of git://git.denx.de/u-boot-uniphier (2014-11-11
15:49:10 -0500)
are available in the git repository at:
http://git.denx.de/u-boot-sunxi.git master
for you to fetch changes up to 64a97599b79e277600bc6f1b22cf48aa04ee9bd0:
sunxi: gmac: Update bananapi fixup to the new CONFIG_TARGET_ structure
(2014-11-13 14:49:02 +0100)
Hans de Goede (9):
sun6i: Add clock functions needed for SPL / DRAM init
sun6i: Add cpucfg register definitions
sun4i: Rename dram files to dram_sun4i.x
sun6i: Add dram initialization code
sun6i: Poke magic sram controller register to avoid cache issues
sun6i: Enable SPL
sun6i: Add Mele M9 board
sunxi: ehci: Add proper Kconfig options to select the usb Vbus gpio-s
sun6i: ehci: Add sun6i ehci support
Oliver Schinagl (2):
sun6i: Add new p2wi controller driver
sun6i: Add basic axp221 driver
Zoltan HERPAI (1):
sunxi: gmac: Update bananapi fixup to the new CONFIG_TARGET_
structure
arch/arm/cpu/armv7/sunxi/Makefile | 8 +-
arch/arm/cpu/armv7/sunxi/board.c | 5 +
arch/arm/cpu/armv7/sunxi/clock_sun6i.c| 77
arch/arm/cpu/armv7/sunxi/{dram.c => dram_sun4i.c} | 0
arch/arm/cpu/armv7/sunxi/dram_sun6i.c | 435 ++
arch/arm/cpu/armv7/sunxi/p2wi.c | 117 ++
arch/arm/cpu/armv7/sunxi/psci.S | 4 +-
arch/arm/include/asm/arch-sunxi/clock.h | 1 +
arch/arm/include/asm/arch-sunxi/clock_sun4i.h | 3 +
arch/arm/include/asm/arch-sunxi/clock_sun6i.h | 38 +-
arch/arm/include/asm/arch-sunxi/cpu.h | 19 +-
arch/arm/include/asm/arch-sunxi/cpucfg_sun6i.h| 67
arch/arm/include/asm/arch-sunxi/dram.h| 171 +
arch/arm/include/asm/arch-sunxi/dram_sun4i.h | 182 +
arch/arm/include/asm/arch-sunxi/dram_sun6i.h | 359 ++
arch/arm/include/asm/arch-sunxi/gpio.h| 3 +
arch/arm/include/asm/arch-sunxi/p2wi.h| 140 +++
arch/arm/include/asm/arch-sunxi/prcm.h| 1 +
board/sunxi/Kconfig | 21 ++
board/sunxi/MAINTAINERS | 1 +
board/sunxi/board.c | 26 ++
board/sunxi/gmac.c| 2 +-
configs/A10s-OLinuXino-M_defconfig| 3 +-
configs/A13-OLinuXinoM_defconfig | 3 +-
configs/A13-OLinuXino_defconfig | 3 +-
configs/Auxtek-T004_defconfig | 3 +-
configs/Colombus_defconfig| 9 +-
configs/Mele_M9_defconfig | 18 +
configs/ba10_tv_box_defconfig | 3 +-
configs/r7-tv-dongle_defconfig| 3 +-
drivers/power/Kconfig | 47 +++
drivers/power/Makefile| 1 +
drivers/power/axp221.c| 186 +
drivers/usb/host/ehci-sunxi.c | 80 ++--
include/axp221.h | 50 +++
include/configs/sun4i.h | 7 -
include/configs/sun6i.h | 6 +
include/configs/sun7i.h | 7 -
38 files changed, 1883 insertions(+), 226 deletions(-)
rename arch/arm/cpu/armv7/sunxi/{dram.c => dram_sun4i.c} (100%)
create mode 100644 arch/arm/cpu/armv7/sunxi/dram_sun6i.c
create mode 100644 arch/arm/cpu/armv7/sunxi/p2wi.c
create mode 100644 arch/arm/include/asm/arch-sunxi/cpucfg_sun6i.h
create mode 100644 arch/arm/include/asm/arch-sunxi/dram_sun4i.h
create mode 100644 arch/arm/include/asm/arch-sunxi/dram_sun6i.h
create mode 100644 arch/arm/include/asm/arch-sunxi/p2wi.h
create mode 100644 configs/Mele_M9_defconfig
create mode 100644 drivers/power/axp221.c
create mode 100644 include/axp221.h
Regards,
Hans
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [ANN] U-Boot v2015.01-rc1 released
Hey Tom, 2014-11-10 22:29 GMT+01:00 Tom Rini : > ... > When I do a buildman of most things I see: > blackfin: + ip04 >arm: + Ippo_q8h_v5 novena openrd_base maxbcm openrd_ultimate > openrd_client tricorder db-mv784mp-gp Linksprite_pcDuino3_fdt tricorder_flash > cm_t3517 >powerpc: + kmcoge4 taishan kmlion1 dlvision > > And I'd really like to see those sorted out, one way or another for > -rc2. dlvision should be fixed with the "Update gdsys board support" series that is already under review by Stefan Roese and Kim Phillips. Cheers Dirk ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] arm: mx6: Fix missing Kconfig option for Novena
Hi Masahiro, On 13/11/2014 14:10, Marek Vasut wrote: > Given you're the Kconfig guru, I would gladly leave it up to you if that is > not > too much inconvenience, and test your result. > That's fine with me. It means only that novena will remain broken for a while on u-boot-imx until your patch will go into Tom's tree. Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2 1/2] imx: mx6q/dl sabre_common: Move MMC ENV offset to 512KB position
On 12/11/2014 07:02, Ye.Li wrote: > Set the CONFIG_ENV_OFFSET from 384KB to 512KB offset, so we will have larger > space > for u-boot image. > When enabling NAND flash support feature, the u-boot image size has exceeded > the > 384KB, which causes overlay to the environment variables storage. > > Signed-off-by: Ye.Li > Acked-by: Fabio Estevam > --- > Changes since v1: > - None > > include/configs/mx6sabre_common.h |2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/include/configs/mx6sabre_common.h > b/include/configs/mx6sabre_common.h > index c81e9e9..1e10422 100644 Applied to u-boot-imx, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PULL] u-boot-usb/master
On Tue, Nov 11, 2014 at 06:19:27PM +0100, Marek Vasut wrote: > Dangling PR, sorry it's late ... > > The following changes since commit 11ada9225a16ed2d8ddbf0715a2416245a777cbc: > > Merge branch 'rmobile' of git://www.denx.de/git/u-boot-sh (2014-11-05 > 13:11:18 > -0500) > > are available in the git repository at: > > > git://git.denx.de/u-boot-usb.git master > > for you to fetch changes up to 6a559bbe2f60ab64e28662f7ab52551a2eaa7163: > > usb_storage: blacklist Enclosure Service Devices (2014-11-08 12:03:35 +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] [PATCH v7 0/5] iMX6 SabreSD SPL Support
Hi John, On 12/11/2014 23:27, John Tobias wrote: > This patch is for SPL support for iMX6 SabreSD. The said > patches has been tested to work on SD2 and SD3 port of the > said board. It tested the non-spl version of uboot as well. > > After applying the following patches, it will produces > SPL and u-boot.img binary images. You should run the > two commands below to store it in your SD or eMMC. > > sudo dd if=SPL of=/dev/xxx bs=1K seek=1; sync > sudo dd if=u-boot.img of=/dev/xxx bs=1K seek=69 > > Changes (v2): > Merged the SPL support into the main board file > Remove the compilation warmings > > Changes (v3): > Removed sp and gd > Use imx_ddr_size to set the ram_size > > Changes (v4): > Add a separate board configuration file to enable SPL > (mx6sabresd_spl_defconfig). > > Mapped DCD data to mx6_mmdc_calibration, mx6dq_iomux_grp_regs, > mx6dq_iomux_ddr_regs and mx6_ddr3_cfg data structures. > > Read 11 and 12 bits of BOOT_CFG register to actually determine > the active mmc port. > > Changes (v5): > Use the default CONFIG_SPL_STACK > Add a macro #ifndef for CONFIG_SYS_TEXT_BASE to avoid > compilation warning. > > Changes (v6): > Use board_mmc_init for spl mmc initialization instead of > adding spl_board_mmc_init function > > Changes (v7): > Corrected the chip select value and now the DRAM showing > a correct 1 GiB. > > John Tobias (5): > imx6: add spl config for mx6sabresd > imx6: add data configuration file for SPL > kconfig: imx6: add SUPPORT_SPL > imx6: add spl in the header file > imx6: SPL support for iMX6 SabreSD > > arch/arm/Kconfig | 1 + > board/freescale/mx6sabresd/mx6sabresd.c | 186 > +- > board/freescale/mx6sabresd/mx6sabresd_spl.cfg | 58 > configs/mx6sabresd_spl_defconfig | 5 + > include/configs/mx6sabre_common.h | 2 + > include/configs/mx6sabresd.h | 6 + > 6 files changed, 256 insertions(+), 2 deletions(-) > create mode 100644 board/freescale/mx6sabresd/mx6sabresd_spl.cfg > create mode 100644 configs/mx6sabresd_spl_defconfig > Applied to u-boot-imx, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V2] powerpc: remove orphaned boards mcc200 and prs200
On Tue, Nov 11, 2014 at 03:46:05PM +0200, Nikita Kiryanov wrote: > mcc200 and prs200 are old and have no maintainer. Remove the boards. > > This also removes the mcc200 specific 1bpp BMP support from > common/lcd.c > > Cc: Wolfgang Denk > Cc: Anatolij Gustschin > Cc: Masahiro Yamada > Cc: York Sun > Signed-off-by: Nikita Kiryanov 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] [PATCH v2 1/2] kconfig: arm: select CPU_V7 for some new boards
On Thu, Nov 06, 2014 at 11:39:26AM +0900, Masahiro Yamada wrote: > This commit adds "select CPU_V7" for some new boards that were not > covered by commit 2e07c249a67e > (kconfig: arm: introduce symbol for ARM CPUs). > > Redundant "SYS_CPU" defines and "string" directives should be removed. > > Signed-off-by: Masahiro Yamada > Acked-by: Stefan Roese > Acked-by: Georges Savoundararadj 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] [PULL] u-boot-socfpga/master
On Tue, Nov 11, 2014 at 06:20:10PM +0100, Marek Vasut wrote: > Dangling PR, sorry it's late ... > > The following changes since commit 571bdf16a78e9e116a93d46f4809c4f8a3f2adb6: > > arm: interrupt_init: set sp in IRQ/FIQ modes (2014-10-29 09:03:28 -0400) > > are available in the git repository at: > > git://git.denx.de/u-boot-socfpga.git master > > for you to fetch changes up to a877bec3ecd7961211a59b2c130e055e0f771976: > > arm: socfpga: Add socfpga_spim_enable() to reset_manager.c (2014-11-07 > 16:09:10 +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] [PATCH 6/6] kbuild: Make scripts executable
2014-10-30 11:06 GMT+09:00 Masahiro Yamada : > > The Makefiles call the respective interpreter explicitly, but this makes > > it easier to use the scripts manually. > > > > (This commit follows commit 06ed5c2bfaca of Linux Kernel) > > > > Signed-off-by: Michal Marek > > Signed-off-by: Masahiro Yamada 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] [PATCH v2 2/2] kconfig: arm: move "armv8" define to arch/arm/Kconfig
On Thu, Nov 06, 2014 at 11:39:27AM +0900, Masahiro Yamada wrote: > Commit 2e07c249a67e (kconfig: arm: introduce symbol for ARM CPUs) > collected the default values of CONFIG_SYS_CPU into arch/arm/Kconfig. > > This commit moves "armv8" to there for consistency. > > Signed-off-by: Masahiro Yamada > Acked-by: Georges Savoundararadj 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] [PATCH v2 2/2] imx: mx6q/dlsabreauto: And NAND flash support
On 12/11/2014 07:02, Ye.Li wrote: > The i.MX6Q/DL sabreauto board has one NAND socket, set the > CONFIG_NAND_MXS and relevant NAND configurations to enable the > MXS NAND flash driver. > Add board level codes to set IOMUX and clock for GPMI-NAND and > BCH module. > > Signed-off-by: Ye.Li > --- Applied to u-boot-imx, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [GIT PULL] Zynq patches
On Tue, Nov 11, 2014 at 11:22:43AM +0100, Michal Simek wrote: > Hi Tom, [cc: Albert] > > please pull these 4 patches to your tree. > It adds support for Zybo board and add support for new ps7_init_gpl file. > > Thanks, > Michal > > > The following changes since commit 11ada9225a16ed2d8ddbf0715a2416245a777cbc: > > Merge branch 'rmobile' of git://www.denx.de/git/u-boot-sh (2014-11-05 > 13:11:18 -0500) > > are available in the git repository at: > > > git://www.denx.de/git/u-boot-microblaze.git zynq > > for you to fetch changes up to 61eb3cf2d5ef174b5a3008df6f7530b21f393261: > > kconfig: zynq: Add ZYBO board (2014-11-11 11:02:52 +0100) > Applied to u-boot/master, thanks! > ___ > U-Boot mailing list > U-Boot@lists.denx.de > http://lists.denx.de/mailman/listinfo/u-boot -- 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] [ANN] U-Boot v2015.01-rc1 released
On Wed, Nov 12, 2014 at 05:16:42PM -0500, Tom Rini wrote:
> On Wed, Nov 12, 2014 at 04:10:06PM -0500, Tom Rini wrote:
> > On Wed, Nov 12, 2014 at 12:04:39PM -0500, Tom Rini wrote:
> > > On Wed, Nov 12, 2014 at 10:12:30AM +0100, Andreas Bießmann wrote:
> > > > Hi Tom,
> > > >
> > > > On 11/10/2014 10:29 PM, Tom Rini wrote:
> > > > > Hey all,
> > > > >
> > > > > I've pushed v2015.01-rc1 out to the repository and tarballs should
> > > > > exist
> > > > > soon.
> > > > >
> > > > > The merge window is now closed. Per both the min-summit and the
> > > > > follow
> > > > > up emails, I'm going to try and get into the every 2 week RC tagging
> > > > > groove. And, I'm going to be relying on everyones best judgement
> > > > > about
> > > > > what level of changes they're going to put into a pull request to me.
> > > > >
> > > > > When I do a buildman of most things I see:
> > > > > blackfin: + ip04
> > > > >arm: + Ippo_q8h_v5 novena openrd_base maxbcm openrd_ultimate
> > > > > openrd_client tricorder db-mv784mp-gp Linksprite_pcDuino3_fdt
> > > > > tricorder_flash cm_t3517
> > > >
> > > > there must be something wrong:
> > >
> > > Compiler fun! With Linaro 2013.03 gcc 4.7.3 we're 260 bytes over the
> > > limit on SPL. With ELDK 5.4's 4.7.x we're 543 bytes under the limit.
> > > What I think I had been thinking was that you could move
> > > CONFIG_SPL_STACK into DDR and bump the max size a bit or based on
> > > CONFIG_FLASHCARD or not build NAND or MMC into MLO but not both (and
> > > that'd be a bigger size savings).
> > >
> > > Or maybe the answer is that I need to stop using that Linaro toolchain
> > > for 4.7.x testing.
> >
> > ... ELDK 5.5.x also has a similar slight size overflow and is 4.8.x. I
> > guess for now I'll default to use ELDK 5.4 for ARM but people may need
> > to consider a something-something for newer toolchains sooner rather
> > than later.
>
> ... I'm actually running into that issue where buildman grabs things
> from $PATH sometimes rather than the toolchain it found, re-running some
> tests.
OK, purging the Ubuntu toolchain packages so that buildman really uses
what I tell it, I'm getting the best (build time) results with ELDK
5.5.2 for ARM. After some patches that I'm about to push:
Summary of current source for 1166 boards (6 threads, 1 job per thread)
arm: + maxbcm odroid db-mv784mp-gp
+(maxbcm) u16 reg;
+(maxbcm,maxbcm) ^
+(maxbcm) u16 devadr = CONFIG_PHY_BASE_ADDR;
+(maxbcm,maxbcm) Didn't find the file 'board/maxbcm/binary.0' in
'arm/current/.bm-work/
03/build' which is mandatory to generate the image
+(maxbcm,maxbcm,db-mv784mp-gp,db-mv784mp-gp) This file generally contains the
DDR3 training code, and should be extracted from an existing bootable
+(maxbcm,maxbcm,db-mv784mp-gp,db-mv784mp-gp) image for your board. See
'kwbimage -x' to extract it from an existing image.
+(maxbcm,db-mv784mp-gp) Could not create image
+(maxbcm,db-mv784mp-gp) make[1]: *** [u-boot.kwb] Error 1
+(maxbcm,db-mv784mp-gp) make: *** [sub-make] Error 2
+(odroid,odroid)addr = CONFIG_SYS_SDRAM_BASE + (i * SDRAM_BANK_SIZE);
+(odroid,odroid) ^
+(odroid) board/samsung/common/board.c:94:2: note: containing loop
+(odroid,odroid) for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
+(odroid,odroid) ^
+(odroid) board/samsung/common/board.c:106:2: note: containing loop
+(db-mv784mp-gp,db-mv784mp-gp) Didn't find the file
'board/Marvell/db-mv784mp-gp/binary.0' in 'arm/current/.bm-work/03/build' which
is mandatory to generate the image
w+(maxbcm) board/maxbcm/maxbcm.c: In function 'reset_phy':
w+(maxbcm) board/maxbcm/maxbcm.c:68:6: warning: unused variable 'reg'
[-Wunused-variable]
w+(maxbcm) board/maxbcm/maxbcm.c:66:6: warning: unused variable 'devadr'
[-Wunused-variable]
w+(odroid) board/samsung/common/board.c: In function 'dram_init':
w+(odroid) board/samsung/common/board.c:95:32: warning: iteration 4u invokes
undefined behavior [-Waggressive-loop-optimizations]
w+(odroid) board/samsung/common/board.c: In function 'dram_init_banksize':
w+(odroid) board/samsung/common/board.c:107:32: warning: iteration 4u invokes
undefined behavior [-Waggressive-loop-optimizations]
--
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] [PATCH] arm: mx6: Fix missing Kconfig option for Novena
On Thu, Nov 13, 2014 at 11:06:21AM +0100, Marek Vasut wrote: > Add two missing Kconfig options for Novena and drop the SPL > from the Novena config. > > Signed-off-by: Marek Vasut > Cc: Stefano Babic > Cc: Sean Cross > Cc: Marek Vasut > Cc: Fabio Estevam > --- > arch/arm/Kconfig | 2 ++ > configs/novena_defconfig | 2 +- > 2 files changed, 3 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig > index 22eb2d5..5cd621a 100644 > --- a/arch/arm/Kconfig > +++ b/arch/arm/Kconfig > @@ -629,6 +629,8 @@ config TARGET_HUMMINGBOARD > > config TARGET_KOSAGI_NOVENA > bool "Support Kosagi Novena" > + select CPU_V7 > + select SUPPORT_SPL After editing things to apply on top of Masahiro's series, 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] [PATCH] ot1200: add support for EHCI
On 10/11/2014 14:35, Christian Gmeiner wrote: > U-Boot 2014.10-17457-g0b23780-dirty (Nov 10 2014 - 11:41:04) > > CPU: Freescale i.MX6D rev1.2 at 792 MHz > Reset cause: WDOG > Board: ot1200 > I2C: ready > DRAM: 1 GiB > MMC: FSL_SDHC: 0, FSL_SDHC: 1 > SF: Detected M25P16 with page size 256 Bytes, erase size 64 KiB, total 2 MiB > In:serial > Out: serial > Err: serial > Net: using phy at 0 > FEC [PRIME] > Hit any key to stop autoboot: 0 > => usb start > (Re)start USB... > USB0: Port not available. > USB1: USB EHCI 1.00 > scanning bus 1 for devices... 4 USB Device(s) found > => usb tree > USB device tree: > 1 Hub (480 Mb/s, 0mA) > | u-boot EHCI Host Controller > | > +-2 Hub (480 Mb/s, 2mA) > | > +-3 Mass Storage (480 Mb/s, 80mA) > |USBest Technology USB Mass Storage Device 00028B > | > +-4 Vendor specific (480 Mb/s, 2mA) > > => > > Signed-off-by: Christian Gmeiner > --- Applied to u-boot-imx, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] ot1200: fix card detect for usdhc4
On 11/11/2014 12:57, Christian Gmeiner wrote:
> Today I got the final board and found out that a different
> connector is used as the one on my development board. The
> new connector has swaped pins for cd and wp.
>
> This change is tested on a production ready baord.
>
I fixed it myself.
> Signed-off-by: Christian Gmeiner
> ---
> board/bachmann/ot1200/ot1200.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/board/bachmann/ot1200/ot1200.c b/board/bachmann/ot1200/ot1200.c
> index 2ed8cf7..007c1ef 100644
> --- a/board/bachmann/ot1200/ot1200.c
> +++ b/board/bachmann/ot1200/ot1200.c
> @@ -159,8 +159,8 @@ int board_mmc_getcd(struct mmc *mmc)
> gpio_direction_input(IMX_GPIO_NR(4, 5));
> ret = gpio_get_value(IMX_GPIO_NR(4, 5));
> } else {
> - gpio_direction_input(IMX_GPIO_NR(1, 4));
> - ret = !gpio_get_value(IMX_GPIO_NR(1, 4));
> + gpio_direction_input(IMX_GPIO_NR(1, 5));
> + ret = !gpio_get_value(IMX_GPIO_NR(1, 5));
> }
>
> return ret;
>
Applied to u-boot-imx, thanks !
Best regards,
Stefano Babic
--
=
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de
=
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] zynq: zybo: Move CONFIG_DEFAULT_DEVICE_TREE to defconfig
On Thu, Nov 13, 2014 at 01:22:40PM +0100, Michal Simek wrote: > Move CONFIG_DEFAULT_DEVICE_TREE from board config > directly to defconfig. > > This patch removes compilation warning: > include/configs/zynq_zybo.h:24:0: warning: "CONFIG_DEFAULT_DEVICE_TREE" > redefined [enabled by default] > #define CONFIG_DEFAULT_DEVICE_TREE zynq-zybo > > Signed-off-by: Michal Simek 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] Updated: Pull request: u-boot-arm/master
On Thu, Nov 13, 2014 at 02:49:10PM +0100, Albert ARIBAUD wrote: > Hello Tom, > > This PR replaces the one posted today at 08:54. > > The following changes since commit 63f7af9a4cfb4a3b9136674c6612c6d13957c2cd: > > Merge branch 'master' of git://git.denx.de/u-boot-uniphier (2014-11-11 > 15:49:10 -0500) > > are available in the git repository at: > > git://git.denx.de/u-boot-arm master > > for you to fetch changes up to 18900401abf54182a56d8ff6dc38c7421402920b: > > ARM: remove unused CPU directory (2014-11-13 12:35:17 +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] [PATCH] mx53loco: Change 'fdt_file' dynamically
On 10/11/2014 20:38, Fabio Estevam wrote: > From: Fabio Estevam > > Since kernel 3.15 there are two dtb's for the imx53-qsb board: > > imx53-qsb.dtb - For the boards with DA9053 PMIC > imx53-qsrb.dtb - For the boards with MC34708 PMIC > > Change the 'fdt_file' dynamically, so that the correct dtb can be used > depending > on the board variant. > > Signed-off-by: Fabio Estevam > --- Applied to u-boot-imx, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Please pull u-boot-sunxi/master into master
On Thu, Nov 13, 2014 at 04:04:25PM +0100, Hans de Goede wrote: > Hi Tom, > > Please pull u-boot-sunxi/master into master, highlights: > > 1) sun6i dram init / SPL support, allowing full-boot of sun6i SoCs with just > u-boot + linux > 2) sun6i ehci support > 3) A bugfix for the gmac on the bananapi > > The following changes since commit 63f7af9a4cfb4a3b9136674c6612c6d13957c2cd: > > Merge branch 'master' of git://git.denx.de/u-boot-uniphier (2014-11-11 > 15:49:10 -0500) > > are available in the git repository at: > > http://git.denx.de/u-boot-sunxi.git master > > for you to fetch changes up to 64a97599b79e277600bc6f1b22cf48aa04ee9bd0: > > sunxi: gmac: Update bananapi fixup to the new CONFIG_TARGET_ > structure (2014-11-13 14:49:02 +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] [PATCH v7 4/5] imx6: add spl in the header file
Hi Stefano, On Thu, Nov 13, 2014 at 4:49 AM, Fabio Estevam wrote: > On Thu, Nov 13, 2014 at 10:41 AM, Fabio Estevam wrote: >> Hi John, >> >> On Thu, Nov 13, 2014 at 6:58 AM, Stefano Babic wrote: >> #define CONFIG_LOADADDR0x1200 +#ifndef CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_TEXT_BASE 0x1780 +#endif >>> >>> Why is that needed ? SPL does not use it, because it use >>> CONFIG_SPL_TEXT_BASE, and this is defined in imx6_spl.h. And you do not >>> redefine it, meaning that overwriting the value is not necessary at all, >>> as we expect. The CONFIG_SYS_TEXT_BASE was defined in imx6_spl.h and I was seeing previously some warning related to the duplication of the said macro. I thought it would be great to remove the warning messages so that is why I added the macro. Regards, john >> >> Stefano is right. >> >> You can simply remove this piece: >> >> --- a/include/configs/mx6sabre_common.h >> +++ b/include/configs/mx6sabre_common.h >> @@ -95,9 +95,6 @@ >> #define CONFIG_BOOTDELAY 1 >> >> #define CONFIG_LOADADDR0x1200 >> -#ifndef CONFIG_SYS_TEXT_BASE >> -#define CONFIG_SYS_TEXT_BASE 0x1780 >> -#endif > > Sorry, I meant to remove only the ifdef: > > --- a/include/configs/mx6sabre_common.h > +++ b/include/configs/mx6sabre_common.h > @@ -95,9 +95,7 @@ > #define CONFIG_BOOTDELAY 1 > > #define CONFIG_LOADADDR0x1200 > -#ifndef CONFIG_SYS_TEXT_BASE > #define CONFIG_SYS_TEXT_BASE 0x1780 > -#endif ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v7 4/5] imx6: add spl in the header file
Hi Fabio, Stefano, Thanks for reviewing my work and for accepting it. Regards, John On Thu, Nov 13, 2014 at 6:42 AM, Stefano Babic wrote: > Hi Fabio, John, > > On 13/11/2014 15:39, Fabio Estevam wrote: >> Hi Stefano, >> >> On Thu, Nov 13, 2014 at 10:49 AM, Fabio Estevam wrote: >> >>> Sorry, I meant to remove only the ifdef: >>> >>> --- a/include/configs/mx6sabre_common.h >>> +++ b/include/configs/mx6sabre_common.h >>> @@ -95,9 +95,7 @@ >>> #define CONFIG_BOOTDELAY 1 >>> >>> #define CONFIG_LOADADDR0x1200 >>> -#ifndef CONFIG_SYS_TEXT_BASE >>> #define CONFIG_SYS_TEXT_BASE 0x1780 >>> -#endif >> >> Should John resend the series again with this change or can you remove >> the ifndef manually while applying it? >> > > We already agree about the changes. There is no need to resend the > patchset, I will fix it when I apply the patchset. > > Best regards, > Stefano Babic > > > > -- > = > DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel > HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany > Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de > = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3 03/26] x96: ifdtool: Allow creation of an empty ROM
Hi, On 13 November 2014 00:06, Masahiro Yamada wrote: > > This typo caught my attention by chance. > >> x96: ifdtool: Allow creation of an empty ROM > > > x96 -> x86 Yes will fix. Probably wishful thinking, but perhaps I should be grateful it is not '76. Regards, Simon ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] x86: Fix a warning with gcc 4.4.4
Hi,
On 13 November 2014 02:38, Bin Meng wrote:
> On Thu, Nov 13, 2014 at 5:00 PM, Måns Rullgård wrote:
>> Simon Glass writes:
>>
>>> This warning appears even though it seems that the compiler could work it
>>> out. Fix it.
>>>
>>> Signed-off-by: Simon Glass
>>> ---
>>>
>>> arch/x86/cpu/cpu.c | 1 +
>>> 1 file changed, 1 insertion(+)
>>>
>>> diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c
>>> index a4e639d..3583619 100644
>>> --- a/arch/x86/cpu/cpu.c
>>> +++ b/arch/x86/cpu/cpu.c
>>> @@ -238,6 +238,7 @@ static void identify_cpu(struct cpu_device_id *cpu)
>>> int i;
>>>
>>> vendor_name[0] = '\0'; /* Unset */
>>> + cpu->device = 0; /* fix gcc 4.4.4 warning */
>>>
>>> /* Find the id and vendor_name */
>>> if (!has_cpuid()) {
>>> --
>>
>> Do other gcc versions warn as well? 4.4 is old and worse than both 4.3
>> and 4.5 in many ways, so there's very little reason to be using it. If
>> more sensible gcc versions do not warn, it's better leaving it as is to
>> avoid real errors creeping in unnoticed.
>>
That gcc is only 5 years old and this is the only such problem in
U-Boot so I'd like to fix it.
>> --
>
> I am using 4.7.2 which does not generate this warning.
4.8.2 doesn't either.
Regards,
Simon
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] arm: mx6: Fix missing Kconfig option for Novena
On Thursday, November 13, 2014 at 04:34:40 PM, Tom Rini wrote: > On Thu, Nov 13, 2014 at 11:06:21AM +0100, Marek Vasut wrote: > > Add two missing Kconfig options for Novena and drop the SPL > > from the Novena config. > > > > Signed-off-by: Marek Vasut > > Cc: Stefano Babic > > Cc: Sean Cross > > Cc: Marek Vasut > > Cc: Fabio Estevam > > --- > > > > arch/arm/Kconfig | 2 ++ > > configs/novena_defconfig | 2 +- > > 2 files changed, 3 insertions(+), 1 deletion(-) > > > > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig > > index 22eb2d5..5cd621a 100644 > > --- a/arch/arm/Kconfig > > +++ b/arch/arm/Kconfig > > @@ -629,6 +629,8 @@ config TARGET_HUMMINGBOARD > > > > config TARGET_KOSAGI_NOVENA > > > > bool "Support Kosagi Novena" > > > > + select CPU_V7 > > + select SUPPORT_SPL > > After editing things to apply on top of Masahiro's series, applied to > u-boot/master, thanks! I hope I was a good ball and chain on your leg. My service is always available to you (lol) ;-) Thanks! Best regards, Marek Vasut ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] putc
Hi Martin, On 13 November 2014 03:28, Martin Dorwig wrote: > Am Mittwoch, 12. November 2014, 19:32:21 schrieben Sie: >> Hi Martin, >> >> On 30 October 2014 00:45, Martin Dorwig wrote: >> > Am Mittwoch, 29. Oktober 2014, 13:03:41 schrieben Sie: >> >> Hi Martin, >> >> >> >> On 28 October 2014 07:23, Martin Dorwig wrote: >> >> > Hello, >> >> > after updating u-boot from git v2014.10 >> >> > i just noticed that my standalone application outputs garbage using >> >> > putc. >> >> > after some investigation i found that the gd->jt[XF_putc] is assigned a >> >> > dev->putc pointer in "common/console.c function console_setfile" >> >> > >> >> > the dev->putc is declared in include/stdio_dev.h as >> >> > void (*putc)(struct stdio_dev *dev, const char c); >> >> > >> >> > int include/exports.h this function is declared as >> >> > void putc(const char); >> >> > >> >> > this was introduced with commit id >> >> > 709ea543b92489e7729d2d7ddd6c9f451e52158c >> >> >> >> That's unfortunate. Is the stdio device pointer available in the >> >> standalone application? >> >> >> >> Perhaps gd->jt should point to a structure of strongly-typed >> >> functions? Then we would get a build error in this case. >> >> >> >> Regards, >> >> Simon >> > >> > What is the motivation to override the jumptable slots ? >> > Why can't they be untouched like this >> > gd->jt[XF_getc] = getc; >> > gd->jt[XF_tstc] = tstc; >> > gd->jt[XF_putc] = putc; >> > gd->jt[XF_puts] = puts; >> > redirection of the console to another device is honored in the >> > implementation of the functions themselves. >> > for example the putc function: >> > it calls pre_console_putc before a console is present >> > if GD_FLG_DEVINIT is set, it calls fputc(stdout,c) which calls >> > console_putc(stdout,c) which in turn calls stdio_devices[stdout]- >> > >> >>putc(stdio_devices[file], c); >> >> >> > else it calls serial_putc(c) >> >> I have taken a bit of a look at this. >> >> I have not actually touched the jumptable slots. The one you mention >> was assigned to dev->putc() before and after. The problem is that now >> dev->putc() has two parameters, the first being 'dev'. >> >> dev->putc() is the device's putc function - typically the serial port >> or a display. >> >> The putc() function you mention is the console out, that outputs to >> all stdout devices. >> >> So yes we could change the bahaviour so that it calls putc(). I think >> this will work, and it probably isn't going to result in a change in >> behaviour for many boards since they only have a single stdout. >> >> Alternatively we could require the stdio device parameter to be passed >> in. I'm not sure that will work though - how will the external program >> get at it? >> >> In any case, teh void *gd->jt[] is not serving our purpose here - it >> should be changed to proper function pointer types so that the >> compiler can check that this sort of thing doesn't happen. >> >> Please let me know what you think should be done here. >> >> Regards, >> Simon > > The jumptable is initialized once, and i don't see any reason to overwrite it. That commit (27b207fd) dates from 2003. Are you wanting to revert an 11-year-old commit or do I misunderstand you? > Adding a parameter to these exported functions will break backward > compatibility > of existing standalone apps Yes that's right, but when they move to a newer U-Boot they will need to be updated. Isn't that expected with standalone apps? I can adjust things that are in the mainline tree, but I can't fix up people's third party apps. I did make a suggestion about how to avoid adding the extra parameter (changing the behaviour to call putc() instead of dev->putc()). What do you think? Regards, Simon ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] verified boot of beaglebone black
Hi, On 11 November 2014 21:29, Srinivasan S wrote: > Hi , > > > From: s...@google.com on behalf of Simon Glass > > Sent: Monday, November 10, 2014 9:23 PM > To: Srinivasan S > Cc: Jagan Teki; U-Boot Mailing List > Subject: Re: [U-Boot] verified boot of beaglebone black > > Hi, > > On 9 November 2014 17:13, Srinivasan S wrote: >> Hi Simon, >> >> Hi Simon, >> >> As you suggested earlier am using u-boot-2014.07 & Am using >> ~/ti-sdk-am335x-evm-07.00.00.00/bin/create-sdcard.sh for creating the >> partitions, >> After creating the partitions I tried implementing step 7. Put U-Boot and >> the kernel onto the board & step 8. Try it, by the following steps, >> And when I tried to boot I am facing the below error for which am not able >> to get the uboot prompt >> >> U-Boot SPL 2013.10-g78d8ebd (Mar 30 2014 - 20:46:34) >> reading args >> spl: error reading image args, err - -1 >> reading u-boot.img >> reading u-boot.img >> No valid FDT found - please append one to U-Boot binary, use u-boot-dtb.bin >> or define CONFIG_OF_EMBED. For sandbox, use -d >> initcall sequence 808511ec failed at call 80833f84 >> ### ERROR ### Please RESET the board ### > > I think you may have missed something here. The instructions should > tell you to use u-boot-dtb.img which has a device tree attached. > > Also please can you read about 'top posting' - you should avoid doing > this on the U-Boot mailing list. Put your response after any part of > the message that you are responding to. > >> >> Steps followed by me >> 1. >> As tmp directory was unavailable while mounting /dev/sdc1, so I created tmp >> directory while mounting /dev/sdc1 & executed the commands as below >> sudo mount /dev/sdc1 /mnt/tmp >> sudo cp >> ~/ti-sdk-am335x-evm-07.00.00.00/board-support/u-boot-2014.07/b/am335x_boneblack_vboot/u-boot.img >> /mnt/tmp/u-boot.img >> sleep 1 >> sudo umount /dev/sdc1 >> >> sudo mount /dev/sdc2 /mnt/tmp >> sudo cp >> ~/ti-sdk-am335x-evm-07.00.00.00/board-support/linux-3.12.10-ti2013.12.01/work/image.fit >> /mnt/tmp/boot/image.fit >> sleep 1 >> sudo umount /dev/sdc2 >> >> 2. >> >> I have even tried copying MLO & u-boot.img of as below, but still the same >> error where unable to get uboot prompt >> >> sudo cp >> ~/ti-sdk-am335x-evm-07.00.00.00/board-support/u-boot-2014.07/b/am335x_boneblack_vboot/MLO >> /media/boot/ >> sudo cp >> ~/ti-sdk-am335x-evm-07.00.00.00/board-support/u-boot-2014.07/b/am335x_boneblack_vboot/u-boot.img >> /media/boot/ >> >> appusony@appusony-laptop:~/ti-sdk-am335x-evm-07.00.00.00/board-support/linux-3.12.10-ti2013.12.01/work$ >> ls >> am335x-boneblack.dtb am335x-boneblack-pubkey.dtb Image image.fit >> Image.lzo keys sign.its u-boot-dtb.img >> appusony@appusony-laptop:~/ti-sdk-am335x-evm-07.00.00.00/board-support/linux-3.12.10-ti2013.12.01/work$ >> sudo image.fit /media/rootfs/boot/ >> >> Please do the needful in resolving the above issue as this is the last steps >> >> Many Thanks in Advance again, > > Regards, > Simon > > > Thanks a lot for your quick responses, Finally I got resolved this problem & > was able to boot uboot 2014 with my linux kernel, The issue was I had defined > the flag in CONFIG_EMBEDD in uboot 2014 & got resolved this issue > > And sorry I didn't understand the meaning of TOP posting > > Could you please suggest me w.r.t following points > > 1. And now Am trying to sign even my rootfs also from kernel, as long back > you had suggested dm_verity could you please let me know which version of > linux kernel in mainline is supported , so that I can back port it to my > kernel & get rootfs also signed from my kernel & please let me know if any > rootfs changes also required for this signing from kernel to rootfs or Is > there any possible way to add hashes in sign.its for rootfs also, so that > it gets verified, if this is possible could you please let me know how this > can be done in sign.its (ie., how hashes can be added in rootfs) It was merged in late 2012, so any version since then should work, but I suggest going with a recent version. > > 2. And am trying to flash MLO, uboot.img, image.fit & rootfs into eMMC > instaed of SD card could you please let me know how this can be flashed onto > emmc & vcan be verified the same There are no special requirements here that I know of. U-Boot will verify the kernel wherever it comes from. I can't remember if I wrote the kernel to the boot partial (FAT format) or the /boot directory of the root disk (ext4 format). But wherever you write it such that U-Boot can find it will be fine. Verify requires a block filesystem such as ext4 in a partition, and a separate area for hashes, typically 8MB or so. You will need to allocate off some space on the eMMC to hold the hashes, and run the tool to write them after you create your read-only ext2 filesystem. On Chrome OS the hashes go in the same disk partition as the ext2 filesystem, and the filesystem is made a little bit sm
Re: [U-Boot] [PATCH v7 4/5] imx6: add spl in the header file
Hi John, On 13/11/2014 16:47, John Tobias wrote: > The CONFIG_SYS_TEXT_BASE was defined in imx6_spl.h and I was seeing > previously some warning related to the duplication of the said macro. > > I thought it would be great to remove the warning messages so that is why > I added the macro. Maybe it was in a development phase where, or it was added as extra option by compiling. I confirm that it compile fine without warnings after removing. Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3 1/5] power: pfuze100: Update definitions for buck regulators
Hello Ye Li,
On 11/06/2014 09:28 AM, Ye.Li wrote:
Add definitions for buck regulators (SW1A/B/C) registers and voltage
values.
Signed-off-by: Ye.Li
---
Changes since v1:
- None
Changes since v2:
- Create this patch for updating registers definitions and magic value.
include/power/pfuze100_pmic.h | 80 +
1 files changed, 80 insertions(+), 0 deletions(-)
diff --git a/include/power/pfuze100_pmic.h b/include/power/pfuze100_pmic.h
index 0002f1e..1118489 100644
--- a/include/power/pfuze100_pmic.h
+++ b/include/power/pfuze100_pmic.h
@@ -38,6 +38,86 @@ enum {
};
/*
+ * Buck Regulators
+ */
+
+/* SW1A/B/C Output Voltage Configuration */
+#define SW1x_0_300V 0
+#define SW1x_0_325V 1
+#define SW1x_0_350V 2
+#define SW1x_0_375V 3
+#define SW1x_0_400V 4
+#define SW1x_0_425V 5
+#define SW1x_0_450V 6
+#define SW1x_0_475V 7
+#define SW1x_0_500V 8
+#define SW1x_0_525V 9
+#define SW1x_0_550V 10
+#define SW1x_0_575V 11
+#define SW1x_0_600V 12
+#define SW1x_0_625V 13
+#define SW1x_0_650V 14
+#define SW1x_0_675V 15
+#define SW1x_0_700V 16
+#define SW1x_0_725V 17
+#define SW1x_0_750V 18
+#define SW1x_0_775V 19
+#define SW1x_0_800V 20
+#define SW1x_0_825V 21
+#define SW1x_0_850V 22
+#define SW1x_0_875V 23
+#define SW1x_0_900V 24
+#define SW1x_0_925V 25
+#define SW1x_0_950V 26
+#define SW1x_0_975V 27
+#define SW1x_1_000V 28
+#define SW1x_1_025V 29
+#define SW1x_1_050V 30
+#define SW1x_1_075V 31
+#define SW1x_1_100V 32
+#define SW1x_1_125V 33
+#define SW1x_1_150V 34
+#define SW1x_1_175V 35
+#define SW1x_1_200V 36
+#define SW1x_1_225V 37
+#define SW1x_1_250V 38
+#define SW1x_1_275V 39
+#define SW1x_1_300V 40
+#define SW1x_1_325V 41
+#define SW1x_1_350V 42
+#define SW1x_1_375V 43
+#define SW1x_1_400V 44
+#define SW1x_1_425V 45
+#define SW1x_1_450V 46
+#define SW1x_1_475V 47
+#define SW1x_1_500V 48
+#define SW1x_1_525V 49
+#define SW1x_1_550V 50
+#define SW1x_1_575V 51
+#define SW1x_1_600V 52
+#define SW1x_1_625V 53
+#define SW1x_1_650V 54
+#define SW1x_1_675V 55
+#define SW1x_1_700V 56
+#define SW1x_1_725V 57
+#define SW1x_1_750V 58
+#define SW1x_1_775V 59
+#define SW1x_1_800V 60
+#define SW1x_1_825V 61
+#define SW1x_1_850V 62
+#define SW1x_1_875V 63
+
+#define SW1x_NORMAL_MASK 0x3f
+#define SW1x_STBY_MASK0x3f
+#define SW1x_OFF_MASK 0x3f
+
+#define SW1xCONF_DVSSPEED_MASK 0xc0
+#define SW1xCONF_DVSSPEED_2US 0x00
+#define SW1xCONF_DVSSPEED_4US 0x40
+#define SW1xCONF_DVSSPEED_8US 0x80
+#define SW1xCONF_DVSSPEED_16US 0xc0
+
+/*
* LDO Configuration
*/
I can't test this code, but the changes looks good for me.
Reviewed-by: Przemyslaw Marczak
Best regards,
--
Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marc...@samsung.com
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3 1/5] ARM: HYP/non-sec: add the pen address BE mode support.
On 10/20/2014 02:00 AM, Xiubo Li wrote: > For some SoCs, the pen address register maybe in BE mode and the > CPUs are in LE mode. > > This patch adds BE mode support for smp pen address. > > Signed-off-by: Xiubo Li > --- Acked-by: York Sun ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3 2/5] ARM: HYP/non-sec: Fix the ARCH Timer frequency setting.
On 10/20/2014 02:00 AM, Xiubo Li wrote: > For some SoCs, the system clock frequency may not equal to the > ARCH Timer's frequency. > > This patch uses the CONFIG_TIMER_CLK_FREQ instead of > CONFIG_SYS_CLK_FREQ, then the system clock macro and arch timer > macor could be set separately and without interfering each other. > > Signed-off-by: Xiubo Li > --- Acked-by: York Sun ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3 4/5] ARM: ls102xa: allow all the peripheral access permissions as R/W.
On 10/20/2014 02:00 AM, Xiubo Li wrote: > The Central Security Unit (CSU) allows secure world software to > change the default access control policies of peripherals/bus > slaves, determining which bus masters may access them. This > allows peripherals to be separated into distinct security domains. > Combined with SMMU configuration of the system masters privileges, > these features provide protection against indirect unauthorized > access to data. > > For now we configure all the peripheral access permissions as R/W. > > Signed-off-by: Xiubo Li > --- Acked-by: York Sun ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3 3/5] ls102xa: HYP/non-sec: support for ls102xa boards
On 10/20/2014 02:00 AM, Xiubo Li wrote: > Enable hypervisors utilizing the ARMv7 virtualization extension > on the LS1021A-QDS/TWR boards with the A7 core tile, we add the > required configuration variable. > Also we define the board specific smp_set_cpu_boot_addr() function > to set the start address for secondary cores in the LS1021A specific > manner. > > Signed-off-by: Xiubo Li > --- Acked-by: York Sun ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3 5/5] ARM: ls102xa: Setting device's stream id for SMMUs.
On 10/20/2014 02:00 AM, Xiubo Li wrote: > LS1 has 4 SMMUs for address translation of the masters. All the > SMMUs' stream IDs are 8-bit. The address translation depends on the > stream ID of the incoming transaction. > Each master has unique stream ID assigned to it and is configurable > through SCFG registers. The stream ID for the masters is identical > and share the same register field of STREAM ID registers. > > Signed-off-by: Xiubo Li > --- Acked-by: York Sun ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2 4/4] ARM: ls102xa: allow all the peripheral access permissions as R/W.
Albert, This set should be marked as superseded. York On 11/12/2014 10:09 PM, York Sun wrote: > I will take a closer look tomorrow. Being crazy busy lately. > > York > > > From: Albert ARIBAUD > Sent: Wed, 12/11/2014 22:08 > To: Sun York-R58495 > CC: Xiubo Li-B47053 ; Sun York-R58495 > ; u-boot@lists.denx.de > Subject: Re: [PATCH v2 4/4] ARM: ls102xa: allow all the peripheral access > permissions as R/W. > > > Hello York, > > On Wed, 8 Oct 2014 11:07:36 +0800, Xiubo Li > wrote: >> The Central Security Unit (CSU) allows secure world software to >> change the default access control policies of peripherals/bus >> slaves, determining which bus masters may access them. This >> allows peripherals to be separated into distinct security domains. >> Combined with SMMU configuration of the system masters privileges, >> these features provide protection against indirect unauthorized >> access to data. >> >> For now we configure all the peripheral access permissions as R/W. >> >> Signed-off-by: Xiubo Li >> --- > > I see half this set is delegated to you and half to me. If you just give > your Acked-by: to patches 3 and 4, I will handle the whole set. > > Amicalement, > -- > Albert. > > > > ___ > 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
[U-Boot] Query on CONFIG_SYS_THUMB_BUILD
Hello,
I am working with a Cortex A5 Freescale Vybrid Processor. Since a thumb build
leads to a saving of almost 1 MB for my u-boot image and consequently to faster
serial downloads I have been looking at this. Currently enabling this option
leads to a hang.
After some debugging I have narrowed the place of hang to "ldr pc,
=board_init_r" in arch/arm/lib/crt0.S. My debugging procedure was to put a
branch to a small function which just printed a small message with puts, just
before the ldr instruction and then a printing a small message with puts just
at the start of board_init_r in common/board_r.c . For a non thumb build, the
two messages get printed and I can boot to the u-boot prompt. For a thumb
build, only the first message before the ldr instruction gets printed.
In crt0.S
bl debug_print
ldr pc, =board_init_r
In board_init_r
puts("In board_init_r\n"); // Right at start
void debug_print(void)
{
// Defined in board file
puts("Debug print\n");
}
My assembly knowledge is limited and after some consultation with a senior
colleague, he told me things to check.
An object dump of the crt0.o shows a branch to an even address. For thumb, this
is expected to be odd. To just try out, I did a change as below
ldr r3, =board_init_r
add r3, #1
bx r3
No change with this. My expectation was the compiler/linker/assembler would
take care of the requirements, with the CONFIG_SYS_THUMB_BUILD. Frankly
speaking I am not sure if this is the complete issue or only a part of it. I
have seen patches with regards to OMAP send in by Aneesh V, which made changes
of the form .type fn_name, %function to all the low level assembly functions,
but, I couldn't dig up much more or variants thereof. Basically, from what I
understand, this takes care of specifying .thumb_func for a thumb function or
so to speak.
Any pointers?
Thanks & Regards,
Sanchayan Maity.
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] mx6: video_skip: Fix crash on NULL pointer
Hi Nikolay, On 05/11/2014 09:55, picmas...@mail.bg wrote: > From: Nikolay Dimitrov > > Signed-off-by: Nikolay Dimitrov > Cc: Stefano Babic > --- Applied to -u-boot-imx, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v3 0/2] Fix SoC-specific exception handling
Short version: * this patch fixes exception handling on i.MX27 which was broken, probably from day one. * this patch was tested on apf27. Due to lack of debugging hardware, only the data abort, prefetch abort and undefined instruction cases have been tested; software interrupt, IRQ and FIQ were not tested. * This patch was NOT tested on imx27lite, which is the only other i.MX27-based board AFAICT. The maintainer of imx27lite is Cc:ed on this series. * i.MX custodian (Cc:) please review this patch and let me know if this should also be done for other i.MX SoCs as well. Long version: This patch was created after apf27 maintainer found out that the board did not boot any more. The root cause was that commit 3ff46cc4 would try and write into the exception vectors table, which i.MX27 has in ROM. This caused a data abort, and as the U-Boot vectors were not in place yet, this abort went to the ROM code which silently hung. Investigation led to a patch sent in 2009 to the list (but never applied) with a description of the i.MX27 exception handling: http://lists.denx.de/pipermail/u-boot/2009-October/062811.html By his own author's admission, this patch was not fit for inclusion in U-Boot, but it gave the technical information needed to produce this present patch set. The first patch is only cosmetic, fixing whitespace quirks which affect legibility or cause a warning in patman. The second patch moves vectors relocation out of the relocate_code routine and into its own relocate_vectors routine. This routine is made weak so that it can be replaced by a SoC-specific, strong one. Such a strong replacement is provided for i.MX27. Changes in v3: - Fixed AGAIN wrong i.MX27 vector relocation code Changes in v2: - Fixed wrong i.MX27 vector relocation code Albert ARIBAUD (2): cosmetic: arm: fix whitespace in arch/arm/lib/relocate.S imx: fix exception vectors relocation in imx27 arch/arm/cpu/arm926ejs/mx27/Makefile | 4 ++ arch/arm/cpu/arm926ejs/mx27/relocate.S | 51 arch/arm/lib/crt0.S| 5 +++ arch/arm/lib/relocate.S| 73 -- 4 files changed, 103 insertions(+), 30 deletions(-) create mode 100644 arch/arm/cpu/arm926ejs/mx27/relocate.S -- 2.1.0 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v3 2/2] imx: fix exception vectors relocation in imx27
Commit 3ff46cc4 fixed exception vectors setting in
the general ARM case, by either copying the exception
and indirect vector tables to normal (0x) or
high (0x) vectors address, or setting VBAR to
U-Boot's base if applicable.
i.MX27 SoC is ARM926E-JS, thus has only normal and
high options, but does not provide RAM at 0x
and has only ROM at 0x; it is therefore not
possible to move or change its exception vectors.
Besides, i.MX27 ROM code does provide an indirect
vectors table but at a non-standard address and with
the reset and reserved vectors missing.
Turn the current vector relocation code into a weak
routine called after relocate_code from crt0, and add
strong version for i.MX27.
Series-Cc: Heiko Schocher
Signed-off-by: Albert ARIBAUD
---
Changes in v3:
- Fixed AGAIN wrong i.MX27 vector relocation code
Changes in v2:
- Fixed wrong i.MX27 vector relocation code
arch/arm/cpu/arm926ejs/mx27/Makefile | 4 ++
arch/arm/cpu/arm926ejs/mx27/relocate.S | 51 +
arch/arm/lib/crt0.S| 5 +++
arch/arm/lib/relocate.S| 69 --
4 files changed, 101 insertions(+), 28 deletions(-)
create mode 100644 arch/arm/cpu/arm926ejs/mx27/relocate.S
diff --git a/arch/arm/cpu/arm926ejs/mx27/Makefile
b/arch/arm/cpu/arm926ejs/mx27/Makefile
index 4976bbb..0edf144 100644
--- a/arch/arm/cpu/arm926ejs/mx27/Makefile
+++ b/arch/arm/cpu/arm926ejs/mx27/Makefile
@@ -5,3 +5,7 @@
# SPDX-License-Identifier: GPL-2.0+
obj-y = generic.o reset.o timer.o
+
+ifndef CONFIG_SPL_BUILD
+obj-y += relocate.o
+endif
diff --git a/arch/arm/cpu/arm926ejs/mx27/relocate.S
b/arch/arm/cpu/arm926ejs/mx27/relocate.S
new file mode 100644
index 000..0c4b272
--- /dev/null
+++ b/arch/arm/cpu/arm926ejs/mx27/relocate.S
@@ -0,0 +1,51 @@
+/*
+ * relocate - i.MX27-specific vector relocation
+ *
+ * Copyright (c) 2013 Albert ARIBAUD
+ *
+ * SPDX-License-Identifier:GPL-2.0+
+ */
+
+#include
+#include
+#include
+
+/*
+ * The i.MX27 SoC is very specific with respect to exceptions: it
+ * does not provide RAM at the high vectors address (0x),
+ * thus only the low address (0x) is useable; but that is
+ * in ROM. Therefore, vectors cannot be changed at all.
+ *
+ * However, these ROM-based vectors actually just perform indirect
+ * calls through pointers located in RAM at SoC-specific addresses,
+ * as follows:
+ *
+ * Offset Exception Use by ROM code
+ * 0x reset indirect branch to [0x0014]
+ * 0x0004 undefined instruction indirect branch to [0xfef0]
+ * 0x0008 software interrupt indirect branch to [0xfef4]
+ * 0x000c prefetch abort indirect branch to [0xfef8]
+ * 0x0010 data abort indirect branch to [0xfefc]
+ * 0x0014 (reserved in ARMv5)vector to ROM reset: 0xc000
+ * 0x0018 IRQindirect branch to [0xff00]
+ * 0x001c FIQindirect branch to [0xff04]
+ *
+ * In order to initialize exceptions on i.MX27, we must copy U-Boot's
+ * indirect (not exception!) vector table into 0xfef0..0xff04
+ * taking care not to copy vectors number 5 (reserved exception).
+ */
+
+ .section.text.relocate_vectors,"ax",%progbits
+
+ENTRY(relocate_vectors)
+
+ ldr r0, [r9, #GD_RELOCADDR] /* r0 = gd->relocaddr */
+ ldr r1, =32 /* size of vector table */
+ add r0, r0, r1 /* skip to indirect table */
+ ldr r1, =0xFEF0 /* i.MX27 indirect table */
+ ldmia r0!, {r2-r8}/* load indirect vectors 1..7 */
+ stmia r1!, {r2-r5, r7,r8} /* write all but vector 5 */
+
+ bx lr
+
+ENDPROC(relocate_vectors)
diff --git a/arch/arm/lib/crt0.S b/arch/arm/lib/crt0.S
index 29cdad0..a33ad3e 100644
--- a/arch/arm/lib/crt0.S
+++ b/arch/arm/lib/crt0.S
@@ -104,6 +104,11 @@ clr_gd:
ldr r0, [r9, #GD_RELOCADDR] /* r0 = gd->relocaddr */
b relocate_code
here:
+/*
+ * now relocate vectors
+ */
+
+ bl relocate_vectors
/* Set up final (full) environment */
diff --git a/arch/arm/lib/relocate.S b/arch/arm/lib/relocate.S
index 6ede41c..92f5314 100644
--- a/arch/arm/lib/relocate.S
+++ b/arch/arm/lib/relocate.S
@@ -11,6 +11,47 @@
#include
/*
+ * Default/weak exception vectors relocation routine
+ *
+ * This routine covers the standard ARM cases: normal (0x),
+ * high (0x) and VBAR. SoCs which do not comply with any of
+ * the standard cases must provide their own, strong, version.
+ */
+
+ .section.text.relocate_vectors,"ax",%progbits
+ .weak relocate_vectors
+
+ENTRY(relocate_vectors)
+
+#ifdef CONFIG_HAS_VBAR
+ /*
+* If the ARM processor has the security extensions,
+* use VBAR to relocate the exception vectors.
+*/
+
[U-Boot] [PATCH v3 1/2] cosmetic: arm: fix whitespace in arch/arm/lib/relocate.S
Signed-off-by: Albert ARIBAUD
---
Changes in v3: None
Changes in v2: None
arch/arm/lib/relocate.S | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/lib/relocate.S b/arch/arm/lib/relocate.S
index b4a258c..6ede41c 100644
--- a/arch/arm/lib/relocate.S
+++ b/arch/arm/lib/relocate.S
@@ -74,8 +74,8 @@ fixnext:
ldr r0, [r9, #GD_RELOCADDR] /* r0 = gd->relocaddr */
mrc p15, 0, r2, c1, c0, 0 /* V bit (bit[13]) in CP15 c1 */
andsr2, r2, #(1 << 13)
- ldreq r1, =0x /* If V=0 */
- ldrne r1, =0x /* If V=1 */
+ ldreq r1, =0x /* If V=0 */
+ ldrne r1, =0x /* If V=1 */
ldmia r0!, {r2-r8,r10}
stmia r1!, {r2-r8,r10}
ldmia r0!, {r2-r8,r10}
@@ -96,9 +96,9 @@ relocate_done:
/* ARMv4- don't know bx lr but the assembler fails to see that */
#ifdef __ARM_ARCH_4__
- movpc, lr
+ mov pc, lr
#else
- bxlr
+ bx lr
#endif
ENDPROC(relocate_code)
--
2.1.0
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/2] mx6sabresd: Fix error handling in board_mmc_init()
On 06/11/2014 15:24, Fabio Estevam wrote: > When an invalid USDHC port is passed we should return -EINVAL instead of 0. > > Also, return the error immediately on fsl_esdhc_initialize() failure. > > Signed-off-by: Fabio Estevam > --- Applied to -u-boot-imx, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 2/2] mx6sabresd: Staticize when possible
On 06/11/2014 15:24, Fabio Estevam wrote: > Annotate 'static' when appropriate for the variables used locally. > > Signed-off-by: Fabio Estevam > --- Applied to -u-boot-imx, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3 0/2] Fix SoC-specific exception handling
On Thu, 13 Nov 2014 17:59:13 +0100, Albert ARIBAUD wrote: > * This patch was NOT tested on imx27lite, which is > the only other i.MX27-based board AFAICT. The > maintainer of imx27lite is Cc:ed on this series. ... or should have, if it had not been for my flaky patman-fu. Wolfgang, CC:ing you as said maintainer. CC:ing Heiko as the magnesium maintainer, too, although I guess testing on one of the two variants will be enough to validate the patch. Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] ubi: reset relevant globals in ubi_exit()
Before calling ubi_init() the U-Boot wrapper calls ubi_mtd_param_parse() to have the UBI driver add it to its mtd_dev_param[] array and increment mtd_devs. The first time ubi_init() is called, mtd_devs would be 1. Before ubi_init() is called again (another partition is attached), ubi_mtd_param_parse() is called again, incrementing mtd_devs again (now 2). This results in ubi_init() now trying to attach the first partition and the second partition. Fix this by adding a section at the end of ubi_exit() where we reset any globals that would need to be reset (in this case, just mtd_devs). Test case: $ ubi part ; ubi part Before patch: $ ubi part data UBI: attaching mtd1 to ubi0 UBI: scanning is finished UBI: attached mtd1 (name "mtd=4", size 4 MiB) to ubi0 [...] UBI: available PEBs: 0, total reserved PEBs: 32, [...] $ ubi part data UBI: detaching mtd1 from ubi0 UBI: mtd1 is detached from ubi0 UBI: attaching mtd1 to ubi0 [...] UBI: available PEBs: 0, total reserved PEBs: 32, [...] ** Note that this is where it tries to attach mtd1 again, fails, and ** then detaches everything as it errors out of ubi_init() UBI: detaching mtd1 from ubi0 UBI: mtd1 is detached from ubi0 UBI init error 17 $ After patch: $ ubi part data UBI: attaching mtd1 to ubi0 UBI: scanning is finished UBI: attached mtd1 (name "mtd=4", size 4 MiB) to ubi0 [...] UBI: available PEBs: 0, total reserved PEBs: 32, [...] $ ubi part data UBI: detaching mtd1 from ubi0 UBI: mtd1 is detached from ubi0 UBI: attaching mtd1 to ubi0 UBI: scanning is finished UBI: attached mtd1 (name "mtd=4", size 4 MiB) to ubi0 [...] UBI: available PEBs: 0, total reserved PEBs: 32, [...] $ Signed-off-by: Andrew Ruder Cc: Heiko Schocher Cc: Kyungmin Park --- drivers/mtd/ubi/build.c | 4 1 file changed, 4 insertions(+) Not sure this is the best place to make the change, but it is one of the least obtrusive, IMO. Please Cc: me on any responses as it will go directly to my inbox! diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c index 584cf5f..fc5cbce 100644 --- a/drivers/mtd/ubi/build.c +++ b/drivers/mtd/ubi/build.c @@ -1384,6 +1384,10 @@ void ubi_exit(void) misc_deregister(&ubi_ctrl_cdev); class_remove_file(ubi_class, &ubi_version); class_destroy(ubi_class); +#ifdef __UBOOT__ + /* Reset any globals that the driver depends on being zeroed */ + mtd_devs = 0; +#endif } module_exit(ubi_exit); -- 2.1.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2] ext4: goni: Modify dfu_alt_info's file names to have absolute path
After the clean up performed in the commit 1151b7ac10b81ecbb the DFU subsystem requires absolute path for correct operation. Signed-off-by: Lukasz Majewski Acked-by: Robert Baldyga --- Changes for v2: - Correct spelling error - Get ACK from board maintainer --- include/configs/s5p_goni.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index 0c6e9c7..8ae3e64 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -121,8 +121,8 @@ #define CONFIG_DFU_ALT \ "u-boot raw 0x80 0x400;" \ - "uImage ext4 0 2;" \ - "exynos3-goni.dtb ext4 0 2;" \ + "/uImage ext4 0 2;" \ + "/exynos3-goni.dtb ext4 0 2;" \ ""PARTS_ROOT" part 0 5\0" #define PARTS_DEFAULT \ -- 2.0.0.rc2 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v4] arm: mx6: add support for TBS2910 Matrix ARM miniPC
On 03/11/2014 13:57, Soeren Moch wrote: > Add initial support for TBS2910 Matrix ARM miniPC. > Support includes MMC, Ethernet, UARTs, HDMI, USB, SATA, PCI, I2C, RTC. > > Signed-off-by: Soeren Moch > --- Applied to -u-boot-imx, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2] arm: socfpga: set skew settings for ethernet phy
From: Dinh Nguyen
Set the PHY skew settings for the ethernet phy on the SOCFPGA Cyclone5
hardware.
Signed-off-by: Dinh Nguyen
Cc: Vince Bridgers
Cc: Pavel Machek
Cc: Marek Vasut
Cc: Tom Rini
Cc: Albert Aribaud
Cc: Wolfgang Denk
---
v2: Added comments on why it is necessary for setting the skew values.
---
board/altera/socfpga/socfpga_cyclone5.c | 16
1 file changed, 16 insertions(+)
diff --git a/board/altera/socfpga/socfpga_cyclone5.c
b/board/altera/socfpga/socfpga_cyclone5.c
index 0f81d89..543a143 100644
--- a/board/altera/socfpga/socfpga_cyclone5.c
+++ b/board/altera/socfpga/socfpga_cyclone5.c
@@ -8,7 +8,9 @@
#include
#include
+#include
#include
+#include
DECLARE_GLOBAL_DATA_PTR;
@@ -39,3 +41,17 @@ int board_init(void)
return 0;
}
+
+int board_phy_config(struct phy_device *phydev)
+{
+ /*
+* These skew settings for the KSZ9021 ethernet phy is required for
ethernet
+* to work reliably on most flavors of cyclone5 boards.
+*/
+ ksz9021_phy_extended_write(phydev, MII_KSZ9021_EXT_RGMII_RX_DATA_SKEW,
+ 0x0);
+ ksz9021_phy_extended_write(phydev, MII_KSZ9021_EXT_RGMII_TX_DATA_SKEW,
+ 0x0);
+ ksz9021_phy_extended_write(phydev, MII_KSZ9021_EXT_RGMII_CLOCK_SKEW,
+ 0xf0f0);
+}
--
2.0.3
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3 0/7] Addition of new board Peach-Pi
Hi Akshay, On 13 November 2014 10:16, Akshay Saraswat wrote: > Hi Simon, > >>Hi Akshay, >> >>On 31 October 2014 02:55, Akshay Saraswat wrote: >>> Now we are adding a new Peach-Pi board which is a variant of Peach-Pit >>> and is based on Exynos5800. Exynos5800 itself is a variant of Exynos5420, >>> hence, most of the hardware config and settings are reused for this board. >>> >>> Changes since v1: >>> - Rebased all the patches >>> >>> Changes since v2: >>> - Rebased all the patches >>> - Added new patch "Enable update mode for DREX controller" >>> >> >>This last patch fixed USB for me, pleased you found the problem! >> >>The display doesn't work yet - will that be the next series? > > Thanks for testing. Ajay will send the patch for display. > >> >>Also I had to drop the clock to 900MHz as with Pit. It must be >>something odd I am doing, but I'm not sure what. >> > > For my board it works fine. I am trying to reproduce it. > I'll post the fix as soon as I see the problem. Let's not worry about it. I'll see if I can dig into it one day, but if the problem doesn't happen for you then I'm not bothered about it. There could be various strange things about my setup. Regards, Simon ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3 1/5] power: pfuze100: Update definitions for buck regulators
Hi Przemyslaw, On 13/11/2014 17:29, Przemyslaw Marczak wrote: > Hello Ye Li, > > On 11/06/2014 09:28 AM, Ye.Li wrote: >> Add definitions for buck regulators (SW1A/B/C) registers and voltage >> values. >> >> Signed-off-by: Ye.Li >> --- > > I can't test this code, but the changes looks good for me. > > Reviewed-by: Przemyslaw Marczak Thanks - I will check the series for merging into u-boot-imx now (the rest of patches are related to i.MX boards). Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Booting non devicetree enabled kernels using u-boot build with CONFIG_OF_LIBFDT ?
Hi all, So as you know I've been working on getting mainline u-boot to boot the older android derived linux-sunxi kernels, as some people need features not yet in mainline, and I would like there to be only one u-boot for both. I had this working a while ago, but recently it broke, this is caused by config_distro_defaults.h setting CONFIG_OF_LIBFDT, if I undef that after including config_distro_defaults.h things work again. I do not know if CONFIG_OF_LIBFDT is a recent addition to config_distro_defaults.h, or if something else broke things. But if I do not undef it, boot fails with: sun7i# bootm start 0x4800 ## Booting kernel from Legacy Image at 4800 ... Image Name: Linux-3.4.75.sun7i+ Image Type: ARM Linux Kernel Image (uncompressed) Data Size:3966672 Bytes = 3.8 MiB Load Address: 40008000 Entry Point: 40008000 Verifying Checksum ... OK Could not find a valid device tree Now this can be fixed by removing CONFIG_OF_LIBFDT when CONFIG_OLD_SUNXI_KERNEL_COMPAT is set, but that is a somewhat big hammer, making it impossible to have one u-boot build which can boot both old and new kernels with more or less optimal settings. One theoretical work around is to just pass in a dummy fdt, but that seems silly. Another option is to allow: bootm start 0x4800 - - To continue with a devicetree, would a patch for that be acceptable ? Regards, Hams ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 5/7] board: iocon: Fix fpga index in print_fpga_info()
From: Dirk Eibach Signed-off-by: Dirk Eibach --- Changes in v2: None board/gdsys/405ep/iocon.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/board/gdsys/405ep/iocon.c b/board/gdsys/405ep/iocon.c index 1bac970..fffed73 100644 --- a/board/gdsys/405ep/iocon.c +++ b/board/gdsys/405ep/iocon.c @@ -180,11 +180,11 @@ static void print_fpga_info(unsigned int fpga, bool rgmii2_present) unsigned feature_carriers; unsigned feature_video_channels; - int legacy = get_fpga_state(0) & FPGA_STATE_PLATFORM; + int legacy = get_fpga_state(fpga) & FPGA_STATE_PLATFORM; - FPGA_GET_REG(0, versions, &versions); - FPGA_GET_REG(0, fpga_version, &fpga_version); - FPGA_GET_REG(0, fpga_features, &fpga_features); + FPGA_GET_REG(fpga, versions, &versions); + FPGA_GET_REG(fpga, fpga_version, &fpga_version); + FPGA_GET_REG(fpga, fpga_features, &fpga_features); unit_type = (versions & 0xf000) >> 12; feature_compression = (fpga_features & 0xe000) >> 13; -- 1.8.3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 2/7] mtd: Handle 29LV800BT
From: Dirk Eibach
The device id makes u-boot think that this chip needs
cfi_reverse_geometry(), which is not the case.
Add it to jedec_flash, so it is handled properly.
Signed-off-by: Dirk Eibach
---
Changes in v2: None
drivers/mtd/jedec_flash.c | 51 +++
include/flash.h | 1 +
2 files changed, 52 insertions(+)
diff --git a/drivers/mtd/jedec_flash.c b/drivers/mtd/jedec_flash.c
index 593b9b8..ce9af8f 100644
--- a/drivers/mtd/jedec_flash.c
+++ b/drivers/mtd/jedec_flash.c
@@ -333,6 +333,57 @@ static const struct amd_flash_info jedec_table[] = {
}
},
{
+ .mfr_id = (u16)AMD_MANUFACT,
+ .dev_id = AM29LV800BT,
+ .name = "AMD AM29LV800BT",
+ .uaddr = {
+ [1] = MTD_UADDR_0x0555_0x02AA /* x16 */
+ },
+ .DevSize= SIZE_1MiB,
+ .CmdSet = CFI_CMDSET_AMD_LEGACY,
+ .NumEraseRegions= 4,
+ .regions= {
+ ERASEINFO(0x1, 15),
+ ERASEINFO(0x08000, 1),
+ ERASEINFO(0x02000, 2),
+ ERASEINFO(0x04000, 1),
+ }
+ },
+ {
+ .mfr_id = (u16)MX_MANUFACT,
+ .dev_id = AM29LV800BT,
+ .name = "MXIC MX29LV800BT",
+ .uaddr = {
+ [1] = MTD_UADDR_0x0555_0x02AA /* x16 */
+ },
+ .DevSize= SIZE_1MiB,
+ .CmdSet = CFI_CMDSET_AMD_LEGACY,
+ .NumEraseRegions= 4,
+ .regions= {
+ ERASEINFO(0x1, 15),
+ ERASEINFO(0x08000, 1),
+ ERASEINFO(0x02000, 2),
+ ERASEINFO(0x04000, 1),
+ }
+ },
+ {
+ .mfr_id = (u16)EON_ALT_MANU,
+ .dev_id = AM29LV800BT,
+ .name = "EON EN29LV800BT",
+ .uaddr = {
+ [1] = MTD_UADDR_0x0555_0x02AA /* x16 */
+ },
+ .DevSize= SIZE_1MiB,
+ .CmdSet = CFI_CMDSET_AMD_LEGACY,
+ .NumEraseRegions= 4,
+ .regions= {
+ ERASEINFO(0x1, 15),
+ ERASEINFO(0x08000, 1),
+ ERASEINFO(0x02000, 2),
+ ERASEINFO(0x04000, 1),
+ }
+ },
+ {
.mfr_id = (u16)STM_MANUFACT,
.dev_id = STM29F400BB,
.name = "ST Micro M29F400BB",
diff --git a/include/flash.h b/include/flash.h
index 5454c9e..30aa080 100644
--- a/include/flash.h
+++ b/include/flash.h
@@ -158,6 +158,7 @@ extern flash_info_t *flash_get_info(ulong base);
#define EXCEL_MANUFACT 0x004A004A /* Excel Semiconductor
*/
#define AMIC_MANUFACT 0x00370037 /* AMICmanuf. ID in D23..D16,
D7..D0 */
#define WINB_MANUFACT 0x00DA00DA /* Winbond manuf. ID in D23..D16,
D7..D0 */
+#define EON_ALT_MANU 0x001C001C /* EON manuf. ID in D23..D16,
D7..D0 */
/* Manufacturers inside bank 1 have ids like 0x01xx01xx */
#define EON_MANUFACT 0x011C011C /* EON manuf. ID in D23..D16,
D7..D0 */
--
1.8.3
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 0/7] Update gdsys board support
From: Dirk Eibach Changes in v2: - fix compiler warning - fix cppcheck finding reported by Wolfgang - move cmd_ioloop from common to board/gdsys/common - remove debug code from hrcon.c Dirk Eibach (7): board: dlvision: Reduce memory footprint mtd: Handle 29LV800BT common: Fix cmd_fpgad addressing board: dlvision-10g: Compile fix board: iocon: Fix fpga index in print_fpga_info() board: iocon: Fix uninitialized access mpc83xx: Add gdsys hrcon board arch/powerpc/cpu/mpc83xx/Kconfig | 4 + board/gdsys/405ep/iocon.c| 201 +--- board/gdsys/common/Makefile | 4 +- board/gdsys/common/cmd_ioloop.c | 295 + board/gdsys/common/ihs_mdio.c| 88 + board/gdsys/common/ihs_mdio.h| 18 ++ board/gdsys/common/osd.c | 7 +- board/gdsys/common/phy.c | 280 board/gdsys/common/phy.h | 14 + board/gdsys/mpc8308/Kconfig | 12 + board/gdsys/mpc8308/MAINTAINERS | 6 + board/gdsys/mpc8308/Makefile | 9 + board/gdsys/mpc8308/hrcon.c | 675 +++ board/gdsys/mpc8308/mpc8308.c| 109 +++ board/gdsys/mpc8308/mpc8308.h| 10 + board/gdsys/mpc8308/sdram.c | 82 + common/cmd_fpgad.c | 32 +- configs/hrcon_defconfig | 3 + drivers/mtd/jedec_flash.c| 51 +++ include/configs/dlvision.h | 9 +- include/configs/hrcon.h | 614 +++ include/flash.h | 1 + include/gdsys_fpga.h | 64 +++- 23 files changed, 2375 insertions(+), 213 deletions(-) create mode 100644 board/gdsys/common/cmd_ioloop.c create mode 100644 board/gdsys/common/ihs_mdio.c create mode 100644 board/gdsys/common/ihs_mdio.h create mode 100644 board/gdsys/common/phy.c create mode 100644 board/gdsys/common/phy.h create mode 100644 board/gdsys/mpc8308/Kconfig create mode 100644 board/gdsys/mpc8308/MAINTAINERS create mode 100644 board/gdsys/mpc8308/Makefile create mode 100644 board/gdsys/mpc8308/hrcon.c create mode 100644 board/gdsys/mpc8308/mpc8308.c create mode 100644 board/gdsys/mpc8308/mpc8308.h create mode 100644 board/gdsys/mpc8308/sdram.c create mode 100644 configs/hrcon_defconfig create mode 100644 include/configs/hrcon.h -- 1.8.3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 3/7] common: Fix cmd_fpgad addressing
From: Dirk Eibach
Addressing was completely broken for cmd_fpgad.
Signed-off-by: Dirk Eibach
---
Changes in v2: None
common/cmd_fpgad.c | 32
1 file changed, 24 insertions(+), 8 deletions(-)
diff --git a/common/cmd_fpgad.c b/common/cmd_fpgad.c
index 1b25ed8..1f1d00f 100644
--- a/common/cmd_fpgad.c
+++ b/common/cmd_fpgad.c
@@ -31,7 +31,8 @@ int do_fpga_md(cmd_tbl_t *cmdtp, int flag, int argc, char *
const argv[])
unsigned int fpga;
ulong addr, length;
int rc = 0;
- u16 linebuf[DISP_LINE_LEN/sizeof(u16)];
+ u16 linebuf[DISP_LINE_LEN/sizeof(u16)];
+ ulong nbytes;
/*
* We use the last specified parameters, unless new ones are
@@ -63,13 +64,28 @@ int do_fpga_md(cmd_tbl_t *cmdtp, int flag, int argc, char *
const argv[])
length = simple_strtoul(argv[3], NULL, 16);
}
- /* Print the lines. */
- for (k = 0; k < DISP_LINE_LEN / sizeof(u16); ++k)
- fpga_get_reg(fpga, (u16 *)fpga_ptr[fpga] + k, k * sizeof(u16),
-&linebuf[k]);
- print_buffer(addr, (void *)linebuf, sizeof(u16),
-length, DISP_LINE_LEN / sizeof(u16));
- addr += sizeof(u16)*length;
+ nbytes = length * sizeof(u16);
+ do {
+ ulong linebytes = (nbytes > DISP_LINE_LEN) ?
+ DISP_LINE_LEN : nbytes;
+
+ for (k = 0; k < linebytes / sizeof(u16); ++k)
+ fpga_get_reg(fpga,
+(u16 *)fpga_ptr[fpga] + addr
+/ sizeof(u16) + k,
+addr + k * sizeof(u16),
+&linebuf[k]);
+ print_buffer(addr, (void *)linebuf, sizeof(u16),
+linebytes / sizeof(u16),
+DISP_LINE_LEN / sizeof(u16));
+
+ nbytes -= linebytes;
+ addr += linebytes;
+ if (ctrlc()) {
+ rc = 1;
+ break;
+ }
+ } while (nbytes > 0);
dp_last_fpga = fpga;
dp_last_addr = addr;
--
1.8.3
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 1/7] board: dlvision: Reduce memory footprint
From: Dirk Eibach
Tune dlvision configuration similar to other gdsys boards to reduce memory
footprint.
Signed-off-by: Dirk Eibach
---
Changes in v2: None
include/configs/dlvision.h | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/include/configs/dlvision.h b/include/configs/dlvision.h
index af0d602..a9cfc10 100644
--- a/include/configs/dlvision.h
+++ b/include/configs/dlvision.h
@@ -35,6 +35,7 @@
/* new uImage format support */
#define CONFIG_FIT
#define CONFIG_FIT_VERBOSE /* enable fit_format_{error,warning}() */
+#define CONFIG_FIT_DISABLE_SHA256
#define CONFIG_ENV_IS_IN_FLASH /* use FLASH for environment vars */
@@ -59,8 +60,14 @@
/*
* Commands additional to the ones defined in amcc-common.h
*/
-#define CONFIG_CMD_CACHE
+#define CONFIG_CMD_DTT
+#undef CONFIG_CMD_DHCP
+#undef CONFIG_CMD_DIAG
#undef CONFIG_CMD_EEPROM
+#undef CONFIG_CMD_ELF
+#undef CONFIG_CMD_I2C
+#undef CONFIG_CMD_IRQ
+#undef CONFIG_CMD_NFS
/*
* SDRAM configuration (please see cpu/ppc/sdram.[ch])
--
1.8.3
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 7/7] mpc83xx: Add gdsys hrcon board
From: Dirk Eibach
The gdsys hrcon board is based on a Freescale MPC8308 SOC.
It boots from NOR-Flash, kernel and rootfs are stored on
SD-Card.
On board peripherals include:
- 1x GbE (optional)
- Lattice ECP3 FPGA connected via eLBC and PCIe
Signed-off-by: Dirk Eibach
---
Changes in v2:
- move cmd_ioloop from common to board/gdsys/common
- remove debug code from hrcon.c
arch/powerpc/cpu/mpc83xx/Kconfig | 4 +
board/gdsys/405ep/iocon.c| 190 +--
board/gdsys/common/Makefile | 4 +-
board/gdsys/common/cmd_ioloop.c | 295 +
board/gdsys/common/ihs_mdio.c| 88 +
board/gdsys/common/ihs_mdio.h| 18 ++
board/gdsys/common/phy.c | 280
board/gdsys/common/phy.h | 14 +
board/gdsys/mpc8308/Kconfig | 12 +
board/gdsys/mpc8308/MAINTAINERS | 6 +
board/gdsys/mpc8308/Makefile | 9 +
board/gdsys/mpc8308/hrcon.c | 675 +++
board/gdsys/mpc8308/mpc8308.c| 109 +++
board/gdsys/mpc8308/mpc8308.h| 10 +
board/gdsys/mpc8308/sdram.c | 82 +
configs/hrcon_defconfig | 3 +
include/configs/hrcon.h | 614 +++
include/gdsys_fpga.h | 64 +++-
18 files changed, 2282 insertions(+), 195 deletions(-)
create mode 100644 board/gdsys/common/cmd_ioloop.c
create mode 100644 board/gdsys/common/ihs_mdio.c
create mode 100644 board/gdsys/common/ihs_mdio.h
create mode 100644 board/gdsys/common/phy.c
create mode 100644 board/gdsys/common/phy.h
create mode 100644 board/gdsys/mpc8308/Kconfig
create mode 100644 board/gdsys/mpc8308/MAINTAINERS
create mode 100644 board/gdsys/mpc8308/Makefile
create mode 100644 board/gdsys/mpc8308/hrcon.c
create mode 100644 board/gdsys/mpc8308/mpc8308.c
create mode 100644 board/gdsys/mpc8308/mpc8308.h
create mode 100644 board/gdsys/mpc8308/sdram.c
create mode 100644 configs/hrcon_defconfig
create mode 100644 include/configs/hrcon.h
diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig
index 2a1abe0..69a600c 100644
--- a/arch/powerpc/cpu/mpc83xx/Kconfig
+++ b/arch/powerpc/cpu/mpc83xx/Kconfig
@@ -68,6 +68,9 @@ config TARGET_TUXX1
config TARGET_TQM834X
bool "Support TQM834x"
+config TARGET_HRCON
+ bool "Support hrcon"
+
endchoice
source "board/esd/vme8349/Kconfig"
@@ -88,5 +91,6 @@ source "board/mpc8308_p1m/Kconfig"
source "board/sbc8349/Kconfig"
source "board/tqc/tqm834x/Kconfig"
source "board/ve8313/Kconfig"
+source "board/gdsys/mpc8308/Kconfig"
endmenu
diff --git a/board/gdsys/405ep/iocon.c b/board/gdsys/405ep/iocon.c
index 1d7e141..3a51d86 100644
--- a/board/gdsys/405ep/iocon.c
+++ b/board/gdsys/405ep/iocon.c
@@ -17,6 +17,7 @@
#include "../common/osd.h"
#include "../common/mclink.h"
+#include "../common/phy.h"
#include
#include
@@ -98,8 +99,6 @@ enum {
unsigned int mclink_fpgacount;
struct ihs_fpga *fpga_ptr[] = CONFIG_SYS_FPGA_PTR;
-static int setup_88e1518(const char *bus, unsigned char addr);
-
int fpga_set_reg(u32 fpga, u16 *reg, off_t regoff, u16 data)
{
int res;
@@ -647,190 +646,3 @@ struct bb_miiphy_bus bb_miiphy_buses[] = {
int bb_miiphy_buses_num = sizeof(bb_miiphy_buses) /
sizeof(bb_miiphy_buses[0]);
-
-enum {
- MIICMD_SET,
- MIICMD_MODIFY,
- MIICMD_VERIFY_VALUE,
- MIICMD_WAIT_FOR_VALUE,
-};
-
-struct mii_setupcmd {
- u8 token;
- u8 reg;
- u16 data;
- u16 mask;
- u32 timeout;
-};
-
-/*
- * verify we are talking to a 88e1518
- */
-struct mii_setupcmd verify_88e1518[] = {
- { MIICMD_SET, 22, 0x },
- { MIICMD_VERIFY_VALUE, 2, 0x0141, 0x },
- { MIICMD_VERIFY_VALUE, 3, 0x0dd0, 0xfff0 },
-};
-
-/*
- * workaround for erratum mentioned in 88E1518 release notes
- */
-struct mii_setupcmd fixup_88e1518[] = {
- { MIICMD_SET, 22, 0x00ff },
- { MIICMD_SET, 17, 0x214b },
- { MIICMD_SET, 16, 0x2144 },
- { MIICMD_SET, 17, 0x0c28 },
- { MIICMD_SET, 16, 0x2146 },
- { MIICMD_SET, 17, 0xb233 },
- { MIICMD_SET, 16, 0x214d },
- { MIICMD_SET, 17, 0xcc0c },
- { MIICMD_SET, 16, 0x2159 },
- { MIICMD_SET, 22, 0x00fb },
- { MIICMD_SET, 7, 0xc00d },
- { MIICMD_SET, 22, 0x },
-};
-
-/*
- * default initialization:
- * - set RGMII receive timing to "receive clock transition when data stable"
- * - set RGMII transmit timing to "transmit clock internally delayed"
- * - set RGMII output impedance target to 78,8 Ohm
- * - run output impedance calibration
- * - set autonegotiation advertise to 1000FD only
- */
-struct mii_setupcmd default_88e1518[] = {
- { MIICMD_SET, 22, 0x0002 },
- { MIICMD_MODIFY, 21, 0x0030, 0x0030 },
- { MIICMD_MODIFY, 25, 0x, 0x0003 },
- { MIICMD_MODIFY, 24, 0x8000, 0x8000 },
- { MIICMD_WAIT_FOR_VALUE, 24, 0x4000, 0x4000, 2000 },
- { MIICMD_SET, 22, 0x },
- { MIICMD_MOD
[U-Boot] [PATCH v2 4/7] board: dlvision-10g: Compile fix
From: Dirk Eibach
Signed-off-by: Dirk Eibach
---
Changes in v2:
- fix compiler warning
board/gdsys/common/osd.c | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/board/gdsys/common/osd.c b/board/gdsys/common/osd.c
index 1c765e4..55ecdf1 100644
--- a/board/gdsys/common/osd.c
+++ b/board/gdsys/common/osd.c
@@ -289,7 +289,6 @@ int osd_probe(unsigned screen)
{
u16 version;
u16 features;
- u8 value;
int old_bus = i2c_get_bus_num();
bool pixclock_present = false;
bool output_driver_present = false;
@@ -330,7 +329,8 @@ int osd_probe(unsigned screen)
#ifdef CONFIG_SYS_CH7301_I2C
i2c_set_bus_num(ch7301_i2c[screen]);
if (!i2c_probe(CH7301_I2C_ADDR)) {
- value = i2c_reg_read(CH7301_I2C_ADDR, CH7301_DID);
+ u8 value = i2c_reg_read(CH7301_I2C_ADDR, CH7301_DID);
+
if (value == 0x17) {
i2c_reg_write(CH7301_I2C_ADDR, CH7301_TPCP, 0x08);
i2c_reg_write(CH7301_I2C_ADDR, CH7301_TPD, 0x16);
@@ -345,8 +345,7 @@ int osd_probe(unsigned screen)
#ifdef CONFIG_SYS_SIL1178_I2C
i2c_set_bus_num(sil1178_i2c[screen]);
if (!i2c_probe(SIL1178_SLAVE_I2C_ADDRESS)) {
- value = i2c_reg_read(SIL1178_SLAVE_I2C_ADDRESS, 0x02);
- if (value == 0x06) {
+ if (i2c_reg_read(SIL1178_SLAVE_I2C_ADDRESS, 0x02) == 0x06) {
/*
* magic initialization sequence,
* adapted from datasheet
--
1.8.3
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 6/7] board: iocon: Fix uninitialized access
From: Dirk Eibach
Wolfgang Denk found this issue using cppcheck:
(error) Uninitialized variable: fpga_features
Signed-off-by: Dirk Eibach
---
Changes in v2:
- fix cppcheck finding reported by Wolfgang
board/gdsys/405ep/iocon.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/board/gdsys/405ep/iocon.c b/board/gdsys/405ep/iocon.c
index fffed73..1d7e141 100644
--- a/board/gdsys/405ep/iocon.c
+++ b/board/gdsys/405ep/iocon.c
@@ -369,10 +369,11 @@ int last_stage_init(void)
unsigned char mclink_controllers[] = { 0x24, 0x25, 0x26 };
int legacy = get_fpga_state(0) & FPGA_STATE_PLATFORM;
u16 fpga_features;
- int feature_carrier_speed = fpga_features & (1<<4);
+ int feature_carrier_speed;
bool ch0_rgmii2_present = false;
FPGA_GET_REG(0, fpga_features, &fpga_features);
+ feature_carrier_speed = fpga_features & (1<<4);
if (!legacy) {
/* Turn on Parade DP501 */
--
1.8.3
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Booting non devicetree enabled kernels using u-boot build with CONFIG_OF_LIBFDT ?
On Thu, Nov 13, 2014 at 07:08:59PM +0100, Hans de Goede wrote: > Hi all, > > So as you know I've been working on getting mainline u-boot to boot the > older android derived linux-sunxi kernels, as some people need features > not yet in mainline, and I would like there to be only one u-boot for both. > > I had this working a while ago, but recently it broke, this is caused by > config_distro_defaults.h setting CONFIG_OF_LIBFDT, if I undef that > after including config_distro_defaults.h things work again. > > I do not know if CONFIG_OF_LIBFDT is a recent addition to > config_distro_defaults.h, > or if something else broke things. But if I do not undef it, boot fails with: > > sun7i# bootm start 0x4800 > ## Booting kernel from Legacy Image at 4800 ... >Image Name: Linux-3.4.75.sun7i+ >Image Type: ARM Linux Kernel Image (uncompressed) >Data Size:3966672 Bytes = 3.8 MiB >Load Address: 40008000 >Entry Point: 40008000 >Verifying Checksum ... OK > Could not find a valid device tree My hunch is that we've got more fall-out from Simon's re-org of the bootm code ages ago. It should be valid to try and boot a kernel without a device tree and other parts of the code base (for example arch/arm/lib/bootm.c) still do a FDT-or-ATAGS dance for example. -- 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] Booting non devicetree enabled kernels using u-boot build with CONFIG_OF_LIBFDT ?
Hi, On 11/13/2014 07:34 PM, Tom Rini wrote: > On Thu, Nov 13, 2014 at 07:08:59PM +0100, Hans de Goede wrote: >> Hi all, >> >> So as you know I've been working on getting mainline u-boot to boot the >> older android derived linux-sunxi kernels, as some people need features >> not yet in mainline, and I would like there to be only one u-boot for both. >> >> I had this working a while ago, but recently it broke, this is caused by >> config_distro_defaults.h setting CONFIG_OF_LIBFDT, if I undef that >> after including config_distro_defaults.h things work again. >> >> I do not know if CONFIG_OF_LIBFDT is a recent addition to >> config_distro_defaults.h, >> or if something else broke things. But if I do not undef it, boot fails with: >> >> sun7i# bootm start 0x4800 >> ## Booting kernel from Legacy Image at 4800 ... >>Image Name: Linux-3.4.75.sun7i+ >>Image Type: ARM Linux Kernel Image (uncompressed) >>Data Size:3966672 Bytes = 3.8 MiB >>Load Address: 40008000 >>Entry Point: 40008000 >>Verifying Checksum ... OK >> Could not find a valid device tree > > My hunch is that we've got more fall-out from Simon's re-org of the > bootm code ages ago. It should be valid to try and boot a kernel > without a device tree and other parts of the code base (for example > arch/arm/lib/bootm.c) still do a FDT-or-ATAGS dance for example. That is good news, because ideally upstream u-boot build with OLD_SUNXI_KERNEL_COMPAT should be able to boot old disk images without needing them to modify their boot.scr, which requiring bootm 0xfoo - - would do. So maybe check if there is a third argument to bootm, and if there is not still try the dance for finding one appended in various ways, and if that fails continue normally (where as with the third argument present this of course needs to stay an error) ? Regards, Hans ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
