Re: [PATCH 1/2] mv_ddr: ddr3: Use correct bitmask for read sample delay
On 27.05.20 03:31, Chris Packham wrote: From: Chris Packham In the Armada 385 functional spec (MV-S109094-00 Rev. C) the read sample delay fields are 5 bits wide. Use the correct bitmask of 0x1f when extracting the value. Signed-off-by: Chris Packham [upstream https://github.com/MarvellEmbeddedProcessors/mv-ddr-marvell/pull/22] Signed-off-by: Chris Packham --- Reviewed-by: Stefan Roese Thanks, Stefan drivers/ddr/marvell/a38x/ddr3_training_hw_algo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/ddr/marvell/a38x/ddr3_training_hw_algo.c b/drivers/ddr/marvell/a38x/ddr3_training_hw_algo.c index df832ac6dce0..ce9a47fc2ce0 100644 --- a/drivers/ddr/marvell/a38x/ddr3_training_hw_algo.c +++ b/drivers/ddr/marvell/a38x/ddr3_training_hw_algo.c @@ -11,7 +11,7 @@ #define VREF_MAX_INDEX7 #define MAX_VALUE (1024 - 1) #define MIN_VALUE (-MAX_VALUE) -#define GET_RD_SAMPLE_DELAY(data, cs) ((data >> rd_sample_mask[cs]) & 0xf) +#define GET_RD_SAMPLE_DELAY(data, cs) ((data >> rd_sample_mask[cs]) & 0x1f) u32 ca_delay; int ddr3_tip_centr_skip_min_win_check = 0; Viele Grüße, Stefan -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: s...@denx.de
Re: [PATCH 2/2] mv_ddr: ddr3: Update {min,max}_read_sample calculation
On 27.05.20 03:31, Chris Packham wrote: From: Chris Packham Measurements on actual hardware shown that the read ODT is early by 3 clocks. Adjust the calculation to avoid this. Signed-off-by: Chris Packham [upstream https://github.com/MarvellEmbeddedProcessors/mv-ddr-marvell/pull/22] Signed-off-by: Chris Packham --- Reviewed-by: Stefan Roese Thanks, Stefan drivers/ddr/marvell/a38x/ddr3_training_hw_algo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/ddr/marvell/a38x/ddr3_training_hw_algo.c b/drivers/ddr/marvell/a38x/ddr3_training_hw_algo.c index ce9a47fc2ce0..58ffb205072e 100644 --- a/drivers/ddr/marvell/a38x/ddr3_training_hw_algo.c +++ b/drivers/ddr/marvell/a38x/ddr3_training_hw_algo.c @@ -91,8 +91,8 @@ int ddr3_tip_write_additional_odt_setting(u32 dev_num, u32 if_id) min_read_sample = read_sample[cs_num]; } - min_read_sample = min_read_sample - 1; - max_read_sample = max_read_sample + 4 + (max_phase + 1) / 2 + 1; + min_read_sample = min_read_sample + 2; + max_read_sample = max_read_sample + 7 + (max_phase + 1) / 2 + 1; if (min_read_sample >= 0xf) min_read_sample = 0xf; if (max_read_sample >= 0x1f) Viele Grüße, Stefan -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: s...@denx.de
Re: [PATCH] SPI_DM: Drop non DM support
On 26.05.20 18:17, Bhargav Shah wrote: + Dropped non DM support from Krikwood SPI s/Krikwood/Kirkwood + Modify config files Another comment: Please use a different patch subject next time. Something like this would be better: spi: kirkwood: Drop non-DM support and enable DM_SPI on all boards Other than that: Reviewed-by: Stefan Roese Thanks, Stefan Signed-off-by: Bhargav Shah diff --git a/configs/clearfog_defconfig b/configs/clearfog_defconfig index 449c3a435e..2022779c47 100644 --- a/configs/clearfog_defconfig +++ b/configs/clearfog_defconfig @@ -67,6 +67,8 @@ CONFIG_PCI_MVEBU=y CONFIG_SCSI=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=y diff --git a/configs/clearfog_gt_8k_defconfig b/configs/clearfog_gt_8k_defconfig index 2b6445a3f1..11035ff86c 100644 --- a/configs/clearfog_gt_8k_defconfig +++ b/configs/clearfog_gt_8k_defconfig @@ -67,6 +67,8 @@ CONFIG_DM_REGULATOR_FIXED=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=y diff --git a/configs/controlcenterdc_defconfig b/configs/controlcenterdc_defconfig index 4ac46ff759..ca2121ef47 100644 --- a/configs/controlcenterdc_defconfig +++ b/configs/controlcenterdc_defconfig @@ -73,6 +73,8 @@ CONFIG_PCI_MVEBU=y CONFIG_SCSI=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_TPM_ATMEL_TWI=y CONFIG_TPM_AUTH_SESSIONS=y diff --git a/configs/crs305-1g-4s_defconfig b/configs/crs305-1g-4s_defconfig index 7632fc4254..0e61b889bd 100644 --- a/configs/crs305-1g-4s_defconfig +++ b/configs/crs305-1g-4s_defconfig @@ -48,4 +48,6 @@ CONFIG_SPI_FLASH_WINBOND=y CONFIG_PCI=y CONFIG_PCI_MVEBU=y CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y diff --git a/configs/d2net_v2_defconfig b/configs/d2net_v2_defconfig index fe3c6c4762..82295906ef 100644 --- a/configs/d2net_v2_defconfig +++ b/configs/d2net_v2_defconfig @@ -46,7 +46,9 @@ CONFIG_SPI_FLASH_MACRONIX=y CONFIG_MVGBE=y CONFIG_MII=y CONFIG_SYS_NS16550=y +CONFIG_DM=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/db-88f6281-bp-nand_defconfig b/configs/db-88f6281-bp-nand_defconfig index f98e462d42..87813b67aa 100644 --- a/configs/db-88f6281-bp-nand_defconfig +++ b/configs/db-88f6281-bp-nand_defconfig @@ -53,6 +53,7 @@ CONFIG_DM_RTC=y CONFIG_RTC_MV=y CONFIG_SYS_NS16550=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=y diff --git a/configs/db-88f6720_defconfig b/configs/db-88f6720_defconfig index e5a18d8096..865a8bb583 100644 --- a/configs/db-88f6720_defconfig +++ b/configs/db-88f6720_defconfig @@ -56,6 +56,8 @@ CONFIG_MVPP2=y CONFIG_MII=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=y diff --git a/configs/db-88f6820-amc_defconfig b/configs/db-88f6820-amc_defconfig index 146ea50b89..0ed553c7ba 100644 --- a/configs/db-88f6820-amc_defconfig +++ b/configs/db-88f6820-amc_defconfig @@ -71,6 +71,8 @@ CONFIG_PCI=y CONFIG_PCI_MVEBU=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=y diff --git a/configs/db-88f6820-gp_defconfig b/configs/db-88f6820-gp_defconfig index 20848abae2..9fd54b7ea2 100644 --- a/configs/db-88f6820-gp_defconfig +++ b/configs/db-88f6820-gp_defconfig @@ -65,6 +65,8 @@ CONFIG_PCI_MVEBU=y CONFIG_SCSI=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=y diff --git a/configs/db-mv784mp-gp_defconfig b/configs/db-mv784mp-gp_defconfig index ab96622873..2924be41b2 100644 --- a/configs/db-mv784mp-gp_defconfig +++ b/configs/db-mv784mp-gp_defconfig @@ -66,6 +66,8 @@ CONFIG_PCI=y CONFIG_PCI_MVEBU=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=y diff --git a/configs/db-xc3-24g4xg_defconfig b/configs/db-xc3-24g4xg_defconfig index 2bbff64665..a33a0bcabc 100644 --- a/configs/db-xc3-24g4xg_defconfig +++ b/configs/db-xc3-24g4xg_defconfig @@ -53,6 +53,8 @@ CONFIG_SPI_FLASH_SST=y CONFIG_PCI=y CONFIG_PCI_MVEBU=y CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=y diff --git a/configs/ds414_defconfig b/configs/ds414_defconfig index 7d395d1e26..8b2fa7d081 100644 --- a/configs/ds414_defconfig +++ b/configs/ds414_defconfig @@ -61,6 +61,8 @@ CONFIG_PCI=y CONFIG_PCI_MVEBU=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=y diff --git a/configs/helios4_defconfig
Re: [PATCH v3] arm: mvebu: Convert CRS305-1G-4S board to CRS3xx-98DX3236
On 26.05.20 20:17, Luka Kovacic wrote:
Convert the CRS305-1G-4S board to CRS3xx-98DX3236 to enable easier
implementation of new CRS3xx series boards, based on Marvell Prestera
98DX3236.
Signed-off-by: Luka Kovacic
Cc: Luka Perkov
Cc: Jakov Petrina
Reviewed-by: Stefan Roese
Thanks,
Stefan
---
Changes for v2:
- Fix the patch failing to merge into the current U-Boot tree
Changes for v3:
- Fix the patch failing to merge into the current U-Boot tree
arch/arm/dts/armada-xp-crs305-1g-4s.dts | 103 +---
arch/arm/dts/armada-xp-crs305-1g-4s.dtsi | 111 ++
arch/arm/mach-mvebu/Kconfig | 10 +-
board/mikrotik/crs305-1g-4s/MAINTAINERS | 7 --
.../.gitignore| 0
board/mikrotik/crs3xx-98dx3236/MAINTAINERS| 11 ++
.../Makefile | 2 +-
.../{crs305-1g-4s => crs3xx-98dx3236}/README | 12 +-
.../binary.0 | 0
.../crs3xx-98dx3236.c}| 0
.../kwbimage.cfg.in | 2 +-
configs/crs305-1g-4s_defconfig| 46
.../{crs305-1g-4s.h => crs3xx-98dx3236.h} | 6 +-
13 files changed, 165 insertions(+), 145 deletions(-)
create mode 100644 arch/arm/dts/armada-xp-crs305-1g-4s.dtsi
delete mode 100644 board/mikrotik/crs305-1g-4s/MAINTAINERS
rename board/mikrotik/{crs305-1g-4s => crs3xx-98dx3236}/.gitignore (100%)
create mode 100644 board/mikrotik/crs3xx-98dx3236/MAINTAINERS
rename board/mikrotik/{crs305-1g-4s => crs3xx-98dx3236}/Makefile (93%)
rename board/mikrotik/{crs305-1g-4s => crs3xx-98dx3236}/README (64%)
rename board/mikrotik/{crs305-1g-4s => crs3xx-98dx3236}/binary.0 (100%)
rename board/mikrotik/{crs305-1g-4s/crs305-1g-4s.c =>
crs3xx-98dx3236/crs3xx-98dx3236.c} (100%)
rename board/mikrotik/{crs305-1g-4s => crs3xx-98dx3236}/kwbimage.cfg.in (75%)
rename include/configs/{crs305-1g-4s.h => crs3xx-98dx3236.h} (87%)
diff --git a/arch/arm/dts/armada-xp-crs305-1g-4s.dts
b/arch/arm/dts/armada-xp-crs305-1g-4s.dts
index 1116f5c96c..010b83b542 100644
--- a/arch/arm/dts/armada-xp-crs305-1g-4s.dts
+++ b/arch/arm/dts/armada-xp-crs305-1g-4s.dts
@@ -1,110 +1,17 @@
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
/*
- * Device Tree file for CRS305-1G-4S board
+ * Device Tree file for MikroTik CRS305-1G-4S+ board
*
- * Copyright (C) 2016 Allied Telesis Labs
- *
- * Based on armada-xp-db.dts
- *
- * Note: this Device Tree assumes that the bootloader has remapped the
- * internal registers to 0xf100 (instead of the default
- * 0xd000). The 0xf100 is the default used by the recent,
- * DT-capable, U-Boot bootloaders provided by Marvell. Some earlier
- * boards were delivered with an older version of the bootloader that
- * left internal registers mapped at 0xd000. If you are in this
- * situation, you should either update your bootloader (preferred
- * solution) or the below Device Tree should be adjusted.
+ * Copyright (C) 2020 Sartura Ltd.
+ * Author: Luka Kovacic
*/
-/dts-v1/;
-#include "armada-xp-98dx3236.dtsi"
-#include "armada-xp-crs305-1g-4s-u-boot.dtsi"
+#include "armada-xp-crs305-1g-4s.dtsi"
/ {
- model = "CRS305-1G-4S";
- compatible = "marvell,armadaxp-98dx3236", "marvell,armadaxp-mv78260",
"marvell,armadaxp", "marvell,armada-370-xp";
-
- chosen {
- stdout-path = "serial0:115200n8";
- bootargs = "console=ttyS0,115200 earlyprintk";
- };
-
- aliases {
- spi0 =
- };
-
- memory {
- device_type = "memory";
- reg = <0 0x 0 0x2000>; /* 512 MB */
- };
-};
-
- {
- arm,parity-enable;
- marvell,ecc-enable;
-};
-
-_bootcs {
- status = "okay";
-
- /* Device Bus parameters are required */
-
- /* Read parameters */
- devbus,bus-width= <16>;
- devbus,turn-off-ps = <6>;
- devbus,badr-skew-ps = <0>;
- devbus,acc-first-ps = <124000>;
- devbus,acc-next-ps = <248000>;
- devbus,rd-setup-ps = <0>;
- devbus,rd-hold-ps = <0>;
-
- /* Write parameters */
- devbus,sync-enable = <0>;
- devbus,wr-high-ps = <6>;
- devbus,wr-low-ps = <6>;
- devbus,ale-wr-ps = <6>;
-};
-
- {
- status = "okay";
-};
-
- {
- status = "okay";
-};
-
- {
- clock-frequency = <10>;
- status = "okay";
-};
-
- {
- status = "okay";
+ model = "MikroTik CRS305-1G-4S+";
};
{
status = "okay";
-
- spi-flash@0 {
- #address-cells = <1>;
- #size-cells = <1>;
- compatible = "spi-flash", "jedec,spi-nor";
- reg = <0>; /* Chip select 0 */
- spi-max-frequency = <10800>;
- m25p,fast-read;
-
- partition@u-boot {
- reg = <0x
Re: [PATCH 2/2] mv_ddr: ddr3: Update {min, max}_read_sample calculation
Hi Chris,
On Wed, May 27 2020, Chris Packham wrote:
> From: Chris Packham
>
> Measurements on actual hardware shown that the read ODT is early by 3
> clocks. Adjust the calculation to avoid this.
>
> Signed-off-by: Chris Packham
>
> [upstream https://github.com/MarvellEmbeddedProcessors/mv-ddr-marvell/pull/22]
> Signed-off-by: Chris Packham
Tested here on an Armada 385 based system. Running memtester for more
than an hour.
Tested-by: Baruch Siach
Thanks,
baruch
> ---
>
> drivers/ddr/marvell/a38x/ddr3_training_hw_algo.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/ddr/marvell/a38x/ddr3_training_hw_algo.c
> b/drivers/ddr/marvell/a38x/ddr3_training_hw_algo.c
> index ce9a47fc2ce0..58ffb205072e 100644
> --- a/drivers/ddr/marvell/a38x/ddr3_training_hw_algo.c
> +++ b/drivers/ddr/marvell/a38x/ddr3_training_hw_algo.c
> @@ -91,8 +91,8 @@ int ddr3_tip_write_additional_odt_setting(u32 dev_num, u32
> if_id)
> min_read_sample = read_sample[cs_num];
> }
>
> - min_read_sample = min_read_sample - 1;
> - max_read_sample = max_read_sample + 4 + (max_phase + 1) / 2 + 1;
> + min_read_sample = min_read_sample + 2;
> + max_read_sample = max_read_sample + 7 + (max_phase + 1) / 2 + 1;
> if (min_read_sample >= 0xf)
> min_read_sample = 0xf;
> if (max_read_sample >= 0x1f)
--
~. .~ Tk Open Systems
=}ooO--U--Ooo{=
- bar...@tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
Re: [PATCH 1/1] efi_loader: allow compiling with clang
On Wed, May 27, 2020 at 02:54:06AM +0200, Heinrich Schuchardt wrote: > On ARM systems gd is stored in register r9 or x18. When compiling with > clang gd is defined as a macro calling function gd_ptr(). So we can not > make assignments to gd. > > In the UEFI sub-system we need to save gd when leaving to UEFI binaries and > have to restore gd when reentering U-Boot. > > Define a new function set_gd() for setting gd and use it in the UEFI > sub-system. > > Signed-off-by: Heinrich Schuchardt Tested-by: Tom Rini [Raspberry Pi 3, 32bit, Clang 10] -- Tom signature.asc Description: PGP signature
[PATCH 2/2] mv_ddr: ddr3: Update {min,max}_read_sample calculation
From: Chris Packham Measurements on actual hardware shown that the read ODT is early by 3 clocks. Adjust the calculation to avoid this. Signed-off-by: Chris Packham [upstream https://github.com/MarvellEmbeddedProcessors/mv-ddr-marvell/pull/22] Signed-off-by: Chris Packham --- drivers/ddr/marvell/a38x/ddr3_training_hw_algo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/ddr/marvell/a38x/ddr3_training_hw_algo.c b/drivers/ddr/marvell/a38x/ddr3_training_hw_algo.c index ce9a47fc2ce0..58ffb205072e 100644 --- a/drivers/ddr/marvell/a38x/ddr3_training_hw_algo.c +++ b/drivers/ddr/marvell/a38x/ddr3_training_hw_algo.c @@ -91,8 +91,8 @@ int ddr3_tip_write_additional_odt_setting(u32 dev_num, u32 if_id) min_read_sample = read_sample[cs_num]; } - min_read_sample = min_read_sample - 1; - max_read_sample = max_read_sample + 4 + (max_phase + 1) / 2 + 1; + min_read_sample = min_read_sample + 2; + max_read_sample = max_read_sample + 7 + (max_phase + 1) / 2 + 1; if (min_read_sample >= 0xf) min_read_sample = 0xf; if (max_read_sample >= 0x1f) -- 2.25.1
[PATCH 1/2] mv_ddr: ddr3: Use correct bitmask for read sample delay
From: Chris Packham In the Armada 385 functional spec (MV-S109094-00 Rev. C) the read sample delay fields are 5 bits wide. Use the correct bitmask of 0x1f when extracting the value. Signed-off-by: Chris Packham [upstream https://github.com/MarvellEmbeddedProcessors/mv-ddr-marvell/pull/22] Signed-off-by: Chris Packham --- drivers/ddr/marvell/a38x/ddr3_training_hw_algo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/ddr/marvell/a38x/ddr3_training_hw_algo.c b/drivers/ddr/marvell/a38x/ddr3_training_hw_algo.c index df832ac6dce0..ce9a47fc2ce0 100644 --- a/drivers/ddr/marvell/a38x/ddr3_training_hw_algo.c +++ b/drivers/ddr/marvell/a38x/ddr3_training_hw_algo.c @@ -11,7 +11,7 @@ #define VREF_MAX_INDEX 7 #define MAX_VALUE (1024 - 1) #define MIN_VALUE (-MAX_VALUE) -#define GET_RD_SAMPLE_DELAY(data, cs) ((data >> rd_sample_mask[cs]) & 0xf) +#define GET_RD_SAMPLE_DELAY(data, cs) ((data >> rd_sample_mask[cs]) & 0x1f) u32 ca_delay; int ddr3_tip_centr_skip_min_win_check = 0; -- 2.25.1
[PATCH 0/2] mvebu: ddr3: Armada-385 read ODT configuration
We've been doing some finer grained testing on our Armada-385 based
platforms and found that on a read the ODT was kicking in 3 clock cycles
too early.
It is likely this has gone unnoticed because prior to commit 247c80d6b8ad
("mv_ddr: ddr3: only use active chip-selects when tuning ODT") most
systems would have ended up maxing out the read ODT values.
Marvell have been directing us to add 3 to the min/max read calculation
and that seems to do the trick. Rather than just adding +3 I've adjusted
the existing manipulations.
I've only got access to our x530 platform at the moment so it would be
good if anyone with access to other Armada-385 could take this for a
spin.
Chris Packham (2):
mv_ddr: ddr3: Use correct bitmask for read sample delay
mv_ddr: ddr3: Update {min,max}_read_sample calculation
drivers/ddr/marvell/a38x/ddr3_training_hw_algo.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
2.25.1
[PATCH 1/1] efi_loader: allow compiling with clang
On ARM systems gd is stored in register r9 or x18. When compiling with
clang gd is defined as a macro calling function gd_ptr(). So we can not
make assignments to gd.
In the UEFI sub-system we need to save gd when leaving to UEFI binaries and
have to restore gd when reentering U-Boot.
Define a new function set_gd() for setting gd and use it in the UEFI
sub-system.
Signed-off-by: Heinrich Schuchardt
---
arch/arm/include/asm/global_data.h | 9 +
lib/efi_loader/efi_boottime.c | 10 +-
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/arch/arm/include/asm/global_data.h
b/arch/arm/include/asm/global_data.h
index f23b6bfb75..7c0905d240 100644
--- a/arch/arm/include/asm/global_data.h
+++ b/arch/arm/include/asm/global_data.h
@@ -117,4 +117,13 @@ static inline gd_t *get_gd(void)
#endif
#endif
+static inline void set_gd(volatile gd_t *gd_ptr)
+{
+#ifdef CONFIG_ARM64
+ __asm__ volatile("ldr x18, %0\n" : : "m"(gd_ptr));
+#else
+ __asm__ volatile("ldr r9, %0\n" : : "m"(gd_ptr));
+#endif
+}
+
#endif /* __ASM_GBL_DATA_H */
diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c
index db34938196..1591ad8300 100644
--- a/lib/efi_loader/efi_boottime.c
+++ b/lib/efi_loader/efi_boottime.c
@@ -49,7 +49,7 @@ static efi_handle_t current_image;
* restriction so we need to manually swap its and our view of that register on
* EFI callback entry/exit.
*/
-static volatile void *efi_gd, *app_gd;
+static volatile gd_t *efi_gd, *app_gd;
#endif
/* 1 if inside U-Boot code, 0 if inside EFI payload code */
@@ -89,7 +89,7 @@ int __efi_entry_check(void)
#ifdef CONFIG_ARM
assert(efi_gd);
app_gd = gd;
- gd = efi_gd;
+ set_gd(efi_gd);
#endif
return ret;
}
@@ -99,7 +99,7 @@ int __efi_exit_check(void)
{
int ret = --entry_count == 0;
#ifdef CONFIG_ARM
- gd = app_gd;
+ set_gd(app_gd);
#endif
return ret;
}
@@ -123,7 +123,7 @@ void efi_restore_gd(void)
/* Only restore if we're already in EFI context */
if (!efi_gd)
return;
- gd = efi_gd;
+ set_gd(efi_gd);
#endif
}
@@ -2920,7 +2920,7 @@ efi_status_t EFIAPI efi_start_image(efi_handle_t
image_handle,
* otherwise __efi_entry_check() will put the wrong value into
* app_gd.
*/
- gd = app_gd;
+ set_gd(app_gd);
#endif
/*
* To get ready to call EFI_EXIT below we have to execute the
--
2.26.2
Re: [PATCH][v4 5/6] board: tbs2910: Enable distro_boot support.
On Sun, 1 Mar 2020 14:59:04 +0100 Soeren Moch wrote: > On 27.02.20 01:37, Denis 'GNUtoo' Carikli wrote: > > This keeps the compatibility with the old bootcmd. [...] > > --- a/include/configs/tbs2910.h > > +++ b/include/configs/tbs2910.h > > @@ -8,6 +8,15 @@ > > #ifndef __TBS2910_CONFIG_H > > #define __TBS2910_CONFIG_H > > > > +#define BOOT_TARGET_DEVICES(func) \ > > + func(MMC, mmc, 0) \ > > + func(MMC, mmc, 1) \ > > + func(MMC, mmc, 2) \ > > + func(SATA, sata, 0) \ > > + func(USB, usb, 0) > > + > > +#include > > + > > #include "mx6_common.h" > I prefer to include the new section below the existing #include > "mx6_common.h". This way we keep that include at the usual place in > the beginning, while marking the config_distro_bootcmd.h as special > case. Is right under the "General configuration" comment a good place for that? Denis. pgpTfcyN0J_Me.pgp Description: OpenPGP digital signature
[v2] Azure: Add 'tools-only' build for macOS X hosts
Add building the 'tools-only' target on macOS X 'Catalina'. Hopefully this will catch changes to host tools that are incompatible on BSD style environments. Signed-off-by: Tom Rini Changes in v2: - Add step to brew install gmake - Add display name to the build step --- .azure-pipelines.yml | 15 +++ 1 file changed, 15 insertions(+) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 88438e77a1fc..636500d6cead 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -1,6 +1,7 @@ variables: windows_vm: vs2017-win2016 ubuntu_vm: ubuntu-18.04 + macos_vm: macOS-10.15 ci_runner_image: trini/u-boot-gitlab-ci-runner:bionic-20200403-27Apr2020 # Add '-u 0' options for Azure pipelines, otherwise we get "permission # denied" error when it tries to "useradd -m -u 1001 vsts_azpcontainer", @@ -44,6 +45,20 @@ jobs: # Tell MSYS2 not to ‘cd’ our startup directory to HOME CHERE_INVOKING: yes + - job: tools_only_macOS +displayName: 'Ensure host tools build for macOS X' +pool: + vmImage: $(macos_vm) +steps: + - script: brew install make +displayName: Brew install dependencies + - script: | + gmake tools-only_config tools-only NO_SDL=1 \ +HOSTCFLAGS="-I/usr/local/opt/openssl@1.1/include" \ +HOSTLDFLAGS="-L/usr/local/opt/openssl@1.1/lib" \ +-j$(sysctl -n hw.logicalcpu) +displayName: 'Perform tools-only build' + - job: cppcheck displayName: 'Static code analysis with cppcheck' pool: -- 2.17.1
[PATCH v3 1/5] imx8mp_evk: spl: drop useless code
From: Peng Fan
Drop useless getting ccm device, there is no need to explicted do this
in board code, and we not enable SPL CLK currently.
Signed-off-by: Peng Fan
Signed-off-by: Fabio Estevam
---
Changes since v2:
- None. Rebased against U-Boot master
board/freescale/imx8mp_evk/spl.c | 14 --
1 file changed, 14 deletions(-)
diff --git a/board/freescale/imx8mp_evk/spl.c b/board/freescale/imx8mp_evk/spl.c
index cd5b32c3f8..f2cc177757 100644
--- a/board/freescale/imx8mp_evk/spl.c
+++ b/board/freescale/imx8mp_evk/spl.c
@@ -29,11 +29,6 @@
#include
#include
-#include
-#include
-#include
-#include
-
DECLARE_GLOBAL_DATA_PTR;
int spl_board_boot_device(enum boot_device boot_dev_spl)
@@ -48,16 +43,7 @@ void spl_dram_init(void)
void spl_board_init(void)
{
- struct udevice *dev;
- int ret;
-
puts("Normal Boot\n");
-
- ret = uclass_get_device_by_name(UCLASS_CLK,
- "clock-controller@3038",
- );
- if (ret < 0)
- printf("Failed to find clock node. Check device tree\n");
}
#define I2C_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_HYS | PAD_CTL_PUE | PAD_CTL_PE)
--
2.17.1
[PATCH v3 3/5] imx8mp_evk: spl: use spl_early_init
From: Peng Fan
Use spl_early_init to replace spl_init, spl_init will be invoked
in board_init_r, we only need use spl_early_init to setup malloc
and scan early dt.
Signed-off-by: Peng Fan
Signed-off-by: Fabio Estevam
---
Changes since v2:
- None. Rebased against U-Boot master
board/freescale/imx8mp_evk/spl.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/board/freescale/imx8mp_evk/spl.c b/board/freescale/imx8mp_evk/spl.c
index 3b3112077a..6fc3df5aee 100644
--- a/board/freescale/imx8mp_evk/spl.c
+++ b/board/freescale/imx8mp_evk/spl.c
@@ -118,17 +118,17 @@ void board_init_f(ulong dummy)
board_early_init_f();
- preloader_console_init();
-
- /* Clear the BSS. */
- memset(__bss_start, 0, __bss_end - __bss_start);
-
- ret = spl_init();
+ ret = spl_early_init();
if (ret) {
debug("spl_init() failed: %d\n", ret);
hang();
}
+ preloader_console_init();
+
+ /* Clear the BSS. */
+ memset(__bss_start, 0, __bss_end - __bss_start);
+
enable_tzc380();
setup_i2c(0, CONFIG_SYS_I2C_SPEED, 0x7f, _pad_info1);
--
2.17.1
[PATCH v3 4/5] imx8mp_evk: spl: no need the code since spl framework could do that
From: Peng Fan
We no need invoke the code, since spl framework could help
us do that.
Signed-off-by: Peng Fan
Signed-off-by: Fabio Estevam
---
Changes since v2:
- None. Rebased against U-Boot master
board/freescale/imx8mp_evk/spl.c | 6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/board/freescale/imx8mp_evk/spl.c b/board/freescale/imx8mp_evk/spl.c
index 6fc3df5aee..f9aa0b0826 100644
--- a/board/freescale/imx8mp_evk/spl.c
+++ b/board/freescale/imx8mp_evk/spl.c
@@ -108,6 +108,7 @@ int board_fit_config_name_match(const char *name)
}
#endif
+/* Do not use BSS area in this phase */
void board_init_f(ulong dummy)
{
int ret;
@@ -126,9 +127,6 @@ void board_init_f(ulong dummy)
preloader_console_init();
- /* Clear the BSS. */
- memset(__bss_start, 0, __bss_end - __bss_start);
-
enable_tzc380();
setup_i2c(0, CONFIG_SYS_I2C_SPEED, 0x7f, _pad_info1);
@@ -137,6 +135,4 @@ void board_init_f(ulong dummy)
/* DDR initialization */
spl_dram_init();
-
- board_init_r(NULL, 0);
}
--
2.17.1
[PATCH v3 5/5] imx: imx8mp_evk: fix boot issue
From: Peng Fan The u-boot-spl.bin pad with ddr firmware conflicts with the CONFIG_MALLOC_F_ADDR area, the ddr firmware will be overwritten by malloc in SPL stage and cause ddr initialization not able to finish. So update the related addresses to fix the issue. Reported-by: Fabio Estevam Signed-off-by: Peng Fan Signed-off-by: Fabio Estevam --- Changes since v2: - None. Rebased against U-Boot master configs/imx8mp_evk_defconfig | 3 ++- include/configs/imx8mp_evk.h | 12 +--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/configs/imx8mp_evk_defconfig b/configs/imx8mp_evk_defconfig index 44b2935f69..3189b2ad99 100644 --- a/configs/imx8mp_evk_defconfig +++ b/configs/imx8mp_evk_defconfig @@ -4,7 +4,8 @@ CONFIG_SYS_TEXT_BASE=0x4020 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y -CONFIG_SYS_MALLOC_F_LEN=0x1 +CONFIG_SYS_MALLOC_F_LEN=0x8000 +CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_OFFSET=0x40 CONFIG_SYS_I2C_MXC_I2C1=y diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h index b346154fb3..7f38f21c09 100644 --- a/include/configs/imx8mp_evk.h +++ b/include/configs/imx8mp_evk.h @@ -24,16 +24,14 @@ #ifdef CONFIG_SPL_BUILD /*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/ #define CONFIG_SPL_LDSCRIPT"arch/arm/cpu/armv8/u-boot-spl.lds" -#define CONFIG_SPL_STACK 0x99 -#define CONFIG_SPL_BSS_START_ADDR 0x0095e000 -#define CONFIG_SPL_BSS_MAX_SIZE0x2000 /* 8 KB */ -#define CONFIG_SYS_SPL_MALLOC_START0x4220 -#define CONFIG_SYS_SPL_MALLOC_SIZE SZ_512K /* 512 KB */ +#define CONFIG_SPL_STACK 0x96 +#define CONFIG_SPL_BSS_START_ADDR 0x0098FC00 +#define CONFIG_SPL_BSS_MAX_SIZE0x400 /* 1 KB */ +#define CONFIG_SYS_SPL_MALLOC_START0x4220 +#define CONFIG_SYS_SPL_MALLOC_SIZE SZ_512K /* 512 KB */ #define CONFIG_SYS_ICACHE_OFF #define CONFIG_SYS_DCACHE_OFF -#define CONFIG_MALLOC_F_ADDR 0x94 - #define CONFIG_SPL_ABORT_ON_RAW_IMAGE #undef CONFIG_DM_MMC -- 2.17.1
[PATCH v3 2/5] imx8mp_evk: spl: drop timer_init
From: Peng Fan timer_init has been invoked in arch_cpu_init, no need to invoke it again in board code. Signed-off-by: Peng Fan Signed-off-by: Fabio Estevam --- Changes since v2: - None. Rebased against U-Boot master board/freescale/imx8mp_evk/spl.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/board/freescale/imx8mp_evk/spl.c b/board/freescale/imx8mp_evk/spl.c index 3f9e6fcc8f..3b3112077a 100644 --- a/board/freescale/imx8mp_evk/spl.c +++ b/board/freescale/imx8mp_evk/spl.c @@ -118,8 +118,6 @@ void board_init_f(ulong dummy) board_early_init_f(); - timer_init(); - preloader_console_init(); /* Clear the BSS. */ -- 2.17.1
Re: [PATCH] Azure: Add 'tools-only' build for macOS X hosts
On 5/18/20 2:52 PM, Tom Rini wrote:
> On Sun, May 17, 2020 at 12:48:42PM +1000, Jonathan Gray wrote:
>> On Sat, May 16, 2020 at 02:54:39PM -0400, Tom Rini wrote:
>>> Add building the 'tools-only' target on macOS X 'Catalina'. Hopefully
>>> this will catch changes to host tools that are incompatible on BSD style
>>> environments.
>>>
>>> Signed-off-by: Tom Rini
>>>
>>> Note that at this time commit 3b4847cbee7c
>>> ("efi_loader: support building UEFI binaries on sandbox") is causing
>>> this to fail as non-GNU make does not support 'undefine' and there's not
>>> gmake nor do we need (seemingly) to use gmake otherwise. If we must, we
>>> can look in to 'brew install gmake' I think but I'm trying to have this
>>> be a typical BSD build environment.
>>
>> For building U-Boot (with around 70 targets) in OpenBSD ports we depend
>> on the following additional ports not in the base system:
>>
>> devel/gmake
>> devel/bison
>> devel/dtc
>> devel/swig
>> textproc/gsed (with check-config.sh patched to use it over base sed)
>> lang/python (python3)
>>
>> for aarch64 targets
>> devel/arm-none-eabi/gcc-linaro,aarch64
>> devel/py-elftools
>> sysutils/arm-trusted-firmware
>>
>> for arm targets
>> devel/arm-none-eabi/gcc-linaro
>>
>> The host/system compiler on most OpenBSD platforms is clang.
>>
>> I would like to move to doing native builds when building on aarch64 and
>> armv7 platforms with the system clang. I wonder how many of the
>> warnings in doc/README.clang still apply.
>
> Thanks. Any updates to doc/README.clang would be good. It looks like
> there's still a large number of blocking problems on aarch64 for someone
> to solve (no libgcc, but could we just solve that another way?) and
> linking U-Boot itself fails, but maybe we can use the clang linker by
> now?
>
> On both 32 and 64bit ARM, EFI loader needs to be disabled for rpi at
> least to finish compiling, and on 32bit it does link and run.
>
In lib/efi_loader/efi_boottime.c and in lib/trace.c we are saving and
setting gd.
arch/arm/include/asm/global_data.h defines a function get_gd() which is
used with clang to retrieve the value of gd:
#ifdef __clang__
#define DECLARE_GLOBAL_DATA_PTR
#define gd get_gd()
...
So any statement
gd = foo;
like in __efi_entry_check() is bound to fail with clang.
Does that match your compilation problems with EFI_LOADER=y and clang?
Best regards
Heinrich
Re: [PATCH] video: ipuv3: remove some useless code to reduce binary size
On Tue, May 26, 2020 at 11:03:15PM +0200, Anatolij Gustschin wrote: > On Mon, 25 May 2020 12:05:14 -0400 > Tom Rini tr...@konsulko.com wrote: > > > On Mon, May 25, 2020 at 02:34:17PM +0200, Anatolij Gustschin wrote: > > > > > To enable DM_VIDEO we must decrease binary size to fix build > > > breakage for some boards, so drop not needed code. Also add > > > !DM_VIDEO guards which can be later removed when last non DM > > > users will be converted. > > > > > > Signed-off-by: Anatolij Gustschin > > > > Given that the migration deadline for non-DM video boards was the > > v2019.07 release, what's the case for not: > > 1. Perform the changes here, to save size. > > I've submitted more patches to save size, changes here were > not enough to fix building tbs2910 board with DM video enabled. Thanks a lot for doing all of this. > > 2. Enable conversions that can now be enabled. > > All boards using ipuv3 driver are now converted, I'll submit a > pull request to merge the changes. OK, I'll take it for -next so you can wait a bit more or I'll queue it up for when I open -next. > > 3. Disable video/drop platforms on unconverted boards. > > For boards with only DM video conversion missing, it makes sense > to disable video, but I don't know is this can be done for all > such boards (some do not have serial console and rely on working > display output). Some boards do not even enable DM, these are > candidates to drop. It's a tough call. I think just disabling video support, and CC'ing the maintainer is fine. That should cause one of: - Maintainer says they'll get to converting, does so. - Maintainer says they don't want to maintain the platform anymore (see mx23evk for example). - Maintainer email bounces. In the latter case we can (or rather, let me know, I will..) do a removal patch. -- Tom signature.asc Description: PGP signature
[PATCH 3/3] kconfig: fix typo for OHCI host and add to DM list
Description said that OHCI is not supported for driver model while it was converted too. Signed-off-by: Marcin Juszkiewicz --- drivers/usb/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git drivers/usb/Kconfig drivers/usb/Kconfig index 928a89133c..756a4ec402 100644 --- drivers/usb/Kconfig +++ drivers/usb/Kconfig @@ -39,8 +39,8 @@ config DM_USB help Enable driver model for USB. The USB interface is then implemented by the USB uclass. Multiple USB controllers of different types - (XHCI, EHCI) can be attached and used. The 'usb' command works as - normal. OCHI is not supported at present. + (XHCI, EHCI, OHCI) can be attached and used. The 'usb' command works + as normal. Much of the code is shared but with this option enabled the USB uclass takes care of device enumeration. USB devices can be -- 2.26.2
[PATCH 1/3] kconfig: mark SPL/TPL options for DM_KEYBOARD
All three options had the same description. Signed-off-by: Marcin Juszkiewicz --- drivers/input/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git drivers/input/Kconfig drivers/input/Kconfig index a3bdd9fa34..a17e55e997 100644 --- drivers/input/Kconfig +++ drivers/input/Kconfig @@ -21,7 +21,7 @@ config DM_KEYBOARD input and update LEDs if the keyboard has them. config SPL_DM_KEYBOARD - bool "Enable driver model keyboard support" + bool "Enable driver model keyboard support for SPL" depends on SPL_DM help This adds a uclass for keyboards and implements keyboard support @@ -30,7 +30,7 @@ config SPL_DM_KEYBOARD input and update LEDs if the keyboard has them. config TPL_DM_KEYBOARD - bool "Enable driver model keyboard support" + bool "Enable driver model keyboard support for TPL" depends on TPL_DM help This adds a uclass for keyboards and implements keyboard support -- 2.26.2
[PATCH 2/3] kconfig: fix some typos
Signed-off-by: Marcin Juszkiewicz --- lib/Kconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git lib/Kconfig lib/Kconfig index f18bf3778b..af5c38afd9 100644 --- lib/Kconfig +++ lib/Kconfig @@ -162,7 +162,7 @@ config LIB_RAND bool "Pseudo-random library support" config LIB_HW_RAND - bool "HW Engine for random libray support" + bool "HW Engine for random library support" endchoice @@ -448,7 +448,7 @@ config ZSTD config SPL_LZ4 bool "Enable LZ4 decompression support in SPL" help - This enables support for tge LZ4 decompression algorithm in SPL. LZ4 + This enables support for the LZ4 decompression algorithm in SPL. LZ4 is a lossless data compression algorithm that is focused on fast compression and decompression speed. It belongs to the LZ77 family of byte-oriented compression schemes. @@ -456,7 +456,7 @@ config SPL_LZ4 config SPL_LZMA bool "Enable LZMA decompression support for SPL build" help - This enables support for LZMA compression altorithm for SPL boot. + This enables support for LZMA compression algorithm for SPL boot. config SPL_LZO bool "Enable LZO decompression support in SPL" -- 2.26.2
Re: [PATCH] video: ipuv3: remove some useless code to reduce binary size
On Mon, 25 May 2020 12:05:14 -0400 Tom Rini tr...@konsulko.com wrote: > On Mon, May 25, 2020 at 02:34:17PM +0200, Anatolij Gustschin wrote: > > > To enable DM_VIDEO we must decrease binary size to fix build > > breakage for some boards, so drop not needed code. Also add > > !DM_VIDEO guards which can be later removed when last non DM > > users will be converted. > > > > Signed-off-by: Anatolij Gustschin > > Given that the migration deadline for non-DM video boards was the > v2019.07 release, what's the case for not: > 1. Perform the changes here, to save size. I've submitted more patches to save size, changes here were not enough to fix building tbs2910 board with DM video enabled. > 2. Enable conversions that can now be enabled. All boards using ipuv3 driver are now converted, I'll submit a pull request to merge the changes. > 3. Disable video/drop platforms on unconverted boards. For boards with only DM video conversion missing, it makes sense to disable video, but I don't know is this can be done for all such boards (some do not have serial console and rely on working display output). Some boards do not even enable DM, these are candidates to drop. > 4. Drop non-DM code here. Patch already submitted to drop non-DM code here. -- Anatolij
[PATCH v2] colibri_imx6: fix video stdout in default environment
After migration to DM 'vga' name is not longer supported,
change it to 'vidconsole' in the default environment.
Signed-off-by: Anatolij Gustschin
Cc: Igor Opaniuk
---
Changes in v2:
- fix build error
include/configs/colibri_imx6.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index 3d248ef4ef..af17a0a137 100644
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -156,7 +156,8 @@
BOOTENV \
"bootcmd=setenv fdtfile ${fdt_file}; run distro_bootcmd; " \
"usb start ; " \
- "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \
+ "setenv stdout serial,vidconsole; " \
+ "setenv stdin serial,usbkbd\0" \
"boot_file=zImage\0" \
"console=ttymxc0\0" \
"defargs=enable_wait_mode=off galcore.contiguousSize=50331648\0" \
--
2.17.1
[PATCH v2] apalis_imx6: fix video stdout in default environment
After migration to DM 'vga' name is not longer supported,
change it to 'vidconsole' in the default environment.
Signed-off-by: Anatolij Gustschin
Cc: Igor Opaniuk
---
Changes in v2:
- fix build error
include/configs/apalis_imx6.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index 6f03058a78..c6c2f46a17 100644
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -173,7 +173,8 @@
BOOTENV \
"bootcmd=setenv fdtfile ${fdt_file}; run distro_bootcmd ; " \
"usb start ; " \
- "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \
+ "setenv stdout serial,vidconsole; " \
+ "setenv stdin serial,usbkbd\0" \
"boot_file=zImage\0" \
"console=ttymxc0\0" \
"defargs=enable_wait_mode=off vmalloc=400M\0" \
--
2.17.1
Re: Fwd: New Defects reported by Coverity Scan for Das U-Boot
On Tue, May 26, 2020 at 10:36:44PM +0200, Heinrich Schuchardt wrote:
> On 26.05.20 22:10, Tom Rini wrote:
> > On Tue, May 26, 2020 at 10:02:36PM +0200, Heinrich Schuchardt
> > wrote:
> >> On 26.05.20 20:40, Tom Rini wrote:
> >>> Ah, I thought you might not have been part of Coverity.
> >>> https://scan.coverity.com/projects/das-u-boot is where to
> >>> start, it will take GitHub credentials and then I can approve
> >>> you.
> >>
> >> Thanks for granting access. In the GUI one can really drill down
> >> into the explanation of the problem. This is very helpful.
> >
> > And thanks for digging more!
> >
> >>
> >>> ** CID 303760:(TAINTED_SCALAR)
> >>>
> >>>
> >>>
> >>
> >>>
> >>
> *** CID 303760:(TAINTED_SCALAR)
> >>> /cmd/efidebug.c: 938 in show_efi_boot_order() 932
> >>> } 933 p = label; 934
> >>> utf16_utf8_strncpy(, lo.label, label_len16); 935
> >>> printf("%2d: %s: %s\n", i + 1, var_name, label); 936
> >>> free(label); 937
> >> CID 303760:(TAINTED_SCALAR) Passing tainted variable
> >> "data" to a tainted sink.
> >>> 938 free(data); 939 } 940
> >>> out: 941 free(bootorder); 942 943
> >>> return ret; /cmd/efidebug.c: 929 in show_efi_boot_order() 923
> >>> efi_deserialize_load_option(, data); 924 925
> >>> label_len16 = u16_strlen(lo.label); 926
> >>> label_len = utf16_utf8_strnlen(lo.label,
> >> label_len16);
> >>> 927 label = malloc(label_len + 1); 928
> >>> if (!label) {
> >> CID 303760:(TAINTED_SCALAR) Passing tainted variable
> >> "data" to a tainted sink.
> >>> 929 free(data); 930
> >>> ret = CMD_RET_FAILURE; 931 goto
> >>> out; 932 } 933 p =
> >>> label; 934 utf16_utf8_strncpy(, lo.label,
> >>> label_len16);
> >>
> >> In CID 303760 the logic is as follows:
> >>
> >> In show_efi_boot_order() we malloc() memory. The allocated buffer
> >> is filled via byte swapping (get_unaligned_le16(),
> >> get_unaligned_le32()).
> >>
> >> Here comes Coverity's logic: "byte_swapping: Performing a byte
> >> swapping operation on ... implies that it came from an external
> >> source, and is therefore tainted."
> >>
> >> Now we pass the pointer to free(). Free() looks at 16 bytes
> >> preceding the pointer. Therefore free() is considered a tainted
> >> sink and an issue is raised.
> >>
> >> https://community.synopsys.com/s/article/From-Case-Clearing-TAINTED-STRING
> >>
> >>
> suggests to use Coverity specific comments to mark cleansing functions.
> >> This is not what I am inclined to do.
> >>
> >> CCing Takahiro as he had a hand in this code.
> >
> > So, option B on that link is what I was thinking about which is
> > creating a function in the model file to tell Coverity it's
> > handled. I was going to include what ours was already as I thought
> > I had written one, but there's not one in the dashboard currently.
> > And frankly a drawback of Coverity is that you can't iterate on
> > testing those kind of things easily.
>
> Here are example model files for Coverity:
>
> https://github.com/qemu/qemu/blob/master/scripts/coverity-model.c
> https://github.com/python/cpython/blob/master/Misc/coverity_model.c
>
> How many functions do you think we will have to maintain in the model
> file? Who will take the effort?
Ah yes, I think I looked at those a while ago and didn't come up with
anything that reduced our defects so I set it aside to look harder at
later. And haven't yet cycled back.
I would say once we have an initial functional skeleton in, any time
someone sees a Coverity defect that's a false positive and wants to
write a model function to cover it rather than just close it out in the
dashboard, we'll get an update to it and I'll push it to Coverity.
--
Tom
signature.asc
Description: PGP signature
Re: [PATCH 4/8] blance: Disable CONFIG_CMD_SF / CONFIG_CMD_SPI
On 5/26/20 9:26 PM, Tom Rini wrote: > On Tue, May 26, 2020 at 09:21:59PM +0200, Marek Vasut wrote: >> On 5/26/20 9:06 PM, Tom Rini wrote: >>> The config header for this platform disables both CMD_SF and CMD_SPI and >>> the defconfig leaves them enabled. Disable them from the defconfig and >>> enable them in the header. >>> >>> Cc: Marek Vasut >>> Cc: Masakazu Mochizuki >>> Signed-off-by: Tom Rini >>> --- >>> This is a case where it's hard to tell if this is the correct fix or if >>> both should be enabled instead. >> >> Blanche (with H) is booting from parallel NOR, it's unique that way. >> So this is a correct fix. > > I typo'd that a half dozen times, oops. > >> The tags should be ARM: rmobile: blanche: . Also CC Iwamatsu-san. > > Do you want to fixup the tag or should I when applying? Thanks. Fix it up when applying.
Re: Fwd: New Defects reported by Coverity Scan for Das U-Boot
On 26.05.20 22:10, Tom Rini wrote:
> On Tue, May 26, 2020 at 10:02:36PM +0200, Heinrich Schuchardt
> wrote:
>> On 26.05.20 20:40, Tom Rini wrote:
>>> Ah, I thought you might not have been part of Coverity.
>>> https://scan.coverity.com/projects/das-u-boot is where to
>>> start, it will take GitHub credentials and then I can approve
>>> you.
>>
>> Thanks for granting access. In the GUI one can really drill down
>> into the explanation of the problem. This is very helpful.
>
> And thanks for digging more!
>
>>
>>> ** CID 303760:(TAINTED_SCALAR)
>>>
>>>
>>>
>>
>>>
>>
*** CID 303760:(TAINTED_SCALAR)
>>> /cmd/efidebug.c: 938 in show_efi_boot_order() 932
>>> } 933 p = label; 934
>>> utf16_utf8_strncpy(, lo.label, label_len16); 935
>>> printf("%2d: %s: %s\n", i + 1, var_name, label); 936
>>> free(label); 937
>> CID 303760:(TAINTED_SCALAR) Passing tainted variable
>> "data" to a tainted sink.
>>> 938 free(data); 939 } 940
>>> out: 941 free(bootorder); 942 943
>>> return ret; /cmd/efidebug.c: 929 in show_efi_boot_order() 923
>>> efi_deserialize_load_option(, data); 924 925
>>> label_len16 = u16_strlen(lo.label); 926
>>> label_len = utf16_utf8_strnlen(lo.label,
>> label_len16);
>>> 927 label = malloc(label_len + 1); 928
>>> if (!label) {
>> CID 303760:(TAINTED_SCALAR) Passing tainted variable
>> "data" to a tainted sink.
>>> 929 free(data); 930
>>> ret = CMD_RET_FAILURE; 931 goto
>>> out; 932 } 933 p =
>>> label; 934 utf16_utf8_strncpy(, lo.label,
>>> label_len16);
>>
>> In CID 303760 the logic is as follows:
>>
>> In show_efi_boot_order() we malloc() memory. The allocated buffer
>> is filled via byte swapping (get_unaligned_le16(),
>> get_unaligned_le32()).
>>
>> Here comes Coverity's logic: "byte_swapping: Performing a byte
>> swapping operation on ... implies that it came from an external
>> source, and is therefore tainted."
>>
>> Now we pass the pointer to free(). Free() looks at 16 bytes
>> preceding the pointer. Therefore free() is considered a tainted
>> sink and an issue is raised.
>>
>> https://community.synopsys.com/s/article/From-Case-Clearing-TAINTED-STRING
>>
>>
suggests to use Coverity specific comments to mark cleansing functions.
>> This is not what I am inclined to do.
>>
>> CCing Takahiro as he had a hand in this code.
>
> So, option B on that link is what I was thinking about which is
> creating a function in the model file to tell Coverity it's
> handled. I was going to include what ours was already as I thought
> I had written one, but there's not one in the dashboard currently.
> And frankly a drawback of Coverity is that you can't iterate on
> testing those kind of things easily.
Here are example model files for Coverity:
https://github.com/qemu/qemu/blob/master/scripts/coverity-model.c
https://github.com/python/cpython/blob/master/Misc/coverity_model.c
How many functions do you think we will have to maintain in the model
file? Who will take the effort?
Best regards
Heinrich
>
> Option C is to just mark this (and the similar ones you can see via
> the dashboard) as false positive.
>
[PATCH] rockchip: rockpro64: enable DM_KEYBOARD
USB stack uses DM so DM_KEYBOARD is needed to get USB keyboard working. Signed-off-by: Marcin Juszkiewicz --- configs/rockpro64-rk3399_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git configs/rockpro64-rk3399_defconfig configs/rockpro64-rk3399_defconfig index 9d4343a5a7..a511c60d13 100644 --- configs/rockpro64-rk3399_defconfig +++ configs/rockpro64-rk3399_defconfig @@ -28,6 +28,7 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_DM_KEYBOARD=y CONFIG_MISC=y CONFIG_ROCKCHIP_EFUSE=y CONFIG_MMC_DW=y -- 2.26.2
Re: [PATCH] tbs2910: migrate to DM_VIDEO
On Sun, 24 May 2020 17:46:22 +0200 Soeren Moch sm...@web.de wrote: > On 23.05.20 01:24, Anatolij Gustschin wrote: > > Migration to DM_VIDEO driver is long overdue, configure it in > > board config files. To enable the display set stdout like: > > > > setenv stdout serial,vidconsole > > > > Signed-off-by: Anatolij Gustschin > > --- > > This is only build tested. > I tested this on top of v2020.07-rc2 and your patch > "video: extend stdout video console work-around for 'vga'" > > Works great. However, some comments below. Thanks for testing! ... > > +CONFIG_SYS_MALLOC_F_LEN=0x4000 > This is not necessary. The default 0x2000 also works fine. Dropped in v2. ... > Since DM_VIDEO requires vidconsole as output device, please also add > > ---8<--- > diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h > index 8ab3fcfe3e..82165a9ffe 100644 > --- a/include/configs/tbs2910.h > +++ b/include/configs/tbs2910.h > @@ -92,11 +92,11 @@ > "fan=gpio set 92\0" \ > "set_con_serial=setenv stdout serial; " \ > "setenv stderr serial\0" \ > - "set_con_hdmi=setenv stdout serial,vga; " \ > - "setenv stderr serial,vga\0" \ > - "stderr=serial,vga\0" \ > + "set_con_hdmi=setenv stdout serial,vidconsole; " \ > + "setenv stderr serial,vidconsole\0" \ > + "stderr=serial,vidconsole\0" \ > "stdin=serial,usbkbd\0" \ > - "stdout=serial,vga\0" > + "stdout=serial,vidconsole\0" > > #define CONFIG_BOOTCOMMAND \ > "mmc rescan; " \ > ---8<--- > > to avoid warnings for users with default environment.(not sure if > whitespace is still correct in this snippet) Done in v2. > With this DM_VIDEO conversion the board comes very close to the size > limit. While it works with my toolchain, there might be problems with > others. So maybe not a good idea to merge this as fix immediately. Yes, with GCC 9.2 it didn't work any more. I've submitted some DM_VIDEO patches to disable more unused code to fix this. > Since this depends on your above mentioned patch, do you plan to merge > this via u-boot-video, or should this go as usual through the imx tree? I'll merge this via u-boot-video tree. v2 patch depends on a few more video patches which are under review/built-test currently. -- Anatolij
Re: Fwd: New Defects reported by Coverity Scan for Das U-Boot
On Tue, May 26, 2020 at 10:02:36PM +0200, Heinrich Schuchardt wrote:
> On 26.05.20 20:40, Tom Rini wrote:
> > Ah, I thought you might not have been part of Coverity.
> > https://scan.coverity.com/projects/das-u-boot is where to start, it will
> > take GitHub credentials and then I can approve you.
>
> Thanks for granting access. In the GUI one can really drill down into
> the explanation of the problem. This is very helpful.
And thanks for digging more!
>
> > ** CID 303760:(TAINTED_SCALAR)
> >
> >
> >
>
> > *** CID 303760:(TAINTED_SCALAR)
> > /cmd/efidebug.c: 938 in show_efi_boot_order()
> > 932 }
> > 933 p = label;
> > 934 utf16_utf8_strncpy(, lo.label, label_len16);
> > 935 printf("%2d: %s: %s\n", i + 1, var_name, label);
> > 936 free(label);
> > 937
> CID 303760:(TAINTED_SCALAR)
> Passing tainted variable "data" to a tainted sink.
> > 938 free(data);
> > 939 }
> > 940 out:
> > 941 free(bootorder);
> > 942
> > 943 return ret;
> > /cmd/efidebug.c: 929 in show_efi_boot_order()
> > 923 efi_deserialize_load_option(, data);
> > 924
> > 925 label_len16 = u16_strlen(lo.label);
> > 926 label_len = utf16_utf8_strnlen(lo.label,
> label_len16);
> > 927 label = malloc(label_len + 1);
> > 928 if (!label) {
> CID 303760:(TAINTED_SCALAR)
> Passing tainted variable "data" to a tainted sink.
> > 929 free(data);
> > 930 ret = CMD_RET_FAILURE;
> > 931 goto out;
> > 932 }
> > 933 p = label;
> > 934 utf16_utf8_strncpy(, lo.label, label_len16);
>
> In CID 303760 the logic is as follows:
>
> In show_efi_boot_order() we malloc() memory. The allocated buffer is
> filled via byte swapping (get_unaligned_le16(), get_unaligned_le32()).
>
> Here comes Coverity's logic: "byte_swapping: Performing a byte swapping
> operation on ... implies that it came from an external source, and is
> therefore tainted."
>
> Now we pass the pointer to free(). Free() looks at 16 bytes preceding
> the pointer. Therefore free() is considered a tainted sink and an issue
> is raised.
>
> https://community.synopsys.com/s/article/From-Case-Clearing-TAINTED-STRING
> suggests to use Coverity specific comments to mark cleansing functions.
> This is not what I am inclined to do.
>
> CCing Takahiro as he had a hand in this code.
So, option B on that link is what I was thinking about which is creating
a function in the model file to tell Coverity it's handled. I was
going to include what ours was already as I thought I had written one,
but there's not one in the dashboard currently. And frankly a drawback
of Coverity is that you can't iterate on testing those kind of things
easily.
Option C is to just mark this (and the similar ones you can see via the
dashboard) as false positive.
--
Tom
signature.asc
Description: PGP signature
[PATCH v2] tbs2910: migrate to DM_VIDEO
Migration to DM_VIDEO driver is long overdue, configure it in board config files. To enable the display set stdout like: setenv stdout serial,vidconsole Signed-off-by: Anatolij Gustschin Tested-by: Soeren Moch --- Changes in v2: - add Tested-by tag - drop CONFIG_SYS_MALLOC_F_LEN change - update default environment to replace 'vga' strings - configure options disabling not used DM_VIDEO code (backlight, simple panel, cursor and string output commands) to fix build breakage with current CI toolchain configs/tbs2910_defconfig | 9 - include/configs/tbs2910.h | 10 -- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig index 2ff0e160f7..35c271c91e 100644 --- a/configs/tbs2910_defconfig +++ b/configs/tbs2910_defconfig @@ -84,7 +84,14 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_I2C_EDID=y +CONFIG_DM_VIDEO=y +# CONFIG_BACKLIGHT is not set +# CONFIG_CMD_VIDCONSOLE is not set +# CONFIG_VIDEO_BPP8 is not set +# CONFIG_VIDEO_BPP32 is not set +# CONFIG_VIDEO_ANSI is not set +# CONFIG_PANEL is not set CONFIG_VIDEO_IPUV3=y -CONFIG_VIDEO=y +CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_OF_LIBFDT_ASSUME_MASK=0xff # CONFIG_EFI_LOADER is not set diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index 7376b91f55..82165a9ffe 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -37,11 +37,9 @@ #define CONFIG_MXC_UART_BASE UART1_BASE /* select UART1/UART2 */ /* Framebuffer */ -#ifdef CONFIG_VIDEO #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP -#endif /* PCI */ #ifdef CONFIG_CMD_PCI @@ -94,11 +92,11 @@ "fan=gpio set 92\0" \ "set_con_serial=setenv stdout serial; " \ "setenv stderr serial\0" \ - "set_con_hdmi=setenv stdout serial,vga; " \ - "setenv stderr serial,vga\0" \ - "stderr=serial,vga\0" \ + "set_con_hdmi=setenv stdout serial,vidconsole; " \ + "setenv stderr serial,vidconsole\0" \ + "stderr=serial,vidconsole\0" \ "stdin=serial,usbkbd\0" \ - "stdout=serial,vga\0" + "stdout=serial,vidconsole\0" #define CONFIG_BOOTCOMMAND \ "mmc rescan; " \ -- 2.17.1
Re: Fwd: New Defects reported by Coverity Scan for Das U-Boot
On 26.05.20 20:40, Tom Rini wrote:
> Ah, I thought you might not have been part of Coverity.
> https://scan.coverity.com/projects/das-u-boot is where to start, it will
> take GitHub credentials and then I can approve you.
Thanks for granting access. In the GUI one can really drill down into
the explanation of the problem. This is very helpful.
> ** CID 303760:(TAINTED_SCALAR)
>
>
>
> *** CID 303760:(TAINTED_SCALAR)
> /cmd/efidebug.c: 938 in show_efi_boot_order()
> 932 }
> 933 p = label;
> 934 utf16_utf8_strncpy(, lo.label, label_len16);
> 935 printf("%2d: %s: %s\n", i + 1, var_name, label);
> 936 free(label);
> 937
CID 303760:(TAINTED_SCALAR)
Passing tainted variable "data" to a tainted sink.
> 938 free(data);
> 939 }
> 940 out:
> 941 free(bootorder);
> 942
> 943 return ret;
> /cmd/efidebug.c: 929 in show_efi_boot_order()
> 923 efi_deserialize_load_option(, data);
> 924
> 925 label_len16 = u16_strlen(lo.label);
> 926 label_len = utf16_utf8_strnlen(lo.label,
label_len16);
> 927 label = malloc(label_len + 1);
> 928 if (!label) {
CID 303760:(TAINTED_SCALAR)
Passing tainted variable "data" to a tainted sink.
> 929 free(data);
> 930 ret = CMD_RET_FAILURE;
> 931 goto out;
> 932 }
> 933 p = label;
> 934 utf16_utf8_strncpy(, lo.label, label_len16);
In CID 303760 the logic is as follows:
In show_efi_boot_order() we malloc() memory. The allocated buffer is
filled via byte swapping (get_unaligned_le16(), get_unaligned_le32()).
Here comes Coverity's logic: "byte_swapping: Performing a byte swapping
operation on ... implies that it came from an external source, and is
therefore tainted."
Now we pass the pointer to free(). Free() looks at 16 bytes preceding
the pointer. Therefore free() is considered a tainted sink and an issue
is raised.
https://community.synopsys.com/s/article/From-Case-Clearing-TAINTED-STRING
suggests to use Coverity specific comments to mark cleansing functions.
This is not what I am inclined to do.
CCing Takahiro as he had a hand in this code.
Best regards
Heinrich
Re: [U-Boot] Pull request: u-boot-riscv/master
On Tue, May 26, 2020 at 04:31:43PM +0800, ub...@andestech.com wrote: > Hi Tom, > > Please pull some riscv updates: > > - sifive: fix palmer's email address. > - Move all SMP related SBI calls to SBI_v01. > > Thanks > Rick > > > The following changes since commit 8c48bb21bd6a1778d1f299de30ff62c07929702b: > > Prepare v2020.07-rc3 (2020-05-25 20:34:01 -0400) > > are available in the Git repository at: > > g...@gitlab.denx.de:u-boot/custodians/u-boot-riscv.git > > for you to fetch changes up to 4ef196ce20fc832a412e8fedf51f2f20b3bd6e62: > > sifive: fix palmer's email address (2020-05-26 15:50:15 +0800) > Applied to u-boot/master, thanks! -- Tom signature.asc Description: PGP signature
Re: [PATCH 4/8] blance: Disable CONFIG_CMD_SF / CONFIG_CMD_SPI
On Tue, May 26, 2020 at 09:21:59PM +0200, Marek Vasut wrote: > On 5/26/20 9:06 PM, Tom Rini wrote: > > The config header for this platform disables both CMD_SF and CMD_SPI and > > the defconfig leaves them enabled. Disable them from the defconfig and > > enable them in the header. > > > > Cc: Marek Vasut > > Cc: Masakazu Mochizuki > > Signed-off-by: Tom Rini > > --- > > This is a case where it's hard to tell if this is the correct fix or if > > both should be enabled instead. > > Blanche (with H) is booting from parallel NOR, it's unique that way. > So this is a correct fix. I typo'd that a half dozen times, oops. > The tags should be ARM: rmobile: blanche: . Also CC Iwamatsu-san. Do you want to fixup the tag or should I when applying? Thanks. -- Tom signature.asc Description: PGP signature
Re: [PATCH v3 0/3] cmd: add driver, fs and part type listing commands
On Tue, May 26, 2020 at 09:57:19AM +0200, Wolfgang Denk wrote: > Dear Tom, > > for patch series all review comments have been resolved, and the > latest version has seen no further comments, but it has not been > pulled either. > > Is any further action required to get this into mainline? Ah, sorry. It's on my list to grab and see what the size growth is, since there's new features in generic code. I'll try and get to that soon. -- Tom signature.asc Description: PGP signature
Re: [PATCH 4/8] blance: Disable CONFIG_CMD_SF / CONFIG_CMD_SPI
On 5/26/20 9:06 PM, Tom Rini wrote: > The config header for this platform disables both CMD_SF and CMD_SPI and > the defconfig leaves them enabled. Disable them from the defconfig and > enable them in the header. > > Cc: Marek Vasut > Cc: Masakazu Mochizuki > Signed-off-by: Tom Rini > --- > This is a case where it's hard to tell if this is the correct fix or if > both should be enabled instead. Blanche (with H) is booting from parallel NOR, it's unique that way. So this is a correct fix. The tags should be ARM: rmobile: blanche: . Also CC Iwamatsu-san.
[PATCH 7/8] Convert CONFIG_CMD_ASKENV et al to Kconfig
This converts the following to Kconfig: CONFIG_CMD_ASKENV CONFIG_CMD_BMP CONFIG_CMD_BOOTD CONFIG_CMD_CACHE CONFIG_CMD_CRC32 CONFIG_CMD_DHCP CONFIG_CMD_ENV CONFIG_CMD_EXPORTENV CONFIG_CMD_EXT2 CONFIG_CMD_EXT4 CONFIG_CMD_FLASH CONFIG_CMD_FS_GENERIC CONFIG_CMD_FUSE CONFIG_CMD_GPIO CONFIG_CMD_GPT CONFIG_CMD_GREPENV CONFIG_CMD_I2C CONFIG_CMD_IMLS CONFIG_CMD_IMPORTENV CONFIG_CMD_LOADB CONFIG_CMD_LOADS CONFIG_CMD_MEMINFO CONFIG_CMD_MII CONFIG_CMD_MTDPARTS CONFIG_CMD_NAND CONFIG_CMD_NAND_TRIMFFS CONFIG_CMD_NFS CONFIG_CMD_PCA953X CONFIG_CMD_PCA953X_INFO CONFIG_CMD_PCI CONFIG_CMD_PING CONFIG_CMD_READ CONFIG_CMD_SF CONFIG_CMD_SPI CONFIG_CMD_SPL CONFIG_CMD_SPL_WRITE_SIZE CONFIG_CMD_TIME CONFIG_CMD_TRACE CONFIG_CMD_UBI CONFIG_CMD_UBIFS CONFIG_CMD_UNZIP CONFIG_FS_EXT4 Signed-off-by: Tom Rini --- README | 8 configs/am335x_shc_defconfig | 1 + configs/am335x_shc_ict_defconfig | 1 + configs/am335x_shc_netboot_defconfig | 1 + configs/am335x_shc_sdboot_defconfig | 1 + configs/apalis-tk1_defconfig | 1 + configs/apalis_imx6_defconfig| 4 configs/bcm7260_defconfig| 6 +- configs/bcm7445_defconfig| 3 +++ configs/cl-som-imx7_defconfig| 1 + configs/colibri_imx6_defconfig | 4 configs/deneb_defconfig | 3 +++ configs/display5_defconfig | 1 + configs/display5_factory_defconfig | 1 + configs/ds109_defconfig | 2 +- configs/ge_bx50v3_defconfig | 1 + configs/giedi_defconfig | 3 +++ configs/gurnard_defconfig| 3 +++ configs/gwventana_emmc_defconfig | 1 + configs/gwventana_gw5904_defconfig | 1 + configs/gwventana_nand_defconfig | 1 + configs/imx6dl_mamoj_defconfig | 1 + configs/imx6qdl_icore_mipi_defconfig | 1 + configs/imx6qdl_icore_mmc_defconfig | 1 + configs/imx6qdl_icore_rqs_defconfig | 1 + configs/imx8mq_evk_defconfig | 8 configs/imx8mq_phanbell_defconfig| 7 +++ configs/imx8qm_mek_defconfig | 2 ++ configs/imx8qm_rom7720_a1_4G_defconfig | 1 + configs/imx8qxp_mek_defconfig| 2 ++ configs/ls1012a2g5rdb_qspi_defconfig | 1 + configs/ls1012a2g5rdb_tfa_defconfig | 1 + configs/ls1012afrdm_qspi_defconfig | 1 + configs/ls1012afrdm_tfa_defconfig| 1 + configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig | 1 + configs/ls1012afrwy_qspi_defconfig | 1 + configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig| 1 + configs/ls1012afrwy_tfa_defconfig| 1 + configs/ls1012aqds_qspi_defconfig| 1 + configs/ls1012aqds_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1012aqds_tfa_defconfig | 1 + configs/ls1012ardb_qspi_SECURE_BOOT_defconfig| 1 + configs/ls1012ardb_qspi_defconfig| 1 + configs/ls1012ardb_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1012ardb_tfa_defconfig | 1 + configs/ls1021aiot_qspi_defconfig| 6 ++ configs/ls1021aiot_sdcard_defconfig | 6 ++ configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig | 1 + configs/ls1043ardb_sdcard_defconfig | 1 + configs/ls1088aqds_defconfig | 4 configs/ls1088aqds_qspi_SECURE_BOOT_defconfig| 4 configs/ls1088aqds_qspi_defconfig| 4 configs/ls1088aqds_sdcard_ifc_defconfig | 4 configs/ls1088aqds_sdcard_qspi_defconfig | 4 configs/ls1088aqds_tfa_defconfig | 4 configs/ls1088ardb_qspi_SECURE_BOOT_defconfig| 4 configs/ls1088ardb_qspi_defconfig| 4 configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig | 4 configs/ls1088ardb_sdcard_qspi_defconfig | 4 configs/ls1088ardb_tfa_SECURE_BOOT_defconfig | 4 configs/ls1088ardb_tfa_defconfig | 4 configs/mx25pdk_defconfig| 1 + configs/mx53ppd_defconfig| 1 + configs/mx7ulp_com_defconfig | 1 + configs/mx7ulp_evk_defconfig | 1 +
[PATCH 6/8] Convert CONFIG_BZIP2 et al to Kconfig
This converts the following to Kconfig: CONFIG_BZIP2 CONFIG_GZIP CONFIG_LZO CONFIG_ZLIB CONFIG_LZMA CONFIG_LZO Signed-off-by: Tom Rini --- README| 15 --- configs/bayleybay_defconfig | 1 + configs/cherryhill_defconfig | 1 + configs/chromebook_coral_defconfig| 1 + configs/chromebook_link64_defconfig | 1 + configs/chromebook_link_defconfig | 1 + configs/chromebook_samus_defconfig| 1 + configs/chromebook_samus_tpl_defconfig| 1 + configs/chromebox_panther_defconfig | 1 + ...onga-qeval20-qa3-e3845-internal-uart_defconfig | 1 + configs/conga-qeval20-qa3-e3845_defconfig | 1 + configs/coreboot64_defconfig | 1 + configs/coreboot_defconfig| 1 + configs/cougarcanyon2_defconfig | 1 + configs/crownbay_defconfig| 1 + configs/dfi-bt700-q7x-151_defconfig | 1 + configs/dh_imx6_defconfig | 1 + configs/efi-x86_app_defconfig | 1 + configs/efi-x86_payload32_defconfig | 1 + configs/efi-x86_payload64_defconfig | 1 + configs/galileo_defconfig | 1 + configs/guruplug_defconfig| 1 + configs/ib62x0_defconfig | 1 + configs/iconnect_defconfig| 1 + configs/minnowmax_defconfig | 1 + configs/nsa310s_defconfig | 1 + configs/qemu-x86_64_defconfig | 1 + configs/qemu-x86_defconfig| 1 + configs/sheevaplug_defconfig | 1 + configs/slimbootloader_defconfig | 1 + configs/som-db5800-som-6867_defconfig | 1 + ...adorable-x86-conga-qa3-e3845-pcie-x4_defconfig | 1 + configs/theadorable-x86-conga-qa3-e3845_defconfig | 1 + configs/theadorable-x86-dfi-bt700_defconfig | 1 + configs/wb45n_defconfig | 1 + configs/x530_defconfig| 1 + configs/xilinx_versal_mini_defconfig | 1 + configs/xilinx_versal_mini_emmc0_defconfig| 1 + configs/xilinx_versal_mini_emmc1_defconfig| 1 + configs/xilinx_zynqmp_mini_defconfig | 1 + configs/xilinx_zynqmp_mini_emmc0_defconfig| 1 + configs/xilinx_zynqmp_mini_emmc1_defconfig| 1 + configs/xilinx_zynqmp_mini_nand_defconfig | 1 + configs/xilinx_zynqmp_mini_nand_single_defconfig | 1 + configs/xilinx_zynqmp_mini_qspi_defconfig | 1 + configs/zynq_cse_nand_defconfig | 1 + configs/zynq_cse_nor_defconfig| 1 + configs/zynq_cse_qspi_defconfig | 1 + include/configs/dh_imx6.h | 2 -- include/configs/guruplug.h| 1 - include/configs/ib62x0.h | 5 - include/configs/iconnect.h| 5 - include/configs/nsa310s.h | 3 --- include/configs/sheevaplug.h | 1 - include/configs/wb45n.h | 1 - include/configs/x530.h| 1 - include/configs/x86-common.h | 2 -- include/configs/xilinx_versal_mini.h | 2 -- include/configs/xilinx_zynqmp_mini.h | 2 -- include/configs/zynq_cse.h| 2 -- 60 files changed, 47 insertions(+), 42 deletions(-) diff --git a/README b/README index 17dc0ee33ba2..aefdfe4f6b42 100644 --- a/README +++ b/README @@ -1330,21 +1330,6 @@ The following options need to be configured: can be displayed via the splashscreen support or the bmp command. -- Compression support: - CONFIG_GZIP - - Enabled by default to support gzip compressed images. - - CONFIG_BZIP2 - - If this option is set, support for bzip2 compressed - images is included. If not, only uncompressed and gzip - compressed images are supported. - - NOTE: the bzip2 algorithm requires a lot of RAM, so - the malloc area (as defined by CONFIG_SYS_MALLOC_LEN) should - be at least 4MB. - - MII/PHY support: CONFIG_PHY_CLOCK_FREQ (ppc4xx) diff --git a/configs/bayleybay_defconfig b/configs/bayleybay_defconfig index 80a817a3f32e..ee032e25f6bd 100644 --- a/configs/bayleybay_defconfig +++ b/configs/bayleybay_defconfig @@ -56,3 +56,4 @@ CONFIG_USB_KEYBOARD=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_11B=y CONFIG_CONSOLE_SCROLL_LINES=5 +# CONFIG_GZIP is not set diff --git a/configs/cherryhill_defconfig
[PATCH 8/8] Convert CONFIG_BOARD_LATE_INIT to Kconfig
This converts the following to Kconfig:
CONFIG_BOARD_LATE_INIT
Signed-off-by: Tom Rini
---
configs/am335x_pdu001_defconfig | 1 +
configs/bcm7260_defconfig | 1 +
configs/bcm7445_defconfig | 1 +
configs/cl-som-imx7_defconfig | 1 +
configs/controlcenterdc_defconfig | 1 +
configs/hsdk_4xd_defconfig| 1 +
configs/hsdk_defconfig| 1 +
configs/imx8mq_evk_defconfig | 1 +
configs/mccmon6_nor_defconfig | 1 +
configs/mccmon6_sd_defconfig | 1 +
configs/mx53ppd_defconfig | 1 +
configs/pico-imx8mq_defconfig | 1 +
configs/stm32f746-disco_defconfig | 1 +
configs/stm32f769-disco_defconfig | 1 +
configs/stm32h743-disco_defconfig | 1 +
configs/stm32h743-eval_defconfig | 1 +
include/configs/bcmstb.h | 1 -
include/configs/cl-som-imx7.h | 2 --
include/configs/controlcenterdc.h | 1 -
include/configs/hsdk-4xd.h| 1 -
include/configs/hsdk.h| 1 -
include/configs/imx8mq_evk.h | 1 -
include/configs/mccmon6.h | 1 -
include/configs/mx53ppd.h | 1 -
include/configs/pdu001.h | 1 -
include/configs/pico-imx8mq.h | 1 -
include/configs/stm32f746-disco.h | 1 -
include/configs/stm32h743-disco.h | 2 --
include/configs/stm32h743-eval.h | 2 --
29 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/configs/am335x_pdu001_defconfig b/configs/am335x_pdu001_defconfig
index 792d2165bcfc..d3a0cb88cb65 100644
--- a/configs/am335x_pdu001_defconfig
+++ b/configs/am335x_pdu001_defconfig
@@ -16,6 +16,7 @@ CONFIG_LOCALVERSION="-EETS-1.0.0"
CONFIG_DISTRO_DEFAULTS=y
CONFIG_BOOTDELAY=1
# CONFIG_USE_BOOTCOMMAND is not set
+CONFIG_BOARD_LATE_INIT=y
# CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_SPL_NAND_SUPPORT is not set
diff --git a/configs/bcm7260_defconfig b/configs/bcm7260_defconfig
index 55e290c76689..a2707a0da5d7 100644
--- a/configs/bcm7260_defconfig
+++ b/configs/bcm7260_defconfig
@@ -11,6 +11,7 @@ CONFIG_FIT_SIGNATURE=y
CONFIG_BOOTDELAY=1
CONFIG_USE_PREBOOT=y
CONFIG_PREBOOT="fdt addr ${fdtcontroladdr};fdt move ${fdtcontroladdr}
${fdtsaveaddr};fdt addr ${fdtsaveaddr};"
+CONFIG_BOARD_LATE_INIT=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="U-Boot>"
CONFIG_CMD_ASKENV=y
diff --git a/configs/bcm7445_defconfig b/configs/bcm7445_defconfig
index 338f525bf5c9..65c4b33a5880 100644
--- a/configs/bcm7445_defconfig
+++ b/configs/bcm7445_defconfig
@@ -12,6 +12,7 @@ CONFIG_FIT_SIGNATURE=y
CONFIG_BOOTDELAY=1
CONFIG_USE_PREBOOT=y
CONFIG_PREBOOT="fdt addr ${fdtcontroladdr};fdt move ${fdtcontroladdr}
${fdtsaveaddr};fdt addr ${fdtsaveaddr};"
+CONFIG_BOARD_LATE_INIT=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="U-Boot>"
CONFIG_CMD_ASKENV=y
diff --git a/configs/cl-som-imx7_defconfig b/configs/cl-som-imx7_defconfig
index c1eac88fcd5f..a38c6c242956 100644
--- a/configs/cl-som-imx7_defconfig
+++ b/configs/cl-som-imx7_defconfig
@@ -21,6 +21,7 @@ CONFIG_SPL_TEXT_BASE=0x00911000
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
CONFIG_SPI_BOOT=y
CONFIG_BOOTDELAY=3
+CONFIG_BOARD_LATE_INIT=y
CONFIG_BOUNCE_BUFFER=y
CONFIG_SPL_BOARD_INIT=y
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x80
diff --git a/configs/controlcenterdc_defconfig
b/configs/controlcenterdc_defconfig
index 4ac46ff75941..df609d503665 100644
--- a/configs/controlcenterdc_defconfig
+++ b/configs/controlcenterdc_defconfig
@@ -23,6 +23,7 @@ CONFIG_FIT_SIGNATURE=y
CONFIG_FIT_VERBOSE=y
CONFIG_USE_PREBOOT=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
+CONFIG_BOARD_LATE_INIT=y
CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_LAST_STAGE_INIT=y
CONFIG_SPL_BOARD_INIT=y
diff --git a/configs/hsdk_4xd_defconfig b/configs/hsdk_4xd_defconfig
index 5fe6f75006c9..a6c917737265 100644
--- a/configs/hsdk_4xd_defconfig
+++ b/configs/hsdk_4xd_defconfig
@@ -10,6 +10,7 @@ CONFIG_SYS_CLK_FREQ=5
CONFIG_DEBUG_UART=y
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200n8"
+CONFIG_BOARD_LATE_INIT=y
CONFIG_BOARD_EARLY_INIT_F=y
CONFIG_BOARD_EARLY_INIT_R=y
CONFIG_HUSH_PARSER=y
diff --git a/configs/hsdk_defconfig b/configs/hsdk_defconfig
index 4b767169fc2c..30c9402de64e 100644
--- a/configs/hsdk_defconfig
+++ b/configs/hsdk_defconfig
@@ -9,6 +9,7 @@ CONFIG_SYS_CLK_FREQ=5
CONFIG_DEBUG_UART=y
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200n8"
+CONFIG_BOARD_LATE_INIT=y
CONFIG_BOARD_EARLY_INIT_F=y
CONFIG_BOARD_EARLY_INIT_R=y
CONFIG_HUSH_PARSER=y
diff --git a/configs/imx8mq_evk_defconfig b/configs/imx8mq_evk_defconfig
index c13a954b366f..871f784b49b0 100644
--- a/configs/imx8mq_evk_defconfig
+++ b/configs/imx8mq_evk_defconfig
@@ -14,6 +14,7 @@ CONFIG_FIT_EXTERNAL_OFFSET=0x3000
CONFIG_SPL_LOAD_FIT=y
CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage.cfg"
+CONFIG_BOARD_LATE_INIT=y
CONFIG_SPL_BOARD_INIT=y
CONFIG_HUSH_PARSER=y
# CONFIG_BOOTM_NETBSD is not set
diff --git
[PATCH 1/1] fs: fat_write: fix short name creation.
Truncate file names if the buffer size is exceeded to avoid a buffer
overflow.
Use Sphinx style function description.
Add a TODO comment.
Reported-by: CID 303779
Signed-off-by: Heinrich Schuchardt
---
fs/fat/fat_write.c | 15 ---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/fs/fat/fat_write.c b/fs/fat/fat_write.c
index 59cc0bae94..b16a39d3ff 100644
--- a/fs/fat/fat_write.c
+++ b/fs/fat/fat_write.c
@@ -50,8 +50,11 @@ static int disk_write(__u32 block, __u32 nr_blocks, void
*buf)
return ret;
}
-/*
- * Set short name in directory entry
+/**
+ * set_name() - set short name in directory entry
+ *
+ * @dirent:directory entry
+ * @filename: long file name
*/
static void set_name(dir_entry *dirent, const char *filename)
{
@@ -66,7 +69,8 @@ static void set_name(dir_entry *dirent, const char *filename)
if (len == 0)
return;
- strcpy(s_name, filename);
+ strncpy(s_name, filename, VFAT_MAXLEN_BYTES - 1);
+ s_name[VFAT_MAXLEN_BYTES - 1] = '\0';
uppercase(s_name, len);
period = strchr(s_name, '.');
@@ -87,6 +91,11 @@ static void set_name(dir_entry *dirent, const char *filename)
memcpy(dirent->name, s_name, period_location);
} else {
memcpy(dirent->name, s_name, 6);
+ /*
+* TODO: Translating two long names with the same first six
+* characters to the same short name is utterly wrong.
+* Short names must be unique.
+*/
dirent->name[6] = '~';
dirent->name[7] = '1';
}
--
2.26.2
[PATCH 5/8] topic_miami: Disable GPIO
Per the boards config header file, there is no useful GPIO on these boards. Remove CONFIG_CMD_GPIO from the defconfigs. Cc: Mike Looijmans Signed-off-by: Tom Rini --- configs/topic_miami_defconfig | 1 - configs/topic_miamilite_defconfig | 1 - configs/topic_miamiplus_defconfig | 1 - include/configs/topic_miami.h | 4 4 files changed, 7 deletions(-) diff --git a/configs/topic_miami_defconfig b/configs/topic_miami_defconfig index f50d12d154e2..d2c6412057bc 100644 --- a/configs/topic_miami_defconfig +++ b/configs/topic_miami_defconfig @@ -26,7 +26,6 @@ CONFIG_CMD_MEMTEST=y CONFIG_SYS_MEMTEST_START=0x CONFIG_SYS_MEMTEST_END=0x1800 CONFIG_CMD_DFU=y -CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y diff --git a/configs/topic_miamilite_defconfig b/configs/topic_miamilite_defconfig index d2fe64ed9ee4..089c6a1085d1 100644 --- a/configs/topic_miamilite_defconfig +++ b/configs/topic_miamilite_defconfig @@ -26,7 +26,6 @@ CONFIG_CMD_MEMTEST=y CONFIG_SYS_MEMTEST_START=0x CONFIG_SYS_MEMTEST_END=0x1800 CONFIG_CMD_DFU=y -CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y diff --git a/configs/topic_miamiplus_defconfig b/configs/topic_miamiplus_defconfig index 9afd7f6bcada..6525fd4e3178 100644 --- a/configs/topic_miamiplus_defconfig +++ b/configs/topic_miamiplus_defconfig @@ -26,7 +26,6 @@ CONFIG_CMD_MEMTEST=y CONFIG_SYS_MEMTEST_START=0x CONFIG_SYS_MEMTEST_END=0x1800 CONFIG_CMD_DFU=y -CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y diff --git a/include/configs/topic_miami.h b/include/configs/topic_miami.h index 0e4a824c4242..a2dcd1ae20fd 100644 --- a/include/configs/topic_miami.h +++ b/include/configs/topic_miami.h @@ -25,10 +25,6 @@ /* sspi command isn't useful */ #undef CONFIG_CMD_SPI -/* No useful gpio */ -#undef CONFIG_ZYNQ_GPIO -#undef CONFIG_CMD_GPIO - /* No falcon support */ #undef CONFIG_SPL_OS_BOOT #undef CONFIG_SPL_FPGA_SUPPORT -- 2.17.1
[PATCH 4/8] blance: Disable CONFIG_CMD_SF / CONFIG_CMD_SPI
The config header for this platform disables both CMD_SF and CMD_SPI and the defconfig leaves them enabled. Disable them from the defconfig and enable them in the header. Cc: Marek Vasut Cc: Masakazu Mochizuki Signed-off-by: Tom Rini --- This is a case where it's hard to tell if this is the correct fix or if both should be enabled instead. --- configs/blanche_defconfig | 2 +- include/configs/blanche.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/configs/blanche_defconfig b/configs/blanche_defconfig index 137acceea071..641b7790233b 100644 --- a/configs/blanche_defconfig +++ b/configs/blanche_defconfig @@ -24,7 +24,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_PCI=y CONFIG_CMD_SDRAM=y -CONFIG_CMD_SPI=y +# CONFIG_CMD_SF is not set CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y diff --git a/include/configs/blanche.h b/include/configs/blanche.h index fd29c5d0f1ed..f048f158ed2a 100644 --- a/include/configs/blanche.h +++ b/include/configs/blanche.h @@ -42,8 +42,6 @@ #define CONFIG_SYS_FLASH_WRITE_TOUT3000 #define CONFIG_SYS_FLASH_LOCK_TOUT 3000 #define CONFIG_SYS_FLASH_UNLOCK_TOUT 3000 -#undef CONFIG_CMD_SF -#undef CONFIG_CMD_SPI #endif /* Board Clock */ -- 2.17.1
[PATCH 1/8] pfla02: Rework excluding NAND from SPL
Rather than only enable CONFIG_CMD_NAND for non-SPL builds, move the CMD
options to defconfig and rework the guards to not try and call the
function in SPL builds.
Cc: Stefano Babic
Signed-off-by: Tom Rini
---
A grep around for setup_gpmi_nand() shows that other platforms will just
make an empty function in similar situations.
---
board/phytec/pfla02/pfla02.c | 8
configs/pfla02_defconfig | 2 +-
include/configs/pfla02.h | 4
3 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/board/phytec/pfla02/pfla02.c b/board/phytec/pfla02/pfla02.c
index fed8f52e3e1d..0a961cc8a5a4 100644
--- a/board/phytec/pfla02/pfla02.c
+++ b/board/phytec/pfla02/pfla02.c
@@ -117,7 +117,7 @@ static iomux_v3_cfg_t const gpios_pads[] = {
IOMUX_PADS(PAD_SD4_DAT3__GPIO2_IO11 | MUX_PAD_CTRL(NO_PAD_CTRL)),
};
-#ifdef CONFIG_CMD_NAND
+#if defined(CONFIG_CMD_NAND) && !defined(CONFIG_SPL_BUILD)
/* NAND */
static iomux_v3_cfg_t const nfc_pads[] = {
IOMUX_PADS(PAD_NANDF_CLE__NAND_CLE | MUX_PAD_CTRL(NAND_PAD_CTRL)),
@@ -274,7 +274,7 @@ static void setup_gpios(void)
SETUP_IOMUX_PADS(gpios_pads);
}
-#ifdef CONFIG_CMD_NAND
+#if defined(CONFIG_CMD_NAND) && !defined(CONFIG_SPL_BUILD)
static void setup_gpmi_nand(void)
{
struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
@@ -361,7 +361,7 @@ int board_init(void)
setup_gpios();
-#ifdef CONFIG_CMD_NAND
+#if defined(CONFIG_CMD_NAND) && !defined(CONFIG_SPL_BUILD)
setup_gpmi_nand();
#endif
return 0;
@@ -657,7 +657,7 @@ void board_init_f(ulong dummy)
.refr = 7, /* 8 refresh commands per refresh cycle */
};
-#ifdef CONFIG_CMD_NAND
+#if defined(CONFIG_CMD_NAND) && !defined(CONFIG_SPL_BUILD)
/* Enable NAND */
setup_gpmi_nand();
#endif
diff --git a/configs/pfla02_defconfig b/configs/pfla02_defconfig
index 5e5bbb05bd5e..52cebd9e22ed 100644
--- a/configs/pfla02_defconfig
+++ b/configs/pfla02_defconfig
@@ -37,7 +37,7 @@ CONFIG_SPL_YMODEM_SUPPORT=y
CONFIG_CMD_GPIO=y
CONFIG_CMD_I2C=y
CONFIG_CMD_MMC=y
-# CONFIG_CMD_NAND is not set
+CONFIG_CMD_NAND_TRIMFFS=y
CONFIG_CMD_SF=y
CONFIG_CMD_CACHE=y
CONFIG_CMD_EXT4_WRITE=y
diff --git a/include/configs/pfla02.h b/include/configs/pfla02.h
index d4a7de7df6a2..4162a71ca661 100644
--- a/include/configs/pfla02.h
+++ b/include/configs/pfla02.h
@@ -41,15 +41,11 @@
#define CONFIG_SYS_I2C_MXC_I2C1/* enable I2C bus 0 */
#define CONFIG_SYS_I2C_SPEED 10
-#ifndef CONFIG_SPL_BUILD
-#define CONFIG_CMD_NAND
/* Enable NAND support */
-#define CONFIG_CMD_NAND_TRIMFFS
#define CONFIG_SYS_MAX_NAND_DEVICE 1
#define CONFIG_SYS_NAND_BASE 0x4000
#define CONFIG_SYS_NAND_5_ADDR_CYCLE
#define CONFIG_SYS_NAND_ONFI_DETECTION
-#endif
/* DMA stuff, needed for GPMI/MXS NAND support */
--
2.17.1
[PATCH 2/8] mx6memcal: Finish migration to defconfig options
The config header for this platform uses '#undef' in a number of cases. All of the MMC related ones were already handled correctly in the defconfig file. In the case of CONFIG_CMD_FUSE, the command was being built and enabled via defconfig. Disable it in the defconfig, cleanup the header. Cc: Eric Nelson Signed-off-by: Tom Rini --- configs/mx6memcal_defconfig | 1 + include/configs/mx6memcal.h | 5 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/configs/mx6memcal_defconfig b/configs/mx6memcal_defconfig index 8b5e0ff9b134..ed24b7996b6b 100644 --- a/configs/mx6memcal_defconfig +++ b/configs/mx6memcal_defconfig @@ -33,6 +33,7 @@ CONFIG_CMD_MEMINFO=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_MEMTEST_START=0x1000 CONFIG_SYS_MEMTEST_END=0x2000 +# CONFIG_CMD_FUSE is not set # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set CONFIG_CMD_CACHE=y diff --git a/include/configs/mx6memcal.h b/include/configs/mx6memcal.h index 3d79a7e43765..b774b167f648 100644 --- a/include/configs/mx6memcal.h +++ b/include/configs/mx6memcal.h @@ -13,11 +13,6 @@ #include "mx6_common.h" #include "imx6_spl.h" -#undef CONFIG_MMC -#undef CONFIG_SPL_MMC_SUPPORT -#undef CONFIG_GENERIC_MMC -#undef CONFIG_CMD_FUSE - #define CONFIG_SYS_MALLOC_LEN (64 * 1024 * 1024) #define CONFIG_MXC_UART -- 2.17.1
[PATCH 3/8] bcmstb: Migrate CONFIG_CMD_EXT[24]
The common config header for bcm7260 and bcm7445 enable
CONFIG_CMD_EXT2/EXT4 but the defconfigs do not. This results in the
commands being disabled. Enable them via the defconfig.
Cc: Thomas Fitzsimmons
Signed-off-by: Tom Rini
---
configs/bcm7260_defconfig | 2 ++
configs/bcm7445_defconfig | 2 ++
include/configs/bcmstb.h | 3 ---
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/configs/bcm7260_defconfig b/configs/bcm7260_defconfig
index d467e62deef1..4ddca7cc7f40 100644
--- a/configs/bcm7260_defconfig
+++ b/configs/bcm7260_defconfig
@@ -14,6 +14,8 @@ CONFIG_PREBOOT="fdt addr ${fdtcontroladdr};fdt move
${fdtcontroladdr} ${fdtsavea
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="U-Boot>"
CONFIG_CMD_MMC=y
+CONFIG_CMD_EXT2=y
+CONFIG_CMD_EXT4=y
CONFIG_EFI_PARTITION=y
CONFIG_OF_PRIOR_STAGE=y
CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/bcm7445_defconfig b/configs/bcm7445_defconfig
index 2c71a5efedd1..85dcdded9d4c 100644
--- a/configs/bcm7445_defconfig
+++ b/configs/bcm7445_defconfig
@@ -17,6 +17,8 @@ CONFIG_SYS_PROMPT="U-Boot>"
CONFIG_CMD_MMC=y
CONFIG_CMD_SF_TEST=y
CONFIG_CMD_SPI=y
+CONFIG_CMD_EXT2=y
+CONFIG_CMD_EXT4=y
CONFIG_OF_PRIOR_STAGE=y
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
diff --git a/include/configs/bcmstb.h b/include/configs/bcmstb.h
index 5f6bf62524a9..b906c750edc8 100644
--- a/include/configs/bcmstb.h
+++ b/include/configs/bcmstb.h
@@ -129,7 +129,6 @@ extern phys_addr_t prior_stage_fdt_address;
*/
#define CONFIG_CMD_ASKENV
#define CONFIG_CMD_CACHE
-#define CONFIG_CMD_EXT2
/*
* Flash configuration.
@@ -142,8 +141,6 @@ extern phys_addr_t prior_stage_fdt_address;
* Filesystem configuration.
*/
#define CONFIG_DOS_PARTITION
-#define CONFIG_CMD_EXT4
-#define CONFIG_FS_EXT4
#define CONFIG_CMD_FS_GENERIC
/*
--
2.17.1
Re: [PATCH v1 1/3] drivers: pinctrl-single: handle different register width
Hi Simon,
On Mon, May 25, 2020 at 7:45 AM Simon Glass wrote:
>
> Hi Rayagonda,
>
> On Sun, 24 May 2020 at 04:46, Rayagonda Kokatanur
> wrote:
> >
> > Hi Simon,
> >
> > On Fri, May 8, 2020 at 7:07 AM Simon Glass wrote:
> > >
> > > Hi Rayagonda,
> > >
> > > On Thu, 30 Apr 2020 at 04:06, Rayagonda Kokatanur
> > > wrote:
> > > >
> > > > On Wed, Apr 29, 2020 at 11:34 PM Simon Glass wrote:
> > > > >
> > > > > Hi Rayagonda,
> > > > >
> > > > > +Stephen Warren
> > > > >
> > > > > On Wed, 29 Apr 2020 at 10:35, Rayagonda Kokatanur
> > > > > wrote:
> > > > > >
> > > > > > Add support to use different register read/write api's
> > > > > > based on register width.
> > > > > >
> > > > > > Signed-off-by: Rayagonda Kokatanur
> > > > > >
> > > > > > ---
> > > > > > drivers/pinctrl/pinctrl-single.c | 98
> > > > > >
> > > > > > 1 file changed, 74 insertions(+), 24 deletions(-)
> > > > > >
> > > > > > diff --git a/drivers/pinctrl/pinctrl-single.c
> > > > > > b/drivers/pinctrl/pinctrl-single.c
> > > > > > index 738f5bd636..aed113b083 100644
> > > > > > --- a/drivers/pinctrl/pinctrl-single.c
> > > > > > +++ b/drivers/pinctrl/pinctrl-single.c
> > > > > > @@ -10,12 +10,24 @@
> > > > > > #include
> > > > > > #include
> > > > > >
> > > > > > +/**
> > > > > > + * struct single_pdata - pinctrl device instance
> > > > > > + * @base first configuration register
> > > > > > + * @offset index of last configuration register
> > > > > > + * @mask configuration-value mask bits
> > > > > > + * @width configuration register bit width
> > > > > > + * @bits_per_mux
> > > > > > + * @read register read function to use
> > > > > > + * @write register write function to use
> > > > > > + */
> > > > > > struct single_pdata {
> > > > > > fdt_addr_t base;/* first configuration register */
> > > > > > int offset; /* index of last configuration
> > > > > > register */
> > > > > > u32 mask; /* configuration-value mask bits */
> > > > > > int width; /* configuration register bit width
> > > > > > */
> > > > > > bool bits_per_mux;
> > > > > > + u32 (*read)(phys_addr_t reg);
> > > > > > + void (*write)(u32 val, phys_addr_t reg);
> > > > >
> > > > > Can't we just have a read & write function with a switch statement?
> > > > > Why do we need function pointers?
> > > >
> > > > I referred to the linux pinctrl-single.c and kept code similar to linux.
> > > > Please let me know.
> > >
> > > See the regmap discussion here which is related:
> > >
> > > http://patchwork.ozlabs.org/project/uboot/patch/20191105114700.24989-3-jjhib...@ti.com/
> > >
> > > Should this driver use regmap, then?
> >
> > I think using a function pointer is a better approach, we can check
> > for errors in one place ie invalid register width.
> > Right now it's been done in single_probe() function.
> > Please let me know.
>
> What sort of errors?
What I mean is, right now read/write function pointres are getting
initialized in single_probe() based on pdata->width.
If pdata->width is invalid, its erroring out there only.
So if we use a single read and write function with switch statement
then checking pdata->width should be part of this switch statement.
This means every call to read/write should check for failure. Hence I
am thinking function pointer is a better approach.
Please let me know.
Best regards,
Rayagonda
>
> I'm sorry but I prefer the switch() for U-Boot. We have different
> constraints from Linux. After all, our file is 200 lines and in Linux
> this is 2k lines.
>
> Regards,
> Simon
Re: [PATCHv2 8/8] cubieboard7: Remove ARCH= references from documentation
Hi, On Wed, May 27, 2020 at 12:07 AM Tom Rini wrote: > > When building U-Boot we select the architecture via Kconfig and not ARCH > being passed in via the environment or make cmdline. > > While in here, add the doc file to the MAINTAINERS entry. > > Cc: Amit Singh Tomar > Cc: Manivannan Sadhasivam > Signed-off-by: Tom Rini > --- > Changes in v2: > - New patch > --- > MAINTAINERS | 1 + > doc/board/actions/cubieboard7.rst | 2 +- > 2 files changed, 2 insertions(+), 1 deletion(-) Reviewed-by: Amit Singh Tomar
Re: [PATCH] RFC: tiny-dm: Proposal for using driver model in SPL
Hi Simon, On 25/5/20 18:40, Simon Glass wrote: Hi Tom, On Mon, 25 May 2020 at 14:57, Tom Rini wrote: On Mon, May 25, 2020 at 02:34:20PM -0600, Simon Glass wrote: Hi Tom, On Mon, 25 May 2020 at 13:47, Tom Rini wrote: On Mon, May 25, 2020 at 09:35:44AM -0600, Simon Glass wrote: This patch provides the documentation for a proposed enhancement to driver model to reduce overhead in SPL. The actual patches are not included here because they are based on some pending work by Walter Lozano which is not in final form. For now, the source tree is available at: https://gitlab.denx.de/u-boot/custodians/u-boot-dm/-/tree/dtoc-working Comments welcome! So here's my worry. It's not clear, aside from the device tree, how much re-use of existing code we get with this. It feels like it might be fairly minimal. And at that point, are we not perhaps making too much work for ourselves compared with just excepting that there will need to be a place for non-abstracted-framework drivers? What do we do about TPL, when we get to the point of everything being converted to DM and as-needed tiny-DM but there's still TPL drivers? The reason we have SPL_FRAMEWORK as a symbol today is that we already had some SoCs/architectures (primarily PowerPC) that had "SPL" but it was very centric to the SoCs in question. The interface for example for mmc is: int spl_mmc_load_image(struct spl_image_info *spl_image, struct spl_boot_device *bootdev) and neither part of that is inherently DM. So let it be MMC_TINY for the non-DM case and regular DM_MMC for the DM case. I wonder if we could clean that up code a little if we let it be separate. The interface for example for spi is: int spl_spi_load_image(struct spl_image_info *spl_image, struct spl_boot_device *bootdev) and well, the same thing. Or maybe we can even push that up to the spi_flash_load() call. But my worry is that a different set of abstractions here are still going to bring us in more overhead than writing drivers for the functionality we need directly, and if we define what's allowed in this limited case well, that might be good enough. Some boards (e.g. x86) Need to read multiple things from the SPI flash (such as FSP binaries), so I still think we will want a generic reading interface. You could be right, but my hunch is that there is value in having things more generic and the cost should be minimal. The value is that hopefully writing a few C functions in the SPI driver will be enough to enable tiny SPI on an SoC, reusing much of the code in the driver (only the reading bits!). We won't need as much special-case code and an entirely different way of configuring these devices for TPL/SPL. It has been interesting digging into the Zephyr model. It's drivers are very basic and thus small. But there is still value in using the device tree to assemble things. Anyway I'm not really sure at this point. It is just a hunch. I don't think we can know all this until we have a bit more information. Perhaps with a board with SPI, MMC and serial converted we would get a better picture? I think it's absolutely the case that we'll have to convert something and see how it looks, then convert something else and see if it still looks good enough. At a high enough level there's not really too much of a difference between what it sounds like you're proposing and what I'm proposing. Possibly even in a progmatic way too. We have (I think anyhow) fairly static board configurations in this case so we don't so much need to "probe" for possible drivers be told what our device hierarchy is and to initialize what we're going to use. Yes, we may end up with special, separate code anyway, since if you end up refactoring the driver so much (and putting tiny-dm tentacles into it) that it becomes harder to maintain, it isn't a win. Basically I started out similar to what you are saying, with the idea of just direct calls into the driver (e.g. the driver implements serial_putc() and spi_read_flash()). But then I figured it is a very small overhead to retain some sort of driver model, so I thought I'd try that. I'll fiddle with this again in a week or so... Thanks for this proposal. I'm very interested in see where this implementation leads us, as I always felt that some work could be done in order to reduce the overhead of DM support in TPL/SPL. I'll review this work and hopefully come back to you with some comments. In the same sense, I feel that maybe we can add some additional intelligence to dtoc in order to produce a more customized code for TPL/SPL, maybe relaying in some custom stuff in u-boot.dtsi, but this is only a feeling. Regards. Water
Re: [PATCH] mmc: davinci_mmc: Cleanup to use dt in U-boot and static platdata in SPL
Hi Faiz, On Tue, 26 May 2020 at 11:37, Faiz Abbas wrote: > > Simon, > > On 26/05/20 10:24 pm, Simon Glass wrote: > > Hi Faiz, > > > > I have ended up with an omap L138 lcdk board. Do you have instructions > > on how to get it booting from uSD and how to create the card image? I > > have tried various sources but nothing works so far. Also, are you > > able to send me a test image I can 'dd' onto the board? > > > > The commands in board/davinci/da8xxevm/README.da850 don't work? > > Try the following: > > 2 - using the "dd" command > $ dd if=u-boot.ais of=/dev/mmcblk0 seek=117 bs=512 conv=fsync Thanks! I didn't make the connection with da850 or think to look in board/ for docs. Regards, Simon
[PATCHv2 8/8] cubieboard7: Remove ARCH= references from documentation
When building U-Boot we select the architecture via Kconfig and not ARCH being passed in via the environment or make cmdline. While in here, add the doc file to the MAINTAINERS entry. Cc: Amit Singh Tomar Cc: Manivannan Sadhasivam Signed-off-by: Tom Rini --- Changes in v2: - New patch --- MAINTAINERS | 1 + doc/board/actions/cubieboard7.rst | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 660b12f1a87e..1fd975c72f0b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -275,6 +275,7 @@ M: Manivannan Sadhasivam S: Maintained F: arch/arm/include/asm/arch-owl/ F: arch/arm/mach-owl/ +F: doc/board/actions/ F: drivers/clk/owl/ F: drivers/serial/serial_owl.c F: include/configs/owl-common.h diff --git a/doc/board/actions/cubieboard7.rst b/doc/board/actions/cubieboard7.rst index e01d2d0370a1..74f2b12e41fe 100644 --- a/doc/board/actions/cubieboard7.rst +++ b/doc/board/actions/cubieboard7.rst @@ -102,7 +102,7 @@ Building U-BOOT proper image $ make clean $ export CROSS_COMPILE=aarch64-linux-gnu- - $ make ARCH=arm cubieboard7_defconfig + $ make cubieboard7_defconfig $ make u-boot-dtb.img -j16 u-boot-dtb.img can now be flashed to debian image partition mounted on host machine. -- 2.17.1
[PATCHv2 6/8] m68k: Remove ARCH= references from documentation
When building U-Boot we select the architecture via Kconfig and not ARCH
being passed in via the environment or make cmdline.
While in here, add the doc file to the MAINTAINERS entry for coldfire.
Cc: Huan Wang
Cc: Angelo Dureghello
Signed-off-by: Tom Rini
---
Changes in v2:
- None
---
MAINTAINERS | 1 +
doc/arch/m68k.rst | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 9da0459bf747..660b12f1a87e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -590,6 +590,7 @@ M: Angelo Dureghello
S: Maintained
T: git https://gitlab.denx.de/u-boot/custodians/u-boot-coldfire.git
F: arch/m68k/
+F: doc/arch/m68k.rst
DFU
M: Lukasz Majewski
diff --git a/doc/arch/m68k.rst b/doc/arch/m68k.rst
index 34b2593eb85b..44e1a5dfa384 100644
--- a/doc/arch/m68k.rst
+++ b/doc/arch/m68k.rst
@@ -35,7 +35,7 @@ development boards.
Supported CPU families
--
-Please "make menuconfig" with ARCH=m68k, or check arch/m68k/cpu to see the
+Please "make menuconfig" and select "m68k" or check arch/m68k/cpu to see the
currently supported processor and families.
@@ -75,8 +75,8 @@ A bash script similar to the one below may be used:
board=M5475DFE
make distclean
- make ARCH=m68k ${board}_defconfig
- make ARCH=m68k KBUILD_VERBOSE=1
+ make ${board}_defconfig
+ make KBUILD_VERBOSE=1
Adopted toolchains
--
2.17.1
[PATCHv2 3/8] powerpc: Remove ARCH= references from documentation
When building U-Boot we select the architecture via Kconfig and not ARCH being passed in via the environment or make cmdline. Cc: Po Liu Cc: Qiang Zhao Signed-off-by: Tom Rini --- Changes in v2: - None As an aside, these files should be converted rST and moved to doc/board/ and the MAINTAINERS file updated to include the new documentation file too. Thanks! --- board/freescale/c29xpcie/README | 1 - board/freescale/p1010rdb/README.P1010RDB-PA | 1 - board/freescale/p1010rdb/README.P1010RDB-PB | 1 - 3 files changed, 3 deletions(-) diff --git a/board/freescale/c29xpcie/README b/board/freescale/c29xpcie/README index 2e249cbb3a2e..a6120f1845d2 100644 --- a/board/freescale/c29xpcie/README +++ b/board/freescale/c29xpcie/README @@ -56,7 +56,6 @@ Note: 1 stands for 'off', 0 stands for 'on' Build and program U-Boot to NOR flash == 1. Build u-boot.bin image example: - export ARCH=powerpc export CROSS_COMPILE=/your_path/powerpc-linux-gnu- make C293PCIE diff --git a/board/freescale/p1010rdb/README.P1010RDB-PA b/board/freescale/p1010rdb/README.P1010RDB-PA index 105942f7a54f..46c61237c727 100644 --- a/board/freescale/p1010rdb/README.P1010RDB-PA +++ b/board/freescale/p1010rdb/README.P1010RDB-PA @@ -98,7 +98,6 @@ instead of to CAN/UART1. Build and burn U-Boot to NOR flash == 1. Build u-boot.bin image - export ARCH=powerpc export CROSS_COMPILE=/your_path/powerpc-linux-gnu- make P1010RDB_NOR diff --git a/board/freescale/p1010rdb/README.P1010RDB-PB b/board/freescale/p1010rdb/README.P1010RDB-PB index dc82f0df0984..4a3b389877fc 100644 --- a/board/freescale/p1010rdb/README.P1010RDB-PB +++ b/board/freescale/p1010rdb/README.P1010RDB-PB @@ -128,7 +128,6 @@ To enable IFC in case of SD boot Build images for different boot mode First setup cross compile environment on build host - $ export ARCH=powerpc $ export CROSS_COMPILE=/powerpc-linux-gnu- 1. For NOR boot -- 2.17.1
[PATCHv2 4/8] rockchip: Remove ARCH= references from documentation
When building U-Boot we select the architecture via Kconfig and not ARCH being passed in via the environment or make cmdline. Acked-by: Kever Yang Cc: Simon Glass Cc: Philipp Tomsich Acked-by: Klaus Goger Cc: Jagan Teki Signed-off-by: Tom Rini --- Changes in v2: - None As an aside, these files should be converted rST and moved to doc/board/ and the MAINTAINERS file updated to include the new documentation file too. Thanks! --- board/rockchip/evb_rk3229/README | 1 - board/rockchip/evb_rk3399/README | 1 - board/theobroma-systems/lion_rk3368/README | 4 ++-- board/vamrs/rock960_rk3399/README | 1 - 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/board/rockchip/evb_rk3229/README b/board/rockchip/evb_rk3229/README index 93328c75b204..9068225e2721 100644 --- a/board/rockchip/evb_rk3229/README +++ b/board/rockchip/evb_rk3229/README @@ -22,7 +22,6 @@ Compile the U-Boot > cd ../u-boot > export CROSS_COMPILE=arm-linux-gnueabihf- - > export ARCH=arm > make evb-rk3229_defconfig > make > make u-boot.itb diff --git a/board/rockchip/evb_rk3399/README b/board/rockchip/evb_rk3399/README index da7ae89ab1e9..c6f58203ebe9 100644 --- a/board/rockchip/evb_rk3399/README +++ b/board/rockchip/evb_rk3399/README @@ -54,7 +54,6 @@ Compile U-Boot == > cd ../u-boot - > export ARCH=arm64 > export CROSS_COMPILE=aarch64-linux-gnu- > make evb-rk3399_defconfig for firefly-rk3399, use below instead: diff --git a/board/theobroma-systems/lion_rk3368/README b/board/theobroma-systems/lion_rk3368/README index ad3ac93bd44b..7488b18326b9 100644 --- a/board/theobroma-systems/lion_rk3368/README +++ b/board/theobroma-systems/lion_rk3368/README @@ -17,12 +17,12 @@ Configure U-Boot Build the TPL/SPL stage === - > make CROSS_COMPILE=aarch64-unknown-elf- ARCH=arm + > make CROSS_COMPILE=aarch64-unknown-elf- Build the full U-Boot and a FIT image including the ATF === - > make CROSS_COMPILE=aarch64-unknown-elf- ARCH=arm u-boot.itb + > make CROSS_COMPILE=aarch64-unknown-elf- u-boot.itb Flash the image === diff --git a/board/vamrs/rock960_rk3399/README b/board/vamrs/rock960_rk3399/README index c5c675c4ead1..15df027fbcd4 100644 --- a/board/vamrs/rock960_rk3399/README +++ b/board/vamrs/rock960_rk3399/README @@ -57,7 +57,6 @@ Compile the U-Boot > cd ../u-boot > cp ../rkbin/rk33/rk3399_bl31_v1.00.elf ./bl31.elf - > export ARCH=arm64 > export CROSS_COMPILE=aarch64-linux-gnu- > make rock960-rk3399_defconfig > make -- 2.17.1
[PATCHv2 5/8] arm: ti: Remove ARCH= references from documentation
When building U-Boot we select the architecture via Kconfig and not ARCH being passed in via the environment or make cmdline. Cc: Lokesh Vutla Cc: Vitaly Andrianov Signed-off-by: Tom Rini --- Changes in v2: - None As an aside, these README files should be converted rST and moved to doc/board/ and the MAINTAINERS file updated to include the new documentation file too. Thanks! --- board/ti/am65x/README | 8 board/ti/j721e/README | 8 board/ti/ks2_evm/README | 2 +- doc/uImage.FIT/beaglebone_vboot.txt | 1 - 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/board/ti/am65x/README b/board/ti/am65x/README index 00be1ffe44d6..67081ce349dc 100644 --- a/board/ti/am65x/README +++ b/board/ti/am65x/README @@ -133,12 +133,12 @@ $ make PLATFORM=k3-am65x CFG_ARM64_core=y 4. U-Boot: 4.1. R5: -$ make ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- am65x_evm_r5_defconfig O=/tmp/r5 -$ make ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- O=/tmp/r5 +$ make CROSS_COMPILE=arm-linux-gnueabihf- am65x_evm_r5_defconfig O=/tmp/r5 +$ make CROSS_COMPILE=arm-linux-gnueabihf- O=/tmp/r5 4.2. A53: -$ make ARCH=arm CROSS_COMPILE=aarch64-linux-gnu- am65x_evm_a53_defconfig O=/tmp/a53 -$ make ARCH=arm CROSS_COMPILE=aarch64-linux-gnu- ATF=/build/k3/generic/release/bl31.bin TEE=/out/arm-plat-k3/core/tee-pager_v2.bin O=/tmp/a53 +$ make CROSS_COMPILE=aarch64-linux-gnu- am65x_evm_a53_defconfig O=/tmp/a53 +$ make CROSS_COMPILE=aarch64-linux-gnu- ATF=/build/k3/generic/release/bl31.bin TEE=/out/arm-plat-k3/core/tee-pager_v2.bin O=/tmp/a53 Target Images -- diff --git a/board/ti/j721e/README b/board/ti/j721e/README index 7dcf33633294..757a59cdb44a 100644 --- a/board/ti/j721e/README +++ b/board/ti/j721e/README @@ -149,12 +149,12 @@ $ make PLATFORM=k3-j721e CFG_ARM64_core=y 4. U-Boot: 4.1. R5: -$ make ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- j721e_evm_r5_defconfig O=/tmp/r5 -$ make ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- O=/tmp/r5 +$ make CROSS_COMPILE=arm-linux-gnueabihf- j721e_evm_r5_defconfig O=/tmp/r5 +$ make CROSS_COMPILE=arm-linux-gnueabihf- O=/tmp/r5 4.2. A72: -$ make ARCH=arm CROSS_COMPILE=aarch64-linux-gnu- j721e_evm_a72_defconfig O=/tmp/a72 -$ make ARCH=arm CROSS_COMPILE=aarch64-linux-gnu- ATF=/build/k3/generic/release/bl31.bin TEE=/out/arm-plat-k3/core/tee-pager_v2.bin O=/tmp/a72 +$ make CROSS_COMPILE=aarch64-linux-gnu- j721e_evm_a72_defconfig O=/tmp/a72 +$ make CROSS_COMPILE=aarch64-linux-gnu- ATF=/build/k3/generic/release/bl31.bin TEE=/out/arm-plat-k3/core/tee-pager_v2.bin O=/tmp/a72 Target Images -- diff --git a/board/ti/ks2_evm/README b/board/ti/ks2_evm/README index a26b7f813131..ff0ec5a36377 100644 --- a/board/ti/ks2_evm/README +++ b/board/ti/ks2_evm/README @@ -74,7 +74,7 @@ Supported image formats: Build instructions: === Examples for k2hk, for k2e, k2l and k2g just replace k2hk prefix accordingly. -Don't forget to add ARCH=arm and CROSS_COMPILE. +Don't forget to add CROSS_COMPILE. To build u-boot.bin, u-boot-spi.gph, MLO: >make k2hk_evm_defconfig diff --git a/doc/uImage.FIT/beaglebone_vboot.txt b/doc/uImage.FIT/beaglebone_vboot.txt index 685ec1f46d96..ebd2068ed38d 100644 --- a/doc/uImage.FIT/beaglebone_vboot.txt +++ b/doc/uImage.FIT/beaglebone_vboot.txt @@ -67,7 +67,6 @@ or if you just installed gcc-arm-linux-gnueabi then it might be b. Configure and build U-Boot with verified boot enabled: - export ARCH=arm export UBOOT=/path/to/u-boot cd $UBOOT # You can add -j10 if you have 10 CPUs to make it faster -- 2.17.1
[PATCHv2 7/8] fu540: Remove ARCH= references from documentation
When building U-Boot we select the architecture via Kconfig and not ARCH being passed in via the environment or make cmdline. While in here, add the doc file to the MAINTAINERS entry. Cc: Paul Walmsley Cc: Palmer Dabbelt Cc: Anup Patel Cc: Atish Patra Signed-off-by: Tom Rini --- Changes in v2: - Fix the MAINTAINERS line in commit message. --- board/sifive/fu540/MAINTAINERS | 1 + doc/board/sifive/fu540.rst | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/board/sifive/fu540/MAINTAINERS b/board/sifive/fu540/MAINTAINERS index 702d803ad809..93df97913355 100644 --- a/board/sifive/fu540/MAINTAINERS +++ b/board/sifive/fu540/MAINTAINERS @@ -5,5 +5,6 @@ M: Anup Patel M: Atish Patra S: Maintained F: board/sifive/fu540/ +F: doc/board/sifive/fu540.rst F: include/configs/sifive-fu540.h F: configs/sifive_fu540_defconfig diff --git a/doc/board/sifive/fu540.rst b/doc/board/sifive/fu540.rst index 610ba87074b4..43402cb2e51e 100644 --- a/doc/board/sifive/fu540.rst +++ b/doc/board/sifive/fu540.rst @@ -39,7 +39,6 @@ Building .. code-block:: none - export ARCH=riscv export CROSS_COMPILE= 3. make sifive_fu540_defconfig -- 2.17.1
[PATCHv2 2/8] imx: Remove ARCH= references from documentation
When building U-Boot we select the architecture via Kconfig and not ARCH being passed in via the environment or make cmdline. Cc: Adam Ford Cc: Vanessa Maegima Cc: Otavio Salvador Cc: Igor Opaniuk Cc: Manivannan Sadhasivam Signed-off-by: Tom Rini --- Changes in v2: - Move actions cubieboard to its own commit, oops. As an aside, the README files that haven't already been converted to rST should be converted rST and moved to doc/board/ and the MAINTAINERS file updated to include the new documentation file too. Thanks! --- board/beacon/imx8mm/README | 2 +- board/logicpd/imx6/README | 2 +- board/technexion/pico-imx7d/README.pico-imx7d_BL33 | 2 +- doc/board/toradex/colibri_imx7.rst | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/board/beacon/imx8mm/README b/board/beacon/imx8mm/README index 4223fbd15dd6..dce176fa0b23 100644 --- a/board/beacon/imx8mm/README +++ b/board/beacon/imx8mm/README @@ -26,7 +26,7 @@ $ cp firmware-imx-8.5/firmware/ddr/synopsys/lpddr4*.bin $(srctree) Build U-Boot $ make imx8mm_beacon_defconfig -$ make flash.bin ARCH=arm CROSS_COMPILE=aarch64-linux-gnu- ATF_LOAD_ADDR=0x92 +$ make flash.bin CROSS_COMPILE=aarch64-linux-gnu- ATF_LOAD_ADDR=0x92 Burn U-Boot to microSD Card === diff --git a/board/logicpd/imx6/README b/board/logicpd/imx6/README index 26d053a32c3b..19f79c5734bc 100644 --- a/board/logicpd/imx6/README +++ b/board/logicpd/imx6/README @@ -17,7 +17,7 @@ Building U-Boot for Logic PD Development Kit To build U-Boot for the Dual and Quad variants: make imx6q_logic_defconfig - make u-boot.imx ARCH=arm CROSS_COMPILE=arm-linux- + make u-boot.imx CROSS_COMPILE=arm-linux- Flashing U-Boot into the SD card diff --git a/board/technexion/pico-imx7d/README.pico-imx7d_BL33 b/board/technexion/pico-imx7d/README.pico-imx7d_BL33 index 40324ffe5f34..1b346093b88d 100644 --- a/board/technexion/pico-imx7d/README.pico-imx7d_BL33 +++ b/board/technexion/pico-imx7d/README.pico-imx7d_BL33 @@ -4,7 +4,7 @@ The boot sequence is ATF -> OPTEE -> U-Boot -> Linux. U-Boot is in non-secure world in this case. - Build u-boot -Set environment variable of CROSS_COMPILE for your toolchain and ARCH=arm +Set environment variable of CROSS_COMPILE for your toolchain $ make pico-imx7d_bl33_defconfig $ make all diff --git a/doc/board/toradex/colibri_imx7.rst b/doc/board/toradex/colibri_imx7.rst index 6fb95261..a30e721379ee 100644 --- a/doc/board/toradex/colibri_imx7.rst +++ b/doc/board/toradex/colibri_imx7.rst @@ -18,7 +18,6 @@ Build U-Boot .. code-block:: bash $ export CROSS_COMPILE=arm-linux-gnueabi- -$ export ARCH=arm $ make colibri_imx7_emmc_defconfig # For NAND: colibri_imx7_defconfig $ make -- 2.17.1
[PATCHv2 1/8] amlogic: Remove ARCH= references from documentation
When building U-Boot we select the architecture via Kconfig and not ARCH being passed in via the environment or make cmdline. Cc: Beniamino Galvani Acked-by: Neil Armstrong Cc: u-boot-amlo...@groups.io Signed-off-by: Tom Rini --- Changes in v2: - None --- board/amlogic/p200/README.nanopi-k2| 1 - board/amlogic/p200/README.odroid-c2| 1 - board/amlogic/p200/README.p200 | 1 - board/amlogic/p201/README.p201 | 1 - board/amlogic/p212/README.khadas-vim | 1 - board/amlogic/p212/README.libretech-ac | 1 - board/amlogic/p212/README.libretech-cc | 1 - board/amlogic/p212/README.p212 | 1 - board/amlogic/q200/README.khadas-vim2 | 1 - board/amlogic/q200/README.q200 | 1 - board/amlogic/s400/README | 1 - board/amlogic/sei510/README| 1 - board/amlogic/sei610/README| 1 - board/amlogic/u200/README | 1 - board/amlogic/w400/README.khadas-vim3 | 1 - board/amlogic/w400/README.khadas-vim3l | 1 - board/amlogic/w400/README.odroid-n2| 1 - board/amlogic/w400/README.w400 | 1 - 18 files changed, 18 deletions(-) diff --git a/board/amlogic/p200/README.nanopi-k2 b/board/amlogic/p200/README.nanopi-k2 index d450d3c2b2af..c8dec3569b4d 100644 --- a/board/amlogic/p200/README.nanopi-k2 +++ b/board/amlogic/p200/README.nanopi-k2 @@ -24,7 +24,6 @@ Currently the u-boot port supports the following devices: u-boot compilation == - > export ARCH=arm > export CROSS_COMPILE=aarch64-none-elf- > make nanopi-k2_defconfig > make diff --git a/board/amlogic/p200/README.odroid-c2 b/board/amlogic/p200/README.odroid-c2 index bed48c5728ba..3b9f80df29d8 100644 --- a/board/amlogic/p200/README.odroid-c2 +++ b/board/amlogic/p200/README.odroid-c2 @@ -29,7 +29,6 @@ Currently the u-boot port supports the following devices: u-boot compilation == - > export ARCH=arm > export CROSS_COMPILE=aarch64-none-elf- > make odroid-c2_defconfig > make diff --git a/board/amlogic/p200/README.p200 b/board/amlogic/p200/README.p200 index 01d82d1e79e3..84d5ca535691 100644 --- a/board/amlogic/p200/README.p200 +++ b/board/amlogic/p200/README.p200 @@ -31,7 +31,6 @@ Currently the u-boot port supports the following devices: u-boot compilation == - > export ARCH=arm > export CROSS_COMPILE=aarch64-none-elf- > make p200_defconfig > make diff --git a/board/amlogic/p201/README.p201 b/board/amlogic/p201/README.p201 index c251096ce142..4bb5e9590532 100644 --- a/board/amlogic/p201/README.p201 +++ b/board/amlogic/p201/README.p201 @@ -31,7 +31,6 @@ Currently the u-boot port supports the following devices: u-boot compilation == - > export ARCH=arm > export CROSS_COMPILE=aarch64-none-elf- > make p201_defconfig > make diff --git a/board/amlogic/p212/README.khadas-vim b/board/amlogic/p212/README.khadas-vim index a2c7606454f8..ccf933861b79 100644 --- a/board/amlogic/p212/README.khadas-vim +++ b/board/amlogic/p212/README.khadas-vim @@ -30,7 +30,6 @@ Currently the u-boot port supports the following devices: U-Boot compilation == - > export ARCH=arm > export CROSS_COMPILE=aarch64-none-elf- > make khadas-vim_defconfig > make diff --git a/board/amlogic/p212/README.libretech-ac b/board/amlogic/p212/README.libretech-ac index 538604261b84..3f713ec32634 100644 --- a/board/amlogic/p212/README.libretech-ac +++ b/board/amlogic/p212/README.libretech-ac @@ -25,7 +25,6 @@ Currently the U-Boot port supports the following devices: U-Boot compilation == - > export ARCH=arm > export CROSS_COMPILE=aarch64-none-elf- > make libretech-ac_defconfig > make diff --git a/board/amlogic/p212/README.libretech-cc b/board/amlogic/p212/README.libretech-cc index 6af7de3cfa79..74434d4435ec 100644 --- a/board/amlogic/p212/README.libretech-cc +++ b/board/amlogic/p212/README.libretech-cc @@ -30,7 +30,6 @@ Currently the U-Boot port supports the following devices: U-Boot compilation == - > export ARCH=arm > export CROSS_COMPILE=aarch64-none-elf- > make libretech-cc_defconfig > make diff --git a/board/amlogic/p212/README.p212 b/board/amlogic/p212/README.p212 index ef5370c763c4..3776f2449391 100644 --- a/board/amlogic/p212/README.p212 +++ b/board/amlogic/p212/README.p212 @@ -31,7 +31,6 @@ Currently the u-boot port supports the following devices: u-boot compilation == - > export ARCH=arm > export CROSS_COMPILE=aarch64-none-elf- > make p212_defconfig > make diff --git a/board/amlogic/q200/README.khadas-vim2 b/board/amlogic/q200/README.khadas-vim2 index 8bcfc296f3e0..595998c4fabb 100644 --- a/board/amlogic/q200/README.khadas-vim2 +++ b/board/amlogic/q200/README.khadas-vim2 @@ -31,7 +31,6 @@ Currently the u-boot port supports the following devices: U-Boot compilation == - > export ARCH=arm > export CROSS_COMPILE=aarch64-none-elf- > make khadas-vim2_defconfig > make diff --git
[PATCHv2] checkpatch.pl: Add check for defining CONFIG_CMD_xxx via config files
All of our cmds have a Kconfig entry. Making enabling a CMD via the
config file an error to checkpatch.pl.
Signed-off-by: Tom Rini
---
Changes in v2:
- Rebase on Simon's update that adds a u-boot section
- Catch undef as well
- Have a more generic message
---
scripts/checkpatch.pl | 6 ++
1 file changed, 6 insertions(+)
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 33ec4e2bfd44..cabb072a0de9 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -2265,6 +2265,12 @@ sub u_boot_line {
WARN("PREFER_IF",
"Use 'if (IS_ENABLED(CONFIG...))' instead of '#if or
#ifdef' where possible\n" . $herecurr);
}
+
+ # use defconfig to manage CONFIG_CMD options
+ if ($line =~ /\+\s*#\s*(define|undef)\s+(CONFIG_CMD\w*)\b/) {
+ ERROR("DEFINE_CONFIG_CMD",
+ "All commands are managed by Kconfig\n" . $herecurr);
+ }
}
sub process {
--
2.17.1
[PATCH v1] x86: acpi: Drop _HID() where enumerated by _ADR()
ACPICA complains that either _HID() or _ADR() should be used.
For General Purpose DMA we may not drop the _ADR() because
the device is enumerated by PCI. Thus, simple drop _HID().
Reported-by: Bin Meng
Signed-off-by: Andy Shevchenko
---
arch/x86/include/asm/arch-tangier/acpi/southcluster.asl | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/x86/include/asm/arch-tangier/acpi/southcluster.asl
b/arch/x86/include/asm/arch-tangier/acpi/southcluster.asl
index eaf75c8c673d..01077293bb91 100644
--- a/arch/x86/include/asm/arch-tangier/acpi/southcluster.asl
+++ b/arch/x86/include/asm/arch-tangier/acpi/southcluster.asl
@@ -531,7 +531,6 @@ Device (PCI0)
Device (GDMA)
{
Name (_ADR, 0x0015)
-Name (_HID, "808611A2")
Name (_UID, Zero)
Method (_STA, 0, NotSerialized)
--
2.26.2
[PATCH v3] arm: mvebu: Convert CRS305-1G-4S board to CRS3xx-98DX3236
Convert the CRS305-1G-4S board to CRS3xx-98DX3236 to enable easier
implementation of new CRS3xx series boards, based on Marvell Prestera
98DX3236.
Signed-off-by: Luka Kovacic
Cc: Luka Perkov
Cc: Jakov Petrina
---
Changes for v2:
- Fix the patch failing to merge into the current U-Boot tree
Changes for v3:
- Fix the patch failing to merge into the current U-Boot tree
arch/arm/dts/armada-xp-crs305-1g-4s.dts | 103 +---
arch/arm/dts/armada-xp-crs305-1g-4s.dtsi | 111 ++
arch/arm/mach-mvebu/Kconfig | 10 +-
board/mikrotik/crs305-1g-4s/MAINTAINERS | 7 --
.../.gitignore| 0
board/mikrotik/crs3xx-98dx3236/MAINTAINERS| 11 ++
.../Makefile | 2 +-
.../{crs305-1g-4s => crs3xx-98dx3236}/README | 12 +-
.../binary.0 | 0
.../crs3xx-98dx3236.c}| 0
.../kwbimage.cfg.in | 2 +-
configs/crs305-1g-4s_defconfig| 46
.../{crs305-1g-4s.h => crs3xx-98dx3236.h} | 6 +-
13 files changed, 165 insertions(+), 145 deletions(-)
create mode 100644 arch/arm/dts/armada-xp-crs305-1g-4s.dtsi
delete mode 100644 board/mikrotik/crs305-1g-4s/MAINTAINERS
rename board/mikrotik/{crs305-1g-4s => crs3xx-98dx3236}/.gitignore (100%)
create mode 100644 board/mikrotik/crs3xx-98dx3236/MAINTAINERS
rename board/mikrotik/{crs305-1g-4s => crs3xx-98dx3236}/Makefile (93%)
rename board/mikrotik/{crs305-1g-4s => crs3xx-98dx3236}/README (64%)
rename board/mikrotik/{crs305-1g-4s => crs3xx-98dx3236}/binary.0 (100%)
rename board/mikrotik/{crs305-1g-4s/crs305-1g-4s.c =>
crs3xx-98dx3236/crs3xx-98dx3236.c} (100%)
rename board/mikrotik/{crs305-1g-4s => crs3xx-98dx3236}/kwbimage.cfg.in (75%)
rename include/configs/{crs305-1g-4s.h => crs3xx-98dx3236.h} (87%)
diff --git a/arch/arm/dts/armada-xp-crs305-1g-4s.dts
b/arch/arm/dts/armada-xp-crs305-1g-4s.dts
index 1116f5c96c..010b83b542 100644
--- a/arch/arm/dts/armada-xp-crs305-1g-4s.dts
+++ b/arch/arm/dts/armada-xp-crs305-1g-4s.dts
@@ -1,110 +1,17 @@
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
/*
- * Device Tree file for CRS305-1G-4S board
+ * Device Tree file for MikroTik CRS305-1G-4S+ board
*
- * Copyright (C) 2016 Allied Telesis Labs
- *
- * Based on armada-xp-db.dts
- *
- * Note: this Device Tree assumes that the bootloader has remapped the
- * internal registers to 0xf100 (instead of the default
- * 0xd000). The 0xf100 is the default used by the recent,
- * DT-capable, U-Boot bootloaders provided by Marvell. Some earlier
- * boards were delivered with an older version of the bootloader that
- * left internal registers mapped at 0xd000. If you are in this
- * situation, you should either update your bootloader (preferred
- * solution) or the below Device Tree should be adjusted.
+ * Copyright (C) 2020 Sartura Ltd.
+ * Author: Luka Kovacic
*/
-/dts-v1/;
-#include "armada-xp-98dx3236.dtsi"
-#include "armada-xp-crs305-1g-4s-u-boot.dtsi"
+#include "armada-xp-crs305-1g-4s.dtsi"
/ {
- model = "CRS305-1G-4S";
- compatible = "marvell,armadaxp-98dx3236", "marvell,armadaxp-mv78260",
"marvell,armadaxp", "marvell,armada-370-xp";
-
- chosen {
- stdout-path = "serial0:115200n8";
- bootargs = "console=ttyS0,115200 earlyprintk";
- };
-
- aliases {
- spi0 =
- };
-
- memory {
- device_type = "memory";
- reg = <0 0x 0 0x2000>; /* 512 MB */
- };
-};
-
- {
- arm,parity-enable;
- marvell,ecc-enable;
-};
-
-_bootcs {
- status = "okay";
-
- /* Device Bus parameters are required */
-
- /* Read parameters */
- devbus,bus-width= <16>;
- devbus,turn-off-ps = <6>;
- devbus,badr-skew-ps = <0>;
- devbus,acc-first-ps = <124000>;
- devbus,acc-next-ps = <248000>;
- devbus,rd-setup-ps = <0>;
- devbus,rd-hold-ps = <0>;
-
- /* Write parameters */
- devbus,sync-enable = <0>;
- devbus,wr-high-ps = <6>;
- devbus,wr-low-ps = <6>;
- devbus,ale-wr-ps = <6>;
-};
-
- {
- status = "okay";
-};
-
- {
- status = "okay";
-};
-
- {
- clock-frequency = <10>;
- status = "okay";
-};
-
- {
- status = "okay";
+ model = "MikroTik CRS305-1G-4S+";
};
{
status = "okay";
-
- spi-flash@0 {
- #address-cells = <1>;
- #size-cells = <1>;
- compatible = "spi-flash", "jedec,spi-nor";
- reg = <0>; /* Chip select 0 */
- spi-max-frequency = <10800>;
- m25p,fast-read;
-
- partition@u-boot {
- reg = <0x 0x0010>;
- label = "u-boot";
- };
- partition@u-boot-env {
-
Re: [PATCH] video: extend stdout video console work-around for 'vga'
On Sat, May 23, 2020 at 05:11:20PM +0200, Anatolij Gustschin wrote: > cfb_console driver use 'vga' console name and we still have board > environments defining this name. Re-use existing DM_VIDEO work- > around for console name to support 'vga' name in stdout environment. > > Signed-off-by: Anatolij Gustschin Reviewed-by: Tom Rini -- Tom signature.asc Description: PGP signature
Re: [PATCH 11/14] ti: Drop sdp4430 board
On Tue, May 26, 2020 at 11:17 PM Jagan Teki wrote: > > DM, DM_SPI and other driver model migration deadlines > are expired for this board. > > Drop it. > > Signed-off-by: Jagan Teki > --- > arch/arm/mach-omap2/omap4/Kconfig | 4 -- > board/ti/sdp4430/Kconfig| 15 - > board/ti/sdp4430/MAINTAINERS| 6 -- > board/ti/sdp4430/Makefile | 10 --- > board/ti/sdp4430/cmd_bat.c | 41 > board/ti/sdp4430/sdp.c | 100 > board/ti/sdp4430/sdp4430_mux_data.h | 67 --- > configs/omap4_sdp4430_defconfig | 42 > include/configs/omap4_sdp4430.h | 25 --- > 9 files changed, 310 deletions(-) > delete mode 100644 board/ti/sdp4430/Kconfig > delete mode 100644 board/ti/sdp4430/MAINTAINERS > delete mode 100644 board/ti/sdp4430/Makefile > delete mode 100644 board/ti/sdp4430/cmd_bat.c > delete mode 100644 board/ti/sdp4430/sdp.c > delete mode 100644 board/ti/sdp4430/sdp4430_mux_data.h > delete mode 100644 configs/omap4_sdp4430_defconfig > delete mode 100644 include/configs/omap4_sdp4430.h Added board maintainer.
Re: [PATCH 09/14] gumstix: Drop duovero
On Tue, May 26, 2020 at 11:14:44PM +0530, Jagan Teki wrote: > DM, DM_SPI and other driver model migration deadlines > are expired for this board. > > Drop it. > > Signed-off-by: Jagan Teki > --- > arch/arm/mach-omap2/omap4/Kconfig| 4 - > board/gumstix/duovero/Kconfig| 12 - > board/gumstix/duovero/MAINTAINERS| 6 - > board/gumstix/duovero/Makefile | 6 - > board/gumstix/duovero/duovero.c | 273 --- > board/gumstix/duovero/duovero_mux_data.h | 198 > configs/duovero_defconfig| 42 > include/configs/duovero.h| 36 --- > include/configs/ti_omap4_common.h| 2 - > 9 files changed, 579 deletions(-) > delete mode 100644 board/gumstix/duovero/Kconfig > delete mode 100644 board/gumstix/duovero/MAINTAINERS > delete mode 100644 board/gumstix/duovero/Makefile > delete mode 100644 board/gumstix/duovero/duovero.c > delete mode 100644 board/gumstix/duovero/duovero_mux_data.h > delete mode 100644 configs/duovero_defconfig > delete mode 100644 include/configs/duovero.h Adding listed board maintainer... -- Tom signature.asc Description: PGP signature
Re: [PATCH 06/14] Pandora: Drop omap3 pandora
On Tue, May 26, 2020 at 11:14:41PM +0530, Jagan Teki wrote: > OF_CONTROL, DM_SPI and other driver model migration deadlines > are expired for this board. > > Drop it. > > Signed-off-by: Jagan Teki > --- > arch/arm/mach-omap2/omap3/Kconfig | 6 - > board/pandora/Kconfig | 9 - > board/pandora/MAINTAINERS | 6 - > board/pandora/Makefile| 6 - > board/pandora/pandora.c | 149 > board/pandora/pandora.h | 391 -- > configs/omap3_pandora_defconfig | 40 --- > doc/README.omap3 | 5 - > include/configs/omap3_pandora.h | 62 - > 9 files changed, 674 deletions(-) > delete mode 100644 board/pandora/Kconfig > delete mode 100644 board/pandora/MAINTAINERS > delete mode 100644 board/pandora/Makefile > delete mode 100644 board/pandora/pandora.c > delete mode 100644 board/pandora/pandora.h > delete mode 100644 configs/omap3_pandora_defconfig > delete mode 100644 include/configs/omap3_pandora.h Adding listed board maintainer.. -- Tom signature.asc Description: PGP signature
Re: [PATCHv2] mx23evk: Remove board
On Tue, May 26, 2020 at 02:43:03PM -0300, Fabio Estevam wrote: > On Tue, May 26, 2020 at 2:32 PM Tom Rini wrote: > > > > This board has not yet been converted to DM. After checking with the > > listed maintainer, remove. > > > > Cc: Otavio Salvador > > Signed-off-by: Tom Rini > > Let's try to convert this to DM first, please. Then please send a patch taking over this board, thanks! -- Tom signature.asc Description: PGP signature
Re: Bisected: omap_hsmmc 3.3V IO voltage incompatible with N900 (Was: Re: Bisected: mmc cause reboot loops on N900)
On Thursday 07 May 2020 17:19:38 Pali Rohár wrote:
> On Thursday 07 May 2020 19:10:14 Faiz Abbas wrote:
> > On 26/04/20 3:59 am, Pali Rohár wrote:
> > > On Sunday 26 April 2020 00:20:07 Pali Rohár wrote:
> > >> On Saturday 25 April 2020 23:26:15 Pali Rohár wrote:
> > >>> Now I tried git bisect and here is problematic commit which caused whole
> > >>> reboot loop:
> > >>>
> > >>> 04a2ea248f58b3b6216d0cd0a6b8698df8b14355 is the first bad commit
> > >>> commit 04a2ea248f58b3b6216d0cd0a6b8698df8b14355
> > >>> Author: Jean-Jacques Hiblot
> > >>> Date: Thu Sep 21 16:30:08 2017 +0200
> > >>>
> > >>> mmc: disable UHS modes if Vcc cannot be switched on and off
> > >>>
> > >>> If a power cycle cannot be done on Vcc, it is safer not to try the
> > >>> UHS
> > >>> modes because we wouldn't be able to recover from an error occurring
> > >>> during the UHS initialization.
> > >>>
> > >>> Signed-off-by: Jean-Jacques Hiblot
> > >>>
> > >>> :04 04 04de51428c8311a4b2fb3ad876ac3f6071ab57ee
> > >>> ea7a7959a4bd591c92a2c3d413d5643a8457d2ff M drivers
> > >>> :04 04 03f639baf2a2f55003cb750981fd8accc5b4a993
> > >>> fbcb9607d37959f0b5240f5d727133f58cc35379 M include
> > >>>
> > >>> It changes only core mmc code, nothing platform / board specific.
> > >>> U-Boot compiled from commit before above has fully working eMMC access
> > >>> on real Nokia N900. I can read files on FAT eMMC partition without any
> > >>> problem.
> > >>>
> > >>> I'm not sure what is happening here, but it looks like that omap hs mmc
> > >>> driver used on Nokia N900 is maybe not correctly hooked for UHS support.
> > >>>
> > >>> The most suspicious it that this problem cannot be reproduced in qemu
> > >>> n900 emulator. It happens only on real N900 hw.
> > >>
> > >> I took main change from above commit, reverted it on master and U-Boot
> > >> stopped crashing! No reboot loop anymore. Here is change which fixes
> > >> reboot loop on Nokia N900:
> > >>
> > >> diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
> > >> index 523c055967..d07c7745da 100644
> > >> --- a/drivers/mmc/mmc.c
> > >> +++ b/drivers/mmc/mmc.c
> > >> @@ -2786,18 +2786,7 @@ int mmc_get_op_cond(struct mmc *mmc)
> > >>MMC_QUIRK_RETRY_APP_CMD;
> > >> #endif
> > >>
> > >> -err = mmc_power_cycle(mmc);
> > >> -if (err) {
> > >> -/*
> > >> - * if power cycling is not supported, we should not try
> > >> - * to use the UHS modes, because we wouldn't be able to
> > >> - * recover from an error during the UHS initialization.
> > >> - */
> > >> -pr_debug("Unable to do a full power cycle. Disabling
> > >> the UHS modes for safety\n");
> > >> -uhs_en = false;
> > >> -mmc->host_caps &= ~UHS_CAPS;
> > >> -err = mmc_power_on(mmc);
> > >> -}
> > >> +err = mmc_power_on(mmc);
> > >> if (err)
> > >> return err;
> > >>
> > >>
> > >> Jean, do you have any idea what is happening in above code? It looks
> > >> like something is broken in power cycle / power on sequence if it cause
> > >> "data abort" and reboot of board.
> > >>
> > >>
> > >> But even with above my change eMMC on N900 cannot be initialized...
> > >> I'm running second git bisect with applying above change on every
> > >> commit. It is in progress now.
> > >
> > > And second bisect finished. Result is:
> > >
> > > d2c05f50e12f87128597a28146de7092aaa847c3 is the first bad commit
> > > commit d2c05f50e12f87128597a28146de7092aaa847c3
> > > Author: Faiz Abbas
> > > Date: Fri Apr 5 14:18:46 2019 +0530
> > >
> > > mmc: omap_hsmmc: Set 3.3V for IO voltage
> > >
> > > Pbias voltage should match the IO voltage set for the SD card. With
> > > the
> > > latest pbias change to 3.3V, update the capabilities and IO voltages
> > > settings to 3.3V.
> > >
> > > Signed-off-by: Faiz Abbas
> > >
> > > :04 04 819148217b64a6beaf8247464de6b4384d4581a4
> > > e4fd9288ddb794f33596339813d5386f3bed8fd7 M drivers
> > >
> > > I revered above commit on top of master and eMMC on Nokia N900 finally
> > > started working again!
> > >
> > > Faiz, what is the reason for above commit? It basically changes in omap
> > > hs mmc driver IO voltage from 3.0V to 3.3V. And seems this change is
> > > incompatible with Nokia N900. Are there any problems with 3.0V on some
> > > omap3 boards? If not I would vote for revering that commit. Or at least
> > > making IO voltage configurable.
> > >
> >
> > For the power_cycle patch, it looks like there is a null pointer dereference
> > that might be causing the reboot loops (probably because your platform
> > doesn't
> > have DM_MMC enabled) Can you add a few more prints to see where the data
> > abort
> > comes from exactly?
>
> Hello Faiz!
>
> Sorry, but this is problematic. Because of reboot loops I
[PATCH 14/14] doc: driver-model: Update SPI migration status
ompa3 and fsl_dspi are fully converted into DM_SPI. Update it. Signed-off-by: Jagan Teki --- doc/driver-model/migration.rst | 2 -- 1 file changed, 2 deletions(-) diff --git a/doc/driver-model/migration.rst b/doc/driver-model/migration.rst index 2c0e2c7f06..408643974c 100644 --- a/doc/driver-model/migration.rst +++ b/doc/driver-model/migration.rst @@ -75,10 +75,8 @@ No dm conversion yet:: Partially converted:: - drivers/spi/fsl_dspi.c drivers/spi/kirkwood_spi.c drivers/spi/mxc_spi.c - drivers/spi/omap3_spi.c drivers/spi/sh_qspi.c * Status: In progress -- 2.25.1
[PATCH 13/14] spi: omap3: Drop nondm code
Now all boards are using this omap3 spi driver in
dm model, so drop the nondm code.
Signed-off-by: Jagan Teki
---
drivers/spi/Kconfig | 14 ++---
drivers/spi/omap3_spi.c | 136
2 files changed, 7 insertions(+), 143 deletions(-)
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 09b9cb17d8..8fccfbf20d 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -226,6 +226,13 @@ config NXP_FSPI
Enable the NXP FlexSPI (FSPI) driver. This driver can be used to
access the SPI NOR flash on platforms embedding this NXP IP core.
+config OMAP3_SPI
+ bool "McSPI driver for OMAP"
+ help
+ SPI master controller for OMAP24XX and later Multichannel SPI
+ (McSPI). This driver be used to access SPI chips on platforms
+ embedding this OMAP3 McSPI IP core.
+
config PIC32_SPI
bool "Microchip PIC32 SPI driver"
depends on MACH_PIC32
@@ -429,11 +436,4 @@ config MXC_SPI
Enable the MXC SPI controller driver. This driver can be used
on various i.MX SoCs such as i.MX31/35/51/6/7.
-config OMAP3_SPI
- bool "McSPI driver for OMAP"
- help
- SPI master controller for OMAP24XX and later Multichannel SPI
- (McSPI). This driver be used to access SPI chips on platforms
- embedding this OMAP3 McSPI IP core.
-
endif # menu "SPI Support"
diff --git a/drivers/spi/omap3_spi.c b/drivers/spi/omap3_spi.c
index 6a615d1498..39e6813469 100644
--- a/drivers/spi/omap3_spi.c
+++ b/drivers/spi/omap3_spi.c
@@ -25,16 +25,6 @@
DECLARE_GLOBAL_DATA_PTR;
-#if defined(CONFIG_AM33XX) || defined(CONFIG_AM43XX)
-#define OMAP3_MCSPI1_BASE 0x48030100
-#define OMAP3_MCSPI2_BASE 0x481A0100
-#else
-#define OMAP3_MCSPI1_BASE 0x48098000
-#define OMAP3_MCSPI2_BASE 0x4809A000
-#define OMAP3_MCSPI3_BASE 0x480B8000
-#define OMAP3_MCSPI4_BASE 0x480BA000
-#endif
-
#define OMAP4_MCSPI_REG_OFFSET 0x100
struct omap2_mcspi_platform_config {
@@ -109,9 +99,6 @@ struct mcspi {
};
struct omap3_spi_priv {
-#ifndef CONFIG_DM_SPI
- struct spi_slave slave;
-#endif
struct mcspi *regs;
unsigned int cs;
unsigned int freq;
@@ -455,128 +442,6 @@ static void _omap3_spi_claim_bus(struct omap3_spi_priv
*priv)
writel(conf, >regs->modulctrl);
}
-#ifndef CONFIG_DM_SPI
-
-static inline struct omap3_spi_priv *to_omap3_spi(struct spi_slave *slave)
-{
- return container_of(slave, struct omap3_spi_priv, slave);
-}
-
-void spi_free_slave(struct spi_slave *slave)
-{
- struct omap3_spi_priv *priv = to_omap3_spi(slave);
-
- free(priv);
-}
-
-int spi_claim_bus(struct spi_slave *slave)
-{
- struct omap3_spi_priv *priv = to_omap3_spi(slave);
-
- spi_reset(priv->regs);
-
- _omap3_spi_claim_bus(priv);
- _omap3_spi_set_wordlen(priv);
- _omap3_spi_set_mode(priv);
- _omap3_spi_set_speed(priv);
-
- return 0;
-}
-
-void spi_release_bus(struct spi_slave *slave)
-{
- struct omap3_spi_priv *priv = to_omap3_spi(slave);
-
- writel(OMAP3_MCSPI_MODULCTRL_MS, >regs->modulctrl);
-}
-
-struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
-unsigned int max_hz, unsigned int mode)
-{
- struct omap3_spi_priv *priv;
- struct mcspi *regs;
-
- /*
-* OMAP3 McSPI (MultiChannel SPI) has 4 busses (modules)
-* with different number of chip selects (CS, channels):
-* McSPI1 has 4 CS (bus 0, cs 0 - 3)
-* McSPI2 has 2 CS (bus 1, cs 0 - 1)
-* McSPI3 has 2 CS (bus 2, cs 0 - 1)
-* McSPI4 has 1 CS (bus 3, cs 0)
-*/
-
- switch (bus) {
- case 0:
-regs = (struct mcspi *)OMAP3_MCSPI1_BASE;
-break;
-#ifdef OMAP3_MCSPI2_BASE
- case 1:
-regs = (struct mcspi *)OMAP3_MCSPI2_BASE;
-break;
-#endif
-#ifdef OMAP3_MCSPI3_BASE
- case 2:
-regs = (struct mcspi *)OMAP3_MCSPI3_BASE;
-break;
-#endif
-#ifdef OMAP3_MCSPI4_BASE
- case 3:
-regs = (struct mcspi *)OMAP3_MCSPI4_BASE;
-break;
-#endif
- default:
-printf("SPI error: unsupported bus %i. Supported busses 0 -
3\n", bus);
-return NULL;
- }
-
- if (((bus == 0) && (cs > 3)) ||
- ((bus == 1) && (cs > 1)) ||
- ((bus == 2) && (cs > 1)) ||
- ((bus == 3) && (cs > 0))) {
- printf("SPI error: unsupported chip select %i on bus %i\n", cs,
bus);
- return NULL;
- }
-
- if (max_hz > OMAP3_MCSPI_MAX_FREQ) {
- printf("SPI error: unsupported frequency %i Hz. Max frequency
is 48 MHz\n",
- max_hz);
- return NULL;
- }
-
- if (mode > SPI_MODE_3) {
- printf("SPI error: unsupported SPI mode %i\n", mode);
-
[PATCH 11/14] ti: Drop sdp4430 board
DM, DM_SPI and other driver model migration deadlines
are expired for this board.
Drop it.
Signed-off-by: Jagan Teki
---
arch/arm/mach-omap2/omap4/Kconfig | 4 --
board/ti/sdp4430/Kconfig| 15 -
board/ti/sdp4430/MAINTAINERS| 6 --
board/ti/sdp4430/Makefile | 10 ---
board/ti/sdp4430/cmd_bat.c | 41
board/ti/sdp4430/sdp.c | 100
board/ti/sdp4430/sdp4430_mux_data.h | 67 ---
configs/omap4_sdp4430_defconfig | 42
include/configs/omap4_sdp4430.h | 25 ---
9 files changed, 310 deletions(-)
delete mode 100644 board/ti/sdp4430/Kconfig
delete mode 100644 board/ti/sdp4430/MAINTAINERS
delete mode 100644 board/ti/sdp4430/Makefile
delete mode 100644 board/ti/sdp4430/cmd_bat.c
delete mode 100644 board/ti/sdp4430/sdp.c
delete mode 100644 board/ti/sdp4430/sdp4430_mux_data.h
delete mode 100644 configs/omap4_sdp4430_defconfig
delete mode 100644 include/configs/omap4_sdp4430.h
diff --git a/arch/arm/mach-omap2/omap4/Kconfig
b/arch/arm/mach-omap2/omap4/Kconfig
index 4cc360f38a..f1c60f3562 100644
--- a/arch/arm/mach-omap2/omap4/Kconfig
+++ b/arch/arm/mach-omap2/omap4/Kconfig
@@ -4,9 +4,6 @@ choice
prompt "OMAP4 board select"
optional
-config TARGET_OMAP4_SDP4430
- bool "TI OMAP4 SDP4430"
-
config TARGET_KC1
bool "Amazon Kindle Fire (first generation)"
@@ -15,7 +12,6 @@ endchoice
config SYS_SOC
default "omap4"
-source "board/ti/sdp4430/Kconfig"
source "board/amazon/kc1/Kconfig"
endif
diff --git a/board/ti/sdp4430/Kconfig b/board/ti/sdp4430/Kconfig
deleted file mode 100644
index 36f1852821..00
--- a/board/ti/sdp4430/Kconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-if TARGET_OMAP4_SDP4430
-
-config SYS_BOARD
- default "sdp4430"
-
-config SYS_VENDOR
- default "ti"
-
-config SYS_CONFIG_NAME
- default "omap4_sdp4430"
-
-config CMD_BAT
- bool "Enable board-specific battery command"
-
-endif
diff --git a/board/ti/sdp4430/MAINTAINERS b/board/ti/sdp4430/MAINTAINERS
deleted file mode 100644
index ac4d0ccc19..00
--- a/board/ti/sdp4430/MAINTAINERS
+++ /dev/null
@@ -1,6 +0,0 @@
-SDP4430 BOARD
-M: Lokesh Vutla
-S: Maintained
-F: board/ti/sdp4430/
-F: include/configs/omap4_sdp4430.h
-F: configs/omap4_sdp4430_defconfig
diff --git a/board/ti/sdp4430/Makefile b/board/ti/sdp4430/Makefile
deleted file mode 100644
index ae06945612..00
--- a/board/ti/sdp4430/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2000, 2001, 2002
-# Wolfgang Denk, DENX Software Engineering, w...@denx.de.
-
-obj-y := sdp.o
-
-ifndef CONFIG_SPL_BUILD
-obj-y += cmd_bat.o
-endif
diff --git a/board/ti/sdp4430/cmd_bat.c b/board/ti/sdp4430/cmd_bat.c
deleted file mode 100644
index 6c1e6ca393..00
--- a/board/ti/sdp4430/cmd_bat.c
+++ /dev/null
@@ -1,41 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2010 Texas Instruments
- */
-
-#include
-#include
-
-#ifdef CONFIG_CMD_BAT
-#include
-
-int do_vbat(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
-{
- if (argc == 2) {
- if (strncmp(argv[1], "startcharge", 12) == 0)
- twl6030_start_usb_charging();
- else if (strncmp(argv[1], "stopcharge", 11) == 0)
- twl6030_stop_usb_charging();
- else if (strncmp(argv[1], "status", 7) == 0) {
- twl6030_get_battery_voltage();
- twl6030_get_battery_current();
- } else {
- goto bat_cmd_usage;
- }
- } else {
- goto bat_cmd_usage;
- }
- return 0;
-
-bat_cmd_usage:
- return cmd_usage(cmdtp);
-}
-
-U_BOOT_CMD(
- bat, 2, 1, do_vbat,
- "battery charging, voltage/current measurements",
- "status - display battery voltage and current\n"
- "bat startcharge - start charging via USB\n"
- "bat stopcharge - stop charging\n"
-);
-#endif /* CONFIG_CMD_BAT */
diff --git a/board/ti/sdp4430/sdp.c b/board/ti/sdp4430/sdp.c
deleted file mode 100644
index a5b3504045..00
--- a/board/ti/sdp4430/sdp.c
+++ /dev/null
@@ -1,100 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2010
- * Texas Instruments Incorporated,
- * Aneesh V
- * Steve Sakoman
- */
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include "sdp4430_mux_data.h"
-
-DECLARE_GLOBAL_DATA_PTR;
-
-const struct omap_sysinfo sysinfo = {
- "Board: OMAP4430 SDP\n"
-};
-
-/**
- * @brief board_init
- *
- * @return 0
- */
-int board_init(void)
-{
- gpmc_init();
-
- gd->bd->bi_boot_params = (0x8000 + 0x100); /* boot param addr */
-
- return 0;
-}
-
-int board_eth_init(bd_t *bis)
-{
- return 0;
-}
-
-/**
- * @brief misc_init_r - Configure SDP board specific configurations
- *
[PATCH 12/14] ti: Drop omap5 uevm
DM, DM_SPI and other driver model migration deadlines
are expired for this board.
Drop it.
Cc: Lokesh Vutla
Signed-off-by: Jagan Teki
---
arch/arm/mach-omap2/omap5/Kconfig | 4 -
board/ti/omap5_uevm/Kconfig | 12 --
board/ti/omap5_uevm/MAINTAINERS | 6 -
board/ti/omap5_uevm/Makefile | 6 -
board/ti/omap5_uevm/README| 25 ---
board/ti/omap5_uevm/evm.c | 283 --
board/ti/omap5_uevm/mux_data.h| 57 --
configs/omap5_uevm_defconfig | 55 --
include/configs/omap5_uevm.h | 62 ---
9 files changed, 510 deletions(-)
delete mode 100644 board/ti/omap5_uevm/Kconfig
delete mode 100644 board/ti/omap5_uevm/MAINTAINERS
delete mode 100644 board/ti/omap5_uevm/Makefile
delete mode 100644 board/ti/omap5_uevm/README
delete mode 100644 board/ti/omap5_uevm/evm.c
delete mode 100644 board/ti/omap5_uevm/mux_data.h
delete mode 100644 configs/omap5_uevm_defconfig
delete mode 100644 include/configs/omap5_uevm.h
diff --git a/arch/arm/mach-omap2/omap5/Kconfig
b/arch/arm/mach-omap2/omap5/Kconfig
index a0c0b93a00..e73106e321 100644
--- a/arch/arm/mach-omap2/omap5/Kconfig
+++ b/arch/arm/mach-omap2/omap5/Kconfig
@@ -9,9 +9,6 @@ choice
prompt "OMAP5 board select"
optional
-config TARGET_OMAP5_UEVM
- bool "TI OMAP5 uEVM board"
-
config TARGET_DRA7XX_EVM
bool "TI DRA7XX"
select BOARD_LATE_INIT
@@ -153,7 +150,6 @@ endchoice
endmenu
endif
-source "board/ti/omap5_uevm/Kconfig"
source "board/ti/dra7xx/Kconfig"
source "board/ti/am57xx/Kconfig"
diff --git a/board/ti/omap5_uevm/Kconfig b/board/ti/omap5_uevm/Kconfig
deleted file mode 100644
index aa13844544..00
--- a/board/ti/omap5_uevm/Kconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-if TARGET_OMAP5_UEVM
-
-config SYS_BOARD
- default "omap5_uevm"
-
-config SYS_VENDOR
- default "ti"
-
-config SYS_CONFIG_NAME
- default "omap5_uevm"
-
-endif
diff --git a/board/ti/omap5_uevm/MAINTAINERS b/board/ti/omap5_uevm/MAINTAINERS
deleted file mode 100644
index 280ea2f91f..00
--- a/board/ti/omap5_uevm/MAINTAINERS
+++ /dev/null
@@ -1,6 +0,0 @@
-OMAP5_UEVM BOARD
-M: Lokesh Vutla
-S: Maintained
-F: board/ti/omap5_uevm/
-F: include/configs/omap5_uevm.h
-F: configs/omap5_uevm_defconfig
diff --git a/board/ti/omap5_uevm/Makefile b/board/ti/omap5_uevm/Makefile
deleted file mode 100644
index 17ee516d26..00
--- a/board/ti/omap5_uevm/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2000, 2001, 2002
-# Wolfgang Denk, DENX Software Engineering, w...@denx.de.
-
-obj-y := evm.o
diff --git a/board/ti/omap5_uevm/README b/board/ti/omap5_uevm/README
deleted file mode 100644
index 970e2eceb7..00
--- a/board/ti/omap5_uevm/README
+++ /dev/null
@@ -1,25 +0,0 @@
-Summary
-===
-
-This document covers various features of the 'omap5_uevm' build and some
-related uses.
-
-eMMC boot partition use
-===
-
-It is possible, depending on SYSBOOT configuration to boot from the eMMC
-boot partitions using (name depending on documentation referenced)
-Alternative Boot operation mode or Boot Sequence Option 1/2. In this
-example we load MLO and u-boot.img from the build into DDR and then use
-'mmc bootbus' to set the required rate (see TRM) and 'mmc partconfig' to
-set boot0 as the boot device.
-U-Boot # setenv autoload no
-U-Boot # usb start
-U-Boot # dhcp
-U-Boot # mmc dev 1 1
-U-Boot # tftp ${loadaddr} omap5uevm/MLO
-U-Boot # mmc write ${loadaddr} 0 100
-U-Boot # tftp ${loadaddr} omap5uevm/u-boot.img
-U-Boot # mmc write ${loadaddr} 300 400
-U-Boot # mmc bootbus 1 2 0 2
-U-Boot # mmc partconf 1 1 1 0
diff --git a/board/ti/omap5_uevm/evm.c b/board/ti/omap5_uevm/evm.c
deleted file mode 100644
index e35f319b46..00
--- a/board/ti/omap5_uevm/evm.c
+++ /dev/null
@@ -1,283 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2010
- * Texas Instruments Incorporated,
- * Aneesh V
- * Steve Sakoman
- */
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include "mux_data.h"
-
-#if defined(CONFIG_USB_EHCI_HCD) || defined(CONFIG_USB_XHCI_OMAP)
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#define DIE_ID_REG_BASE (OMAP54XX_L4_CORE_BASE + 0x2000)
-#define DIE_ID_REG_OFFSET 0x200
-
-#endif
-
-DECLARE_GLOBAL_DATA_PTR;
-
-const struct omap_sysinfo sysinfo = {
- "Board: OMAP5432 uEVM\n"
-};
-
-/**
- * @brief tca642x_init - uEVM default values for the GPIO expander
- * input reg, output reg, polarity reg, configuration reg
- */
-struct tca642x_bank_info tca642x_init[] = {
- { .input_reg = 0x00,
- .output_reg = 0x04,
- .polarity_reg = 0x00,
- .configuration_reg = 0x80 },
- { .input_reg = 0x00,
- .output_reg = 0x00,
- .polarity_reg =
[PATCH 10/14] ti: Drop panda board
DM, DM_SPI and other driver model migration deadlines
are expired for this board.
Drop it.
Cc: Lokesh Vutla
Signed-off-by: Jagan Teki
---
arch/arm/mach-omap2/omap4/Kconfig | 4 -
board/ti/panda/Kconfig| 12 --
board/ti/panda/MAINTAINERS| 6 -
board/ti/panda/Makefile | 6 -
board/ti/panda/panda.c| 346 --
board/ti/panda/panda_mux_data.h | 86
configs/omap4_panda_defconfig | 42
include/configs/omap4_panda.h | 34 ---
8 files changed, 536 deletions(-)
delete mode 100644 board/ti/panda/Kconfig
delete mode 100644 board/ti/panda/MAINTAINERS
delete mode 100644 board/ti/panda/Makefile
delete mode 100644 board/ti/panda/panda.c
delete mode 100644 board/ti/panda/panda_mux_data.h
delete mode 100644 configs/omap4_panda_defconfig
delete mode 100644 include/configs/omap4_panda.h
diff --git a/arch/arm/mach-omap2/omap4/Kconfig
b/arch/arm/mach-omap2/omap4/Kconfig
index 899289b645..4cc360f38a 100644
--- a/arch/arm/mach-omap2/omap4/Kconfig
+++ b/arch/arm/mach-omap2/omap4/Kconfig
@@ -4,9 +4,6 @@ choice
prompt "OMAP4 board select"
optional
-config TARGET_OMAP4_PANDA
- bool "TI OMAP4 PandaBoard"
-
config TARGET_OMAP4_SDP4430
bool "TI OMAP4 SDP4430"
@@ -18,7 +15,6 @@ endchoice
config SYS_SOC
default "omap4"
-source "board/ti/panda/Kconfig"
source "board/ti/sdp4430/Kconfig"
source "board/amazon/kc1/Kconfig"
diff --git a/board/ti/panda/Kconfig b/board/ti/panda/Kconfig
deleted file mode 100644
index 8f277b612a..00
--- a/board/ti/panda/Kconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-if TARGET_OMAP4_PANDA
-
-config SYS_BOARD
- default "panda"
-
-config SYS_VENDOR
- default "ti"
-
-config SYS_CONFIG_NAME
- default "omap4_panda"
-
-endif
diff --git a/board/ti/panda/MAINTAINERS b/board/ti/panda/MAINTAINERS
deleted file mode 100644
index 2142368271..00
--- a/board/ti/panda/MAINTAINERS
+++ /dev/null
@@ -1,6 +0,0 @@
-PANDA BOARD
-M: Lokesh Vutla
-S: Maintained
-F: board/ti/panda/
-F: include/configs/omap4_panda.h
-F: configs/omap4_panda_defconfig
diff --git a/board/ti/panda/Makefile b/board/ti/panda/Makefile
deleted file mode 100644
index dd2ff33afa..00
--- a/board/ti/panda/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2000, 2001, 2002
-# Wolfgang Denk, DENX Software Engineering, w...@denx.de.
-
-obj-y := panda.o
diff --git a/board/ti/panda/panda.c b/board/ti/panda/panda.c
deleted file mode 100644
index 9ebecfdbf5..00
--- a/board/ti/panda/panda.c
+++ /dev/null
@@ -1,346 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2010
- * Texas Instruments Incorporated,
- * Steve Sakoman
- */
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include "panda_mux_data.h"
-
-#ifdef CONFIG_USB_EHCI_HCD
-#include
-#include
-#include
-#endif
-
-#define PANDA_ULPI_PHY_TYPE_GPIO 182
-#define PANDA_BOARD_ID_1_GPIO 101
-#define PANDA_ES_BOARD_ID_1_GPIO48
-#define PANDA_BOARD_ID_2_GPIO 171
-#define PANDA_ES_BOARD_ID_3_GPIO 3
-#define PANDA_ES_BOARD_ID_4_GPIO 2
-
-DECLARE_GLOBAL_DATA_PTR;
-
-const struct omap_sysinfo sysinfo = {
- "Board: OMAP4 Panda\n"
-};
-
-struct omap4_scrm_regs *const scrm = (struct omap4_scrm_regs *)0x4a30a000;
-
-/**
- * @brief board_init
- *
- * @return 0
- */
-int board_init(void)
-{
- gpmc_init();
-
- gd->bd->bi_arch_number = MACH_TYPE_OMAP4_PANDA;
- gd->bd->bi_boot_params = (0x8000 + 0x100); /* boot param addr */
-
- return 0;
-}
-
-int board_eth_init(bd_t *bis)
-{
- return 0;
-}
-
-/*
-* Routine: get_board_revision
-* Description: Detect if we are running on a panda revision A1-A6,
-* or an ES panda board. This can be done by reading
-* the level of GPIOs and checking the processor revisions.
-* This should result in:
-* Panda 4430:
-* GPIO171, GPIO101, GPIO182: 0 1 1 => A1-A5
-* GPIO171, GPIO101, GPIO182: 1 0 1 => A6
-* Panda ES:
-* GPIO2, GPIO3, GPIO171, GPIO48, GPIO182: 0 0 0 1 1 => B1/B2
-* GPIO2, GPIO3, GPIO171, GPIO48, GPIO182: 0 0 1 1 1 => B3
-*/
-int get_board_revision(void)
-{
- int board_id0, board_id1, board_id2;
- int board_id3, board_id4;
- int board_id;
-
- int processor_rev = omap_revision();
-
- /* Setup the mux for the common board ID pins (gpio 171 and 182) */
- writew((IEN | M3), (*ctrl)->control_padconf_core_base + UNIPRO_TX0);
- writew((IEN | M3), (*ctrl)->control_padconf_core_base + FREF_CLK2_OUT);
-
- board_id0 = gpio_get_value(PANDA_ULPI_PHY_TYPE_GPIO);
- board_id2 = gpio_get_value(PANDA_BOARD_ID_2_GPIO);
-
- if ((processor_rev >= OMAP4460_ES1_0 &&
-
[PATCH 09/14] gumstix: Drop duovero
DM, DM_SPI and other driver model migration deadlines
are expired for this board.
Drop it.
Signed-off-by: Jagan Teki
---
arch/arm/mach-omap2/omap4/Kconfig| 4 -
board/gumstix/duovero/Kconfig| 12 -
board/gumstix/duovero/MAINTAINERS| 6 -
board/gumstix/duovero/Makefile | 6 -
board/gumstix/duovero/duovero.c | 273 ---
board/gumstix/duovero/duovero_mux_data.h | 198
configs/duovero_defconfig| 42
include/configs/duovero.h| 36 ---
include/configs/ti_omap4_common.h| 2 -
9 files changed, 579 deletions(-)
delete mode 100644 board/gumstix/duovero/Kconfig
delete mode 100644 board/gumstix/duovero/MAINTAINERS
delete mode 100644 board/gumstix/duovero/Makefile
delete mode 100644 board/gumstix/duovero/duovero.c
delete mode 100644 board/gumstix/duovero/duovero_mux_data.h
delete mode 100644 configs/duovero_defconfig
delete mode 100644 include/configs/duovero.h
diff --git a/arch/arm/mach-omap2/omap4/Kconfig
b/arch/arm/mach-omap2/omap4/Kconfig
index 49adb8ec5b..899289b645 100644
--- a/arch/arm/mach-omap2/omap4/Kconfig
+++ b/arch/arm/mach-omap2/omap4/Kconfig
@@ -4,9 +4,6 @@ choice
prompt "OMAP4 board select"
optional
-config TARGET_DUOVERO
- bool "OMAP4430 Gumstix Duovero"
-
config TARGET_OMAP4_PANDA
bool "TI OMAP4 PandaBoard"
@@ -21,7 +18,6 @@ endchoice
config SYS_SOC
default "omap4"
-source "board/gumstix/duovero/Kconfig"
source "board/ti/panda/Kconfig"
source "board/ti/sdp4430/Kconfig"
source "board/amazon/kc1/Kconfig"
diff --git a/board/gumstix/duovero/Kconfig b/board/gumstix/duovero/Kconfig
deleted file mode 100644
index 2f8558aaf3..00
--- a/board/gumstix/duovero/Kconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-if TARGET_DUOVERO
-
-config SYS_BOARD
- default "duovero"
-
-config SYS_VENDOR
- default "gumstix"
-
-config SYS_CONFIG_NAME
- default "duovero"
-
-endif
diff --git a/board/gumstix/duovero/MAINTAINERS
b/board/gumstix/duovero/MAINTAINERS
deleted file mode 100644
index 87cd4e670c..00
--- a/board/gumstix/duovero/MAINTAINERS
+++ /dev/null
@@ -1,6 +0,0 @@
-DUOVERO BOARD
-M: Ash Charles
-S: Maintained
-F: board/gumstix/duovero/
-F: include/configs/duovero.h
-F: configs/duovero_defconfig
diff --git a/board/gumstix/duovero/Makefile b/board/gumstix/duovero/Makefile
deleted file mode 100644
index d6eff473f8..00
--- a/board/gumstix/duovero/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2000, 2001, 2002
-# Wolfgang Denk, DENX Software Engineering, w...@denx.de.
-
-obj-y := duovero.o
diff --git a/board/gumstix/duovero/duovero.c b/board/gumstix/duovero/duovero.c
deleted file mode 100644
index 0df03a5a61..00
--- a/board/gumstix/duovero/duovero.c
+++ /dev/null
@@ -1,273 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2013
- * Gumstix Inc.
- * Maintainer: Ash Charles
- */
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include "duovero_mux_data.h"
-
-#define WIFI_EN43
-
-#if defined(CONFIG_CMD_NET)
-#define SMSC_NRESET45
-static void setup_net_chip(void);
-#endif
-
-#ifdef CONFIG_USB_EHCI_HCD
-#include
-#include
-#include
-#endif
-
-DECLARE_GLOBAL_DATA_PTR;
-
-const struct omap_sysinfo sysinfo = {
- "Board: duovero\n"
-};
-
-struct omap4_scrm_regs *const scrm = (struct omap4_scrm_regs *)0x4a30a000;
-
-/**
- * @brief board_init
- *
- * @return 0
- */
-int board_init(void)
-{
- gpmc_init();
-
- gd->bd->bi_arch_number = MACH_TYPE_DUOVERO;
- gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
-
- return 0;
-}
-
-/**
- * @brief misc_init_r - Configure board specific configurations
- * such as power configurations, ethernet initialization as phase2 of
- * boot sequence
- *
- * @return 0
- */
-int misc_init_r(void)
-{
- int ret = 0;
- u8 val;
-
- /* wifi setup: first enable 32Khz clock from 6030 pmic */
- val = 0xe1;
- ret = i2c_write(TWL6030_CHIP_PM, 0xbe, 1, , 1);
- if (ret)
- printf("Failed to enable 32Khz clock to wifi module\n");
-
- /* then setup WIFI_EN as an output pin and send reset pulse */
- if (!gpio_request(WIFI_EN, "")) {
- gpio_direction_output(WIFI_EN, 0);
- gpio_set_value(WIFI_EN, 1);
- udelay(1);
- gpio_set_value(WIFI_EN, 0);
- udelay(1);
- gpio_set_value(WIFI_EN, 1);
- }
-
-#if defined(CONFIG_CMD_NET)
- setup_net_chip();
-#endif
- return 0;
-}
-
-void set_muxconf_regs(void)
-{
- do_set_mux((*ctrl)->control_padconf_core_base,
- core_padconf_array_essential,
- sizeof(core_padconf_array_essential) /
- sizeof(struct
[PATCH 07/14] logicpd: Drop omap3 zoom1
OF_CONTROL, DM_SPI and other driver model migration deadlines
are expired for this board.
Drop it.
Cc: Nishanth Menon
Signed-off-by: Jagan Teki
---
arch/arm/mach-omap2/omap3/Kconfig | 8 --
board/logicpd/zoom1/Kconfig | 12 ---
board/logicpd/zoom1/MAINTAINERS | 6 --
board/logicpd/zoom1/Makefile | 6 --
board/logicpd/zoom1/config.mk | 14 ---
board/logicpd/zoom1/zoom1.c | 148 --
board/logicpd/zoom1/zoom1.h | 122
configs/omap3_zoom1_defconfig | 41 -
doc/README.omap3 | 5 -
include/configs/omap3_zoom1.h | 131 --
10 files changed, 493 deletions(-)
delete mode 100644 board/logicpd/zoom1/Kconfig
delete mode 100644 board/logicpd/zoom1/MAINTAINERS
delete mode 100644 board/logicpd/zoom1/Makefile
delete mode 100644 board/logicpd/zoom1/config.mk
delete mode 100644 board/logicpd/zoom1/zoom1.c
delete mode 100644 board/logicpd/zoom1/zoom1.h
delete mode 100644 configs/omap3_zoom1_defconfig
delete mode 100644 include/configs/omap3_zoom1.h
diff --git a/arch/arm/mach-omap2/omap3/Kconfig
b/arch/arm/mach-omap2/omap3/Kconfig
index 18068be076..7421fe5e6c 100644
--- a/arch/arm/mach-omap2/omap3/Kconfig
+++ b/arch/arm/mach-omap2/omap3/Kconfig
@@ -68,13 +68,6 @@ config TARGET_OMAP3_IGEP00X0
select OMAP3_GPIO_6
imply CMD_DM
-config TARGET_OMAP3_ZOOM1
- bool "TI Zoom1"
- select DM
- select DM_GPIO
- select DM_SERIAL
- imply CMD_DM
-
config TARGET_AM3517_CRANE
bool "am3517_crane"
@@ -154,7 +147,6 @@ source "board/ti/beagle/Kconfig"
source "board/timll/devkit8000/Kconfig"
source "board/ti/evm/Kconfig"
source "board/isee/igep00x0/Kconfig"
-source "board/logicpd/zoom1/Kconfig"
source "board/ti/am3517crane/Kconfig"
source "board/corscience/tricorder/Kconfig"
source "board/logicpd/omap3som/Kconfig"
diff --git a/board/logicpd/zoom1/Kconfig b/board/logicpd/zoom1/Kconfig
deleted file mode 100644
index d76cb663f7..00
--- a/board/logicpd/zoom1/Kconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-if TARGET_OMAP3_ZOOM1
-
-config SYS_BOARD
- default "zoom1"
-
-config SYS_VENDOR
- default "logicpd"
-
-config SYS_CONFIG_NAME
- default "omap3_zoom1"
-
-endif
diff --git a/board/logicpd/zoom1/MAINTAINERS b/board/logicpd/zoom1/MAINTAINERS
deleted file mode 100644
index 338b965deb..00
--- a/board/logicpd/zoom1/MAINTAINERS
+++ /dev/null
@@ -1,6 +0,0 @@
-ZOOM1 BOARD
-M: Nishanth Menon
-S: Maintained
-F: board/logicpd/zoom1/
-F: include/configs/omap3_zoom1.h
-F: configs/omap3_zoom1_defconfig
diff --git a/board/logicpd/zoom1/Makefile b/board/logicpd/zoom1/Makefile
deleted file mode 100644
index e73b42e702..00
--- a/board/logicpd/zoom1/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2000, 2001, 2002
-# Wolfgang Denk, DENX Software Engineering, w...@denx.de.
-
-obj-y := zoom1.o
diff --git a/board/logicpd/zoom1/config.mk b/board/logicpd/zoom1/config.mk
deleted file mode 100644
index a8e4f52e7b..00
--- a/board/logicpd/zoom1/config.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2006-2008
-# Texas Instruments,
-#
-# Zoom MDK uses OMAP3 (ARM-CortexA8) cpu
-# see http://www.ti.com/ for more information on Texas Instruments
-# Physical Address:
-# 8000' (bank0)
-# A000/ (bank1)
-# Linux-Kernel is expected to be at 8000'8000, entry 8000'8000
-# (mem base + reserved)
-
-# For use with external or internal boots.
diff --git a/board/logicpd/zoom1/zoom1.c b/board/logicpd/zoom1/zoom1.c
deleted file mode 100644
index 53dc9762f8..00
--- a/board/logicpd/zoom1/zoom1.c
+++ /dev/null
@@ -1,148 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2004-2008
- * Texas Instruments,
- *
- * Author :
- * Nishanth Menon
- *
- * Derived from Beagle Board and 3430 SDP code by
- * Sunil Kumar
- * Shashi Ranjan
- * Richard Woodruff
- * Syed Mohammed Khasim
- *
- */
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include "zoom1.h"
-
-DECLARE_GLOBAL_DATA_PTR;
-
-/*
- * gpmc_cfg is initialized by gpmc_init and we use it here.
- * GPMC definitions for Ethenet Controller LAN9211
- */
-static const u32 gpmc_lab_enet[] = {
- ZOOM1_ENET_GPMC_CONF1,
- ZOOM1_ENET_GPMC_CONF2,
- ZOOM1_ENET_GPMC_CONF3,
- ZOOM1_ENET_GPMC_CONF4,
- ZOOM1_ENET_GPMC_CONF5,
- ZOOM1_ENET_GPMC_CONF6,
- /*CONF7- computed as params */
-};
-
-static const struct ns16550_platdata zoom1_serial = {
- .base = OMAP34XX_UART3,
- .reg_shift = 2,
- .clock = V_NS16550_CLK,
- .fcr = UART_FCR_DEFVAL,
-};
-
-U_BOOT_DEVICE(zoom1_uart) = {
- "ns16550_serial",
- _serial
-};
-
-/*
- * Routine: board_init
- *
[PATCH 05/14] Overo: Drop omap3 overo
OF_CONTROL, DM_SPI and other driver model migration deadlines
are expired for this board.
Drop it.
Cc: Steve Sakoman
Signed-off-by: Jagan Teki
---
arch/arm/mach-omap2/omap3/Kconfig | 13 -
board/overo/Kconfig | 9 -
board/overo/MAINTAINERS | 6 -
board/overo/Makefile | 10 -
board/overo/common.c | 368 --
board/overo/overo.c | 411 --
board/overo/overo.h | 169
board/overo/spl.c | 61 -
configs/omap3_overo_defconfig | 53
doc/README.omap3 | 6 -
include/configs/omap3_overo.h | 184 -
11 files changed, 1290 deletions(-)
delete mode 100644 board/overo/Kconfig
delete mode 100644 board/overo/MAINTAINERS
delete mode 100644 board/overo/Makefile
delete mode 100644 board/overo/common.c
delete mode 100644 board/overo/overo.c
delete mode 100644 board/overo/overo.h
delete mode 100644 board/overo/spl.c
delete mode 100644 configs/omap3_overo_defconfig
delete mode 100644 include/configs/omap3_overo.h
diff --git a/arch/arm/mach-omap2/omap3/Kconfig
b/arch/arm/mach-omap2/omap3/Kconfig
index 34a845e9b6..306c2596d3 100644
--- a/arch/arm/mach-omap2/omap3/Kconfig
+++ b/arch/arm/mach-omap2/omap3/Kconfig
@@ -68,18 +68,6 @@ config TARGET_OMAP3_IGEP00X0
select OMAP3_GPIO_6
imply CMD_DM
-config TARGET_OMAP3_OVERO
- bool "OMAP35xx Gumstix Overo"
- select DM
- select DM_GPIO
- select DM_SERIAL
- select OMAP3_GPIO_2
- select OMAP3_GPIO_3
- select OMAP3_GPIO_4
- select OMAP3_GPIO_5
- select OMAP3_GPIO_6
- imply CMD_DM
-
config TARGET_OMAP3_ZOOM1
bool "TI Zoom1"
select DM
@@ -171,7 +159,6 @@ source "board/ti/beagle/Kconfig"
source "board/timll/devkit8000/Kconfig"
source "board/ti/evm/Kconfig"
source "board/isee/igep00x0/Kconfig"
-source "board/overo/Kconfig"
source "board/logicpd/zoom1/Kconfig"
source "board/ti/am3517crane/Kconfig"
source "board/pandora/Kconfig"
diff --git a/board/overo/Kconfig b/board/overo/Kconfig
deleted file mode 100644
index 74572a62be..00
--- a/board/overo/Kconfig
+++ /dev/null
@@ -1,9 +0,0 @@
-if TARGET_OMAP3_OVERO
-
-config SYS_BOARD
- default "overo"
-
-config SYS_CONFIG_NAME
- default "omap3_overo"
-
-endif
diff --git a/board/overo/MAINTAINERS b/board/overo/MAINTAINERS
deleted file mode 100644
index 8f089e87f8..00
--- a/board/overo/MAINTAINERS
+++ /dev/null
@@ -1,6 +0,0 @@
-OVERO BOARD
-M: Steve Sakoman
-S: Maintained
-F: board/overo/
-F: include/configs/omap3_overo.h
-F: configs/omap3_overo_defconfig
diff --git a/board/overo/Makefile b/board/overo/Makefile
deleted file mode 100644
index b62bab9fe4..00
--- a/board/overo/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2000, 2001, 2002
-# Wolfgang Denk, DENX Software Engineering, w...@denx.de.
-
-ifdef CONFIG_SPL_BUILD
-obj-y := spl.o common.o
-else
-obj-y := overo.o common.o
-endif
diff --git a/board/overo/common.c b/board/overo/common.c
deleted file mode 100644
index 67823e68b6..00
--- a/board/overo/common.c
+++ /dev/null
@@ -1,368 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Maintainer : Steve Sakoman
- *
- * Derived from Beagle Board, 3430 SDP, and OMAP3EVM code by
- * Richard Woodruff
- * Syed Mohammed Khasim
- * Sunil Kumar
- * Shashi Ranjan
- *
- * (C) Copyright 2004-2008
- * Texas Instruments,
- */
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-DECLARE_GLOBAL_DATA_PTR;
-
-#define TWL4030_I2C_BUS 0
-
-/*
- * Routine: board_init
- * Description: Early hardware init.
- */
-int board_init(void)
-{
- gpmc_init(); /* in SRAM or SDRAM, finish GPMC */
- /* board id for Linux */
- gd->bd->bi_arch_number = MACH_TYPE_OVERO;
- /* boot param addr */
- gd->bd->bi_boot_params = (OMAP34XX_SDRC_CS0 + 0x100);
-
- return 0;
-}
-
-#if defined(CONFIG_MMC)
-int board_mmc_init(bd_t *bis)
-{
- return omap_mmc_init(0, 0, 0, -1, -1);
-}
-#endif
-
-#if defined(CONFIG_MMC)
-void board_mmc_power_init(void)
-{
- twl4030_power_mmc_init(0);
-}
-#endif
-
-#if defined(CONFIG_SPL_OS_BOOT)
-int spl_start_uboot(void)
-{
- /* break into full u-boot on 'c' */
- if (serial_tstc() && serial_getc() == 'c')
- return 1;
-
- return 0;
-}
-#endif /* CONFIG_SPL_OS_BOOT */
-
-#define MUX_OVERO() \
- /*SDRC*/\
- MUX_VAL(CP(SDRC_D0),(IEN | PTD | DIS | M0)) /*SDRC_D0*/\
- MUX_VAL(CP(SDRC_D1),(IEN | PTD | DIS | M0)) /*SDRC_D1*/\
- MUX_VAL(CP(SDRC_D2),(IEN | PTD | DIS | M0)) /*SDRC_D2*/\
- MUX_VAL(CP(SDRC_D3),(IEN | PTD | DIS | M0)) /*SDRC_D3*/\
- MUX_VAL(CP(SDRC_D4),(IEN | PTD | DIS | M0))
[PATCH 08/14] quipos: Drop omap3 cairo
OF_CONTROL, DM_SPI and other driver model migration deadlines
are expired for this board.
Drop it.
Cc: Albert ARIBAUD (3ADEV)
Signed-off-by: Jagan Teki
---
arch/arm/mach-omap2/omap3/Kconfig | 8 -
board/quipos/cairo/Kconfig| 12 --
board/quipos/cairo/MAINTAINERS| 6 -
board/quipos/cairo/Makefile | 6 -
board/quipos/cairo/cairo.c| 98 -
board/quipos/cairo/cairo.h| 318 --
configs/cairo_defconfig | 40
include/configs/omap3_cairo.h | 215
8 files changed, 703 deletions(-)
delete mode 100644 board/quipos/cairo/Kconfig
delete mode 100644 board/quipos/cairo/MAINTAINERS
delete mode 100644 board/quipos/cairo/Makefile
delete mode 100644 board/quipos/cairo/cairo.c
delete mode 100644 board/quipos/cairo/cairo.h
delete mode 100644 configs/cairo_defconfig
delete mode 100644 include/configs/omap3_cairo.h
diff --git a/arch/arm/mach-omap2/omap3/Kconfig
b/arch/arm/mach-omap2/omap3/Kconfig
index 7421fe5e6c..044f61c796 100644
--- a/arch/arm/mach-omap2/omap3/Kconfig
+++ b/arch/arm/mach-omap2/omap3/Kconfig
@@ -97,13 +97,6 @@ config TARGET_TAO3530
select OMAP3_GPIO_5
select OMAP3_GPIO_6
-config TARGET_OMAP3_CAIRO
- bool "QUIPOS CAIRO"
- select DM
- select DM_GPIO
- select DM_SERIAL
- imply CMD_DM
-
config TARGET_SNIPER
bool "LG Optimus Black"
select DM
@@ -152,7 +145,6 @@ source "board/corscience/tricorder/Kconfig"
source "board/logicpd/omap3som/Kconfig"
source "board/nokia/rx51/Kconfig"
source "board/technexion/tao3530/Kconfig"
-source "board/quipos/cairo/Kconfig"
source "board/lg/sniper/Kconfig"
endif
diff --git a/board/quipos/cairo/Kconfig b/board/quipos/cairo/Kconfig
deleted file mode 100644
index 8df9421b57..00
--- a/board/quipos/cairo/Kconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-if TARGET_OMAP3_CAIRO
-
-config SYS_BOARD
- default "cairo"
-
-config SYS_VENDOR
- default "quipos"
-
-config SYS_CONFIG_NAME
- default "omap3_cairo"
-
-endif
diff --git a/board/quipos/cairo/MAINTAINERS b/board/quipos/cairo/MAINTAINERS
deleted file mode 100644
index 01332da5ab..00
--- a/board/quipos/cairo/MAINTAINERS
+++ /dev/null
@@ -1,6 +0,0 @@
-CAIRO BOARD
-M: Albert ARIBAUD (3ADEV)
-S: Maintained
-F: board/quipos/cairo/
-F: include/configs/omap3_cairo.h
-F: configs/cairo_defconfig
diff --git a/board/quipos/cairo/Makefile b/board/quipos/cairo/Makefile
deleted file mode 100644
index ec2c83cc89..00
--- a/board/quipos/cairo/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2014 DENX Software Engineering
-# Written-By: Albert ARIBAUD
-
-obj-y := cairo.o
diff --git a/board/quipos/cairo/cairo.c b/board/quipos/cairo/cairo.c
deleted file mode 100644
index 8999542a7d..00
--- a/board/quipos/cairo/cairo.c
+++ /dev/null
@@ -1,98 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (c) 2014 DENX
- * Written-by: Albert ARIBAUD
- *
- * Derived from code written by Robert Aigner (r...@spiid.net)
- *
- * Itself derived from Beagle Board and 3430 SDP code by
- * Richard Woodruff
- * Syed Mohammed Khasim
- */
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include "cairo.h"
-
-DECLARE_GLOBAL_DATA_PTR;
-
-/*
- * Routine: board_init
- * Description: Early hardware init.
- */
-int board_init(void)
-{
- gpmc_init(); /* in SRAM or SDRAM, finish GPMC */
- /* board id for Linux */
- gd->bd->bi_arch_number = CONFIG_MACH_TYPE;
- /* boot param addr */
- gd->bd->bi_boot_params = (OMAP34XX_SDRC_CS0 + 0x100);
- return 0;
-}
-
-/*
- * Routine: set_muxconf_regs
- * Description: Setting up the configuration Mux registers specific to the
- * hardware. Many pins need to be moved from protect to primary
- * mode.
- */
-void set_muxconf_regs(void)
-{
- MUX_CAIRO();
-}
-
-#if defined(CONFIG_MMC)
-int board_mmc_init(bd_t *bis)
-{
- return omap_mmc_init(0, 0, 0, -1, -1);
-}
-#endif
-
-#ifdef CONFIG_SPL_BUILD
-/*
- * Routine: get_board_mem_timings
- * Description: If we use SPL then there is no x-loader nor config header
- * so we have to setup the DDR timings ourself on the first bank. This
- * provides the timing values back to the function that configures
- * the memory.
- *
- * The Cairo board uses SAMSUNG DDR - K4X51163PG-FGC6
- */
-void get_board_mem_timings(struct board_sdrc_timings *timings)
-{
- timings->sharing = SAMSUNG_SHARING;
- timings->mcfg = SAMSUNG_V_MCFG_165(128 << 20);
- timings->ctrla = SAMSUNG_V_ACTIMA_165;
- timings->ctrlb = SAMSUNG_V_ACTIMB_165;
- timings->rfr_ctrl = SDP_3430_SDRC_RFR_CTRL_165MHz;
- timings->mr = SAMSUNG_V_MR_165;
-}
-#endif
-
-static const struct ns16550_platdata cairo_serial = {
- .base = OMAP34XX_UART2,
- .reg_shift
[PATCH 06/14] Pandora: Drop omap3 pandora
OF_CONTROL, DM_SPI and other driver model migration deadlines
are expired for this board.
Drop it.
Signed-off-by: Jagan Teki
---
arch/arm/mach-omap2/omap3/Kconfig | 6 -
board/pandora/Kconfig | 9 -
board/pandora/MAINTAINERS | 6 -
board/pandora/Makefile| 6 -
board/pandora/pandora.c | 149
board/pandora/pandora.h | 391 --
configs/omap3_pandora_defconfig | 40 ---
doc/README.omap3 | 5 -
include/configs/omap3_pandora.h | 62 -
9 files changed, 674 deletions(-)
delete mode 100644 board/pandora/Kconfig
delete mode 100644 board/pandora/MAINTAINERS
delete mode 100644 board/pandora/Makefile
delete mode 100644 board/pandora/pandora.c
delete mode 100644 board/pandora/pandora.h
delete mode 100644 configs/omap3_pandora_defconfig
delete mode 100644 include/configs/omap3_pandora.h
diff --git a/arch/arm/mach-omap2/omap3/Kconfig
b/arch/arm/mach-omap2/omap3/Kconfig
index 306c2596d3..18068be076 100644
--- a/arch/arm/mach-omap2/omap3/Kconfig
+++ b/arch/arm/mach-omap2/omap3/Kconfig
@@ -78,11 +78,6 @@ config TARGET_OMAP3_ZOOM1
config TARGET_AM3517_CRANE
bool "am3517_crane"
-config TARGET_OMAP3_PANDORA
- bool "OMAP3 Pandora"
- select OMAP3_GPIO_4
- select OMAP3_GPIO_6
-
config TARGET_TRICORDER
bool "Tricorder"
select OMAP3_GPIO_2
@@ -161,7 +156,6 @@ source "board/ti/evm/Kconfig"
source "board/isee/igep00x0/Kconfig"
source "board/logicpd/zoom1/Kconfig"
source "board/ti/am3517crane/Kconfig"
-source "board/pandora/Kconfig"
source "board/corscience/tricorder/Kconfig"
source "board/logicpd/omap3som/Kconfig"
source "board/nokia/rx51/Kconfig"
diff --git a/board/pandora/Kconfig b/board/pandora/Kconfig
deleted file mode 100644
index 0b33818008..00
--- a/board/pandora/Kconfig
+++ /dev/null
@@ -1,9 +0,0 @@
-if TARGET_OMAP3_PANDORA
-
-config SYS_BOARD
- default "pandora"
-
-config SYS_CONFIG_NAME
- default "omap3_pandora"
-
-endif
diff --git a/board/pandora/MAINTAINERS b/board/pandora/MAINTAINERS
deleted file mode 100644
index e12351735c..00
--- a/board/pandora/MAINTAINERS
+++ /dev/null
@@ -1,6 +0,0 @@
-PANDORA BOARD
-M: Grazvydas Ignotas
-S: Maintained
-F: board/pandora/
-F: include/configs/omap3_pandora.h
-F: configs/omap3_pandora_defconfig
diff --git a/board/pandora/Makefile b/board/pandora/Makefile
deleted file mode 100644
index c05c8fb854..00
--- a/board/pandora/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2000, 2001, 2002
-# Wolfgang Denk, DENX Software Engineering, w...@denx.de.
-
-obj-y := pandora.o
diff --git a/board/pandora/pandora.c b/board/pandora/pandora.c
deleted file mode 100644
index a93848666f..00
--- a/board/pandora/pandora.c
+++ /dev/null
@@ -1,149 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2008
- * Grazvydas Ignotas
- *
- * Derived from Beagle Board, 3430 SDP, and OMAP3EVM code by
- * Richard Woodruff
- * Syed Mohammed Khasim
- * Sunil Kumar
- * Shashi Ranjan
- *
- * (C) Copyright 2004-2008
- * Texas Instruments,
- */
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include "pandora.h"
-
-DECLARE_GLOBAL_DATA_PTR;
-
-#define TWL4030_BB_CFG_BBCHEN (1 << 4)
-#define TWL4030_BB_CFG_BBSEL_3200MV(3 << 2)
-#define TWL4030_BB_CFG_BBISEL_500UA2
-
-#define CONTROL_WKUP_CTRL 0x48002a5c
-#define GPIO_IO_PWRDNZ (1 << 6)
-#define PBIASLITEVMODE1(1 << 8)
-
-static const struct ns16550_platdata pandora_serial = {
- .base = OMAP34XX_UART3,
- .reg_shift = 2,
- .clock = V_NS16550_CLK,
- .fcr = UART_FCR_DEFVAL,
-};
-
-U_BOOT_DEVICE(pandora_uart) = {
- "ns16550_serial",
- _serial
-};
-
-/*
- * Routine: board_init
- * Description: Early hardware init.
- */
-int board_init(void)
-{
- gpmc_init(); /* in SRAM or SDRAM, finish GPMC */
- /* board id for Linux */
- gd->bd->bi_arch_number = MACH_TYPE_OMAP3_PANDORA;
- /* boot param addr */
- gd->bd->bi_boot_params = (OMAP34XX_SDRC_CS0 + 0x100);
-
- return 0;
-}
-
-static void set_output_gpio(unsigned int gpio, int value)
-{
- int ret;
-
- ret = gpio_request(gpio, "");
- if (ret != 0) {
- printf("could not request GPIO %u\n", gpio);
- return;
- }
- ret = gpio_direction_output(gpio, value);
- if (ret != 0)
- printf("could not set GPIO %u to %d\n", gpio, value);
-}
-
-/*
- * Routine: misc_init_r
- * Description: Configure board specific parts
- */
-int misc_init_r(void)
-{
- t2_t *t2_base = (t2_t *)T2_BASE;
- u32 pbias_lite;
-
- twl4030_led_init(TWL4030_LED_LEDEN_LEDBON);
-
- /* set up dual-voltage GPIOs to 1.8V
[PATCH 04/14] compulab: Drop cm_t54
DM, DM_SPI and other driver model migration deadlines
are expired for this board.
Drop it.
Cc: Igor Grinberg
Signed-off-by: Jagan Teki
---
arch/arm/mach-omap2/omap3/Kconfig | 7 -
board/compulab/cm_t35/Kconfig | 12 -
board/compulab/cm_t35/MAINTAINERS | 6 -
board/compulab/cm_t35/Makefile| 8 -
board/compulab/cm_t35/cm_t35.c| 513 --
configs/cm_t35_defconfig | 65
include/configs/cm_t35.h | 249 ---
7 files changed, 860 deletions(-)
delete mode 100644 board/compulab/cm_t35/Kconfig
delete mode 100644 board/compulab/cm_t35/MAINTAINERS
delete mode 100644 board/compulab/cm_t35/Makefile
delete mode 100644 board/compulab/cm_t35/cm_t35.c
delete mode 100644 configs/cm_t35_defconfig
delete mode 100644 include/configs/cm_t35.h
diff --git a/arch/arm/mach-omap2/omap3/Kconfig
b/arch/arm/mach-omap2/omap3/Kconfig
index d75fab1530..34a845e9b6 100644
--- a/arch/arm/mach-omap2/omap3/Kconfig
+++ b/arch/arm/mach-omap2/omap3/Kconfig
@@ -43,12 +43,6 @@ config TARGET_OMAP3_BEAGLE
select OMAP3_GPIO_6
imply CMD_DM
-config TARGET_CM_T35
- bool "CompuLab CM-T3530 and CM-T3730 boards"
- select OMAP3_GPIO_2
- select OMAP3_GPIO_5
- select OMAP3_GPIO_6 if LED_STATUS
-
config TARGET_DEVKIT8000
bool "TimLL OMAP3 Devkit8000"
select DM
@@ -174,7 +168,6 @@ config SYS_SOC
source "board/logicpd/am3517evm/Kconfig"
source "board/ti/beagle/Kconfig"
-source "board/compulab/cm_t35/Kconfig"
source "board/timll/devkit8000/Kconfig"
source "board/ti/evm/Kconfig"
source "board/isee/igep00x0/Kconfig"
diff --git a/board/compulab/cm_t35/Kconfig b/board/compulab/cm_t35/Kconfig
deleted file mode 100644
index d87741f146..00
--- a/board/compulab/cm_t35/Kconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-if TARGET_CM_T35
-
-config SYS_BOARD
- default "cm_t35"
-
-config SYS_VENDOR
- default "compulab"
-
-config SYS_CONFIG_NAME
- default "cm_t35"
-
-endif
diff --git a/board/compulab/cm_t35/MAINTAINERS
b/board/compulab/cm_t35/MAINTAINERS
deleted file mode 100644
index fc5d73f04c..00
--- a/board/compulab/cm_t35/MAINTAINERS
+++ /dev/null
@@ -1,6 +0,0 @@
-CM_T35 BOARD
-M: Igor Grinberg
-S: Maintained
-F: board/compulab/cm_t35/
-F: include/configs/cm_t35.h
-F: configs/cm_t35_defconfig
diff --git a/board/compulab/cm_t35/Makefile b/board/compulab/cm_t35/Makefile
deleted file mode 100644
index 929c53c144..00
--- a/board/compulab/cm_t35/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2011 - 2013 CompuLab, Ltd.
-#
-# Authors: Nikita Kiryanov
-# Igor Grinberg
-
-obj-y += cm_t35.o
diff --git a/board/compulab/cm_t35/cm_t35.c b/board/compulab/cm_t35/cm_t35.c
deleted file mode 100644
index 4b67df4f1a..00
--- a/board/compulab/cm_t35/cm_t35.c
+++ /dev/null
@@ -1,513 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2011 - 2013 CompuLab, Ltd.
- *
- * Authors: Mike Rapoport
- * Igor Grinberg
- *
- * Derived from omap3evm and Beagle Board by
- * Manikandan Pillai
- * Richard Woodruff
- * Syed Mohammed Khasim
- */
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include "../common/common.h"
-#include "../common/eeprom.h"
-
-DECLARE_GLOBAL_DATA_PTR;
-
-const omap3_sysinfo sysinfo = {
- DDR_DISCRETE,
- "CM-T3x board",
- "NAND",
-};
-
-#ifdef CONFIG_SPL_BUILD
-/*
- * Routine: get_board_mem_timings
- * Description: If we use SPL then there is no x-loader nor config header
- * so we have to setup the DDR timings ourself on both banks.
- */
-void get_board_mem_timings(struct board_sdrc_timings *timings)
-{
- timings->mr = MICRON_V_MR_165;
- timings->mcfg = MICRON_V_MCFG_200(256 << 20); /* raswidth 14 needed */
- timings->ctrla = MICRON_V_ACTIMA_165;
- timings->ctrlb = MICRON_V_ACTIMB_165;
- timings->rfr_ctrl = SDP_3430_SDRC_RFR_CTRL_165MHz;
-}
-#endif
-
-struct splash_location splash_locations[] = {
- {
- .name = "nand",
- .storage = SPLASH_STORAGE_NAND,
- .flags = SPLASH_STORAGE_RAW,
- .offset = 0x10,
- },
-};
-
-int splash_screen_prepare(void)
-{
- return splash_source_load(splash_locations,
- ARRAY_SIZE(splash_locations));
-}
-
-/*
- * Routine: board_init
- * Description: hardware init.
- */
-int board_init(void)
-{
- gpmc_init(); /* in SRAM or SDRAM, finish GPMC */
-
- /* board id for Linux */
- if (get_cpu_family() == CPU_OMAP34XX)
- gd->bd->bi_arch_number = MACH_TYPE_CM_T35;
- else
- gd->bd->bi_arch_number = MACH_TYPE_CM_T3730;
-
- /* boot param addr */
[PATCH 03/14] compulab: Drop cm_t54
DM, DM_SPI and other driver model migration deadlines
are expired for this board.
Drop it.
Cc: Dmitry Lifshitz
Signed-off-by: Jagan Teki
---
arch/arm/mach-omap2/omap5/Kconfig | 4 -
board/compulab/cm_t54/Kconfig | 12 --
board/compulab/cm_t54/MAINTAINERS | 6 -
board/compulab/cm_t54/Makefile| 8 -
board/compulab/cm_t54/cm_t54.c| 261 --
board/compulab/cm_t54/mux.c | 94 ---
board/compulab/cm_t54/spl.c | 65
configs/cm_t54_defconfig | 53 --
include/configs/cm_t54.h | 120 --
9 files changed, 623 deletions(-)
delete mode 100644 board/compulab/cm_t54/Kconfig
delete mode 100644 board/compulab/cm_t54/MAINTAINERS
delete mode 100644 board/compulab/cm_t54/Makefile
delete mode 100644 board/compulab/cm_t54/cm_t54.c
delete mode 100644 board/compulab/cm_t54/mux.c
delete mode 100644 board/compulab/cm_t54/spl.c
delete mode 100644 configs/cm_t54_defconfig
delete mode 100644 include/configs/cm_t54.h
diff --git a/arch/arm/mach-omap2/omap5/Kconfig
b/arch/arm/mach-omap2/omap5/Kconfig
index fddbac9dec..a0c0b93a00 100644
--- a/arch/arm/mach-omap2/omap5/Kconfig
+++ b/arch/arm/mach-omap2/omap5/Kconfig
@@ -9,9 +9,6 @@ choice
prompt "OMAP5 board select"
optional
-config TARGET_CM_T54
- bool "CompuLab CM-T54"
-
config TARGET_OMAP5_UEVM
bool "TI OMAP5 uEVM board"
@@ -156,7 +153,6 @@ endchoice
endmenu
endif
-source "board/compulab/cm_t54/Kconfig"
source "board/ti/omap5_uevm/Kconfig"
source "board/ti/dra7xx/Kconfig"
source "board/ti/am57xx/Kconfig"
diff --git a/board/compulab/cm_t54/Kconfig b/board/compulab/cm_t54/Kconfig
deleted file mode 100644
index 52d38804df..00
--- a/board/compulab/cm_t54/Kconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-if TARGET_CM_T54
-
-config SYS_BOARD
- default "cm_t54"
-
-config SYS_VENDOR
- default "compulab"
-
-config SYS_CONFIG_NAME
- default "cm_t54"
-
-endif
diff --git a/board/compulab/cm_t54/MAINTAINERS
b/board/compulab/cm_t54/MAINTAINERS
deleted file mode 100644
index 461fe098c0..00
--- a/board/compulab/cm_t54/MAINTAINERS
+++ /dev/null
@@ -1,6 +0,0 @@
-CM_T54 BOARD
-M: Dmitry Lifshitz
-S: Maintained
-F: board/compulab/cm_t54/
-F: include/configs/cm_t54.h
-F: configs/cm_t54_defconfig
diff --git a/board/compulab/cm_t54/Makefile b/board/compulab/cm_t54/Makefile
deleted file mode 100644
index a907074414..00
--- a/board/compulab/cm_t54/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# Copyright (C) 2014 Compulab Ltd - http://compulab.co.il/
-#
-# Author: Dmitry Lifshitz
-
-obj-y += cm_t54.o
-obj-$(CONFIG_SPL_BUILD) += mux.o spl.o
diff --git a/board/compulab/cm_t54/cm_t54.c b/board/compulab/cm_t54/cm_t54.c
deleted file mode 100644
index 413f3c9c8f..00
--- a/board/compulab/cm_t54/cm_t54.c
+++ /dev/null
@@ -1,261 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Board functions for Compulab CM-T54 board
- *
- * Copyright (C) 2014, Compulab Ltd - http://compulab.co.il/
- *
- * Author: Dmitry Lifshitz
- */
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include "../common/eeprom.h"
-
-#define DIE_ID_REG_BASE(OMAP54XX_L4_CORE_BASE + 0x2000)
-#define DIE_ID_REG_OFFSET 0x200
-
-DECLARE_GLOBAL_DATA_PTR;
-
-#if !defined(CONFIG_SPL_BUILD)
-inline void set_muxconf_regs(void){};
-#endif
-
-const struct omap_sysinfo sysinfo = {
- "Board: CM-T54\n"
-};
-
-/*
- * Routine: board_init
- * Description: hardware init.
- */
-int board_init(void)
-{
- gd->bd->bi_boot_params = (CONFIG_SYS_SDRAM_BASE + 0x100);
-
- return 0;
-}
-
-/*
- * Routine: cm_t54_palmas_regulator_set
- * Description: select voltage and turn on/off Palmas PMIC regulator.
- */
-static int cm_t54_palmas_regulator_set(u8 vreg, u8 vval, u8 creg, u8 cval)
-{
- int err;
-
- /* Setup voltage */
- err = palmas_i2c_write_u8(TWL603X_CHIP_P1, vreg, vval);
- if (err) {
- printf("cm_t54: could not set regulator 0x%02x voltage : %d\n",
- vreg, err);
- return err;
- }
-
- /* Turn on/off regulator */
- err = palmas_i2c_write_u8(TWL603X_CHIP_P1, creg, cval);
- if (err) {
- printf("cm_t54: could not turn on/off regulator 0x%02x : %d\n",
- creg, err);
- return err;
- }
-
- return 0;
-}
-
-/*
- * Routine: mmc_get_env_part
- * Description: setup environment storage device partition.
- */
-#ifdef CONFIG_SYS_MMC_ENV_PART
-uint mmc_get_env_part(struct mmc *mmc)
-{
- u32 bootmode = gd->arch.omap_boot_mode;
- uint bootpart = CONFIG_SYS_MMC_ENV_PART;
-
- /*
-* If booted from eMMC boot partition then force eMMC
-* FIRST boot partition to be env storage
-*/
[PATCH 01/14] spi: fsl_dspi: Drop nondm code
Drop the nondm code from fsl_dspi.c since there
is no board or any other code using it.
Signed-off-by: Jagan Teki
---
drivers/spi/fsl_dspi.c | 132 -
1 file changed, 132 deletions(-)
diff --git a/drivers/spi/fsl_dspi.c b/drivers/spi/fsl_dspi.c
index 1cdb233110..78ad61ca37 100644
--- a/drivers/spi/fsl_dspi.c
+++ b/drivers/spi/fsl_dspi.c
@@ -100,13 +100,6 @@ struct fsl_dspi_priv {
struct dspi *regs;
};
-#ifndef CONFIG_DM_SPI
-struct fsl_dspi {
- struct spi_slave slave;
- struct fsl_dspi_priv priv;
-};
-#endif
-
__weak void cpu_dspi_port_conf(void)
{
}
@@ -414,131 +407,7 @@ static int fsl_dspi_cfg_speed(struct fsl_dspi_priv *priv,
uint speed)
return 0;
}
-#ifndef CONFIG_DM_SPI
-int spi_cs_is_valid(unsigned int bus, unsigned int cs)
-{
- if (((cs >= 0) && (cs < 8)) && ((bus >= 0) && (bus < 8)))
- return 1;
- else
- return 0;
-}
-
-struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
- unsigned int max_hz, unsigned int mode)
-{
- struct fsl_dspi *dspi;
- uint mcr_cfg_val;
-
- dspi = spi_alloc_slave(struct fsl_dspi, bus, cs);
- if (!dspi)
- return NULL;
-
- cpu_dspi_port_conf();
-
-#ifdef CONFIG_SYS_FSL_DSPI_BE
- dspi->priv.flags |= DSPI_FLAG_REGMAP_ENDIAN_BIG;
-#endif
-
- dspi->priv.regs = (struct dspi *)MMAP_DSPI;
-
-#ifdef CONFIG_M68K
- dspi->priv.bus_clk = gd->bus_clk;
-#else
- dspi->priv.bus_clk = mxc_get_clock(MXC_DSPI_CLK);
-#endif
- dspi->priv.speed_hz = FSL_DSPI_DEFAULT_SCK_FREQ;
-
- /* default: all CS signals inactive state is high */
- mcr_cfg_val = DSPI_MCR_MSTR | DSPI_MCR_PCSIS_MASK |
- DSPI_MCR_CRXF | DSPI_MCR_CTXF;
- fsl_dspi_init_mcr(>priv, mcr_cfg_val);
-
- for (i = 0; i < FSL_DSPI_MAX_CHIPSELECT; i++)
- dspi->priv.ctar_val[i] = DSPI_CTAR_DEFAULT_VALUE;
-
-#ifdef CONFIG_SYS_DSPI_CTAR0
- if (FSL_DSPI_MAX_CHIPSELECT > 0)
- dspi->priv.ctar_val[0] = CONFIG_SYS_DSPI_CTAR0;
-#endif
-#ifdef CONFIG_SYS_DSPI_CTAR1
- if (FSL_DSPI_MAX_CHIPSELECT > 1)
- dspi->priv.ctar_val[1] = CONFIG_SYS_DSPI_CTAR1;
-#endif
-#ifdef CONFIG_SYS_DSPI_CTAR2
- if (FSL_DSPI_MAX_CHIPSELECT > 2)
- dspi->priv.ctar_val[2] = CONFIG_SYS_DSPI_CTAR2;
-#endif
-#ifdef CONFIG_SYS_DSPI_CTAR3
- if (FSL_DSPI_MAX_CHIPSELECT > 3)
- dspi->priv.ctar_val[3] = CONFIG_SYS_DSPI_CTAR3;
-#endif
-#ifdef CONFIG_SYS_DSPI_CTAR4
- if (FSL_DSPI_MAX_CHIPSELECT > 4)
- dspi->priv.ctar_val[4] = CONFIG_SYS_DSPI_CTAR4;
-#endif
-#ifdef CONFIG_SYS_DSPI_CTAR5
- if (FSL_DSPI_MAX_CHIPSELECT > 5)
- dspi->priv.ctar_val[5] = CONFIG_SYS_DSPI_CTAR5;
-#endif
-#ifdef CONFIG_SYS_DSPI_CTAR6
- if (FSL_DSPI_MAX_CHIPSELECT > 6)
- dspi->priv.ctar_val[6] = CONFIG_SYS_DSPI_CTAR6;
-#endif
-#ifdef CONFIG_SYS_DSPI_CTAR7
- if (FSL_DSPI_MAX_CHIPSELECT > 7)
- dspi->priv.ctar_val[7] = CONFIG_SYS_DSPI_CTAR7;
-#endif
- fsl_dspi_cfg_speed(>priv, max_hz);
-
- /* configure transfer mode */
- fsl_dspi_cfg_ctar_mode(>priv, cs, mode);
-
- /* configure active state of CSX */
- fsl_dspi_cfg_cs_active_state(>priv, cs, mode);
-
- return >slave;
-}
-
-void spi_free_slave(struct spi_slave *slave)
-{
- free(slave);
-}
-
-int spi_claim_bus(struct spi_slave *slave)
-{
- uint sr_val;
- struct fsl_dspi *dspi = (struct fsl_dspi *)slave;
-
- cpu_dspi_claim_bus(slave->bus, slave->cs);
-
- fsl_dspi_clr_fifo(>priv);
-
- /* check module TX and RX status */
- sr_val = dspi_read32(dspi->priv.flags, >priv.regs->sr);
- if ((sr_val & DSPI_SR_TXRXS) != DSPI_SR_TXRXS) {
- debug("DSPI RX/TX not ready!\n");
- return -EIO;
- }
-
- return 0;
-}
-
-void spi_release_bus(struct spi_slave *slave)
-{
- struct fsl_dspi *dspi = (struct fsl_dspi *)slave;
-
- dspi_halt(>priv, 1);
- cpu_dspi_release_bus(slave->bus.slave->cs);
-}
-
-int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout,
-void *din, unsigned long flags)
-{
- struct fsl_dspi *dspi = (struct fsl_dspi *)slave;
- return dspi_xfer(>priv, slave->cs, bitlen, dout, din, flags);
-}
-#else
static int fsl_dspi_child_pre_probe(struct udevice *dev)
{
struct dm_spi_slave_platdata *slave_plat = dev_get_parent_platdata(dev);
@@ -745,4 +614,3 @@ U_BOOT_DRIVER(fsl_dspi) = {
.child_pre_probe = fsl_dspi_child_pre_probe,
.bind = fsl_dspi_bind,
};
-#endif
--
2.25.1
[PATCH 02/14] configs: igep00x0: Enable DM_SPI
Enable DM_SPI for igep00x0 board. Cc: Enric Balletbo i Serra Signed-off-by: Jagan Teki --- configs/igep00x0_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/igep00x0_defconfig b/configs/igep00x0_defconfig index a5c301dbdb..d32c017907 100644 --- a/configs/igep00x0_defconfig +++ b/configs/igep00x0_defconfig @@ -62,6 +62,7 @@ CONFIG_SMC911X_BASE=0x2C00 CONFIG_SMC911X_32_BIT=y CONFIG_CONS_INDEX=3 CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_OMAP3_SPI=y CONFIG_BCH=y CONFIG_FDT_FIXUP_PARTITIONS=y -- 2.25.1
[PATCH 00/14] spi: dm-conversion (part1)
This series dropped nondm code from omap3 and fsl_dspi drivers. Few omap boards are removed since they still in nondm with no OF_CONTROL. So removed the same since the dm conversion deadline expired few months ago. Travis-CI: https://travis-ci.org/github/openedev/u-boot-amarula/builds/691404323 Any inputs? Jagan. Jagan Teki (14): spi: fsl_dspi: Drop nondm code configs: igep00x0: Enable DM_SPI compulab: Drop cm_t54 compulab: Drop cm_t54 Overo: Drop omap3 overo Pandora: Drop omap3 pandora logicpd: Drop omap3 zoom1 quipos: Drop omap3 cairo gumstix: Drop duovero ti: Drop panda board ti: Drop sdp4430 board ti: Drop omap5 uevm spi: omap3: Drop nondm code doc: driver-model: Update SPI migration status arch/arm/mach-omap2/omap3/Kconfig| 42 -- arch/arm/mach-omap2/omap4/Kconfig| 12 - arch/arm/mach-omap2/omap5/Kconfig| 8 - board/compulab/cm_t35/Kconfig| 12 - board/compulab/cm_t35/MAINTAINERS| 6 - board/compulab/cm_t35/Makefile | 8 - board/compulab/cm_t35/cm_t35.c | 513 --- board/compulab/cm_t54/Kconfig| 12 - board/compulab/cm_t54/MAINTAINERS| 6 - board/compulab/cm_t54/Makefile | 8 - board/compulab/cm_t54/cm_t54.c | 261 board/compulab/cm_t54/mux.c | 94 - board/compulab/cm_t54/spl.c | 65 --- board/gumstix/duovero/Kconfig| 12 - board/gumstix/duovero/MAINTAINERS| 6 - board/gumstix/duovero/Makefile | 6 - board/gumstix/duovero/duovero.c | 273 board/gumstix/duovero/duovero_mux_data.h | 198 - board/logicpd/zoom1/Kconfig | 12 - board/logicpd/zoom1/MAINTAINERS | 6 - board/logicpd/zoom1/Makefile | 6 - board/logicpd/zoom1/config.mk| 14 - board/logicpd/zoom1/zoom1.c | 148 --- board/logicpd/zoom1/zoom1.h | 122 -- board/overo/Kconfig | 9 - board/overo/MAINTAINERS | 6 - board/overo/Makefile | 10 - board/overo/common.c | 368 board/overo/overo.c | 411 -- board/overo/overo.h | 169 board/overo/spl.c| 61 --- board/pandora/Kconfig| 9 - board/pandora/MAINTAINERS| 6 - board/pandora/Makefile | 6 - board/pandora/pandora.c | 149 --- board/pandora/pandora.h | 391 - board/quipos/cairo/Kconfig | 12 - board/quipos/cairo/MAINTAINERS | 6 - board/quipos/cairo/Makefile | 6 - board/quipos/cairo/cairo.c | 98 - board/quipos/cairo/cairo.h | 318 -- board/ti/omap5_uevm/Kconfig | 12 - board/ti/omap5_uevm/MAINTAINERS | 6 - board/ti/omap5_uevm/Makefile | 6 - board/ti/omap5_uevm/README | 25 -- board/ti/omap5_uevm/evm.c| 283 - board/ti/omap5_uevm/mux_data.h | 57 --- board/ti/panda/Kconfig | 12 - board/ti/panda/MAINTAINERS | 6 - board/ti/panda/Makefile | 6 - board/ti/panda/panda.c | 346 --- board/ti/panda/panda_mux_data.h | 86 board/ti/sdp4430/Kconfig | 15 - board/ti/sdp4430/MAINTAINERS | 6 - board/ti/sdp4430/Makefile| 10 - board/ti/sdp4430/cmd_bat.c | 41 -- board/ti/sdp4430/sdp.c | 100 - board/ti/sdp4430/sdp4430_mux_data.h | 67 --- configs/cairo_defconfig | 40 -- configs/cm_t35_defconfig | 65 --- configs/cm_t54_defconfig | 53 --- configs/duovero_defconfig| 42 -- configs/igep00x0_defconfig | 1 + configs/omap3_overo_defconfig| 53 --- configs/omap3_pandora_defconfig | 40 -- configs/omap3_zoom1_defconfig| 41 -- configs/omap4_panda_defconfig| 42 -- configs/omap4_sdp4430_defconfig | 42 -- configs/omap5_uevm_defconfig | 55 --- doc/README.omap3 | 16 - doc/driver-model/migration.rst | 2 - drivers/spi/Kconfig | 14 +- drivers/spi/fsl_dspi.c | 132 -- drivers/spi/omap3_spi.c | 136 -- include/configs/cm_t35.h | 249 --- include/configs/cm_t54.h | 120 -- include/configs/duovero.h| 36 -- include/configs/omap3_cairo.h| 215 -- include/configs/omap3_overo.h| 184 include/configs/omap3_pandora.h | 62 ---
Re: [PATCHv2] mx23evk: Remove board
On Tue, May 26, 2020 at 2:32 PM Tom Rini wrote: > > This board has not yet been converted to DM. After checking with the > listed maintainer, remove. > > Cc: Otavio Salvador > Signed-off-by: Tom Rini Let's try to convert this to DM first, please.
Re: [PATCH] mmc: davinci_mmc: Cleanup to use dt in U-boot and static platdata in SPL
Simon, On 26/05/20 10:24 pm, Simon Glass wrote: > Hi Faiz, > > I have ended up with an omap L138 lcdk board. Do you have instructions > on how to get it booting from uSD and how to create the card image? I > have tried various sources but nothing works so far. Also, are you > able to send me a test image I can 'dd' onto the board? > The commands in board/davinci/da8xxevm/README.da850 don't work? Try the following: 2 - using the "dd" command $ dd if=u-boot.ais of=/dev/mmcblk0 seek=117 bs=512 conv=fsync Thanks, Faiz
[PATCH] SPI_DM: Drop non DM support
+ Dropped non DM support from Krikwood SPI + Modify config files Signed-off-by: Bhargav Shah diff --git a/configs/clearfog_defconfig b/configs/clearfog_defconfig index 449c3a435e..2022779c47 100644 --- a/configs/clearfog_defconfig +++ b/configs/clearfog_defconfig @@ -67,6 +67,8 @@ CONFIG_PCI_MVEBU=y CONFIG_SCSI=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=y diff --git a/configs/clearfog_gt_8k_defconfig b/configs/clearfog_gt_8k_defconfig index 2b6445a3f1..11035ff86c 100644 --- a/configs/clearfog_gt_8k_defconfig +++ b/configs/clearfog_gt_8k_defconfig @@ -67,6 +67,8 @@ CONFIG_DM_REGULATOR_FIXED=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=y diff --git a/configs/controlcenterdc_defconfig b/configs/controlcenterdc_defconfig index 4ac46ff759..ca2121ef47 100644 --- a/configs/controlcenterdc_defconfig +++ b/configs/controlcenterdc_defconfig @@ -73,6 +73,8 @@ CONFIG_PCI_MVEBU=y CONFIG_SCSI=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_TPM_ATMEL_TWI=y CONFIG_TPM_AUTH_SESSIONS=y diff --git a/configs/crs305-1g-4s_defconfig b/configs/crs305-1g-4s_defconfig index 7632fc4254..0e61b889bd 100644 --- a/configs/crs305-1g-4s_defconfig +++ b/configs/crs305-1g-4s_defconfig @@ -48,4 +48,6 @@ CONFIG_SPI_FLASH_WINBOND=y CONFIG_PCI=y CONFIG_PCI_MVEBU=y CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y diff --git a/configs/d2net_v2_defconfig b/configs/d2net_v2_defconfig index fe3c6c4762..82295906ef 100644 --- a/configs/d2net_v2_defconfig +++ b/configs/d2net_v2_defconfig @@ -46,7 +46,9 @@ CONFIG_SPI_FLASH_MACRONIX=y CONFIG_MVGBE=y CONFIG_MII=y CONFIG_SYS_NS16550=y +CONFIG_DM=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/db-88f6281-bp-nand_defconfig b/configs/db-88f6281-bp-nand_defconfig index f98e462d42..87813b67aa 100644 --- a/configs/db-88f6281-bp-nand_defconfig +++ b/configs/db-88f6281-bp-nand_defconfig @@ -53,6 +53,7 @@ CONFIG_DM_RTC=y CONFIG_RTC_MV=y CONFIG_SYS_NS16550=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=y diff --git a/configs/db-88f6720_defconfig b/configs/db-88f6720_defconfig index e5a18d8096..865a8bb583 100644 --- a/configs/db-88f6720_defconfig +++ b/configs/db-88f6720_defconfig @@ -56,6 +56,8 @@ CONFIG_MVPP2=y CONFIG_MII=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=y diff --git a/configs/db-88f6820-amc_defconfig b/configs/db-88f6820-amc_defconfig index 146ea50b89..0ed553c7ba 100644 --- a/configs/db-88f6820-amc_defconfig +++ b/configs/db-88f6820-amc_defconfig @@ -71,6 +71,8 @@ CONFIG_PCI=y CONFIG_PCI_MVEBU=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=y diff --git a/configs/db-88f6820-gp_defconfig b/configs/db-88f6820-gp_defconfig index 20848abae2..9fd54b7ea2 100644 --- a/configs/db-88f6820-gp_defconfig +++ b/configs/db-88f6820-gp_defconfig @@ -65,6 +65,8 @@ CONFIG_PCI_MVEBU=y CONFIG_SCSI=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=y diff --git a/configs/db-mv784mp-gp_defconfig b/configs/db-mv784mp-gp_defconfig index ab96622873..2924be41b2 100644 --- a/configs/db-mv784mp-gp_defconfig +++ b/configs/db-mv784mp-gp_defconfig @@ -66,6 +66,8 @@ CONFIG_PCI=y CONFIG_PCI_MVEBU=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=y diff --git a/configs/db-xc3-24g4xg_defconfig b/configs/db-xc3-24g4xg_defconfig index 2bbff64665..a33a0bcabc 100644 --- a/configs/db-xc3-24g4xg_defconfig +++ b/configs/db-xc3-24g4xg_defconfig @@ -53,6 +53,8 @@ CONFIG_SPI_FLASH_SST=y CONFIG_PCI=y CONFIG_PCI_MVEBU=y CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=y diff --git a/configs/ds414_defconfig b/configs/ds414_defconfig index 7d395d1e26..8b2fa7d081 100644 --- a/configs/ds414_defconfig +++ b/configs/ds414_defconfig @@ -61,6 +61,8 @@ CONFIG_PCI=y CONFIG_PCI_MVEBU=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=y diff --git a/configs/helios4_defconfig b/configs/helios4_defconfig index e15f10cdd5..efe012f539 100644 --- a/configs/helios4_defconfig +++ b/configs/helios4_defconfig @@ -61,6 +61,8 @@ CONFIG_MII=y CONFIG_SCSI=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=y diff --git a/configs/inetspace_v2_defconfig b/configs/inetspace_v2_defconfig index
[PATCHv2] mx23evk: Remove board
This board has not yet been converted to DM. After checking with the
listed maintainer, remove.
Cc: Otavio Salvador
Signed-off-by: Tom Rini
---
Changes in v2:
- Grab the hunk for arch/arm/mach-imx/mxs/Kconfig as well.
---
arch/arm/mach-imx/mxs/Kconfig | 4 -
board/freescale/mx23evk/Kconfig | 15
board/freescale/mx23evk/MAINTAINERS | 6 --
board/freescale/mx23evk/Makefile| 10 ---
board/freescale/mx23evk/mx23evk.c | 78
board/freescale/mx23evk/spl_boot.c | 134
configs/mx23evk_defconfig | 40 -
include/configs/mx23evk.h | 110 ---
8 files changed, 397 deletions(-)
delete mode 100644 board/freescale/mx23evk/Kconfig
delete mode 100644 board/freescale/mx23evk/MAINTAINERS
delete mode 100644 board/freescale/mx23evk/Makefile
delete mode 100644 board/freescale/mx23evk/mx23evk.c
delete mode 100644 board/freescale/mx23evk/spl_boot.c
delete mode 100644 configs/mx23evk_defconfig
delete mode 100644 include/configs/mx23evk.h
diff --git a/arch/arm/mach-imx/mxs/Kconfig b/arch/arm/mach-imx/mxs/Kconfig
index b90d7b6e4176..fb632b7df24f 100644
--- a/arch/arm/mach-imx/mxs/Kconfig
+++ b/arch/arm/mach-imx/mxs/Kconfig
@@ -12,10 +12,6 @@ config TARGET_MX23_OLINUXINO
bool "Support mx23_olinuxino"
select BOARD_EARLY_INIT_F
-config TARGET_MX23EVK
- bool "Support mx23evk"
- select BOARD_EARLY_INIT_F
-
config TARGET_SANSA_FUZE_PLUS
bool "Support sansa_fuze_plus"
diff --git a/board/freescale/mx23evk/Kconfig b/board/freescale/mx23evk/Kconfig
deleted file mode 100644
index 51a8f9f773cb..
--- a/board/freescale/mx23evk/Kconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-if TARGET_MX23EVK
-
-config SYS_BOARD
- default "mx23evk"
-
-config SYS_VENDOR
- default "freescale"
-
-config SYS_SOC
- default "mxs"
-
-config SYS_CONFIG_NAME
- default "mx23evk"
-
-endif
diff --git a/board/freescale/mx23evk/MAINTAINERS
b/board/freescale/mx23evk/MAINTAINERS
deleted file mode 100644
index b03ad6ae0af6..
--- a/board/freescale/mx23evk/MAINTAINERS
+++ /dev/null
@@ -1,6 +0,0 @@
-MX23EVK BOARD
-M: Otavio Salvador
-S: Maintained
-F: board/freescale/mx23evk/
-F: include/configs/mx23evk.h
-F: configs/mx23evk_defconfig
diff --git a/board/freescale/mx23evk/Makefile b/board/freescale/mx23evk/Makefile
deleted file mode 100644
index 6fe6992a5fcd..
--- a/board/freescale/mx23evk/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2000-2006
-# Wolfgang Denk, DENX Software Engineering, w...@denx.de.
-
-ifndef CONFIG_SPL_BUILD
-obj-y := mx23evk.o
-else
-obj-y := spl_boot.o
-endif
diff --git a/board/freescale/mx23evk/mx23evk.c
b/board/freescale/mx23evk/mx23evk.c
deleted file mode 100644
index 6cfff0496631..
--- a/board/freescale/mx23evk/mx23evk.c
+++ /dev/null
@@ -1,78 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Freescale MX23EVK board
- *
- * (C) Copyright 2013 O.S. Systems Software LTDA.
- *
- * Author: Otavio Salvador
- *
- * Based on m28evk.c:
- * Copyright (C) 2011 Marek Vasut
- * on behalf of DENX Software Engineering GmbH
- */
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-DECLARE_GLOBAL_DATA_PTR;
-
-/*
- * Functions
- */
-int board_early_init_f(void)
-{
- /* IO0 clock at 480MHz */
- mxs_set_ioclk(MXC_IOCLK0, 48);
-
- /* SSP0 clock at 96MHz */
- mxs_set_sspclk(MXC_SSPCLK0, 96000, 0);
-
- /* Power on LCD */
- gpio_direction_output(MX23_PAD_LCD_RESET__GPIO_1_18, 1);
-
- /* Set contrast to maximum */
- gpio_direction_output(MX23_PAD_PWM2__GPIO_1_28, 1);
-
- return 0;
-}
-
-int dram_init(void)
-{
- return mxs_dram_init();
-}
-
-int board_init(void)
-{
- /* Adress of boot parameters */
- gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
-
- return 0;
-}
-
-#ifdef CONFIG_CMD_MMC
-static int mx23evk_mmc_wp(int id)
-{
- if (id != 0) {
- printf("MXS MMC: Invalid card selected (card id = %d)\n", id);
- return 1;
- }
-
- return gpio_get_value(MX23_PAD_PWM4__GPIO_1_30);
-}
-
-int board_mmc_init(bd_t *bis)
-{
- /* Configure WP as input */
- gpio_direction_input(MX23_PAD_PWM4__GPIO_1_30);
-
- /* Configure MMC0 Power Enable */
- gpio_direction_output(MX23_PAD_PWM3__GPIO_1_29, 0);
-
- return mxsmmc_initialize(bis, 0, mx23evk_mmc_wp, NULL);
-}
-#endif
diff --git a/board/freescale/mx23evk/spl_boot.c
b/board/freescale/mx23evk/spl_boot.c
deleted file mode 100644
index 14e9b4a8634f..
--- a/board/freescale/mx23evk/spl_boot.c
+++ /dev/null
@@ -1,134 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Freescale MX23EVK Boot setup
- *
- * Copyright (C) 2011 Marek Vasut
- * on behalf of DENX Software Engineering GmbH
- */
-
-#include
-#include
-#include
-#include
-#include
[PATCH] mx23evk: Remove board
This board has not yet been converted to DM. After checking with the
listed maintainer, remove.
Cc: Otavio Salvador
Signed-off-by: Tom Rini
---
board/freescale/mx23evk/Kconfig | 15
board/freescale/mx23evk/MAINTAINERS | 6 --
board/freescale/mx23evk/Makefile| 10 ---
board/freescale/mx23evk/mx23evk.c | 78
board/freescale/mx23evk/spl_boot.c | 134
configs/mx23evk_defconfig | 40 -
include/configs/mx23evk.h | 110 ---
7 files changed, 393 deletions(-)
delete mode 100644 board/freescale/mx23evk/Kconfig
delete mode 100644 board/freescale/mx23evk/MAINTAINERS
delete mode 100644 board/freescale/mx23evk/Makefile
delete mode 100644 board/freescale/mx23evk/mx23evk.c
delete mode 100644 board/freescale/mx23evk/spl_boot.c
delete mode 100644 configs/mx23evk_defconfig
delete mode 100644 include/configs/mx23evk.h
diff --git a/board/freescale/mx23evk/Kconfig b/board/freescale/mx23evk/Kconfig
deleted file mode 100644
index 51a8f9f773cb..
--- a/board/freescale/mx23evk/Kconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-if TARGET_MX23EVK
-
-config SYS_BOARD
- default "mx23evk"
-
-config SYS_VENDOR
- default "freescale"
-
-config SYS_SOC
- default "mxs"
-
-config SYS_CONFIG_NAME
- default "mx23evk"
-
-endif
diff --git a/board/freescale/mx23evk/MAINTAINERS
b/board/freescale/mx23evk/MAINTAINERS
deleted file mode 100644
index b03ad6ae0af6..
--- a/board/freescale/mx23evk/MAINTAINERS
+++ /dev/null
@@ -1,6 +0,0 @@
-MX23EVK BOARD
-M: Otavio Salvador
-S: Maintained
-F: board/freescale/mx23evk/
-F: include/configs/mx23evk.h
-F: configs/mx23evk_defconfig
diff --git a/board/freescale/mx23evk/Makefile b/board/freescale/mx23evk/Makefile
deleted file mode 100644
index 6fe6992a5fcd..
--- a/board/freescale/mx23evk/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2000-2006
-# Wolfgang Denk, DENX Software Engineering, w...@denx.de.
-
-ifndef CONFIG_SPL_BUILD
-obj-y := mx23evk.o
-else
-obj-y := spl_boot.o
-endif
diff --git a/board/freescale/mx23evk/mx23evk.c
b/board/freescale/mx23evk/mx23evk.c
deleted file mode 100644
index 6cfff0496631..
--- a/board/freescale/mx23evk/mx23evk.c
+++ /dev/null
@@ -1,78 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Freescale MX23EVK board
- *
- * (C) Copyright 2013 O.S. Systems Software LTDA.
- *
- * Author: Otavio Salvador
- *
- * Based on m28evk.c:
- * Copyright (C) 2011 Marek Vasut
- * on behalf of DENX Software Engineering GmbH
- */
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-DECLARE_GLOBAL_DATA_PTR;
-
-/*
- * Functions
- */
-int board_early_init_f(void)
-{
- /* IO0 clock at 480MHz */
- mxs_set_ioclk(MXC_IOCLK0, 48);
-
- /* SSP0 clock at 96MHz */
- mxs_set_sspclk(MXC_SSPCLK0, 96000, 0);
-
- /* Power on LCD */
- gpio_direction_output(MX23_PAD_LCD_RESET__GPIO_1_18, 1);
-
- /* Set contrast to maximum */
- gpio_direction_output(MX23_PAD_PWM2__GPIO_1_28, 1);
-
- return 0;
-}
-
-int dram_init(void)
-{
- return mxs_dram_init();
-}
-
-int board_init(void)
-{
- /* Adress of boot parameters */
- gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
-
- return 0;
-}
-
-#ifdef CONFIG_CMD_MMC
-static int mx23evk_mmc_wp(int id)
-{
- if (id != 0) {
- printf("MXS MMC: Invalid card selected (card id = %d)\n", id);
- return 1;
- }
-
- return gpio_get_value(MX23_PAD_PWM4__GPIO_1_30);
-}
-
-int board_mmc_init(bd_t *bis)
-{
- /* Configure WP as input */
- gpio_direction_input(MX23_PAD_PWM4__GPIO_1_30);
-
- /* Configure MMC0 Power Enable */
- gpio_direction_output(MX23_PAD_PWM3__GPIO_1_29, 0);
-
- return mxsmmc_initialize(bis, 0, mx23evk_mmc_wp, NULL);
-}
-#endif
diff --git a/board/freescale/mx23evk/spl_boot.c
b/board/freescale/mx23evk/spl_boot.c
deleted file mode 100644
index 14e9b4a8634f..
--- a/board/freescale/mx23evk/spl_boot.c
+++ /dev/null
@@ -1,134 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Freescale MX23EVK Boot setup
- *
- * Copyright (C) 2011 Marek Vasut
- * on behalf of DENX Software Engineering GmbH
- */
-
-#include
-#include
-#include
-#include
-#include
-#include
-
-#defineMUX_CONFIG_SSP1 (MXS_PAD_8MA | MXS_PAD_PULLUP)
-#defineMUX_CONFIG_EMI (MXS_PAD_3V3 | MXS_PAD_12MA | MXS_PAD_PULLUP)
-#defineMUX_CONFIG_LCD (MXS_PAD_4MA | MXS_PAD_NOPULL)
-
-const iomux_cfg_t iomux_setup[] = {
- /* DUART */
- MX23_PAD_PWM0__DUART_RX,
- MX23_PAD_PWM1__DUART_TX,
-
- /* EMI */
- MX23_PAD_EMI_D00__EMI_D00 | MUX_CONFIG_EMI,
- MX23_PAD_EMI_D01__EMI_D01 | MUX_CONFIG_EMI,
- MX23_PAD_EMI_D02__EMI_D02 | MUX_CONFIG_EMI,
- MX23_PAD_EMI_D03__EMI_D03 | MUX_CONFIG_EMI,
-
[PATCH v1 2/3] x86: acpi: Replace _ADR() by _UID() in description of PCI host bridge
PCI Firmware specification requires _UID() and doesn't require _ADR()
to be set. Replace latter by former.
Reported-by: Bin Meng
Signed-off-by: Andy Shevchenko
---
arch/x86/include/asm/arch-tangier/acpi/southcluster.asl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/include/asm/arch-tangier/acpi/southcluster.asl
b/arch/x86/include/asm/arch-tangier/acpi/southcluster.asl
index 3518538806ee..e44a7ccfc263 100644
--- a/arch/x86/include/asm/arch-tangier/acpi/southcluster.asl
+++ b/arch/x86/include/asm/arch-tangier/acpi/southcluster.asl
@@ -10,7 +10,7 @@ Device (PCI0)
Name (_HID, EISAID("PNP0A08"))/* PCIe */
Name (_CID, EISAID("PNP0A03"))/* PCI */
-Name (_ADR, Zero)
+Name (_UID, Zero)
Name (_BBN, Zero)
Name (MCRS, ResourceTemplate()
--
2.26.2
[PATCH v1 3/3] x86: acpi: Drop _ADR() where _HID() is present
ACPICA complains that either _HID() or _ADR() should be used.
Drop _ADR() where _HID() is present.
Reported-by: Bin Meng
Signed-off-by: Andy Shevchenko
---
arch/x86/include/asm/arch-tangier/acpi/southcluster.asl | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/x86/include/asm/arch-tangier/acpi/southcluster.asl
b/arch/x86/include/asm/arch-tangier/acpi/southcluster.asl
index e44a7ccfc263..eaf75c8c673d 100644
--- a/arch/x86/include/asm/arch-tangier/acpi/southcluster.asl
+++ b/arch/x86/include/asm/arch-tangier/acpi/southcluster.asl
@@ -452,7 +452,6 @@ Device (PCI0)
Device (PMIC)
{
-Name (_ADR, Zero)
Name (_HID, "INTC100E")
Name (_CID, "INTC100E")
Name (_DDN, "Basin Cove PMIC")
--
2.26.2
[PATCH v1 1/3] x86: acpi: Create buffers outside of the methods
Create buffers outside of the methods as ACPICA 20200214 complains about this:
Remark 2173 - Creation of named objects within a method is
highly inefficient, use globals or method local variables
instead
Reported-by: Bin Meng
Signed-off-by: Andy Shevchenko
---
.../asm/arch-tangier/acpi/southcluster.asl| 106 +-
1 file changed, 55 insertions(+), 51 deletions(-)
diff --git a/arch/x86/include/asm/arch-tangier/acpi/southcluster.asl
b/arch/x86/include/asm/arch-tangier/acpi/southcluster.asl
index 9501cd8ada12..3518538806ee 100644
--- a/arch/x86/include/asm/arch-tangier/acpi/southcluster.asl
+++ b/arch/x86/include/asm/arch-tangier/acpi/southcluster.asl
@@ -141,13 +141,14 @@ Device (PCI0)
Return (STA_VISIBLE)
}
+Name (RBUF, ResourceTemplate()
+{
+GpioInt(Level, ActiveHigh, Exclusive, PullNone, 0,
+"\\_SB.PCI0.GPIO", 0, ResourceConsumer, , ) { 64 }
+})
+
Method (_CRS, 0, Serialized)
{
-Name (RBUF, ResourceTemplate()
-{
-GpioInt(Level, ActiveHigh, Exclusive, PullNone, 0,
-"\\_SB.PCI0.GPIO", 0, ResourceConsumer, , ) { 64 }
-})
Return (RBUF)
}
@@ -348,12 +349,12 @@ Device (PCI0)
{
Name (_ADR, Zero)
+Name (PCKG, Package () {
+Buffer (0x14) {}
+})
+
/* GPLD: Generate Port Location Data (PLD) */
Method (GPLD, 1, Serialized) {
-Name (PCKG, Package () {
-Buffer (0x14) {}
-})
-
/* REV: Revision 0x02 for ACPI 5.0 */
CreateField (DerefOf (Index (PCKG, Zero)), Zero, 0x07, REV)
Store (0x0002, REV)
@@ -411,20 +412,21 @@ Device (PCI0)
Return (STA_VISIBLE)
}
+Name (RBUF, ResourceTemplate()
+{
+UartSerialBus(0x0001C200, DataBitsEight, StopBitsOne,
+0xFC, LittleEndian, ParityTypeNone, FlowControlHardware,
+0x20, 0x20, "\\_SB.PCI0.HSU0", 0, ResourceConsumer, , )
+GpioInt(Level, ActiveHigh, Exclusive, PullNone, 0,
+"\\_SB.PCI0.GPIO", 0, ResourceConsumer, , ) { 185 }
+GpioIo(Exclusive, PullDefault, 0, 0, IoRestrictionOutputOnly,
+"\\_SB.PCI0.GPIO", 0, ResourceConsumer, , ) { 184 }
+GpioIo(Exclusive, PullDefault, 0, 0, IoRestrictionOutputOnly,
+"\\_SB.PCI0.GPIO", 0, ResourceConsumer, , ) { 71 }
+})
+
Method (_CRS, 0, Serialized)
{
-Name (RBUF, ResourceTemplate()
-{
-UartSerialBus(0x0001C200, DataBitsEight, StopBitsOne,
-0xFC, LittleEndian, ParityTypeNone,
FlowControlHardware,
-0x20, 0x20, "\\_SB.PCI0.HSU0", 0, ResourceConsumer, , )
-GpioInt(Level, ActiveHigh, Exclusive, PullNone, 0,
-"\\_SB.PCI0.GPIO", 0, ResourceConsumer, , ) { 185 }
-GpioIo(Exclusive, PullDefault, 0, 0,
IoRestrictionOutputOnly,
-"\\_SB.PCI0.GPIO", 0, ResourceConsumer, , ) { 184 }
-GpioIo(Exclusive, PullDefault, 0, 0,
IoRestrictionOutputOnly,
-"\\_SB.PCI0.GPIO", 0, ResourceConsumer, , ) { 71 }
-})
Return (RBUF)
}
@@ -464,33 +466,34 @@ Device (PCI0)
Return (STA_VISIBLE)
}
+Name (RBUF, ResourceTemplate()
+{
+/*
+ * Shadow registers in SRAM for PMIC:
+ * SRAMPMIC register
+ *
+ * 0x00-Unknown
+ * 0x03THRMIRQ (0x04)
+ * 0x04BCUIRQ (0x05)
+ * 0x05ADCIRQ (0x06)
+ * 0x06CHGRIRQ0 (0x07)
+ * 0x07CHGRIRQ1 (0x08)
+ * 0x08-Unknown
+ * 0x0aPBSTATUS (0x27)
+ * 0x0b-Unknown
+ */
+Memory32Fixed(ReadWrite, 0xF610, 0x0010)
+Interrupt(ResourceConsumer, Level, ActiveHigh, Shared, ,, ) {
30 }
+Interrupt(ResourceConsumer, Level, ActiveHigh, Shared, ,, ) {
23 }
+Interrupt(ResourceConsumer, Level, ActiveHigh, Shared, ,, ) {
52 }
+Interrupt(ResourceConsumer, Level, ActiveHigh, Shared, ,, ) {
51 }
+Interrupt(ResourceConsumer, Level, ActiveHigh, Shared, ,, ) {
50 }
+Interrupt(ResourceConsumer, Level, ActiveHigh, Shared, ,, ) {
27 }
+Interrupt(ResourceConsumer, Level, ActiveHigh,
Re: [PATCH] cmd: fitupd: move config check to Kconfig
On Tue, May 26, 2020 at 06:34:15PM +0200, Heinrich Schuchardt wrote: > Configuration checks should not be in the C files but in the Kconfig files. > > Signed-off-by: Heinrich Schuchardt For the patch itself: Reviewed-by: Tom Rini > --- > @Lukasz, @Tom > No board seems to be using the 'fitupd' command anymore. Shouldn't we > simply remove it? 'dfu tftp' offers a similar functionality. So yes, DFU over TFTP came later and leverages the minor updates the series that added fitupd command did. It's also never been enabled by default anywhere. Perhaps we should just enable it for sandbox? It's small enough that it's probably useful in out of tree configs. -- Tom signature.asc Description: PGP signature
[PATCH v2 4/4] riscv: cpu: check and append L1 cache to cpu features
All cpu cores within FU540-C000 having split I/D caches. Set the L1 feature bit using the i-cache-size as one of the property from device tree indicating that L1 cache is present on the cpu core. => cpu detail 0: cpu@0 rv64imac ID = 0, freq = 999.100 MHz: L1 cache 1: cpu@1 rv64imafdc ID = 1, freq = 999.100 MHz: L1 cache, MMU 2: cpu@2 rv64imafdc ID = 2, freq = 999.100 MHz: L1 cache, MMU 3: cpu@3 rv64imafdc ID = 3, freq = 999.100 MHz: L1 cache, MMU 4: cpu@4 rv64imafdc ID = 4, freq = 999.100 MHz: L1 cache, MMU Signed-off-by: Sagar Shrikant Kadam --- drivers/cpu/riscv_cpu.c | 6 ++ 1 file changed, 6 insertions(+) diff --git a/drivers/cpu/riscv_cpu.c b/drivers/cpu/riscv_cpu.c index 8c4b5e7..ce722cb 100644 --- a/drivers/cpu/riscv_cpu.c +++ b/drivers/cpu/riscv_cpu.c @@ -35,6 +35,7 @@ static int riscv_cpu_get_info(struct udevice *dev, struct cpu_info *info) int ret; struct clk clk; const char *mmu; + u32 split_cache_size; /* Zero out the frequency, in case sizeof(ulong) != sizeof(u32) */ info->cpu_freq = 0; @@ -57,6 +58,11 @@ static int riscv_cpu_get_info(struct udevice *dev, struct cpu_info *info) if (mmu) info->features |= BIT(CPU_FEAT_MMU); + /* check if I/D cache is present */ + ret = dev_read_u32(dev, "i-cache-size", _cache_size); + if (!ret) + info->features |= BIT(CPU_FEAT_L1_CACHE); + return 0; } -- 2.7.4
[PATCH v2 3/4] riscv: cpu: fixes to display proper CPU features
The cmd "cpu detail" fetches uninitialized cpu feature information and thus displays wrong / inconsitent details as below. FU540-C000 doesn't have any microcode, yet the cmd display's it. => cpu detail 0: cpu@0 rv64imac ID = 0, freq = 999.100 MHz: L1 cache, MMU, Microcode, Device ID Microcode version 0x0 Device ID 0x0 1: cpu@1 rv64imafdc ID = 1, freq = 999.100 MHz: L1 cache, MMU, Microcode, Device ID Microcode version 0x0 Device ID 0x0 2: cpu@2 rv64imafdc ID = 2, freq = 999.100 MHz: L1 cache, MMU, Microcode, Device ID Microcode version 0x0 Device ID 0x0 3: cpu@3 rv64imafdc ID = 3, freq = 999.100 MHz: L1 cache, MMU, Microcode, Device ID Microcode version 0x0 Device ID 0x0 4: cpu@4 rv64imafdc ID = 4, freq = 999.100 MHz: L1 cache, MMU, Microcode, Device ID Microcode version 0x0 Device ID 0x0 The L1 cache or MMU entry seen above is also displayed inconsistently. So initialize features to zero before fetching from device tree. Additionally the conditional check to read "mmu-type" from device tree is not rightly handled due to which the cpu feature doesn't include CPU_FEAT_MMU even if it's corresponding entry is present in device tree. We now see correct features as: => cpu detail 0: cpu@0 rv64imac ID = 0, freq = 999.100 MHz 1: cpu@1 rv64imafdc ID = 1, freq = 999.100 MHz: MMU 2: cpu@2 rv64imafdc ID = 2, freq = 999.100 MHz: MMU 3: cpu@3 rv64imafdc ID = 3, freq = 999.100 MHz: MMU 4: cpu@4 rv64imafdc ID = 4, freq = 999.100 MHz: MMU Signed-off-by: Sagar Shrikant Kadam --- drivers/cpu/riscv_cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/cpu/riscv_cpu.c b/drivers/cpu/riscv_cpu.c index 76b0489..8c4b5e7 100644 --- a/drivers/cpu/riscv_cpu.c +++ b/drivers/cpu/riscv_cpu.c @@ -38,6 +38,8 @@ static int riscv_cpu_get_info(struct udevice *dev, struct cpu_info *info) /* Zero out the frequency, in case sizeof(ulong) != sizeof(u32) */ info->cpu_freq = 0; + /* Initialise cpu features before updating from device tree */ + info->features = 0; /* First try getting the frequency from the assigned clock */ ret = clk_get_by_index(dev, 0, ); @@ -52,7 +54,7 @@ static int riscv_cpu_get_info(struct udevice *dev, struct cpu_info *info) dev_read_u32(dev, "clock-frequency", (u32 *)>cpu_freq); mmu = dev_read_string(dev, "mmu-type"); - if (!mmu) + if (mmu) info->features |= BIT(CPU_FEAT_MMU); return 0; -- 2.7.4
[PATCH v2 1/4] fu540: prci: add request and free clock handlers
Add clk_request handler to check if a valid clock is requested,
Here clk_free handler is added for debug purpose which will display
details of clock passed to clk_free.
Signed-off-by: Sagar Shrikant Kadam
---
drivers/clk/sifive/fu540-prci.c | 21 +
1 file changed, 21 insertions(+)
diff --git a/drivers/clk/sifive/fu540-prci.c b/drivers/clk/sifive/fu540-prci.c
index 67e21b6..bf50ea2 100644
--- a/drivers/clk/sifive/fu540-prci.c
+++ b/drivers/clk/sifive/fu540-prci.c
@@ -581,6 +581,25 @@ static ulong sifive_fu540_prci_set_rate(struct clk *clk,
ulong rate)
return rate;
}
+static int sifive_fu540_prci_clk_request(struct clk *clk)
+{
+ debug("%s(clk=%p) (dev=%p, id=%lu)\n", __func__, clk, clk->dev,
+ clk->id);
+
+ if (clk->id >= ARRAY_SIZE(__prci_init_clocks))
+ return -EINVAL;
+
+ return 0;
+}
+
+static int sifive_fu540_prci_clk_free(struct clk *clk)
+{
+ debug("%s(clk=%p) (dev=%p, id=%lu)\n", __func__, clk, clk->dev,
+ clk->id);
+
+ return 0;
+}
+
static int sifive_fu540_prci_probe(struct udevice *dev)
{
int i, err;
@@ -612,6 +631,8 @@ static int sifive_fu540_prci_probe(struct udevice *dev)
static struct clk_ops sifive_fu540_prci_ops = {
.set_rate = sifive_fu540_prci_set_rate,
.get_rate = sifive_fu540_prci_get_rate,
+ .request = sifive_fu540_prci_clk_request,
+ .rfree= sifive_fu540_prci_clk_free,
};
static const struct udevice_id sifive_fu540_prci_ids[] = {
--
2.7.4
[PATCH v2 2/4] riscv: dts: hifive-unleashed-a00: add cpu aliases
Add cpu aliases to U-Boot specific dtsi for hifive-unleashed.
Without aliases we see that the CPU device sequence numbers are set
randomly and the cpu list/detail command will show it as follows:
=> cpu list
1: cpu@0 rv64imac
0: cpu@1 rv64imafdc
2: cpu@2 rv64imafdc
3: cpu@3 rv64imafdc
4: cpu@4 rv64imafdc
Seems like CPU probing with dm-model also relies on aliases as observed
in case spi. The fu540-c000-u-boot.dtsi has cpu0/1/2/3/4 nodes and so
adding corresponding aliases we can ensure that cpu devices are assigned
proper sequence as follows:
=> cpu list
0: cpu@0 rv64imac
1: cpu@1 rv64imafdc
2: cpu@2 rv64imafdc
3: cpu@3 rv64imafdc
4: cpu@4 rv64imafdc
Signed-off-by: Sagar Shrikant Kadam
---
arch/riscv/dts/hifive-unleashed-a00-u-boot.dtsi | 5 +
1 file changed, 5 insertions(+)
diff --git a/arch/riscv/dts/hifive-unleashed-a00-u-boot.dtsi
b/arch/riscv/dts/hifive-unleashed-a00-u-boot.dtsi
index 9787332..9894260 100644
--- a/arch/riscv/dts/hifive-unleashed-a00-u-boot.dtsi
+++ b/arch/riscv/dts/hifive-unleashed-a00-u-boot.dtsi
@@ -7,6 +7,11 @@
/ {
aliases {
+ cpu0 =
+ cpu1 =
+ cpu2 =
+ cpu3 =
+ cpu4 =
spi0 =
spi2 =
};
--
2.7.4
[PATCH v2 0/4] update clock handler and proper cpu features
U-Boot cmd "cpu detail" shows inconsistent CPU features and is missing
clk_request and free handlers.
The current "cpu detail" sometimes shows "Microcode" as a feature, which
is not the case with FU540-C000 on HiFive Unleashed board.
Patch 1: add clk request handler to check if valid clock id is requested.
Patch 2: add cpu node aliases
Patch 3: Correctly parse and update mmu-type.
RISC-V core's on FU540-C000 SoC have separate instruction and data (split)
L1 cache.
Patch 4:Use i-cache-size dt property as one of identifier to indicate a
split cache is available.
I have picked few dependent patches from Sean's and Pragnesh's latest
series from here [1]...[5].
These have applied on mainline U-Boot
commit 8c48bb21bd6a ("Prepare v2020.07-rc3")
Patch history:
=
V2:
1. Incorporate review comments from Bin and Sean Anderson.
and dropped 2nd patch as similar work was already done in [1] & [2]
2 Add cpu node aliases to display cpu node's in sequence.
3. Add fix to show mmu as available cpu feature.
4. Check and append L1 cache feature.
V1: Base version.
Thanks to Vincent Chen for testing the V1
version of this series.
[1] https://patchwork.ozlabs.org/patch/1295345
[2] https://patchwork.ozlabs.org/patch/1295346
[3] https://patchwork.ozlabs.org/patch/1297146
[4] https://patchwork.ozlabs.org/patch/1297147
[5] https://patchwork.ozlabs.org/patch/1297149
All these together is available here:
https://github.com/sagsifive/u-boot/commits/dev/sagark/clk-v2
Sagar Shrikant Kadam (4):
fu540: prci: add request and free clock handlers
riscv: dts: hifive-unleashed-a00: add cpu aliases
riscv: cpu: fixes to display proper CPU features
riscv: cpu: check and append L1 cache to cpu features
arch/riscv/dts/hifive-unleashed-a00-u-boot.dtsi | 5 +
drivers/clk/sifive/fu540-prci.c | 21 +
drivers/cpu/riscv_cpu.c | 10 +-
3 files changed, 35 insertions(+), 1 deletion(-)
--
2.7.4
[PATCH] Fix MMC access on Sabrelite
It appears that MMC access on the Sabrelite has been broken since
cdcaee9518:
Loading Environment from MMC... Card did not respond to voltage select!
*** Warning - No block device, using default environment
Remove the board_mmc_init() and related entries now that we should be
using DM_MMC, add PINCTRL so that things work as expected.
Signed-off-by: Martyn Welch
---
board/boundary/nitrogen6x/nitrogen6x.c | 71 --
configs/mx6qsabrelite_defconfig| 3 ++
2 files changed, 3 insertions(+), 71 deletions(-)
diff --git a/board/boundary/nitrogen6x/nitrogen6x.c
b/board/boundary/nitrogen6x/nitrogen6x.c
index d49725daa8..5eb810f4ad 100644
--- a/board/boundary/nitrogen6x/nitrogen6x.c
+++ b/board/boundary/nitrogen6x/nitrogen6x.c
@@ -161,26 +161,6 @@ static iomux_v3_cfg_t const usdhc2_pads[] = {
IOMUX_PAD_CTRL(SD2_DAT3__SD2_DATA3, USDHC_PAD_CTRL),
};
-static iomux_v3_cfg_t const usdhc3_pads[] = {
- IOMUX_PAD_CTRL(SD3_CLK__SD3_CLK, USDHC_PAD_CTRL),
- IOMUX_PAD_CTRL(SD3_CMD__SD3_CMD, USDHC_PAD_CTRL),
- IOMUX_PAD_CTRL(SD3_DAT0__SD3_DATA0, USDHC_PAD_CTRL),
- IOMUX_PAD_CTRL(SD3_DAT1__SD3_DATA1, USDHC_PAD_CTRL),
- IOMUX_PAD_CTRL(SD3_DAT2__SD3_DATA2, USDHC_PAD_CTRL),
- IOMUX_PAD_CTRL(SD3_DAT3__SD3_DATA3, USDHC_PAD_CTRL),
- IOMUX_PAD_CTRL(SD3_DAT5__GPIO7_IO00, NO_PAD_CTRL), /* CD */
-};
-
-static iomux_v3_cfg_t const usdhc4_pads[] = {
- IOMUX_PAD_CTRL(SD4_CLK__SD4_CLK, USDHC_PAD_CTRL),
- IOMUX_PAD_CTRL(SD4_CMD__SD4_CMD, USDHC_PAD_CTRL),
- IOMUX_PAD_CTRL(SD4_DAT0__SD4_DATA0, USDHC_PAD_CTRL),
- IOMUX_PAD_CTRL(SD4_DAT1__SD4_DATA1, USDHC_PAD_CTRL),
- IOMUX_PAD_CTRL(SD4_DAT2__SD4_DATA2, USDHC_PAD_CTRL),
- IOMUX_PAD_CTRL(SD4_DAT3__SD4_DATA3, USDHC_PAD_CTRL),
- IOMUX_PAD_CTRL(NANDF_D6__GPIO2_IO06, NO_PAD_CTRL), /* CD */
-};
-
static iomux_v3_cfg_t const enet_pads1[] = {
IOMUX_PAD_CTRL(ENET_MDIO__ENET_MDIO, ENET_PAD_CTRL),
IOMUX_PAD_CTRL(ENET_MDC__ENET_MDC, ENET_PAD_CTRL),
@@ -305,57 +285,6 @@ int board_ehci_power(int port, int on)
#endif
-#ifdef CONFIG_FSL_ESDHC_IMX
-static struct fsl_esdhc_cfg usdhc_cfg[2] = {
- {USDHC3_BASE_ADDR},
- {USDHC4_BASE_ADDR},
-};
-
-int board_mmc_getcd(struct mmc *mmc)
-{
- struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv;
- int gp_cd = (cfg->esdhc_base == USDHC3_BASE_ADDR) ? IMX_GPIO_NR(7, 0) :
- IMX_GPIO_NR(2, 6);
-
- gpio_direction_input(gp_cd);
- return !gpio_get_value(gp_cd);
-}
-
-int board_mmc_init(bd_t *bis)
-{
- int ret;
- u32 index = 0;
-
- usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK);
- usdhc_cfg[1].sdhc_clk = mxc_get_clock(MXC_ESDHC4_CLK);
-
- usdhc_cfg[0].max_bus_width = 4;
- usdhc_cfg[1].max_bus_width = 4;
-
- for (index = 0; index < CONFIG_SYS_FSL_USDHC_NUM; ++index) {
- switch (index) {
- case 0:
- SETUP_IOMUX_PADS(usdhc3_pads);
- break;
- case 1:
- SETUP_IOMUX_PADS(usdhc4_pads);
- break;
- default:
- printf("Warning: you configured more USDHC controllers"
- "(%d) then supported by the board (%d)\n",
- index + 1, CONFIG_SYS_FSL_USDHC_NUM);
- return -EINVAL;
- }
-
- ret = fsl_esdhc_initialize(bis, _cfg[index]);
- if (ret)
- return ret;
- }
-
- return 0;
-}
-#endif
-
#ifdef CONFIG_MXC_SPI
int board_spi_cs_gpio(unsigned bus, unsigned cs)
{
diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig
index ea338c1b53..39b0ef7a42 100644
--- a/configs/mx6qsabrelite_defconfig
+++ b/configs/mx6qsabrelite_defconfig
@@ -28,6 +28,7 @@ CONFIG_CMD_GPT=y
# CONFIG_RANDOM_UUID is not set
CONFIG_CMD_I2C=y
CONFIG_CMD_MMC=y
+# CONFIG_CMD_PINMUX is not set
CONFIG_CMD_SATA=y
CONFIG_CMD_USB=y
CONFIG_CMD_USB_MASS_STORAGE=y
@@ -55,6 +56,8 @@ CONFIG_PHYLIB=y
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ90X1=y
CONFIG_MII=y
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_IMX6=y
CONFIG_SPI=y
CONFIG_DM_SPI=y
CONFIG_MXC_SPI=y
--
2.26.2
Re: [PATCH] mmc: davinci_mmc: Cleanup to use dt in U-boot and static platdata in SPL
Hi Faiz,
I have ended up with an omap L138 lcdk board. Do you have instructions
on how to get it booting from uSD and how to create the card image? I
have tried various sources but nothing works so far. Also, are you
able to send me a test image I can 'dd' onto the board?
Regards,
Simon
On Mon, 25 May 2020 at 09:38, Simon Glass wrote:
>
> Hi Faiz,
>
> On Mon, 25 May 2020 at 09:33, Faiz Abbas wrote:
> >
> > Hi Simon,
> >
> > On 25/05/20 8:27 pm, Simon Glass wrote:
> > > Hi Faiz,
> > >
> > > On Thu, 21 May 2020 at 20:02, Faiz Abbas wrote:
> > >>
> > >> Cleanup this driver to use dt in U-boot and static platdata in SPL.
> > >> This requires the following steps:
> > >>
> > >> 1. Move all platdata assignment from probe() to ofdata_to_platdata().
> > >>This function is only called in U-boot.
> > >> 2. Replicate all the platdata assignment being done in
> > >>ofdata_to_platdata() in the omapl138 board file. This data is used in
> > >>the SPL case where SPL_OF_CONTROL is not enabled.
> > >> 3. Remove SPL_OF_CONTROL and related configs from omapl138_lcdk_defconfig
> > >>
> > >> This cleanup effectively reverts 3ef94715cc ('mmc: davinci: fix mmc boot
> > >> in SPL')
> > >>
> > >> Signed-off-by: Faiz Abbas
> > >> ---
> > >>
> > >> This patch fixes things being broken by Simon's series disabling
> > >> libfdt when using of-platdata:
> > >> https://patchwork.ozlabs.org/project/uboot/cover/20191107155318.103300-1-...@chromium.org/
> > >>
> > >>
> > >> .../mach-davinci/include/mach/sdmmc_defs.h| 7 +++
> > >> board/davinci/da8xxevm/omapl138_lcdk.c| 12
> > >> configs/omapl138_lcdk_defconfig | 4 --
> > >> drivers/mmc/davinci_mmc.c | 63 ---
> > >> 4 files changed, 45 insertions(+), 41 deletions(-)
> > >
> > > Could this use of-platdata instead?
> > >
> >
> > We would need to implement address translation in of-platdata to do that. I
> > prefer merging your
> > fixes with this for now and leave of-platdata up for the future.
>
> OK, yes, we can't wait for non-existent features.
>
> There is a bit of a queue of functionality lining up for of-platdata at
> present.
>
> Regards,
> Simon
[PATCH] cmd: fitupd: move config check to Kconfig
Configuration checks should not be in the C files but in the Kconfig files.
Signed-off-by: Heinrich Schuchardt
---
@Lukasz, @Tom
No board seems to be using the 'fitupd' command anymore. Shouldn't we
simply remove it? 'dfu tftp' offers a similar functionality.
Best regards
Heinrich
---
cmd/Kconfig | 1 +
cmd/fitupd.c | 4
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 153864c587..192b3b262f 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -491,6 +491,7 @@ config CMD_SPL_WRITE_SIZE
config CMD_FITUPD
bool "fitImage update command"
+ depends on UPDATE_TFTP
help
Implements the 'fitupd' command, which allows to automatically
store software updates present on a TFTP server in NOR Flash
diff --git a/cmd/fitupd.c b/cmd/fitupd.c
index f6270d9c15..0f490c58fc 100644
--- a/cmd/fitupd.c
+++ b/cmd/fitupd.c
@@ -8,10 +8,6 @@
#include
#include
-#if !defined(CONFIG_UPDATE_TFTP)
-#error "CONFIG_UPDATE_TFTP required"
-#endif
-
static int do_fitupd(struct cmd_tbl *cmdtp, int flag, int argc,
char *const argv[])
{
--
2.26.2
RE: [PATCH] doc: log: correct option name CONFIG_LOG_MAX_LEVEL
Hi, > From: Heinrich Schuchardt > Sent: mardi 26 mai 2020 15:51 > > On 26.05.20 11:48, Patrick Delaunay wrote: > > Replace CONFIG_(SPL_)MAX_LOG_LEVEL by the correct name as defined in > > common/Kconfig: > > line 668:config LOG_MAX_LEVEL > > line 688:config SPL_LOG_MAX_LEVEL > > line 708:config TPL_LOG_MAX_LEVEL > > > > Signed-off-by: Patrick Delaunay > > > --- > > > > doc/README.log | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/doc/README.log b/doc/README.log index > > 1057981f45..170e4ba24e 100644 > > --- a/doc/README.log > > +++ b/doc/README.log [...] > > > > -The above have SPL versions also, e.g. CONFIG_SPL_MAX_LOG_LEVEL. > > +The above have SPL versions also, e.g. CONFIG_SPL_LOG_MAX_LEVEL. > > Please mention TPL and CONFIG_TPL_LOG_MAX_LEVEL here too. Yes, I prepare a V2. Regards. Patrick
