[U-Boot] [PATCH] ARMv8: Bug fix of dcache_disable()
From: David Feng feng...@phytium.com.cn The cache disable operation shoud be performed after flush_dcache_all(). If cache disable operation is performed before flush_dcache_all(), flush_dcache_all() store data directly to memory and may be overrided by data copy in cache. Signed-off-by: David Feng feng...@phytium.com.cn --- arch/arm/cpu/armv8/cache_v8.c |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/cpu/armv8/cache_v8.c b/arch/arm/cpu/armv8/cache_v8.c index 9dbcdf2..dc2fc8c 100644 --- a/arch/arm/cpu/armv8/cache_v8.c +++ b/arch/arm/cpu/armv8/cache_v8.c @@ -124,9 +124,10 @@ void dcache_disable(void) if (!(sctlr CR_C)) return; + flush_dcache_all(); + set_sctlr(sctlr ~(CR_C|CR_M)); - flush_dcache_all(); __asm_invalidate_tlb_all(); } -- 1.7.9.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] mx53loco: Fix boot hang during reboot stress test
From: Fabio Estevam fabio.este...@freescale.com Currently by running the following test: = setenv bootcmd reset = save = reset , we observe a hang after approximately 20-30 minutes of stress reboot test. Investigation of this issue revealed that when a single DDR chip select is used, the hang does not happen. It only happens when the two chip selects are active. MX53 reference manual states at 28.6.2 Memory ZQ calibration sequence: The controller must keep the memory lines quiet (except for CK) for the ZQ calibration time as defined in the Jedec (512 cycles for ZQCL after reset, 256 for other ZQCL and 64 for ZQCS). According to the SDE_0 and SDE_1 bit descriptions from register ESDCTL_ESDCTL: Writing 1 to SDE0 or SDE1 will initiate power up delays as JEDEC defines. Power up delays are a function of the configured memory type (DDR2/DDR3/LPDDR2) So make sure to activate one chip select at time (CS0 first and then CS1 later), so that the required JEDEC delay is respected for each chip select. With this change applied the board has gone through three days of reboot stress test without any hang. Signed-off-by: Fabio Estevam fabio.este...@freescale.com --- board/freescale/mx53loco/imximage.cfg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/board/freescale/mx53loco/imximage.cfg b/board/freescale/mx53loco/imximage.cfg index d1c1931..a5f1d98 100644 --- a/board/freescale/mx53loco/imximage.cfg +++ b/board/freescale/mx53loco/imximage.cfg @@ -59,7 +59,7 @@ DATA 4 0x63fd9090 0x4d444c44 DATA 4 0x63fd907c 0x01370138 DATA 4 0x63fd9080 0x013b013c DATA 4 0x63fd9018 0x00011740 -DATA 4 0x63fd9000 0xc319 +DATA 4 0x63fd9000 0x8319 DATA 4 0x63fd900c 0x9f5152e3 DATA 4 0x63fd9010 0xb68e8a63 DATA 4 0x63fd9014 0x01ff00db @@ -72,6 +72,7 @@ DATA 4 0x63fd901c 0x8033 DATA 4 0x63fd901c 0x00028031 DATA 4 0x63fd901c 0x052080b0 DATA 4 0x63fd901c 0x04008040 +DATA 4 0x63fd9000 0xc319 DATA 4 0x63fd901c 0x803a DATA 4 0x63fd901c 0x803b DATA 4 0x63fd901c 0x00028039 -- 1.9.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCHv1 13/22] arm: socfpga: spl: Add s_init
On 02/07/2015 07:34 AM, Marek Vasut wrote: On Thursday, February 05, 2015 at 10:16:59 PM, Dinh Nguyen wrote: On 01/14/2015 05:54 PM, Marek Vasut wrote: [...] + /* + * Private components security + * U-Boot : configure private timer, global timer and cpu + * component access as non secure for kernel stage (as required + * by kernel) + */ + setbits_le32(SOCFPGA_SCU_SNSAC, 0xfff); We do this in socfpga/misc.c in arch_early_init_r() already. You should consolidate this code so we don't have it twice I think. Yes, this can be removed. Hi! Please use whichever place you think is better. + +#endif/* CONFIG_SPL_BUILD */ + + /* Configure the L2 controller to make SDRAM start at 0 */ + writel(0x1, (SOCFPGA_MPUL2_ADDRESS + SOCFPGA_MPUL2_ADRFLTR_START)); This as well. This call has to stay because we want to map the SDRAM to 0x0 in the SPL. The call in arch_early_init_r() is in u-boot, and thus is too late. Roger, but please remove the other invocation once the SPL is in place. OK? Yes, I can remove it in the series? Thanks, Dinh ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2 18/19] dm: socfpga: Move driver model CONFIGs to Kconfig
On 02/09/2015 01:29 AM, Stefan Roese wrote: Hi, (added Marek to Cc) On 07.02.2015 01:11, Simon Glass wrote: Hi Dinh, On 6 February 2015 at 16:36, Dinh Nguyen dingu...@opensource.altera.com wrote: Hi Simon, On 02/05/2015 10:41 PM, Simon Glass wrote: Remove driver model CONFIGs from the board config headers and use Kconfig instead. Signed-off-by: Simon Glass s...@chromium.org --- Changes in v2: None configs/socfpga_socrates_defconfig | 3 +++ include/configs/socfpga_common.h | 7 --- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/configs/socfpga_socrates_defconfig b/configs/socfpga_socrates_defconfig index 0f3896d..888bbb6 100644 --- a/configs/socfpga_socrates_defconfig +++ b/configs/socfpga_socrates_defconfig @@ -3,3 +3,6 @@ CONFIG_SPL=y +S:CONFIG_TARGET_SOCFPGA_CYCLONE5=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE=socfpga_cyclone5_socrates +CONFIG_DM=y +CONFIG_DM_SPI=y +CONFIG_DM_SPI_FLASH=y Would you need to also update socfpga_cyclone5_defconfig or is that not needed? From what I can tell it does not use driver model yet (it doesn't define CONFIG_OF_CONTROL either). socrates was the first SoCFPGA board to use DT and DM. IIRC, Marek has a patch series queued to move the other SoCFPGA boards over to DT based probing (with DM enabled) as well. Ah ok, thanks for the clarification. Dinh ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] kwbimage: Make the Makefile pass in CONFIG_SYS_SPI_U_BOOT_OFFS
We can't use config.h directly as some platforms include headers that aren't safe to use in normal Linux userland. Signed-off-by: Tom Rini tr...@ti.com --- tools/Makefile |4 tools/kwbimage.c |1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/Makefile b/tools/Makefile index 6e1ce79..e4b23eb 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -115,6 +115,10 @@ ifdef CONFIG_FIT_SIGNATURE HOST_EXTRACFLAGS += -DCONFIG_FIT_SIGNATURE endif +ifdef CONFIG_SYS_SPI_U_BOOT_OFFS +HOSTCFLAGS_kwbimage.o += -DCONFIG_SYS_SPI_U_BOOT_OFFS=$(CONFIG_SYS_SPI_U_BOOT_OFFS) +endif + # MXSImage needs LibSSL ifneq ($(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_FIT_SIGNATURE),) HOSTLOADLIBES_mkimage += -lssl -lcrypto diff --git a/tools/kwbimage.c b/tools/kwbimage.c index 28ce1e4..de5c808 100644 --- a/tools/kwbimage.c +++ b/tools/kwbimage.c @@ -16,7 +16,6 @@ #include image.h #include stdint.h #include kwbimage.h -#include config.h #define ALIGN_SUP(x, a) (((x) + (a - 1)) ~(a - 1)) -- 1.7.9.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2 18/19] dm: socfpga: Move driver model CONFIGs to Kconfig
On Monday, February 09, 2015 at 05:45:37 PM, Dinh Nguyen wrote: On 02/09/2015 01:29 AM, Stefan Roese wrote: Hi, (added Marek to Cc) [...] Would you need to also update socfpga_cyclone5_defconfig or is that not needed? From what I can tell it does not use driver model yet (it doesn't define CONFIG_OF_CONTROL either). socrates was the first SoCFPGA board to use DT and DM. IIRC, Marek has a patch series queued to move the other SoCFPGA boards over to DT based probing (with DM enabled) as well. Ah ok, thanks for the clarification. Hi! it's only DT, not DM. It's the Arria V patchset I sent out that Stefan is referring to. I'll address his comment this week and will repost then. In case you want to base on top of that patchset, it's in the u-boot-socfpga repository, branch topic/vip-arriav . Best regards, Marek Vasut ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCHv1 13/22] arm: socfpga: spl: Add s_init
On Monday, February 09, 2015 at 05:50:34 PM, Dinh Nguyen wrote: Hi! [...] + +#endif /* CONFIG_SPL_BUILD */ + +/* Configure the L2 controller to make SDRAM start at 0 */ +writel(0x1, (SOCFPGA_MPUL2_ADDRESS + SOCFPGA_MPUL2_ADRFLTR_START)); This as well. This call has to stay because we want to map the SDRAM to 0x0 in the SPL. The call in arch_early_init_r() is in u-boot, and thus is too late. Roger, but please remove the other invocation once the SPL is in place. OK? Yes, I can remove it in the series? Roger, thank you. Please address Simon's email too :) Best regards, Marek Vasut ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [RFC PATCH 0/7] RFC: dm: Add USB support
Hi Marek, On 9 February 2015 at 14:02, Marek Vasut ma...@denx.de wrote: On Friday, January 30, 2015 at 11:41:33 PM, Simon Glass wrote: Hi Marek, Hi! On 30 January 2015 at 15:16, Marek Vasut ma...@denx.de wrote: On Friday, January 30, 2015 at 08:04:50 PM, Simon Glass wrote: This series adds basic driver model support to USB. The intent is to permit the various subsystems (OHCI, EHCI, XHCI) to co-exist and allow any number of USB ports of different types. So far the absolute limit on the number of USB devices is only slightly relaxed. Only USB controllers have a real driver model device. USB devices (including the hub in the controller) are not modelled as driver model devices. This is for two reasons: - it is easier since we don't need to bind a whole lot of devices when scanning - the two main USB devices (block devices and Ethernet) don't have driver mode support yet anyway, so it would be pointless. However the recent network RFC has encouraged me to send this. The basic approach is to set up the driver model structures in parallel to what already exists rather than to replace them. This allows both driver model and legacy to be used for USB, although not with the same board. So far only XHCI is supported. As an example the Exynos XHCI driver is converted to driver model. I would appreciate comments before going further. Caveats: - sandbox code is incomplete and there are no tests - 'usb stop' does not remove existing devices (I have not yet settled on the best approach) - the usb.h changes need to be split correctly into the patches once they are final This series is available at u-boot-dm/usb-working. Hi! I'll look at this by the end of next week, I will be free by then. It's not possible for me to do it earlier, sorry. Does this still work for you please? Definitely, that sounds good. I was planning to leave it a week or two anyway, although I might fiddle more with the sandbox side in the meantime. I skimmed through the series finally, it looks mostly good for but a few minor coding style things. I would prefer if this went in for the next MW, what do you think please ? Sounds good, hopefully we can bring in wider driver support too. I'd like to get this lot in before thinking too hard about how to deal with actual devices! Maybe we can target getting this series cleaned up and into u-boot-dm/next by end of Feb? Regards, Simon ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/3] bcm2835/rpi: add SPDX license tags for some files
Signed-off-by: Stephen Warren swar...@wwwdotorg.org --- arch/arm/cpu/arm1176/bcm2835/Makefile | 12 ++-- arch/arm/include/asm/arch-bcm2835/sdhci.h | 12 +--- arch/arm/include/asm/arch-bcm2835/timer.h | 12 +--- arch/arm/include/asm/arch-bcm2835/wdog.h | 12 +--- board/raspberrypi/rpi/Makefile| 12 ++-- board/raspberrypi/rpi/rpi.c | 12 +--- include/configs/rpi.h | 12 +--- 7 files changed, 9 insertions(+), 75 deletions(-) diff --git a/arch/arm/cpu/arm1176/bcm2835/Makefile b/arch/arm/cpu/arm1176/bcm2835/Makefile index 0ad36906dfc5..7e5dbe1fdeaf 100644 --- a/arch/arm/cpu/arm1176/bcm2835/Makefile +++ b/arch/arm/cpu/arm1176/bcm2835/Makefile @@ -1,15 +1,7 @@ # -# See file CREDITS for list of people who contributed to this -# project. +# (C) Copyright 2012 Stephen Warren # -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# version 2 as published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# SPDX-License-Identifier: GPL-2.0 # obj-y := lowlevel_init.o diff --git a/arch/arm/include/asm/arch-bcm2835/sdhci.h b/arch/arm/include/asm/arch-bcm2835/sdhci.h index a4f867b2e9a4..da4d5cd5a88f 100644 --- a/arch/arm/include/asm/arch-bcm2835/sdhci.h +++ b/arch/arm/include/asm/arch-bcm2835/sdhci.h @@ -1,17 +1,7 @@ /* * (C) Copyright 2012 Stephen Warren * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * SPDX-License-Identifier:GPL-2.0 */ #ifndef _BCM2835_SDHCI_H_ diff --git a/arch/arm/include/asm/arch-bcm2835/timer.h b/arch/arm/include/asm/arch-bcm2835/timer.h index c2001b6f932a..2d7cfe5c56f8 100644 --- a/arch/arm/include/asm/arch-bcm2835/timer.h +++ b/arch/arm/include/asm/arch-bcm2835/timer.h @@ -1,17 +1,7 @@ /* * (C) Copyright 2012 Stephen Warren * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * SPDX-License-Identifier:GPL-2.0 */ #ifndef _BCM2835_TIMER_H diff --git a/arch/arm/include/asm/arch-bcm2835/wdog.h b/arch/arm/include/asm/arch-bcm2835/wdog.h index 303a65f32e08..f369ab589c9a 100644 --- a/arch/arm/include/asm/arch-bcm2835/wdog.h +++ b/arch/arm/include/asm/arch-bcm2835/wdog.h @@ -1,17 +1,7 @@ /* * (C) Copyright 2012 Stephen Warren * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * SPDX-License-Identifier:GPL-2.0 */ #ifndef _BCM2835_TIMER_H diff --git a/board/raspberrypi/rpi/Makefile b/board/raspberrypi/rpi/Makefile index c53c92b1ddb7..4ce2c983b382 100644 --- a/board/raspberrypi/rpi/Makefile +++ b/board/raspberrypi/rpi/Makefile @@ -1,15 +1,7 @@ # -# See file CREDITS for list of people who contributed to this -# project. +# (C) Copyright 2012 Stephen Warren # -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# version 2 as published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# SPDX-License-Identifier: GPL-2.0 # obj-y := rpi.o diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c index
[U-Boot] [PATCH 3/3] rpi: add support for Raspberry Pi 2 model B
The get board rev firmware API doesn't seem to return a useful value on
this platform, so we hard-code the board ID for now, since there's only
one bcm2836-based RPi board at present.
USB doesn't seem to work yet; the controller detects the on-board Hub/
Ethernet device but can't read the descriptors from it. I haven't
investigated yet.
HDMI is untested.
Signed-off-by: Stephen Warren swar...@wwwdotorg.org
---
arch/arm/Kconfig | 5 +
arch/arm/include/asm/arch-bcm2835/mbox.h | 4 +
board/raspberrypi/rpi/rpi.c | 26 -
board/raspberrypi/rpi_2/Kconfig | 15 +++
board/raspberrypi/rpi_2/MAINTAINERS | 6 ++
board/raspberrypi/rpi_2/Makefile | 7 ++
configs/rpi_2_defconfig | 2 +
include/configs/{rpi.h = rpi-common.h} | 16 ++-
include/configs/rpi.h| 175 +--
include/configs/rpi_2.h | 15 +++
10 files changed, 93 insertions(+), 178 deletions(-)
create mode 100644 board/raspberrypi/rpi_2/Kconfig
create mode 100644 board/raspberrypi/rpi_2/MAINTAINERS
create mode 100644 board/raspberrypi/rpi_2/Makefile
create mode 100644 configs/rpi_2_defconfig
copy include/configs/{rpi.h = rpi-common.h} (92%)
create mode 100644 include/configs/rpi_2.h
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 47806f85dafa..b916eb0dd44c 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -413,6 +413,10 @@ config TARGET_RPI
bool Support rpi
select CPU_ARM1176
+config TARGET_RPI_2
+ bool Support rpi_2
+ select CPU_V7
+
config TARGET_TNETV107X_EVM
bool Support tnetv107x_evm
select CPU_ARM1176
@@ -958,6 +962,7 @@ source board/phytec/pcm051/Kconfig
source board/ppcag/bg0900/Kconfig
source board/pxa255_idp/Kconfig
source board/raspberrypi/rpi/Kconfig
+source board/raspberrypi/rpi_2/Kconfig
source board/ronetix/pm9261/Kconfig
source board/ronetix/pm9263/Kconfig
source board/ronetix/pm9g45/Kconfig
diff --git a/arch/arm/include/asm/arch-bcm2835/mbox.h
b/arch/arm/include/asm/arch-bcm2835/mbox.h
index c4bbacaf3c3f..8b7ff8165617 100644
--- a/arch/arm/include/asm/arch-bcm2835/mbox.h
+++ b/arch/arm/include/asm/arch-bcm2835/mbox.h
@@ -125,6 +125,9 @@ struct bcm2835_mbox_tag_hdr {
#define BCM2835_MBOX_TAG_GET_BOARD_REV 0x00010002
+#ifdef CONFIG_BCM2836
+#define BCM2836_BOARD_REV_2_B 0x1
+#else
/*
* 0x2..0xf from:
*
http://raspberryalphaomega.org.uk/2013/02/06/automatic-raspberry-pi-board-revision-detection-model-a-b1-and-b2/
@@ -145,6 +148,7 @@ struct bcm2835_mbox_tag_hdr {
#define BCM2835_BOARD_REV_B_PLUS 0x10
#define BCM2835_BOARD_REV_CM 0x11
#define BCM2835_BOARD_REV_A_PLUS 0x12
+#endif
struct bcm2835_mbox_tag_get_board_rev {
struct bcm2835_mbox_tag_hdr tag_hdr;
diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
index 2185b1bd029a..314d1672f80a 100644
--- a/board/raspberrypi/rpi/rpi.c
+++ b/board/raspberrypi/rpi/rpi.c
@@ -1,5 +1,5 @@
/*
- * (C) Copyright 2012-2013 Stephen Warren
+ * (C) Copyright 2012-2013,2015 Stephen Warren
*
* SPDX-License-Identifier:GPL-2.0
*/
@@ -28,7 +28,11 @@ U_BOOT_DEVICE(bcm2835_gpios) = {
};
static const struct pl01x_serial_platdata serial_platdata = {
+#ifdef CONFIG_BCM2836
+ .base = 0x3f201000,
+#else
.base = 0x20201000,
+#endif
.type = TYPE_PL011,
.clock = 300,
};
@@ -76,9 +80,20 @@ static const struct {
} models[] = {
[0] = {
Unknown model,
+#ifdef CONFIG_BCM2836
+ bcm2836-rpi-other.dtb,
+#else
bcm2835-rpi-other.dtb,
+#endif
false,
},
+#ifdef CONFIG_BCM2836
+ [BCM2836_BOARD_REV_2_B] = {
+ 2 Model B,
+ bcm2836-rpi-2-b.dtb,
+ true,
+ },
+#else
[BCM2835_BOARD_REV_B_I2C0_2] = {
Model B (no P5),
bcm2835-rpi-b-i2c0.dtb,
@@ -149,6 +164,7 @@ static const struct {
bcm2835-rpi-a-plus.dtb,
false,
},
+#endif
};
u32 rpi_board_rev = 0;
@@ -242,10 +258,15 @@ static int power_on_module(u32 module)
static void get_board_rev(void)
{
+#ifndef CONFIG_BCM2836
ALLOC_ALIGN_BUFFER(struct msg_get_board_rev, msg, 1, 16);
int ret;
+#endif
const char *name;
+#ifdef CONFIG_BCM2836
+ rpi_board_rev = BCM2836_BOARD_REV_2_B;
+#else
BCM2835_MBOX_INIT_HDR(msg);
BCM2835_MBOX_INIT_TAG(msg-get_board_rev, GET_BOARD_REV);
@@ -266,9 +287,10 @@ static void get_board_rev(void)
printf(RPI: Board rev %u unknown\n, rpi_board_rev);
rpi_board_rev = 0;
}
+#endif
name = models[rpi_board_rev].name;
- printf(RPI model: %s\n, name);
+ printf(RPI %s\n, name);
}
int board_init(void)
diff --git a/board/raspberrypi/rpi_2/Kconfig b/board/raspberrypi/rpi_2/Kconfig
new file mode 100644
index
[U-Boot] [PATCH 2/3] bcm2836 SoC support (used in Raspberry Pi 2 model B)
The bcm2835 and bcm2836 are essentially identical, except:
- The CPU is an ARM1176 v.s. a quad-core Cortex-A7.
- The physical address of many IO controllers has moved.
Rather than introducing a whole new bcm2836 value for $(SOC) or $(ARCH),
update the existing bcm2835 code to handle the minor differences, and
plumb it into the ARMv7 CPU architecture.
Signed-off-by: Stephen Warren swar...@wwwdotorg.org
---
arch/arm/cpu/armv7/Makefile | 1 +
arch/arm/cpu/armv7/bcm2835/Makefile | 13 +
arch/arm/include/asm/arch-bcm2835/gpio.h | 5 +
arch/arm/include/asm/arch-bcm2835/mbox.h | 6 +-
arch/arm/include/asm/arch-bcm2835/sdhci.h | 6 +-
arch/arm/include/asm/arch-bcm2835/timer.h | 6 +-
arch/arm/include/asm/arch-bcm2835/wdog.h | 6 +-
7 files changed, 39 insertions(+), 4 deletions(-)
create mode 100644 arch/arm/cpu/armv7/bcm2835/Makefile
diff --git a/arch/arm/cpu/armv7/Makefile b/arch/arm/cpu/armv7/Makefile
index 409e6f5651b6..7f77c729a191 100644
--- a/arch/arm/cpu/armv7/Makefile
+++ b/arch/arm/cpu/armv7/Makefile
@@ -41,6 +41,7 @@ endif
obj-$(if $(filter am33xx,$(SOC)),y) += am33xx/
obj-$(if $(filter armada-xp,$(SOC)),y) += armada-xp/
obj-$(CONFIG_AT91FAMILY) += at91/
+obj-$(CONFIG_BCM2835) += bcm2835/
obj-$(if $(filter bcm281xx,$(SOC)),y) += bcm281xx/
obj-$(if $(filter bcmcygnus,$(SOC)),y) += bcmcygnus/
obj-$(if $(filter bcmnsp,$(SOC)),y) += bcmnsp/
diff --git a/arch/arm/cpu/armv7/bcm2835/Makefile
b/arch/arm/cpu/armv7/bcm2835/Makefile
new file mode 100644
index ..ed1ee4753d49
--- /dev/null
+++ b/arch/arm/cpu/armv7/bcm2835/Makefile
@@ -0,0 +1,13 @@
+#
+# (C) Copyright 2012 Stephen Warren
+#
+# SPDX-License-Identifier: GPL-2.0+
+#
+
+src_dir := ../../arm1176/bcm2835/
+
+obj-y :=
+obj-y += $(src_dir)/init.o
+obj-y += $(src_dir)/reset.o
+obj-y += $(src_dir)/timer.o
+obj-y += $(src_dir)/mbox.o
diff --git a/arch/arm/include/asm/arch-bcm2835/gpio.h
b/arch/arm/include/asm/arch-bcm2835/gpio.h
index db42896201b3..c8ef8f528a21 100644
--- a/arch/arm/include/asm/arch-bcm2835/gpio.h
+++ b/arch/arm/include/asm/arch-bcm2835/gpio.h
@@ -1,6 +1,7 @@
/*
* Copyright (C) 2012 Vikram Narayananan
* vikram...@gmail.com
+ * (C) Copyright 2012,2015 Stephen Warren
*
* SPDX-License-Identifier:GPL-2.0+
*/
@@ -8,7 +9,11 @@
#ifndef _BCM2835_GPIO_H_
#define _BCM2835_GPIO_H_
+#ifdef CONFIG_BCM2836
+#define BCM2835_GPIO_BASE 0x3f20
+#else
#define BCM2835_GPIO_BASE 0x2020
+#endif
#define BCM2835_GPIO_COUNT 54
#define BCM2835_GPIO_FSEL_MASK 0x7
diff --git a/arch/arm/include/asm/arch-bcm2835/mbox.h
b/arch/arm/include/asm/arch-bcm2835/mbox.h
index 88d2ec11a7c2..c4bbacaf3c3f 100644
--- a/arch/arm/include/asm/arch-bcm2835/mbox.h
+++ b/arch/arm/include/asm/arch-bcm2835/mbox.h
@@ -1,5 +1,5 @@
/*
- * (C) Copyright 2012 Stephen Warren
+ * (C) Copyright 2012,2015 Stephen Warren
*
* SPDX-License-Identifier:GPL-2.0+
*/
@@ -38,7 +38,11 @@
/* Raw mailbox HW */
+#ifdef CONFIG_BCM2836
+#define BCM2835_MBOX_PHYSADDR 0x3f00b880
+#else
#define BCM2835_MBOX_PHYSADDR 0x2000b880
+#endif
struct bcm2835_mbox_regs {
u32 read;
diff --git a/arch/arm/include/asm/arch-bcm2835/sdhci.h
b/arch/arm/include/asm/arch-bcm2835/sdhci.h
index da4d5cd5a88f..2a21ccbf66ba 100644
--- a/arch/arm/include/asm/arch-bcm2835/sdhci.h
+++ b/arch/arm/include/asm/arch-bcm2835/sdhci.h
@@ -1,5 +1,5 @@
/*
- * (C) Copyright 2012 Stephen Warren
+ * (C) Copyright 2012,2015 Stephen Warren
*
* SPDX-License-Identifier:GPL-2.0
*/
@@ -7,7 +7,11 @@
#ifndef _BCM2835_SDHCI_H_
#define _BCM2835_SDHCI_H_
+#ifdef CONFIG_BCM2836
+#define BCM2835_SDHCI_BASE 0x3f30
+#else
#define BCM2835_SDHCI_BASE 0x2030
+#endif
int bcm2835_sdhci_init(u32 regbase, u32 emmc_freq);
diff --git a/arch/arm/include/asm/arch-bcm2835/timer.h
b/arch/arm/include/asm/arch-bcm2835/timer.h
index 2d7cfe5c56f8..fc7aec7b7c59 100644
--- a/arch/arm/include/asm/arch-bcm2835/timer.h
+++ b/arch/arm/include/asm/arch-bcm2835/timer.h
@@ -1,5 +1,5 @@
/*
- * (C) Copyright 2012 Stephen Warren
+ * (C) Copyright 2012,2015 Stephen Warren
*
* SPDX-License-Identifier:GPL-2.0
*/
@@ -7,7 +7,11 @@
#ifndef _BCM2835_TIMER_H
#define _BCM2835_TIMER_H
+#ifdef CONFIG_BCM2836
+#define BCM2835_TIMER_PHYSADDR 0x3f003000
+#else
#define BCM2835_TIMER_PHYSADDR 0x20003000
+#endif
struct bcm2835_timer_regs {
u32 cs;
diff --git a/arch/arm/include/asm/arch-bcm2835/wdog.h
b/arch/arm/include/asm/arch-bcm2835/wdog.h
index f369ab589c9a..beb6a0820601 100644
--- a/arch/arm/include/asm/arch-bcm2835/wdog.h
+++ b/arch/arm/include/asm/arch-bcm2835/wdog.h
@@ -1,5 +1,5 @@
/*
- * (C) Copyright 2012 Stephen Warren
+ * (C) Copyright 2012,2015 Stephen Warren
*
* SPDX-License-Identifier:GPL-2.0
*/
@@ -7,7 +7,11 @@
#ifndef _BCM2835_TIMER_H
#define _BCM2835_TIMER_H
+#ifdef CONFIG_BCM2836
+#define BCM2835_WDOG_PHYSADDR
[U-Boot] [PATCH v2 01/10] ARM: remove mx31ads board support
This is still a non-generic board. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Cc: Guennadi Liakhovetski g.liakhovet...@gmx.de --- arch/arm/Kconfig| 5 - board/freescale/mx31ads/Kconfig | 15 -- board/freescale/mx31ads/MAINTAINERS | 6 - board/freescale/mx31ads/Makefile| 8 - board/freescale/mx31ads/lowlevel_init.S | 268 board/freescale/mx31ads/mx31ads.c | 114 -- board/freescale/mx31ads/u-boot.lds | 110 - configs/mx31ads_defconfig | 2 - doc/README.scrapyard| 35 +++-- include/configs/mx31ads.h | 188 -- 10 files changed, 18 insertions(+), 733 deletions(-) delete mode 100644 board/freescale/mx31ads/Kconfig delete mode 100644 board/freescale/mx31ads/MAINTAINERS delete mode 100644 board/freescale/mx31ads/Makefile delete mode 100644 board/freescale/mx31ads/lowlevel_init.S delete mode 100644 board/freescale/mx31ads/mx31ads.c delete mode 100644 board/freescale/mx31ads/u-boot.lds delete mode 100644 configs/mx31ads_defconfig delete mode 100644 include/configs/mx31ads.h diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 986b4c5..f12dac9 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -373,10 +373,6 @@ config TARGET_QONG bool Support qong select CPU_ARM1136 -config TARGET_MX31ADS - bool Support mx31ads - select CPU_ARM1136 - config TARGET_MX31PDK bool Support mx31pdk select CPU_ARM1136 @@ -919,7 +915,6 @@ source board/freescale/ls1021atwr/Kconfig source board/freescale/mx23evk/Kconfig source board/freescale/mx25pdk/Kconfig source board/freescale/mx28evk/Kconfig -source board/freescale/mx31ads/Kconfig source board/freescale/mx31pdk/Kconfig source board/freescale/mx35pdk/Kconfig source board/freescale/mx51evk/Kconfig diff --git a/board/freescale/mx31ads/Kconfig b/board/freescale/mx31ads/Kconfig deleted file mode 100644 index eeeb6f4..000 --- a/board/freescale/mx31ads/Kconfig +++ /dev/null @@ -1,15 +0,0 @@ -if TARGET_MX31ADS - -config SYS_BOARD - default mx31ads - -config SYS_VENDOR - default freescale - -config SYS_SOC - default mx31 - -config SYS_CONFIG_NAME - default mx31ads - -endif diff --git a/board/freescale/mx31ads/MAINTAINERS b/board/freescale/mx31ads/MAINTAINERS deleted file mode 100644 index 5f6ec26..000 --- a/board/freescale/mx31ads/MAINTAINERS +++ /dev/null @@ -1,6 +0,0 @@ -MX31ADS BOARD -#M:(resigned) Guennadi Liakhovetski g.liakhovet...@gmx.de -S: Orphan (since 2013-09) -F: board/freescale/mx31ads/ -F: include/configs/mx31ads.h -F: configs/mx31ads_defconfig diff --git a/board/freescale/mx31ads/Makefile b/board/freescale/mx31ads/Makefile deleted file mode 100644 index 5e1440d..000 --- a/board/freescale/mx31ads/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# -# Copyright (C) 2008, Guennadi Liakhovetski l...@denx.de -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y := mx31ads.o -obj-y += lowlevel_init.o diff --git a/board/freescale/mx31ads/lowlevel_init.S b/board/freescale/mx31ads/lowlevel_init.S deleted file mode 100644 index fcb5549..000 --- a/board/freescale/mx31ads/lowlevel_init.S +++ /dev/null @@ -1,268 +0,0 @@ -/* - * Copyright (C) 2008, Guennadi Liakhovetski l...@denx.de - * - * SPDX-License-Identifier:GPL-2.0+ - */ - -#include asm/arch/imx-regs.h - -.macro REG reg, val - ldr r2, =\reg - ldr r3, =\val - str r3, [r2] -.endm - -.macro REG8 reg, val - ldr r2, =\reg - ldr r3, =\val - strb r3, [r2] -.endm - -.macro DELAY loops - ldr r2, =\loops -1: - subsr2, r2, #1 - nop - bcs 1b -.endm - -/* RedBoot: AIPS setup - Only setup MPROTx registers. - * The PACR default values are good.*/ -.macro init_aips - /* -* Set all MPROTx to be non-bufferable, trusted for R/W, -* not forced to user-mode. -*/ - ldr r0, =0x43F0 - ldr r1, =0x - str r1, [r0, #0x00] - str r1, [r0, #0x04] - ldr r0, =0x53F0 - str r1, [r0, #0x00] - str r1, [r0, #0x04] - - /* -* Clear the on and off peripheral modules Supervisor Protect bit -* for SDMA to access them. Did not change the AIPS control registers -* (offset 0x20) access type -*/ - ldr r0, =0x43F0 - ldr r1, =0x0 - str r1, [r0, #0x40] - str r1, [r0, #0x44] - str r1, [r0, #0x48] - str r1, [r0, #0x4C] - ldr r1, [r0, #0x50] - and r1, r1, #0x00FF - str r1, [r0, #0x50] - - ldr r0, =0x53F0 - ldr r1, =0x0 - str r1, [r0, #0x40] - str r1, [r0, #0x44] - str r1, [r0, #0x48] - str r1, [r0, #0x4C] - ldr r1, [r0, #0x50] - and r1, r1, #0x00FF - str r1, [r0, #0x50] -.endm /* init_aips */ - -/* RedBoot: MAX (Multi-Layer AHB Crossbar Switch) setup */
[U-Boot] [PATCH 2/2] dm: mx6: sabre: Move driver model CONFIGs to Kconfig
Remove driver model CONFIGs from the board config headers and use Kconfig instead. Signed-off-by: Simon Glass s...@chromium.org --- configs/mx6dlsabreauto_defconfig | 2 ++ configs/mx6dlsabresd_defconfig| 2 ++ configs/mx6qsabreauto_defconfig | 2 ++ configs/mx6qsabrelite_defconfig | 2 ++ configs/mx6qsabresd_defconfig | 2 ++ configs/mx6sabresd_spl_defconfig | 3 ++- include/configs/mx6sabre_common.h | 2 -- 7 files changed, 12 insertions(+), 3 deletions(-) diff --git a/configs/mx6dlsabreauto_defconfig b/configs/mx6dlsabreauto_defconfig index ccdfe31..47f3f87 100644 --- a/configs/mx6dlsabreauto_defconfig +++ b/configs/mx6dlsabreauto_defconfig @@ -3,3 +3,5 @@ CONFIG_ARM=y CONFIG_TARGET_MX6QSABREAUTO=y CONFIG_SYS_MALLOC_F=y CONFIG_SYS_MALLOC_F_LEN=0x400 +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/mx6dlsabresd_defconfig b/configs/mx6dlsabresd_defconfig index 7f6cdff..6adfd55 100644 --- a/configs/mx6dlsabresd_defconfig +++ b/configs/mx6dlsabresd_defconfig @@ -1,3 +1,5 @@ CONFIG_SYS_EXTRA_OPTIONS=IMX_CONFIG=board/freescale/mx6sabresd/mx6dlsabresd.cfg,MX6DL CONFIG_ARM=y CONFIG_TARGET_MX6SABRESD=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/mx6qsabreauto_defconfig b/configs/mx6qsabreauto_defconfig index fe3d797..ab72942 100644 --- a/configs/mx6qsabreauto_defconfig +++ b/configs/mx6qsabreauto_defconfig @@ -3,3 +3,5 @@ CONFIG_ARM=y CONFIG_TARGET_MX6QSABREAUTO=y CONFIG_SYS_MALLOC_F=y CONFIG_SYS_MALLOC_F_LEN=0x400 +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig index dfa9c2e..50b75ae 100644 --- a/configs/mx6qsabrelite_defconfig +++ b/configs/mx6qsabrelite_defconfig @@ -1,3 +1,5 @@ CONFIG_SYS_EXTRA_OPTIONS=IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024,SABRELITE CONFIG_ARM=y CONFIG_TARGET_NITROGEN6X=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/mx6qsabresd_defconfig b/configs/mx6qsabresd_defconfig index 09b0190..112918b 100644 --- a/configs/mx6qsabresd_defconfig +++ b/configs/mx6qsabresd_defconfig @@ -3,3 +3,5 @@ CONFIG_ARM=y CONFIG_TARGET_MX6SABRESD=y CONFIG_SYS_MALLOC_F=y CONFIG_SYS_MALLOC_F_LEN=0x400 +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/mx6sabresd_spl_defconfig b/configs/mx6sabresd_spl_defconfig index 12e7844..67079ba 100644 --- a/configs/mx6sabresd_spl_defconfig +++ b/configs/mx6sabresd_spl_defconfig @@ -2,4 +2,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS=IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,SPL,MX6Q +S:CONFIG_ARM=y +S:CONFIG_TARGET_MX6SABRESD=y - +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index 80e48d1..4aa8101 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -25,8 +25,6 @@ #define CONFIG_INITRD_TAG #define CONFIG_REVISION_TAG -#define CONFIG_DM -#define CONFIG_DM_THERMAL #define CONFIG_IMX6_THERMAL #define CONFIG_SYS_GENERIC_BOARD -- 2.2.0.rc0.207.ga3a616c ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/2] dm: stv0991: Move driver model CONFIGs to Kconfig
Remove driver model CONFIGs from the board config headers and use Kconfig
instead.
Signed-off-by: Simon Glass s...@chromium.org
---
configs/stv0991_defconfig | 2 ++
include/configs/stv0991.h | 10 --
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/configs/stv0991_defconfig b/configs/stv0991_defconfig
index 37b10ba..1c9ba88 100644
--- a/configs/stv0991_defconfig
+++ b/configs/stv0991_defconfig
@@ -3,3 +3,5 @@ CONFIG_ARM=y
CONFIG_TARGET_STV0991=y
CONFIG_SYS_MALLOC_F=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_DM=y
+CONFIG_DM_SERIAL=y
diff --git a/include/configs/stv0991.h b/include/configs/stv0991.h
index 071b1c2..156e0fa 100644
--- a/include/configs/stv0991.h
+++ b/include/configs/stv0991.h
@@ -29,19 +29,9 @@
#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 16 * 1024)
-#define CONFIG_DM
/* serial port (PL011) configuration */
#define CONFIG_BAUDRATE115200
-#ifdef CONFIG_DM
-#define CONFIG_DM_SERIAL
#define CONFIG_PL01X_SERIAL
-#else
-#define CONFIG_SYS_SERIAL0 0x80406000
-#define CONFIG_CONS_INDEX 0
-#define CONFIG_PL011_SERIAL
-#define CONFIG_PL01x_PORTS {(void *)CONFIG_SYS_SERIAL0}
-#define CONFIG_PL011_CLOCK (2700 * 1000)
-#endif
/* user interface */
#define CONFIG_SYS_PROMPT STV0991
--
2.2.0.rc0.207.ga3a616c
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] arm: rmobile: silk: Migrate serial driver to drivers model
From: Nobuhiro Iwamatsu nobuhiro.iwamatsu...@renesas.com
This adds drivers model support of serial port to Silk board,
and migrate serial port to drivers model.
Signed-off-by: Nobuhiro Iwamatsu nobuhiro.iwamatsu...@renesas.com
---
board/renesas/silk/silk.c | 14 ++
configs/silk_defconfig| 2 ++
include/configs/silk.h| 3 ---
3 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/board/renesas/silk/silk.c b/board/renesas/silk/silk.c
index 8818211..6bba41e 100644
--- a/board/renesas/silk/silk.c
+++ b/board/renesas/silk/silk.c
@@ -9,6 +9,8 @@
#include common.h
#include malloc.h
+#include dm.h
+#include dm/platform_data/serial_sh.h
#include asm/processor.h
#include asm/mach-types.h
#include asm/io.h
@@ -173,3 +175,15 @@ void reset_cpu(ulong addr)
val |= 0x02;
i2c_write(CONFIG_SYS_I2C_POWERIC_ADDR, 0x13, 1, val, 1);
}
+
+static const struct sh_serial_platdata serial_platdata = {
+ .base = SCIF2_BASE,
+ .type = PORT_SCIF,
+ .clk = 14745600,
+ .clk_mode = EXT_CLK,
+};
+
+U_BOOT_DEVICE(alt_serials) = {
+ .name = serial_sh,
+ .platdata = serial_platdata,
+};
diff --git a/configs/silk_defconfig b/configs/silk_defconfig
index 515ee33..3130e93 100644
--- a/configs/silk_defconfig
+++ b/configs/silk_defconfig
@@ -1,3 +1,5 @@
CONFIG_ARM=y
CONFIG_RMOBILE=y
CONFIG_TARGET_SILK=y
+CONFIG_DM=y
+CONFIG_DM_SERIAL=y
diff --git a/include/configs/silk.h b/include/configs/silk.h
index a4235e9..00a3158 100644
--- a/include/configs/silk.h
+++ b/include/configs/silk.h
@@ -39,8 +39,6 @@
/* SCIF */
#define CONFIG_SCIF_CONSOLE
-#define CONFIG_CONS_SCIF2
-#define CONFIG_SCIF_USE_EXT_CLK
/* FLASH */
#define CONFIG_SPI
@@ -71,7 +69,6 @@
#define CONFIG_SH_TMU_CLK_FREQ (CONFIG_SYS_CLK_FREQ / 2) /* EXT / 2 */
#define CONFIG_PLL1_CLK_FREQ (CONFIG_SYS_CLK_FREQ * 156 / 2)
#define CONFIG_P_CLK_FREQ (CONFIG_PLL1_CLK_FREQ / 24)
-#define CONFIG_SH_SCIF_CLK_FREQ14745600 /* External Clock */
#define CONFIG_SYS_TMU_CLK_DIV 4
--
2.1.4
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] mtd: atmel_nand: according to pmecc version to perform 0xff page correction
Hi, Andreas On 2/10/2015 5:51 AM, Andreas Bießmann wrote: Hi Scott, On 09.02.15 18:04, Scott Wood wrote: On Mon, 2015-02-02 at 14:08 +0800, Josh Wu wrote: Hi, Scott On 1/16/2015 4:24 PM, Andreas Bießmann wrote: Hi Bo, Josh, On 01/16/2015 07:50 AM, Josh Wu wrote: Hi, Bo On 1/16/2015 1:27 PM, Bo Shen wrote: Hi Josh, On 01/16/2015 11:54 AM, Josh Wu wrote: As the PMECC hardware has different version. In SAMA5D4 chip, the PMECC ip can generate 0xff pmecc ECC value for all 0xff sector. According to this, add PMECC version check, if it's SAMA5D4 then we always let PMECC hardware to correct it. Signed-off-by: Josh Wu josh...@atmel.com except the nitpick. Acked-by: Bo Shen voice.s...@atmel.com Acked-by: Andreas Bießmann andreas.de...@googlemail.com Would you pick this patch into your tree with Bo and Andreas's Acked-by? Thanks. I won't be able to apply anything for at least a week and a half... I'll look at it then if it hasn't been applied yet, but I'm fine with the custodian for the relevant hardware taking it in the meantime. I picked it up already Great, Thanks. Best regards Andreas Bießmann Best Regards, Josh Wu ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] arm: rmobile: r8a7794: Enable SMP mode of Auxiliary Control Register
R8a7794 uses ARM SoC of CA7 base. If we want to use dcache on CA7, we need to enable SMP bit of Auxiliary Control Register. Signed-off-by: Nobuhiro Iwamatsu nobuhiro.iwamatsu...@renesas.com --- arch/arm/cpu/armv7/rmobile/lowlevel_init_ca15.S | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/arch/arm/cpu/armv7/rmobile/lowlevel_init_ca15.S b/arch/arm/cpu/armv7/rmobile/lowlevel_init_ca15.S index d47546a..fc839ea 100644 --- a/arch/arm/cpu/armv7/rmobile/lowlevel_init_ca15.S +++ b/arch/arm/cpu/armv7/rmobile/lowlevel_init_ca15.S @@ -40,7 +40,7 @@ do_lowlevel_init: and r1, r1, #0x7F00 lsrsr1, r1, #8 cmp r1, #0x4C /* 0x4C is ID of r8a7794 */ - beq _exit_init_l2_a15 + beq _enable_actlr_smp /* surpress wfe if ca15 */ tst r4, #4 @@ -64,6 +64,14 @@ do_lowlevel_init: orrne r0, r0, #0x20 /* L2CTLR[5] */ #endif mcrne p15, 1, r0, c9, c0, 2 + + b _exit_init_l2_a15 + +_enable_actlr_smp: /* R8A7794 only (CA7) */ + mrcp15, 0, r0, c1, c0, 1 + orrr0, r0, #0x40 + mcrp15, 0, r0, c1, c0, 1 + _exit_init_l2_a15: ldr r3, =(CONFIG_SYS_INIT_SP_ADDR) sub sp, r3, #4 -- 2.1.3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V2 08/10] arm: socfpga: Add Altera Arria V DK support
On 09.02.2015 20:09, Marek Vasut wrote: On Monday, February 02, 2015 at 08:47:52 AM, Stefan Roese wrote: On 30.01.2015 23:08, Marek Vasut wrote: Add support for the Altera Arria V development kit. Signed-off-by: Marek Vasut ma...@denx.de Cc: Chin Liang See cl...@opensource.altera.com Cc: Dinh Nguyen dingu...@opensource.altera.com Cc: Pavel Machek pa...@denx.de Cc: Stefan Roese s...@denx.de Cc: Vince Bridgers vbrid...@opensource.altera.com --- [...] +/* The rest of the configuration is shared */ +#include configs/socfpga_common.h + +#endif /* __CONFIG_SOCFPGA_ARRIA5_H__ */ Without really diff'ing this file with socfpga_cyclone5.h, I'm pretty sure that they share many lines. Wouldn't it make sense to move those common defines / configs to a common file instead (socfpga_common.h)? Hi! I agree they share a lot, but I would not recommend moving any of this into socfpga_common.h . Not all boards which include socfpga_common.h will want all that's common between socfpga_cyclone5.h and socfpga_arria5.h as well. We need to switch to DM really soon, since without DM, we cannot really make any common configuration. The socfpga_cyclone5.h file in fact represents a configuration for SoCDK with Cyclone 5, same for Arria 5. Unless you have any suggestion, I'd just apply this stuff as is for now with the note that these config files must be cleaned up once DM is in place. Or do you have any suggestions please ? No. Please go ahead with this series. We can merge stuff later as well. Once we have better view on how this multi-board support for SoCFPGA will really end up. Thanks, Stefan ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] ARM: rmobile: silk: Remove initialization of ACTLR.SMP
Initialization of ACTLR.SMP is in lowlevel_init. This remove duplicate function. Signed-off-by: Nobuhiro Iwamatsu nobuhiro.iwamatsu...@renesas.com --- board/renesas/silk/silk.c | 12 1 file changed, 12 deletions(-) diff --git a/board/renesas/silk/silk.c b/board/renesas/silk/silk.c index 6bba41e..8fb729a 100644 --- a/board/renesas/silk/silk.c +++ b/board/renesas/silk/silk.c @@ -40,18 +40,6 @@ void s_init(void) /* QoS */ qos_init(); - -#ifndef CONFIG_DCACHE_OFF - /* -* The caches are disabled when ACTLR.SMP is set to 0 -* regardless of the value of the SCTLR.C (cache enable bit) -* on Cortex-A7 MPCore -*/ - asm volatile( - mrc15, 0, r0, c1, c0, 1\n /* read ACTLR */ - orrr0, r0, #(1 6)\n/* set ACTLR.SMP bit */ - mcrp15, 0, r0, c1, c0, 1\n); /* write ACTLR */ -#endif } #define TMU0_MSTP125 (1 25) -- 2.1.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 06/10] ARM: remove dkb board support
This is still a non-generic board.
Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com
Cc: Lei Wen lei...@marvell.com
---
Changes in v2: None
arch/arm/Kconfig | 5 -
arch/arm/cpu/arm926ejs/Makefile | 1 -
arch/arm/cpu/arm926ejs/pantheon/Makefile | 9 --
arch/arm/cpu/arm926ejs/pantheon/cpu.c | 85 ---
arch/arm/cpu/arm926ejs/pantheon/dram.c| 117 ---
arch/arm/cpu/arm926ejs/pantheon/timer.c | 201 --
arch/arm/include/asm/arch-pantheon/config.h | 53 ---
arch/arm/include/asm/arch-pantheon/cpu.h | 77 --
arch/arm/include/asm/arch-pantheon/gpio.h | 0
arch/arm/include/asm/arch-pantheon/mfp.h | 39 -
arch/arm/include/asm/arch-pantheon/pantheon.h | 38 -
board/Marvell/dkb/Kconfig | 15 --
board/Marvell/dkb/MAINTAINERS | 6 -
board/Marvell/dkb/Makefile| 9 --
board/Marvell/dkb/dkb.c | 85 ---
configs/dkb_defconfig | 2 -
doc/README.scrapyard | 1 +
include/configs/dkb.h | 51 ---
18 files changed, 1 insertion(+), 793 deletions(-)
delete mode 100644 arch/arm/cpu/arm926ejs/pantheon/Makefile
delete mode 100644 arch/arm/cpu/arm926ejs/pantheon/cpu.c
delete mode 100644 arch/arm/cpu/arm926ejs/pantheon/dram.c
delete mode 100644 arch/arm/cpu/arm926ejs/pantheon/timer.c
delete mode 100644 arch/arm/include/asm/arch-pantheon/config.h
delete mode 100644 arch/arm/include/asm/arch-pantheon/cpu.h
delete mode 100644 arch/arm/include/asm/arch-pantheon/gpio.h
delete mode 100644 arch/arm/include/asm/arch-pantheon/mfp.h
delete mode 100644 arch/arm/include/asm/arch-pantheon/pantheon.h
delete mode 100644 board/Marvell/dkb/Kconfig
delete mode 100644 board/Marvell/dkb/MAINTAINERS
delete mode 100644 board/Marvell/dkb/Makefile
delete mode 100644 board/Marvell/dkb/dkb.c
delete mode 100644 configs/dkb_defconfig
delete mode 100644 include/configs/dkb.h
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index b0b7eaf..74dd164 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -316,10 +316,6 @@ config ORION5X
bool Marvell Orion
select CPU_ARM926EJS
-config TARGET_DKB
- bool Support dkb
- select CPU_ARM926EJS
-
config TARGET_SPEAR300
bool Support spear300
select CPU_ARM926EJS
@@ -843,7 +839,6 @@ source board/BuS/vl_ma2sc/Kconfig
source board/CarMediaLab/flea3/Kconfig
source board/Marvell/aspenite/Kconfig
source board/Marvell/db-mv784mp-gp/Kconfig
-source board/Marvell/dkb/Kconfig
source board/Marvell/gplugd/Kconfig
source board/afeb9260/Kconfig
source board/altera/socfpga/Kconfig
diff --git a/arch/arm/cpu/arm926ejs/Makefile b/arch/arm/cpu/arm926ejs/Makefile
index bfa365e..38ab0d4 100644
--- a/arch/arm/cpu/arm926ejs/Makefile
+++ b/arch/arm/cpu/arm926ejs/Makefile
@@ -23,6 +23,5 @@ obj-$(CONFIG_MX27) += mx27/
obj-$(if $(filter mxs,$(SOC)),y) += mxs/
obj-$(CONFIG_ARCH_NOMADIK) += nomadik/
obj-$(CONFIG_ORION5X) += orion5x/
-obj-$(CONFIG_PANTHEON) += pantheon/
obj-$(if $(filter spear,$(SOC)),y) += spear/
obj-$(CONFIG_ARCH_VERSATILE) += versatile/
diff --git a/arch/arm/cpu/arm926ejs/pantheon/Makefile
b/arch/arm/cpu/arm926ejs/pantheon/Makefile
deleted file mode 100644
index 988341f..000
--- a/arch/arm/cpu/arm926ejs/pantheon/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# (C) Copyright 2011
-# Marvell Semiconductor www.marvell.com
-# Written-by: Lei Wen lei...@marvell.com
-#
-# SPDX-License-Identifier: GPL-2.0+
-#
-
-obj-y = cpu.o timer.o dram.o
diff --git a/arch/arm/cpu/arm926ejs/pantheon/cpu.c
b/arch/arm/cpu/arm926ejs/pantheon/cpu.c
deleted file mode 100644
index 4e2a177..000
--- a/arch/arm/cpu/arm926ejs/pantheon/cpu.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * (C) Copyright 2011
- * Marvell Semiconductor www.marvell.com
- * Written-by: Lei Wen lei...@marvell.com
- *
- * SPDX-License-Identifier:GPL-2.0+
- */
-
-#include common.h
-#include asm/arch/cpu.h
-#include asm/arch/pantheon.h
-
-#define UARTCLK14745KHZ(APBC_APBCLK | APBC_FNCLK | APBC_FNCLKSEL(1))
-#define SET_MRVL_ID(18)
-#define L2C_RAM_SEL(14)
-
-int arch_cpu_init(void)
-{
- u32 val;
- struct panthcpu_registers *cpuregs =
- (struct panthcpu_registers*) PANTHEON_CPU_BASE;
-
- struct panthapb_registers *apbclkres =
- (struct panthapb_registers*) PANTHEON_APBC_BASE;
-
- struct panthmpmu_registers *mpmu =
- (struct panthmpmu_registers*) PANTHEON_MPMU_BASE;
-
- struct panthapmu_registers *apmu =
- (struct panthapmu_registers *) PANTHEON_APMU_BASE;
-
- /* set SEL_MRVL_ID bit in PANTHEON_CPU_CONF register */
- val = readl(cpuregs-cpu_conf);
- val = val | SET_MRVL_ID;
- writel(val, cpuregs-cpu_conf);
-
- /* Turn on clock gating (PMUM_CCGR) */
-
[U-Boot] [PATCH v2 03/10] ARM: remove jadecpu board support
This is still a non-generic board.
Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com
Cc: Matthias Weisser weiss...@arcor.de
---
Changes in v2: None
arch/arm/Kconfig | 5 -
arch/arm/cpu/arm926ejs/Makefile | 1 -
arch/arm/cpu/arm926ejs/mb86r0x/Makefile | 8 -
arch/arm/cpu/arm926ejs/mb86r0x/clock.c | 27 --
arch/arm/cpu/arm926ejs/mb86r0x/reset.c | 24 --
arch/arm/cpu/arm926ejs/mb86r0x/timer.c | 115 -
arch/arm/include/asm/arch-mb86r0x/hardware.h | 15 -
arch/arm/include/asm/arch-mb86r0x/mb86r0x.h | 599 ---
arch/arm/lib/asm-offsets.c | 46 --
board/syteco/jadecpu/Kconfig | 15 -
board/syteco/jadecpu/MAINTAINERS | 6 -
board/syteco/jadecpu/Makefile| 13 -
board/syteco/jadecpu/jadecpu.c | 160 ---
board/syteco/jadecpu/lowlevel_init.S | 249 ---
configs/jadecpu_defconfig| 2 -
doc/README.scrapyard | 1 +
drivers/video/Makefile | 1 -
drivers/video/mb86r0xgdc.c | 168
include/configs/jadecpu.h| 273
include/serial.h | 2 +-
20 files changed, 2 insertions(+), 1728 deletions(-)
delete mode 100644 arch/arm/cpu/arm926ejs/mb86r0x/Makefile
delete mode 100644 arch/arm/cpu/arm926ejs/mb86r0x/clock.c
delete mode 100644 arch/arm/cpu/arm926ejs/mb86r0x/reset.c
delete mode 100644 arch/arm/cpu/arm926ejs/mb86r0x/timer.c
delete mode 100644 arch/arm/include/asm/arch-mb86r0x/hardware.h
delete mode 100644 arch/arm/include/asm/arch-mb86r0x/mb86r0x.h
delete mode 100644 board/syteco/jadecpu/Kconfig
delete mode 100644 board/syteco/jadecpu/MAINTAINERS
delete mode 100644 board/syteco/jadecpu/Makefile
delete mode 100644 board/syteco/jadecpu/jadecpu.c
delete mode 100644 board/syteco/jadecpu/lowlevel_init.S
delete mode 100644 configs/jadecpu_defconfig
delete mode 100644 drivers/video/mb86r0xgdc.c
delete mode 100644 include/configs/jadecpu.h
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index d49142e..3ade156 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -245,10 +245,6 @@ config TARGET_DEVKIT3250
bool Support devkit3250
select CPU_ARM926EJS
-config TARGET_JADECPU
- bool Support jadecpu
- select CPU_ARM926EJS
-
config TARGET_MX25PDK
bool Support mx25pdk
select CPU_ARM926EJS
@@ -969,7 +965,6 @@ source board/st-ericsson/snowball/Kconfig
source board/st-ericsson/u8500/Kconfig
source board/st/stv0991/Kconfig
source board/sunxi/Kconfig
-source board/syteco/jadecpu/Kconfig
source board/syteco/zmx25/Kconfig
source board/taskit/stamp9g20/Kconfig
source board/tbs/tbs2910/Kconfig
diff --git a/arch/arm/cpu/arm926ejs/Makefile b/arch/arm/cpu/arm926ejs/Makefile
index adcea9f..607d29f 100644
--- a/arch/arm/cpu/arm926ejs/Makefile
+++ b/arch/arm/cpu/arm926ejs/Makefile
@@ -19,7 +19,6 @@ obj-$(CONFIG_AT91FAMILY) += at91/
obj-$(CONFIG_ARCH_DAVINCI) += davinci/
obj-$(CONFIG_KIRKWOOD) += kirkwood/
obj-$(if $(filter lpc32xx,$(SOC)),y) += lpc32xx/
-obj-$(CONFIG_MB86R0x) += mb86r0x/
obj-$(CONFIG_MX25) += mx25/
obj-$(CONFIG_MX27) += mx27/
obj-$(if $(filter mxs,$(SOC)),y) += mxs/
diff --git a/arch/arm/cpu/arm926ejs/mb86r0x/Makefile
b/arch/arm/cpu/arm926ejs/mb86r0x/Makefile
deleted file mode 100644
index 365892c..000
--- a/arch/arm/cpu/arm926ejs/mb86r0x/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# (C) Copyright 2000-2006
-# Wolfgang Denk, DENX Software Engineering, w...@denx.de.
-#
-# SPDX-License-Identifier: GPL-2.0+
-#
-
-obj-y = clock.o reset.o timer.o
diff --git a/arch/arm/cpu/arm926ejs/mb86r0x/clock.c
b/arch/arm/cpu/arm926ejs/mb86r0x/clock.c
deleted file mode 100644
index 1f6f66e..000
--- a/arch/arm/cpu/arm926ejs/mb86r0x/clock.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * (C) Copyright 2010
- * Matthias Weisser weiss...@arcor.de
- *
- * SPDX-License-Identifier:GPL-2.0+
- */
-
-#include common.h
-#include asm/io.h
-#include asm/arch/hardware.h
-
-/*
- * Get the peripheral bus frequency depending on pll pin settings
- */
-ulong get_bus_freq(ulong dummy)
-{
- struct mb86r0x_crg * crg = (struct mb86r0x_crg *)
- MB86R0x_CRG_BASE;
- uint32_t pllmode;
-
- pllmode = readl(crg-crpr) MB86R0x_CRG_CRPR_PLLMODE;
-
- if (pllmode == MB86R0x_CRG_CRPR_PLLMODE_X20)
- return 4000;
-
- return 41164767;
-}
diff --git a/arch/arm/cpu/arm926ejs/mb86r0x/reset.c
b/arch/arm/cpu/arm926ejs/mb86r0x/reset.c
deleted file mode 100644
index 7bd77ff..000
--- a/arch/arm/cpu/arm926ejs/mb86r0x/reset.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * (C) Copyright 2010
- * Matthias Weisser weiss...@arcor.de
- *
- * SPDX-License-Identifier:GPL-2.0+
- */
-
-#include common.h
-#include asm/io.h
-#include asm/arch/hardware.h
-
-/*
- * Reset the cpu by
[U-Boot] [PATCH v2 10/10] ARM: davinci: remove hawkboard support
This is still a non-generic board. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Cc: Syed Mohammed Khasim sm.kha...@gmail.com Cc: Sughosh Ganu urwithsugh...@gmail.com --- Changes in v2: None arch/arm/cpu/arm926ejs/davinci/Kconfig| 4 - board/davinci/da8xxevm/Kconfig| 13 -- board/davinci/da8xxevm/MAINTAINERS| 8 - board/davinci/da8xxevm/Makefile | 1 - board/davinci/da8xxevm/README.hawkboard | 92 --- board/davinci/da8xxevm/hawkboard-ais-nand.cfg | 4 - board/davinci/da8xxevm/hawkboard.c| 120 -- board/davinci/da8xxevm/u-boot-spl-hawk.lds| 69 configs/hawkboard_defconfig | 4 - configs/hawkboard_uart_defconfig | 5 - doc/README.scrapyard | 1 + include/configs/hawkboard.h | 220 -- 12 files changed, 1 insertion(+), 540 deletions(-) delete mode 100644 board/davinci/da8xxevm/README.hawkboard delete mode 100644 board/davinci/da8xxevm/hawkboard-ais-nand.cfg delete mode 100644 board/davinci/da8xxevm/hawkboard.c delete mode 100644 board/davinci/da8xxevm/u-boot-spl-hawk.lds delete mode 100644 configs/hawkboard_defconfig delete mode 100644 configs/hawkboard_uart_defconfig delete mode 100644 include/configs/hawkboard.h diff --git a/arch/arm/cpu/arm926ejs/davinci/Kconfig b/arch/arm/cpu/arm926ejs/davinci/Kconfig index 613f04d..6827721 100644 --- a/arch/arm/cpu/arm926ejs/davinci/Kconfig +++ b/arch/arm/cpu/arm926ejs/davinci/Kconfig @@ -21,10 +21,6 @@ config TARGET_CAM_ENC_4XX bool CAM ENC 4xx board select SUPPORT_SPL -config TARGET_HAWKBOARD - bool Hawkboard - select SUPPORT_SPL - config TARGET_DAVINCI_DM355EVM bool DM355 EVM board diff --git a/board/davinci/da8xxevm/Kconfig b/board/davinci/da8xxevm/Kconfig index 1a841ce..1108e4b 100644 --- a/board/davinci/da8xxevm/Kconfig +++ b/board/davinci/da8xxevm/Kconfig @@ -23,16 +23,3 @@ config SYS_CONFIG_NAME default da850evm endif - -if TARGET_HAWKBOARD - -config SYS_BOARD - default da8xxevm - -config SYS_VENDOR - default davinci - -config SYS_CONFIG_NAME - default hawkboard - -endif diff --git a/board/davinci/da8xxevm/MAINTAINERS b/board/davinci/da8xxevm/MAINTAINERS index dd66f07..10c4e2f 100644 --- a/board/davinci/da8xxevm/MAINTAINERS +++ b/board/davinci/da8xxevm/MAINTAINERS @@ -12,11 +12,3 @@ F: include/configs/da850evm.h F: configs/da850_am18xxevm_defconfig F: configs/da850evm_defconfig F: configs/da850evm_direct_nor_defconfig - -HAWKBOARD BOARD -M: Syed Mohammed Khasim sm.kha...@gmail.com -M: Sughosh Ganu urwithsugh...@gmail.com -S: Maintained -F: include/configs/hawkboard.h -F: configs/hawkboard_defconfig -F: configs/hawkboard_uart_defconfig diff --git a/board/davinci/da8xxevm/Makefile b/board/davinci/da8xxevm/Makefile index d3acacc..4da509b 100644 --- a/board/davinci/da8xxevm/Makefile +++ b/board/davinci/da8xxevm/Makefile @@ -9,4 +9,3 @@ obj-$(CONFIG_MACH_DAVINCI_DA830_EVM) += da830evm.o obj-$(CONFIG_MACH_DAVINCI_DA850_EVM) += da850evm.o -obj-$(CONFIG_MACH_DAVINCI_HAWK)+= hawkboard.o diff --git a/board/davinci/da8xxevm/README.hawkboard b/board/davinci/da8xxevm/README.hawkboard deleted file mode 100644 index d6ae02e..000 --- a/board/davinci/da8xxevm/README.hawkboard +++ /dev/null @@ -1,92 +0,0 @@ -Summary -=== -The README is for the boot procedure used for TI's OMAP-L138 based -hawkboard. The hawkboard comes with a 128MiB Nand flash and a 128MiB -DDR SDRAM along with a host of other controllers. - -The hawkboard is booted in three stages. The initial bootloader which -executes upon reset is the Rom Boot Loader(RBL) which sits in the -internal ROM of the omap. The RBL initialises the memory and the nand -controller, and copies the image stored at a predefined location(block -1) of the nand flash. The image loaded by the RBL to the memory is the -AIS signed spl image. This, in turns copies the u-boot binary from the -nand flash to the memory and jumps to the u-boot entry point. - -AIS is an image format defined by TI for the images that are to be -loaded to memory by the RBL. The image is divided into a series of -sections and the image's entry point is specified. Each section comes -with meta data like the target address the section is to be copied to -and the size of the section, which is used by the RBL to load the -image. At the end of the image the RBL jumps to the image entry -point. - -The secondary stage bootloader(spl) which is loaded by the RBL then -loads the u-boot from a predefined location in the nand to the memory -and jumps to the u-boot entry point. - -The reason a secondary stage bootloader is used is because the ECC -layout expected by the RBL is not the same as that used by -u-boot/linux. This also implies that for flashing the spl image,we -need to use the u-boot which uses
[U-Boot] [PATCH v2 02/10] ARM: mx31: remove imx31_phycore board
This is still a non-generic board.
Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com
Cc: Guennadi Liakhovetski g.liakhovet...@gmx.de
---
Changes in v2: None
arch/arm/Kconfig| 5 -
board/imx31_phycore/Kconfig | 12 ---
board/imx31_phycore/MAINTAINERS | 11 --
board/imx31_phycore/Makefile| 9 --
board/imx31_phycore/imx31_phycore.c | 153 ---
board/imx31_phycore/lowlevel_init.S | 88
configs/imx31_phycore_defconfig | 2 -
configs/imx31_phycore_eet_defconfig | 3 -
doc/README.scrapyard| 1 +
include/configs/imx31_phycore.h | 202
10 files changed, 1 insertion(+), 485 deletions(-)
delete mode 100644 board/imx31_phycore/Kconfig
delete mode 100644 board/imx31_phycore/MAINTAINERS
delete mode 100644 board/imx31_phycore/Makefile
delete mode 100644 board/imx31_phycore/imx31_phycore.c
delete mode 100644 board/imx31_phycore/lowlevel_init.S
delete mode 100644 configs/imx31_phycore_defconfig
delete mode 100644 configs/imx31_phycore_eet_defconfig
delete mode 100644 include/configs/imx31_phycore.h
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index f12dac9..d49142e 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -365,10 +365,6 @@ config TARGET_INTEGRATORCP_CM1136
bool Support integratorcp_cm1136
select CPU_ARM1136
-config TARGET_IMX31_PHYCORE
- bool Support imx31_phycore
- select CPU_ARM1136
-
config TARGET_QONG
bool Support qong
select CPU_ARM1136
@@ -934,7 +930,6 @@ source board/gumstix/pepper/Kconfig
source board/h2200/Kconfig
source board/hale/tt01/Kconfig
source board/icpdas/lp8x4x/Kconfig
-source board/imx31_phycore/Kconfig
source board/isee/igep0033/Kconfig
source board/jornada/Kconfig
source board/karo/tx25/Kconfig
diff --git a/board/imx31_phycore/Kconfig b/board/imx31_phycore/Kconfig
deleted file mode 100644
index d3d2025..000
--- a/board/imx31_phycore/Kconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-if TARGET_IMX31_PHYCORE
-
-config SYS_BOARD
- default imx31_phycore
-
-config SYS_SOC
- default mx31
-
-config SYS_CONFIG_NAME
- default imx31_phycore
-
-endif
diff --git a/board/imx31_phycore/MAINTAINERS b/board/imx31_phycore/MAINTAINERS
deleted file mode 100644
index 41f6cae..000
--- a/board/imx31_phycore/MAINTAINERS
+++ /dev/null
@@ -1,11 +0,0 @@
-IMX31_PHYCORE BOARD
-#M:-
-S: Maintained
-F: board/imx31_phycore/
-F: include/configs/imx31_phycore.h
-F: configs/imx31_phycore_defconfig
-
-IMX31_PHYCORE_EET BOARD
-#M:(resigned) Guennadi Liakhovetski g.liakhovet...@gmx.de
-S: Orphan (since 2013-09)
-F: configs/imx31_phycore_eet_defconfig
diff --git a/board/imx31_phycore/Makefile b/board/imx31_phycore/Makefile
deleted file mode 100644
index e781c13..000
--- a/board/imx31_phycore/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# (C) Copyright 2000-2006
-# Wolfgang Denk, DENX Software Engineering, w...@denx.de.
-#
-# SPDX-License-Identifier: GPL-2.0+
-#
-
-obj-y := imx31_phycore.o
-obj-y += lowlevel_init.o
diff --git a/board/imx31_phycore/imx31_phycore.c
b/board/imx31_phycore/imx31_phycore.c
deleted file mode 100644
index 3f45e4e..000
--- a/board/imx31_phycore/imx31_phycore.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- *
- * (c) 2007 Pengutronix, Sascha Hauer s.ha...@pengutronix.de
- *
- * SPDX-License-Identifier:GPL-2.0+
- */
-
-
-#include common.h
-#include s6e63d6.h
-#include netdev.h
-#include asm/arch/clock.h
-#include asm/arch/imx-regs.h
-#include asm/arch/sys_proto.h
-
-DECLARE_GLOBAL_DATA_PTR;
-
-int dram_init(void)
-{
- /* dram_init must store complete ramsize in gd-ram_size */
- gd-ram_size = get_ram_size((void *)PHYS_SDRAM_1,
- PHYS_SDRAM_1_SIZE);
- return 0;
-}
-
-int board_init(void)
-{
-
- gd-bd-bi_arch_number = MACH_TYPE_PCM037; /* board id for linux */
- gd-bd-bi_boot_params = (0x8100); /* adress of boot parameters */
-
- return 0;
-}
-
-int board_early_init_f(void)
-{
- /* CS0: Nor Flash */
- static const struct mxc_weimcs cs0 = {
- /*sp wp bcd bcs psz pme sync dol cnc wsc ew wws edc */
- CSCR_U(0, 0, 0, 0, 0, 0, 0, 0, 3, 15, 0, 0, 3),
- /* oea oen ebwa ebwn csa ebc dsz csn psr cre wrap csen */
- CSCR_L(1, 0, 0, 0, 0, 1, 5, 0, 0, 0, 1, 1),
- /* ebra ebrn rwa rwn mum lah lbn lba dww dct wwu age cnc2 fce*/
- CSCR_A(0, 0, 7, 2, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0)
- };
-
- /* CS1: Network Controller */
- static const struct mxc_weimcs cs1 = {
- /*sp wp bcd bcs psz pme sync dol cnc wsc ew wws edc */
- CSCR_U(0, 0, 0, 0, 0, 0, 0, 0, 3, 31, 0, 0, 6),
- /* oea oen ebwa ebwn csa ebc dsz csn psr cre wrap csen */
- CSCR_L(4, 4,
[U-Boot] [PATCH v2 04/10] ARM: remove zmx25 board support
This is still a non-generic board. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Cc: Matthias Weisser weiss...@arcor.de --- Changes in v2: None arch/arm/Kconfig | 5 -- board/syteco/zmx25/Kconfig | 15 board/syteco/zmx25/MAINTAINERS | 6 -- board/syteco/zmx25/Makefile| 9 -- board/syteco/zmx25/lowlevel_init.S | 97 - board/syteco/zmx25/zmx25.c | 174 - configs/zmx25_defconfig| 2 - doc/README.scrapyard | 1 + include/configs/zmx25.h| 162 -- 9 files changed, 1 insertion(+), 470 deletions(-) delete mode 100644 board/syteco/zmx25/Kconfig delete mode 100644 board/syteco/zmx25/MAINTAINERS delete mode 100644 board/syteco/zmx25/Makefile delete mode 100644 board/syteco/zmx25/lowlevel_init.S delete mode 100644 board/syteco/zmx25/zmx25.c delete mode 100644 configs/zmx25_defconfig delete mode 100644 include/configs/zmx25.h diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 3ade156..cbed2f4 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -254,10 +254,6 @@ config TARGET_TX25 select CPU_ARM926EJS select SUPPORT_SPL -config TARGET_ZMX25 - bool Support zmx25 - select CPU_ARM926EJS - config TARGET_APF27 bool Support apf27 select CPU_ARM926EJS @@ -965,7 +961,6 @@ source board/st-ericsson/snowball/Kconfig source board/st-ericsson/u8500/Kconfig source board/st/stv0991/Kconfig source board/sunxi/Kconfig -source board/syteco/zmx25/Kconfig source board/taskit/stamp9g20/Kconfig source board/tbs/tbs2910/Kconfig source board/ti/am335x/Kconfig diff --git a/board/syteco/zmx25/Kconfig b/board/syteco/zmx25/Kconfig deleted file mode 100644 index 59a415d..000 --- a/board/syteco/zmx25/Kconfig +++ /dev/null @@ -1,15 +0,0 @@ -if TARGET_ZMX25 - -config SYS_BOARD - default zmx25 - -config SYS_VENDOR - default syteco - -config SYS_SOC - default mx25 - -config SYS_CONFIG_NAME - default zmx25 - -endif diff --git a/board/syteco/zmx25/MAINTAINERS b/board/syteco/zmx25/MAINTAINERS deleted file mode 100644 index 90f9fab..000 --- a/board/syteco/zmx25/MAINTAINERS +++ /dev/null @@ -1,6 +0,0 @@ -ZMX25 BOARD -M: Matthias Weisser weiss...@arcor.de -S: Maintained -F: board/syteco/zmx25/ -F: include/configs/zmx25.h -F: configs/zmx25_defconfig diff --git a/board/syteco/zmx25/Makefile b/board/syteco/zmx25/Makefile deleted file mode 100644 index d5edb48..000 --- a/board/syteco/zmx25/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# -# (c) 2010 Graf-Syteco, Matthias Weisser -# weiss...@arcor.de -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y += zmx25.o -obj-y += lowlevel_init.o diff --git a/board/syteco/zmx25/lowlevel_init.S b/board/syteco/zmx25/lowlevel_init.S deleted file mode 100644 index 5eccf09..000 --- a/board/syteco/zmx25/lowlevel_init.S +++ /dev/null @@ -1,97 +0,0 @@ -/* - * (C) Copyright 2011 - * Matthias Weisser weiss...@arcor.de - * - * (C) Copyright 2009 DENX Software Engineering - * Author: John Rigby jri...@gmail.com - * - * Based on U-Boot and RedBoot sources for several different i.mx - * platforms. - * - * SPDX-License-Identifier:GPL-2.0+ - */ - -#include asm/macro.h -#include asm/arch/macro.h -#include asm/arch/imx-regs.h -#include generated/asm-offsets.h - -/* - * clocks - */ -.macro init_clocks - - /* disable clock output */ - write32 IMX_CCM_BASE + CCM_MCR, 0x - write32 IMX_CCM_BASE + CCM_CCTL, 0x5003 - - /* -* enable all implemented clocks in all three -* clock control registers -*/ - write32 IMX_CCM_BASE + CCM_CGCR0, 0x1fff - write32 IMX_CCM_BASE + CCM_CGCR1, 0x - write32 IMX_CCM_BASE + CCM_CGCR2, 0xf - - /* Devide NAND clock by 32 */ - write32 IMX_CCM_BASE + CCM_PCDR2, 0x0101011F -.endm - -/* - * sdram controller init - */ -.macro init_lpddr - ldr r0, =IMX_ESDRAMC_BASE - ldr r2, =IMX_SDRAM_BANK0_BASE - - /* -* reset SDRAM controller -* then wait for initialization to complete -*/ - ldr r1, =(1 1) | (1 2) - str r1, [r0, #ESDRAMC_ESDMISC] -1: ldr r3, [r0, #ESDRAMC_ESDMISC] - tst r3, #(1 31) - beq 1b - ldr r1, =(1 2) - str r1, [r0, #ESDRAMC_ESDMISC] - - ldr r1, =0x002a7420 - str r1, [r0, #ESDRAMC_ESDCFG0] - - /* control | precharge */ - ldr r1, =0x92216008 - str r1, [r0, #ESDRAMC_ESDCTL0] - /* dram command encoded in address */ - str r1, [r2, #0x400] - - /* auto refresh */ - ldr r1, =0xa2216008 - str r1, [r0, #ESDRAMC_ESDCTL0] - /* read dram twice to auto refresh */ - ldr r3, [r2] - ldr r3, [r2] - - /* control | load mode */ - ldr r1, =0xb2216008
[U-Boot] [PATCH v2] arm: rmobile: r8a7794: Enable SMP mode of Auxiliary Control Register
r8a7794 uses ARM SoC of CA7 base. If we want to use dcache on CA7, we need to enable SMP bit of Auxiliary Control Register. Signed-off-by: Nobuhiro Iwamatsu nobuhiro.iwamatsu...@renesas.com --- v2: Add CONFIG_DCACHE_OFF. arch/arm/cpu/armv7/rmobile/lowlevel_init_ca15.S | 12 +++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/arch/arm/cpu/armv7/rmobile/lowlevel_init_ca15.S b/arch/arm/cpu/armv7/rmobile/lowlevel_init_ca15.S index d47546a..a5dbbea 100644 --- a/arch/arm/cpu/armv7/rmobile/lowlevel_init_ca15.S +++ b/arch/arm/cpu/armv7/rmobile/lowlevel_init_ca15.S @@ -40,7 +40,7 @@ do_lowlevel_init: and r1, r1, #0x7F00 lsrsr1, r1, #8 cmp r1, #0x4C /* 0x4C is ID of r8a7794 */ - beq _exit_init_l2_a15 + beq _enable_actlr_smp /* surpress wfe if ca15 */ tst r4, #4 @@ -64,6 +64,16 @@ do_lowlevel_init: orrne r0, r0, #0x20 /* L2CTLR[5] */ #endif mcrne p15, 1, r0, c9, c0, 2 + + b _exit_init_l2_a15 + +_enable_actlr_smp: /* R8A7794 only (CA7) */ +#ifndef CONFIG_DCACHE_OFF + mrcp15, 0, r0, c1, c0, 1 + orrr0, r0, #0x40 + mcrp15, 0, r0, c1, c0, 1 +#endif + _exit_init_l2_a15: ldr r3, =(CONFIG_SYS_INIT_SP_ADDR) sub sp, r3, #4 -- 2.1.3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v4 3/3] dm:gpio:mxc add DT support
This patch add DT support for mxc gpio driver.
There are one place using CONFIG_OF_CONTROL macro.
1. The U_BOOT_DEVICES and mxc_plat array are complied out. To DT,
platdata is alloced using calloc, so there is no need to use mxc_plat.
The following situations are tested, and all work fine:
1. with DM, without DT
2. with DM and DT
3. without DM
Since device tree has not been upstreamed, if want to test this patch.
The followings need to be done.
+ pieces of code does not gpio_request when using gpio_direction_xxx and
etc, need to request gpio.
+ move the gpio settings from board_early_init_f to board_init
+ define CONFIG_DM ,CONFIG_DM_GPIO and CONFIG_OF_CONTROL
+ Add device tree file and do related configuration in
`make ARCH=arm menuconfig`
These will be done in future patches by step.
Signed-off-by: Peng Fan peng@freescale.com
---
drivers/gpio/mxc_gpio.c | 81 ++---
1 file changed, 64 insertions(+), 17 deletions(-)
diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c
index c52dd19..815407b 100644
--- a/drivers/gpio/mxc_gpio.c
+++ b/drivers/gpio/mxc_gpio.c
@@ -151,6 +151,9 @@ int gpio_direction_output(unsigned gpio, int value)
#endif
#ifdef CONFIG_DM_GPIO
+#include fdtdec.h
+DECLARE_GLOBAL_DATA_PTR;
+
static int mxc_gpio_is_output(struct gpio_regs *regs, int offset)
{
u32 val;
@@ -259,23 +262,6 @@ static const struct dm_gpio_ops gpio_mxc_ops = {
.get_function = mxc_gpio_get_function,
};
-static const struct mxc_gpio_plat mxc_plat[] = {
- { 0, (struct gpio_regs *)GPIO1_BASE_ADDR },
- { 1, (struct gpio_regs *)GPIO2_BASE_ADDR },
- { 2, (struct gpio_regs *)GPIO3_BASE_ADDR },
-#if defined(CONFIG_MX25) || defined(CONFIG_MX27) || defined(CONFIG_MX51) || \
- defined(CONFIG_MX53) || defined(CONFIG_MX6)
- { 3, (struct gpio_regs *)GPIO4_BASE_ADDR },
-#endif
-#if defined(CONFIG_MX27) || defined(CONFIG_MX53) || defined(CONFIG_MX6)
- { 4, (struct gpio_regs *)GPIO5_BASE_ADDR },
- { 5, (struct gpio_regs *)GPIO6_BASE_ADDR },
-#endif
-#if defined(CONFIG_MX53) || defined(CONFIG_MX6)
- { 6, (struct gpio_regs *)GPIO7_BASE_ADDR },
-#endif
-};
-
static int mxc_gpio_probe(struct udevice *dev)
{
struct mxc_bank_info *bank = dev_get_priv(dev);
@@ -296,12 +282,72 @@ static int mxc_gpio_probe(struct udevice *dev)
return 0;
}
+static int mxc_gpio_bind(struct udevice *dev)
+{
+ struct mxc_gpio_plat *plat = dev-platdata;
+ fdt_addr_t addr;
+
+ /*
+* If platdata already exsits, directly return.
+* Actually only when DT is not supported, platdata
+* is statically initialized in U_BOOT_DEVICES.Here
+* will return.
+*/
+ if (plat)
+ return 0;
+
+ addr = dev_get_addr(dev);
+ if (addr == FDT_ADDR_T_NONE)
+ return -ENODEV;
+
+ /*
+* TODO:
+* When every board is converted to driver model and DT is supported,
+* this can be done by auto-alloc feature, but not using calloc
+* to alloc memory for platdata.
+*/
+ plat = calloc(1, sizeof(*plat));
+ if (!plat)
+ return -ENOMEM;
+
+ plat-regs = (struct gpio_regs *)addr;
+ plat-bank_index = dev-req_seq;
+ dev-platdata = plat;
+
+ return 0;
+}
+
+static const struct udevice_id mxc_gpio_ids[] = {
+ { .compatible = fsl,imx35-gpio },
+ { }
+};
+
U_BOOT_DRIVER(gpio_mxc) = {
.name = gpio_mxc,
.id = UCLASS_GPIO,
.ops= gpio_mxc_ops,
.probe = mxc_gpio_probe,
.priv_auto_alloc_size = sizeof(struct mxc_bank_info),
+ .of_match = mxc_gpio_ids,
+ .bind = mxc_gpio_bind,
+};
+
+#ifndef CONFIG_OF_CONTROL
+static const struct mxc_gpio_plat mxc_plat[] = {
+ { 0, (struct gpio_regs *)GPIO1_BASE_ADDR },
+ { 1, (struct gpio_regs *)GPIO2_BASE_ADDR },
+ { 2, (struct gpio_regs *)GPIO3_BASE_ADDR },
+#if defined(CONFIG_MX25) || defined(CONFIG_MX27) || defined(CONFIG_MX51) || \
+ defined(CONFIG_MX53) || defined(CONFIG_MX6)
+ { 3, (struct gpio_regs *)GPIO4_BASE_ADDR },
+#endif
+#if defined(CONFIG_MX27) || defined(CONFIG_MX53) || defined(CONFIG_MX6)
+ { 4, (struct gpio_regs *)GPIO5_BASE_ADDR },
+ { 5, (struct gpio_regs *)GPIO6_BASE_ADDR },
+#endif
+#if defined(CONFIG_MX53) || defined(CONFIG_MX6)
+ { 6, (struct gpio_regs *)GPIO7_BASE_ADDR },
+#endif
};
U_BOOT_DEVICES(mxc_gpios) = {
@@ -321,3 +367,4 @@ U_BOOT_DEVICES(mxc_gpios) = {
#endif
};
#endif
+#endif
--
1.8.4
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v4 0/3] dm:gpio:mxc add DT support
This patch set is to add DT support for mxc_gpio driver. patch 1/3, a new dev_get_addr interface is abstracted to improve driver who want to get device address. patch 2/3, add a new bank_index entry in platdata to avoid `plat - mxc_plat` pointer subtract usage. patch 3/3, add compatible ids and implement bind function. Also commented out U_BOOT_DEVICES and mxc_plat, since they are not needed if using DT. This patch set was tested on mx6sxsabresd board with DM and DT support. Changes v4: 1. add Igor's Acked-by for patch 1/3 and 2/3 2. According Simon's suggestion, using fdt_addr_t as the return type of dev_get_addr. 3. Merge the 1/4 and 2/4 of v3 into 1/3 of v4. Acording Ignor's advice, there is no need to split prototype into a single patch. 4. To patch 3/3, address Simon's comments, add TODO to using auto-alloc feature, add comments, fix return value. 5. rebase on dm/master branch Changes v3: 1. split bank_index patch 2. abstract dev_get_addr for driver Changes v2: 1. remove uneccessary #ifdef 2. add more stuff in commit log 3. include a new function mxc_get_gpio_addr to get register base. This function is different for DT and not DT, by `#ifdef`. If using one implementation for DT and not DT, final image will be big. 4. include a new entry in platdata, named bank_index. it can simplify DT support. To no DT, bank_index is static initilized; to DT, bank_index is get from device's req_seq. Peng Fan (3): dm: introduce dev_get_addr interface dm:gpio:mxc add a bank_index entry in platdata dm:gpio:mxc add DT support drivers/core/device.c | 12 +++ drivers/gpio/mxc_gpio.c | 89 +++-- include/dm/device.h | 10 ++ 3 files changed, 93 insertions(+), 18 deletions(-) -- 1.8.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v4 2/3] dm:gpio:mxc add a bank_index entry in platdata
Add a new entry in platdata structure and intialize
bank_index in mxc_plat array.
This new entry can avoid using `plat - mxc_plat` by using
`plat-bank_index`.
Signed-off-by: Peng Fan peng@freescale.com
Acked-by: Igor Grinberg grinb...@compulab.co.il
---
drivers/gpio/mxc_gpio.c | 17 +
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c
index 8bb9e39..c52dd19 100644
--- a/drivers/gpio/mxc_gpio.c
+++ b/drivers/gpio/mxc_gpio.c
@@ -23,6 +23,7 @@ enum mxc_gpio_direction {
#define GPIO_PER_BANK 32
struct mxc_gpio_plat {
+ int bank_index;
struct gpio_regs *regs;
};
@@ -259,19 +260,19 @@ static const struct dm_gpio_ops gpio_mxc_ops = {
};
static const struct mxc_gpio_plat mxc_plat[] = {
- { (struct gpio_regs *)GPIO1_BASE_ADDR },
- { (struct gpio_regs *)GPIO2_BASE_ADDR },
- { (struct gpio_regs *)GPIO3_BASE_ADDR },
+ { 0, (struct gpio_regs *)GPIO1_BASE_ADDR },
+ { 1, (struct gpio_regs *)GPIO2_BASE_ADDR },
+ { 2, (struct gpio_regs *)GPIO3_BASE_ADDR },
#if defined(CONFIG_MX25) || defined(CONFIG_MX27) || defined(CONFIG_MX51) || \
defined(CONFIG_MX53) || defined(CONFIG_MX6)
- { (struct gpio_regs *)GPIO4_BASE_ADDR },
+ { 3, (struct gpio_regs *)GPIO4_BASE_ADDR },
#endif
#if defined(CONFIG_MX27) || defined(CONFIG_MX53) || defined(CONFIG_MX6)
- { (struct gpio_regs *)GPIO5_BASE_ADDR },
- { (struct gpio_regs *)GPIO6_BASE_ADDR },
+ { 4, (struct gpio_regs *)GPIO5_BASE_ADDR },
+ { 5, (struct gpio_regs *)GPIO6_BASE_ADDR },
#endif
#if defined(CONFIG_MX53) || defined(CONFIG_MX6)
- { (struct gpio_regs *)GPIO7_BASE_ADDR },
+ { 6, (struct gpio_regs *)GPIO7_BASE_ADDR },
#endif
};
@@ -283,7 +284,7 @@ static int mxc_gpio_probe(struct udevice *dev)
int banknum;
char name[18], *str;
- banknum = plat - mxc_plat;
+ banknum = plat-bank_index;
sprintf(name, GPIO%d_, banknum + 1);
str = strdup(name);
if (!str)
--
1.8.4
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v4 1/3] dm: introduce dev_get_addr interface
Abstracting dev_get_addr can improve drivers that want to
get device's address.
Signed-off-by: Peng Fan peng@freescale.com
Acked-by: Igor Grinberg grinb...@compulab.co.il
---
drivers/core/device.c | 12
include/dm/device.h | 10 ++
2 files changed, 22 insertions(+)
diff --git a/drivers/core/device.c b/drivers/core/device.c
index b73d3b8..73c3e07 100644
--- a/drivers/core/device.c
+++ b/drivers/core/device.c
@@ -449,3 +449,15 @@ enum uclass_id device_get_uclass_id(struct udevice *dev)
{
return dev-uclass-uc_drv-id;
}
+
+#ifdef CONFIG_OF_CONTROL
+fdt_addr_t dev_get_addr(struct udevice *dev)
+{
+ return fdtdec_get_addr(gd-fdt_blob, dev-of_offset, reg);
+}
+#else
+fdt_addr_t dev_get_addr(struct udevice *dev)
+{
+ return FDT_ADDR_T_NONE;
+}
+#endif
diff --git a/include/dm/device.h b/include/dm/device.h
index 81afa8c..7a48eb8 100644
--- a/include/dm/device.h
+++ b/include/dm/device.h
@@ -12,6 +12,7 @@
#define _DM_DEVICE_H
#include dm/uclass-id.h
+#include fdtdec.h
#include linker_lists.h
#include linux/list.h
@@ -351,4 +352,13 @@ int device_find_first_child(struct udevice *parent, struct
udevice **devp);
*/
int device_find_next_child(struct udevice **devp);
+/**
+ * dev_get_addr() - Get the reg property of a device
+ *
+ * @dev: Pointer to a device
+ *
+ * @return addr
+ */
+fdt_addr_t dev_get_addr(struct udevice *dev);
+
#endif
--
1.8.4
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 08/10] ARM: remove a320evb board support
This is still a non-generic board.
Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com
Cc: Po-Yu Chuang ratb...@faraday-tech.com
---
Changes in v2: None
arch/arm/Kconfig | 5 -
arch/arm/cpu/arm920t/Makefile | 1 -
arch/arm/cpu/arm920t/a320/Makefile| 9 --
arch/arm/cpu/arm920t/a320/reset.S | 10 --
arch/arm/cpu/arm920t/a320/timer.c | 118 ---
arch/arm/include/asm/arch-a320/a320.h | 22
board/faraday/a320evb/Kconfig | 15 ---
board/faraday/a320evb/MAINTAINERS | 6 -
board/faraday/a320evb/Makefile| 9 --
board/faraday/a320evb/a320evb.c | 59 --
board/faraday/a320evb/lowlevel_init.S | 106 -
configs/a320evb_defconfig | 2 -
doc/README.scrapyard | 1 +
include/configs/a320evb.h | 211 --
14 files changed, 1 insertion(+), 573 deletions(-)
delete mode 100644 arch/arm/cpu/arm920t/a320/Makefile
delete mode 100644 arch/arm/cpu/arm920t/a320/reset.S
delete mode 100644 arch/arm/cpu/arm920t/a320/timer.c
delete mode 100644 arch/arm/include/asm/arch-a320/a320.h
delete mode 100644 board/faraday/a320evb/Kconfig
delete mode 100644 board/faraday/a320evb/MAINTAINERS
delete mode 100644 board/faraday/a320evb/Makefile
delete mode 100644 board/faraday/a320evb/a320evb.c
delete mode 100644 board/faraday/a320evb/lowlevel_init.S
delete mode 100644 configs/a320evb_defconfig
delete mode 100644 include/configs/a320evb.h
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index d6bb5c3..3ec570b 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -73,10 +73,6 @@ config TARGET_INTEGRATORCP_CM920T
bool Support integratorcp_cm920t
select CPU_ARM920T
-config TARGET_A320EVB
- bool Support a320evb
- select CPU_ARM920T
-
config TARGET_AT91RM9200EK
bool Support at91rm9200ek
select CPU_ARM920T
@@ -877,7 +873,6 @@ source board/esd/otc570/Kconfig
source board/esg/ima3-mx53/Kconfig
source board/eukrea/cpu9260/Kconfig
source board/eukrea/cpuat91/Kconfig
-source board/faraday/a320evb/Kconfig
source board/freescale/ls2085a/Kconfig
source board/freescale/ls1021aqds/Kconfig
source board/freescale/ls1021atwr/Kconfig
diff --git a/arch/arm/cpu/arm920t/Makefile b/arch/arm/cpu/arm920t/Makefile
index a30a572..b07e13a 100644
--- a/arch/arm/cpu/arm920t/Makefile
+++ b/arch/arm/cpu/arm920t/Makefile
@@ -10,7 +10,6 @@ extra-y = start.o
obj-y += cpu.o
obj-$(CONFIG_USE_IRQ) += interrupts.o
-obj-$(if $(filter a320,$(SOC)),y) += a320/
obj-$(CONFIG_AT91FAMILY) += at91/
obj-$(CONFIG_EP93XX) += ep93xx/
obj-$(CONFIG_IMX) += imx/
diff --git a/arch/arm/cpu/arm920t/a320/Makefile
b/arch/arm/cpu/arm920t/a320/Makefile
deleted file mode 100644
index bbdab58..000
--- a/arch/arm/cpu/arm920t/a320/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# (C) Copyright 2000-2006
-# Wolfgang Denk, DENX Software Engineering, w...@denx.de.
-#
-# SPDX-License-Identifier: GPL-2.0+
-#
-
-obj-y += reset.o
-obj-y += timer.o
diff --git a/arch/arm/cpu/arm920t/a320/reset.S
b/arch/arm/cpu/arm920t/a320/reset.S
deleted file mode 100644
index 81f9dc9..000
--- a/arch/arm/cpu/arm920t/a320/reset.S
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * (C) Copyright 2009 Faraday Technology
- * Po-Yu Chuang ratb...@faraday-tech.com
- *
- * SPDX-License-Identifier:GPL-2.0+
- */
-
-.global reset_cpu
-reset_cpu:
- b reset_cpu
diff --git a/arch/arm/cpu/arm920t/a320/timer.c
b/arch/arm/cpu/arm920t/a320/timer.c
deleted file mode 100644
index 1ac5b60..000
--- a/arch/arm/cpu/arm920t/a320/timer.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * (C) Copyright 2009 Faraday Technology
- * Po-Yu Chuang ratb...@faraday-tech.com
- *
- * SPDX-License-Identifier:GPL-2.0+
- */
-
-#include common.h
-#include div64.h
-#include asm/io.h
-#include faraday/ftpmu010.h
-#include faraday/fttmr010.h
-
-DECLARE_GLOBAL_DATA_PTR;
-
-#define TIMER_CLOCK32768
-#define TIMER_LOAD_VAL 0x
-
-static inline unsigned long long tick_to_time(unsigned long long tick)
-{
- tick *= CONFIG_SYS_HZ;
- do_div(tick, gd-arch.timer_rate_hz);
-
- return tick;
-}
-
-static inline unsigned long long usec_to_tick(unsigned long long usec)
-{
- usec *= gd-arch.timer_rate_hz;
- do_div(usec, 100);
-
- return usec;
-}
-
-int timer_init(void)
-{
- struct fttmr010 *tmr = (struct fttmr010 *)CONFIG_FTTMR010_BASE;
- unsigned int cr;
-
- debug(%s()\n, __func__);
-
- /* disable timers */
- writel(0, tmr-cr);
-
- /* use 32768Hz oscillator for RTC, WDT, TIMER */
- ftpmu010_32768osc_enable();
-
- /* setup timer */
- writel(TIMER_LOAD_VAL, tmr-timer3_load);
- writel(TIMER_LOAD_VAL, tmr-timer3_counter);
- writel(0, tmr-timer3_match1);
- writel(0, tmr-timer3_match2);
-
- /* we don't want timer to issue interrupts */
- writel(FTTMR010_TM3_MATCH1 |
-
Re: [U-Boot] [PATCH] mtd: atmel_nand: according to pmecc version to perform 0xff page correction
On Mon, 2015-02-02 at 14:08 +0800, Josh Wu wrote: Hi, Scott On 1/16/2015 4:24 PM, Andreas Bießmann wrote: Hi Bo, Josh, On 01/16/2015 07:50 AM, Josh Wu wrote: Hi, Bo On 1/16/2015 1:27 PM, Bo Shen wrote: Hi Josh, On 01/16/2015 11:54 AM, Josh Wu wrote: As the PMECC hardware has different version. In SAMA5D4 chip, the PMECC ip can generate 0xff pmecc ECC value for all 0xff sector. According to this, add PMECC version check, if it's SAMA5D4 then we always let PMECC hardware to correct it. Signed-off-by: Josh Wu josh...@atmel.com except the nitpick. Acked-by: Bo Shen voice.s...@atmel.com Acked-by: Andreas Bießmann andreas.de...@googlemail.com Would you pick this patch into your tree with Bo and Andreas's Acked-by? Thanks. I won't be able to apply anything for at least a week and a half... I'll look at it then if it hasn't been applied yet, but I'm fine with the custodian for the relevant hardware taking it in the meantime. -Scott ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3 10/12] avr32: add generic board support
Hi Simon, On 07.02.15 01:28, Simon Glass wrote: On 6 February 2015 at 15:06, Andreas Bießmann andreas.de...@googlemail.com wrote: Signed-off-by: Andreas Bießmann andreas.de...@googlemail.com --- This version still has the mmu_init_r() in common/board_r. Removing this now is not that easy ... I'd love to get it in as is and change it later to the board_init_f_r() sequence. Changes in v3: - remove unnecessary stack implementation for avr32 - fix bdinfo output Changes in v2: - remove bootparams allocation, provide as extra patch - use the else path in setup_mon_len() - provide arch_reserve_stacks() for avr32 - use the newly introduced dram_init() Changes in v1: - add timer_init in board_r - remove extern declaration of mmu_init_r() arch/avr32/config.mk|3 +++ arch/avr32/cpu/u-boot.lds |2 ++ arch/avr32/include/asm/config.h |1 + arch/avr32/include/asm/u-boot.h |7 +++ arch/avr32/lib/Makefile |2 ++ arch/avr32/lib/interrupts.c |5 + common/board_f.c|2 +- common/board_r.c| 13 ++--- common/cmd_bdinfo.c |4 ++-- include/asm-generic/u-boot.h|4 10 files changed, 37 insertions(+), 6 deletions(-) diff --git a/common/cmd_bdinfo.c b/common/cmd_bdinfo.c index e6d8a7a..999d026 100644 --- a/common/cmd_bdinfo.c +++ b/common/cmd_bdinfo.c @@ -333,8 +333,8 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) bd_t *bd = gd-bd; print_num(boot_params,(ulong)bd-bi_boot_params); - print_num(memstart, (ulong)bd-bi_memstart); - print_lnum(memsize, (u64)bd-bi_memsize); + print_num(memstart, (ulong)bd-bi_dram[0].start); + print_lnum(memsize, (u64)bd-bi_dram[0].size); Can you explain this change please? I'm not sure what is happening here. avr32 never had bd_t.bi_mem(start|size) members, they where always defined to bd_t.bi_dram[0].(start|size). Please have a look at arch/avr32/include/asm/u-boot.h. When converting to generic board I also have to use the generic bd_t (which is a mess). Since the current generic board implementation do not set both bi_mem(start|size) for all architectures I decided to go with bi_dram[0].(start|size), this will also work with the other boards not converted yet. To use just the first entry in bi_dram[] and do not loop over is ok on avr32 since the only SoC available there has just one SDRAM controller. If you're Ok with this change I would apply this series with one fix for 'common/board_f: factor out reserve_stacks' and maybe a more descriptive commit message for 'common/board_r: allocate bootparams' mid of next week to avr32/master and send a PR. AFAIR the microblaze generic board conversion depends on at least one patch of this series. Best regards Andreas Bießmann ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 07/10] ARM: remove cm4008 and cm41xx board support
These are still non-generic boards. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Cc: Greg Ungerer greg.unge...@opengear.com --- Changes in v2: None arch/arm/Kconfig| 10 - arch/arm/cpu/arm920t/Makefile | 1 - arch/arm/cpu/arm920t/ks8695/Makefile| 9 - arch/arm/cpu/arm920t/ks8695/lowlevel_init.S | 189 - arch/arm/cpu/arm920t/ks8695/timer.c | 77 -- arch/arm/include/asm/arch-ks8695/platform.h | 294 - board/cm4008/Kconfig| 12 - board/cm4008/MAINTAINERS| 6 - board/cm4008/Makefile | 8 - board/cm4008/cm4008.c | 88 --- board/cm4008/config.mk | 1 - board/cm4008/flash.c| 395 board/cm41xx/Kconfig| 12 - board/cm41xx/MAINTAINERS| 6 - board/cm41xx/Makefile | 8 - board/cm41xx/cm41xx.c | 88 --- board/cm41xx/config.mk | 1 - board/cm41xx/flash.c| 395 configs/cm4008_defconfig| 2 - configs/cm41xx_defconfig| 2 - doc/README.scrapyard| 2 + drivers/net/Makefile| 1 - drivers/net/ks8695eth.c | 229 drivers/serial/Makefile | 1 - drivers/serial/serial.c | 2 - drivers/serial/serial_ks8695.c | 121 - include/configs/cm4008.h| 104 include/configs/cm41xx.h| 104 include/netdev.h| 1 - include/serial.h| 1 - 30 files changed, 2 insertions(+), 2168 deletions(-) delete mode 100644 arch/arm/cpu/arm920t/ks8695/Makefile delete mode 100644 arch/arm/cpu/arm920t/ks8695/lowlevel_init.S delete mode 100644 arch/arm/cpu/arm920t/ks8695/timer.c delete mode 100644 arch/arm/include/asm/arch-ks8695/platform.h delete mode 100644 board/cm4008/Kconfig delete mode 100644 board/cm4008/MAINTAINERS delete mode 100644 board/cm4008/Makefile delete mode 100644 board/cm4008/cm4008.c delete mode 100644 board/cm4008/config.mk delete mode 100644 board/cm4008/flash.c delete mode 100644 board/cm41xx/Kconfig delete mode 100644 board/cm41xx/MAINTAINERS delete mode 100644 board/cm41xx/Makefile delete mode 100644 board/cm41xx/cm41xx.c delete mode 100644 board/cm41xx/config.mk delete mode 100644 board/cm41xx/flash.c delete mode 100644 configs/cm4008_defconfig delete mode 100644 configs/cm41xx_defconfig delete mode 100644 drivers/net/ks8695eth.c delete mode 100644 drivers/serial/serial_ks8695.c delete mode 100644 include/configs/cm4008.h delete mode 100644 include/configs/cm41xx.h diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 74dd164..d6bb5c3 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -97,14 +97,6 @@ config TARGET_SCB9328 bool Support scb9328 select CPU_ARM920T -config TARGET_CM4008 - bool Support cm4008 - select CPU_ARM920T - -config TARGET_CM41XX - bool Support cm41xx - select CPU_ARM920T - config TARGET_VCMA9 bool Support VCMA9 select CPU_ARM920T @@ -871,8 +863,6 @@ source board/calao/sbc35_a9g20/Kconfig source board/calao/tny_a9260/Kconfig source board/calao/usb_a9263/Kconfig source board/cirrus/edb93xx/Kconfig -source board/cm4008/Kconfig -source board/cm41xx/Kconfig source board/compulab/cm_t335/Kconfig source board/compulab/cm_fx6/Kconfig source board/congatec/cgtqmx6eval/Kconfig diff --git a/arch/arm/cpu/arm920t/Makefile b/arch/arm/cpu/arm920t/Makefile index a72e5de..a30a572 100644 --- a/arch/arm/cpu/arm920t/Makefile +++ b/arch/arm/cpu/arm920t/Makefile @@ -14,5 +14,4 @@ obj-$(if $(filter a320,$(SOC)),y) += a320/ obj-$(CONFIG_AT91FAMILY) += at91/ obj-$(CONFIG_EP93XX) += ep93xx/ obj-$(CONFIG_IMX) += imx/ -obj-$(CONFIG_KS8695) += ks8695/ obj-$(CONFIG_S3C24X0) += s3c24x0/ diff --git a/arch/arm/cpu/arm920t/ks8695/Makefile b/arch/arm/cpu/arm920t/ks8695/Makefile deleted file mode 100644 index 400aa89..000 --- a/arch/arm/cpu/arm920t/ks8695/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# -# (C) Copyright 2000-2006 -# Wolfgang Denk, DENX Software Engineering, w...@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y = lowlevel_init.o -obj-y += timer.o diff --git a/arch/arm/cpu/arm920t/ks8695/lowlevel_init.S b/arch/arm/cpu/arm920t/ks8695/lowlevel_init.S deleted file mode 100644 index a2a07f2..000 --- a/arch/arm/cpu/arm920t/ks8695/lowlevel_init.S +++ /dev/null @@ -1,189 +0,0 @@ -/* - * lowlevel_init.S - basic hardware initialization for the KS8695 CPU - * - * Copyright (c) 2004-2005, Greg Ungerer greg.unge...@opengear.com - * - * SPDX-License-Identifier:
[U-Boot] [PATCH v2 05/10] ARM: remove devkit3250 board support
This is still a non-generic board. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Cc: Vladimir Zapolskiy v...@mleia.com --- Changes in v2: None arch/arm/Kconfig | 5 - arch/arm/cpu/arm926ejs/Makefile | 1 - arch/arm/cpu/arm926ejs/lpc32xx/Makefile | 8 -- arch/arm/cpu/arm926ejs/lpc32xx/clk.c | 104 - arch/arm/cpu/arm926ejs/lpc32xx/cpu.c | 57 -- arch/arm/cpu/arm926ejs/lpc32xx/devices.c | 39 --- arch/arm/cpu/arm926ejs/lpc32xx/timer.c| 82 -- arch/arm/include/asm/arch-lpc32xx/clk.h | 157 -- arch/arm/include/asm/arch-lpc32xx/config.h| 59 -- arch/arm/include/asm/arch-lpc32xx/cpu.h | 51 - arch/arm/include/asm/arch-lpc32xx/emc.h | 79 - arch/arm/include/asm/arch-lpc32xx/sys_proto.h | 12 -- arch/arm/include/asm/arch-lpc32xx/timer.h | 61 -- arch/arm/include/asm/arch-lpc32xx/uart.h | 101 - arch/arm/include/asm/arch-lpc32xx/wdt.h | 38 --- board/timll/devkit3250/Kconfig| 15 --- board/timll/devkit3250/MAINTAINERS| 6 - board/timll/devkit3250/Makefile | 8 -- board/timll/devkit3250/devkit3250.c | 52 - configs/devkit3250_defconfig | 2 - doc/README.scrapyard | 1 + drivers/serial/Makefile | 1 - drivers/serial/lpc32xx_hsuart.c | 89 --- drivers/serial/serial.c | 2 - include/configs/devkit3250.h | 101 - include/serial.h | 1 - 26 files changed, 1 insertion(+), 1131 deletions(-) delete mode 100644 arch/arm/cpu/arm926ejs/lpc32xx/Makefile delete mode 100644 arch/arm/cpu/arm926ejs/lpc32xx/clk.c delete mode 100644 arch/arm/cpu/arm926ejs/lpc32xx/cpu.c delete mode 100644 arch/arm/cpu/arm926ejs/lpc32xx/devices.c delete mode 100644 arch/arm/cpu/arm926ejs/lpc32xx/timer.c delete mode 100644 arch/arm/include/asm/arch-lpc32xx/clk.h delete mode 100644 arch/arm/include/asm/arch-lpc32xx/config.h delete mode 100644 arch/arm/include/asm/arch-lpc32xx/cpu.h delete mode 100644 arch/arm/include/asm/arch-lpc32xx/emc.h delete mode 100644 arch/arm/include/asm/arch-lpc32xx/sys_proto.h delete mode 100644 arch/arm/include/asm/arch-lpc32xx/timer.h delete mode 100644 arch/arm/include/asm/arch-lpc32xx/uart.h delete mode 100644 arch/arm/include/asm/arch-lpc32xx/wdt.h delete mode 100644 board/timll/devkit3250/Kconfig delete mode 100644 board/timll/devkit3250/MAINTAINERS delete mode 100644 board/timll/devkit3250/Makefile delete mode 100644 board/timll/devkit3250/devkit3250.c delete mode 100644 configs/devkit3250_defconfig delete mode 100644 drivers/serial/lpc32xx_hsuart.c delete mode 100644 include/configs/devkit3250.h diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index cbed2f4..b0b7eaf 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -241,10 +241,6 @@ config TARGET_MAXBCM bool Support maxbcm select CPU_V7 -config TARGET_DEVKIT3250 - bool Support devkit3250 - select CPU_ARM926EJS - config TARGET_MX25PDK bool Support mx25pdk select CPU_ARM926EJS @@ -968,7 +964,6 @@ source board/ti/am43xx/Kconfig source board/ti/ti814x/Kconfig source board/ti/ti816x/Kconfig source board/ti/tnetv107xevm/Kconfig -source board/timll/devkit3250/Kconfig source board/toradex/colibri_pxa270/Kconfig source board/tqc/tqma6/Kconfig source board/trizepsiv/Kconfig diff --git a/arch/arm/cpu/arm926ejs/Makefile b/arch/arm/cpu/arm926ejs/Makefile index 607d29f..bfa365e 100644 --- a/arch/arm/cpu/arm926ejs/Makefile +++ b/arch/arm/cpu/arm926ejs/Makefile @@ -18,7 +18,6 @@ obj-$(CONFIG_ARMADA100) += armada100/ obj-$(CONFIG_AT91FAMILY) += at91/ obj-$(CONFIG_ARCH_DAVINCI) += davinci/ obj-$(CONFIG_KIRKWOOD) += kirkwood/ -obj-$(if $(filter lpc32xx,$(SOC)),y) += lpc32xx/ obj-$(CONFIG_MX25) += mx25/ obj-$(CONFIG_MX27) += mx27/ obj-$(if $(filter mxs,$(SOC)),y) += mxs/ diff --git a/arch/arm/cpu/arm926ejs/lpc32xx/Makefile b/arch/arm/cpu/arm926ejs/lpc32xx/Makefile deleted file mode 100644 index 314f004..000 --- a/arch/arm/cpu/arm926ejs/lpc32xx/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# -# (C) Copyright 2000-2006 -# Wolfgang Denk, DENX Software Engineering, w...@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y = cpu.o clk.o devices.o timer.o diff --git a/arch/arm/cpu/arm926ejs/lpc32xx/clk.c b/arch/arm/cpu/arm926ejs/lpc32xx/clk.c deleted file mode 100644 index b7a44d5..000 --- a/arch/arm/cpu/arm926ejs/lpc32xx/clk.c +++ /dev/null @@ -1,104 +0,0 @@ -/* - * Copyright (C) 2011 by Vladimir Zapolskiy v...@mleia.com - * - * SPDX-License-Identifier:GPL-2.0+ - */ - -#include common.h -#include div64.h -#include asm/arch/cpu.h -#include asm/arch/clk.h -#include asm/io.h -
Re: [U-Boot] [PATCH v4 3/3] dm:gpio:mxc add DT support
On 02/10/15 08:46, Peng Fan wrote: This patch add DT support for mxc gpio driver. There are one place using CONFIG_OF_CONTROL macro. 1. The U_BOOT_DEVICES and mxc_plat array are complied out. To DT, platdata is alloced using calloc, so there is no need to use mxc_plat. The following situations are tested, and all work fine: 1. with DM, without DT 2. with DM and DT 3. without DM Since device tree has not been upstreamed, if want to test this patch. The followings need to be done. + pieces of code does not gpio_request when using gpio_direction_xxx and etc, need to request gpio. + move the gpio settings from board_early_init_f to board_init + define CONFIG_DM ,CONFIG_DM_GPIO and CONFIG_OF_CONTROL + Add device tree file and do related configuration in `make ARCH=arm menuconfig` These will be done in future patches by step. Signed-off-by: Peng Fan peng@freescale.com Acked-by: Igor Grinberg grinb...@compulab.co.il -- Regards, Igor. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 0/10] ARM: remove non-generic boards
Based on Tom's announce mail (http://lists.denx.de/pipermail/u-boot/2015-February/203606.html), let's start removing non-generic ARM boards. No conversion patches have been posted for these boards. Changes in v2: - Do not remove armada100 boards because Ajay will send a patch to convert them. Masahiro Yamada (10): ARM: remove mx31ads board support ARM: mx31: remove imx31_phycore board ARM: remove jadecpu board support ARM: remove zmx25 board support ARM: remove devkit3250 board support ARM: remove dkb board support ARM: remove cm4008 and cm41xx board support ARM: remove a320evb board support ARM: remove tnetv107x board support ARM: davinci: remove hawkboard support arch/arm/Kconfig | 50 --- arch/arm/cpu/arm1176/Makefile | 1 - arch/arm/cpu/arm1176/start.S | 22 - arch/arm/cpu/arm1176/tnetv107x/Makefile| 6 - arch/arm/cpu/arm1176/tnetv107x/aemif.c | 78 arch/arm/cpu/arm1176/tnetv107x/clock.c | 432 -- arch/arm/cpu/arm1176/tnetv107x/init.c | 22 - arch/arm/cpu/arm1176/tnetv107x/lowlevel_init.S | 10 - arch/arm/cpu/arm1176/tnetv107x/mux.c | 319 - arch/arm/cpu/arm1176/tnetv107x/timer.c | 93 arch/arm/cpu/arm920t/Makefile | 2 - arch/arm/cpu/arm920t/a320/Makefile | 9 - arch/arm/cpu/arm920t/a320/reset.S | 10 - arch/arm/cpu/arm920t/a320/timer.c | 118 - arch/arm/cpu/arm920t/ks8695/Makefile | 9 - arch/arm/cpu/arm920t/ks8695/lowlevel_init.S| 189 arch/arm/cpu/arm920t/ks8695/timer.c| 77 arch/arm/cpu/arm926ejs/Makefile| 3 - arch/arm/cpu/arm926ejs/davinci/Kconfig | 4 - arch/arm/cpu/arm926ejs/lpc32xx/Makefile| 8 - arch/arm/cpu/arm926ejs/lpc32xx/clk.c | 104 - arch/arm/cpu/arm926ejs/lpc32xx/cpu.c | 57 --- arch/arm/cpu/arm926ejs/lpc32xx/devices.c | 39 -- arch/arm/cpu/arm926ejs/lpc32xx/timer.c | 82 arch/arm/cpu/arm926ejs/mb86r0x/Makefile| 8 - arch/arm/cpu/arm926ejs/mb86r0x/clock.c | 27 -- arch/arm/cpu/arm926ejs/mb86r0x/reset.c | 24 - arch/arm/cpu/arm926ejs/mb86r0x/timer.c | 115 - arch/arm/cpu/arm926ejs/pantheon/Makefile | 9 - arch/arm/cpu/arm926ejs/pantheon/cpu.c | 85 arch/arm/cpu/arm926ejs/pantheon/dram.c | 117 - arch/arm/cpu/arm926ejs/pantheon/timer.c| 201 - arch/arm/include/asm/arch-a320/a320.h | 22 - arch/arm/include/asm/arch-ks8695/platform.h| 294 arch/arm/include/asm/arch-lpc32xx/clk.h| 157 --- arch/arm/include/asm/arch-lpc32xx/config.h | 59 --- arch/arm/include/asm/arch-lpc32xx/cpu.h| 51 --- arch/arm/include/asm/arch-lpc32xx/emc.h| 79 arch/arm/include/asm/arch-lpc32xx/sys_proto.h | 12 - arch/arm/include/asm/arch-lpc32xx/timer.h | 61 --- arch/arm/include/asm/arch-lpc32xx/uart.h | 101 - arch/arm/include/asm/arch-lpc32xx/wdt.h| 38 -- arch/arm/include/asm/arch-mb86r0x/hardware.h | 15 - arch/arm/include/asm/arch-mb86r0x/mb86r0x.h| 599 - arch/arm/include/asm/arch-pantheon/config.h| 53 --- arch/arm/include/asm/arch-pantheon/cpu.h | 77 arch/arm/include/asm/arch-pantheon/gpio.h | 0 arch/arm/include/asm/arch-pantheon/mfp.h | 39 -- arch/arm/include/asm/arch-pantheon/pantheon.h | 38 -- arch/arm/include/asm/arch-tnetv107x/clock.h| 53 --- arch/arm/include/asm/arch-tnetv107x/hardware.h | 160 --- arch/arm/include/asm/arch-tnetv107x/mux.h | 291 arch/arm/lib/asm-offsets.c | 46 -- board/Marvell/dkb/Kconfig | 15 - board/Marvell/dkb/MAINTAINERS | 6 - board/Marvell/dkb/Makefile | 9 - board/Marvell/dkb/dkb.c| 85 board/cm4008/Kconfig | 12 - board/cm4008/MAINTAINERS | 6 - board/cm4008/Makefile | 8 - board/cm4008/cm4008.c | 88 board/cm4008/config.mk | 1 - board/cm4008/flash.c | 395 board/cm41xx/Kconfig | 12 - board/cm41xx/MAINTAINERS | 6 - board/cm41xx/Makefile | 8 - board/cm41xx/cm41xx.c | 88 board/cm41xx/config.mk | 1 - board/cm41xx/flash.c | 395 board/davinci/da8xxevm/Kconfig | 13 - board/davinci/da8xxevm/MAINTAINERS | 8 - board/davinci/da8xxevm/Makefile| 1 - board/davinci/da8xxevm/README.hawkboard| 92
[U-Boot] [PATCH v2 09/10] ARM: remove tnetv107x board support
This is still a non-generic board. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Cc: Chan-Taek Park c-p...@ti.com --- Changes in v2: None arch/arm/Kconfig | 5 - arch/arm/cpu/arm1176/Makefile | 1 - arch/arm/cpu/arm1176/start.S | 22 -- arch/arm/cpu/arm1176/tnetv107x/Makefile| 6 - arch/arm/cpu/arm1176/tnetv107x/aemif.c | 78 - arch/arm/cpu/arm1176/tnetv107x/clock.c | 432 - arch/arm/cpu/arm1176/tnetv107x/init.c | 22 -- arch/arm/cpu/arm1176/tnetv107x/lowlevel_init.S | 10 - arch/arm/cpu/arm1176/tnetv107x/mux.c | 319 -- arch/arm/cpu/arm1176/tnetv107x/timer.c | 93 -- arch/arm/include/asm/arch-tnetv107x/clock.h| 53 --- arch/arm/include/asm/arch-tnetv107x/hardware.h | 160 - arch/arm/include/asm/arch-tnetv107x/mux.h | 291 - board/ti/tnetv107xevm/Kconfig | 15 - board/ti/tnetv107xevm/MAINTAINERS | 6 - board/ti/tnetv107xevm/Makefile | 5 - board/ti/tnetv107xevm/config.mk| 5 - board/ti/tnetv107xevm/sdb_board.c | 134 configs/tnetv107x_evm_defconfig| 2 - doc/README.scrapyard | 1 + drivers/watchdog/Makefile | 1 - drivers/watchdog/tnetv107x_wdt.c | 165 -- include/configs/tnetv107x_evm.h| 139 23 files changed, 1 insertion(+), 1964 deletions(-) delete mode 100644 arch/arm/cpu/arm1176/tnetv107x/Makefile delete mode 100644 arch/arm/cpu/arm1176/tnetv107x/aemif.c delete mode 100644 arch/arm/cpu/arm1176/tnetv107x/clock.c delete mode 100644 arch/arm/cpu/arm1176/tnetv107x/init.c delete mode 100644 arch/arm/cpu/arm1176/tnetv107x/lowlevel_init.S delete mode 100644 arch/arm/cpu/arm1176/tnetv107x/mux.c delete mode 100644 arch/arm/cpu/arm1176/tnetv107x/timer.c delete mode 100644 arch/arm/include/asm/arch-tnetv107x/clock.h delete mode 100644 arch/arm/include/asm/arch-tnetv107x/hardware.h delete mode 100644 arch/arm/include/asm/arch-tnetv107x/mux.h delete mode 100644 board/ti/tnetv107xevm/Kconfig delete mode 100644 board/ti/tnetv107xevm/MAINTAINERS delete mode 100644 board/ti/tnetv107xevm/Makefile delete mode 100644 board/ti/tnetv107xevm/config.mk delete mode 100644 board/ti/tnetv107xevm/sdb_board.c delete mode 100644 configs/tnetv107x_evm_defconfig delete mode 100644 drivers/watchdog/tnetv107x_wdt.c delete mode 100644 include/configs/tnetv107x_evm.h diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 3ec570b..946ce5d 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -375,10 +375,6 @@ config TARGET_RPI bool Support rpi select CPU_ARM1176 -config TARGET_TNETV107X_EVM - bool Support tnetv107x_evm - select CPU_ARM1176 - config TARGET_INTEGRATORAP_CM946ES bool Support integratorap_cm946es select CPU_ARM946ES @@ -943,7 +939,6 @@ source board/ti/am335x/Kconfig source board/ti/am43xx/Kconfig source board/ti/ti814x/Kconfig source board/ti/ti816x/Kconfig -source board/ti/tnetv107xevm/Kconfig source board/toradex/colibri_pxa270/Kconfig source board/tqc/tqma6/Kconfig source board/trizepsiv/Kconfig diff --git a/arch/arm/cpu/arm1176/Makefile b/arch/arm/cpu/arm1176/Makefile index ead2303..480e130 100644 --- a/arch/arm/cpu/arm1176/Makefile +++ b/arch/arm/cpu/arm1176/Makefile @@ -12,4 +12,3 @@ extra-y = start.o obj-y = cpu.o obj-$(CONFIG_BCM2835) += bcm2835/ -obj-$(CONFIG_TNETV107X) += tnetv107x/ diff --git a/arch/arm/cpu/arm1176/start.S b/arch/arm/cpu/arm1176/start.S index 0704bdd..ac937bf 100644 --- a/arch/arm/cpu/arm1176/start.S +++ b/arch/arm/cpu/arm1176/start.S @@ -96,28 +96,6 @@ mmu_disable: mov pc, r2 mmu_disable_phys: -#ifdef CONFIG_DISABLE_TCM - /* -* Disable the TCMs -*/ - mrc p15, 0, r0, c0, c0, 2 /* Return TCM details */ - cmp r0, #0 - beq skip_tcmdisable - mov r1, #0 - mov r2, #1 - tst r0, r2 - mcrne p15, 0, r1, c9, c1, 1 /* Disable Instruction TCM if present*/ - tst r0, r2, LSL #16 - mcrne p15, 0, r1, c9, c1, 0 /* Disable Data TCM if present*/ -skip_tcmdisable: -#endif -#endif - -#ifdef CONFIG_PERIPORT_REMAP - /* Peri port setup */ - ldr r0, =CONFIG_PERIPORT_BASE - orr r0, r0, #CONFIG_PERIPORT_SIZE - mcr p15,0,r0,c15,c2,4 #endif /* diff --git a/arch/arm/cpu/arm1176/tnetv107x/Makefile b/arch/arm/cpu/arm1176/tnetv107x/Makefile deleted file mode 100644 index a4c1edf..000 --- a/arch/arm/cpu/arm1176/tnetv107x/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y += aemif.o clock.o init.o mux.o timer.o -obj-y += lowlevel_init.o diff --git a/arch/arm/cpu/arm1176/tnetv107x/aemif.c
Re: [U-Boot] netconsole: USB Ethernet connection dropping with ping or tftpboot
On 02/08/2015 02:25 PM, Jörg Krause wrote: On Fr, 2015-02-06 at 11:06 -0700, Stephen Warren wrote: On 02/05/2015 06:06 PM, Jörg Krause wrote: On Do, 2015-02-05 at 15:23 -0700, Stephen Warren wrote: b) In ci_bounce(), the bounce buffer is only allocated if the user-buffer is already aligned, and if a large-enough bounce buffer wasn't previously allocated. If ci_req-b_buf was uninitialized it could be non-zero (thus preventing the expected aligned allocation) yet not actually aligned enough. I can reproduce this issue now. After some timeout sending packets to usb ethernet messages, the bounce buffer somehow gets corrupted. ci_bounce() is called with an unaligned input buffer length 'req-length=66', but the bounce buffer length 'ci_req-b_len=1140305940' or in hex 'ci_req-b_len=0x43f7b014'. This bounce buffer length is obviously an address, as the following misaligned error message shows: CACHE: Misaligned operation at range [43f7b010, 43f7b070]. Ah, I hadn't realized that was [start, length] rather than [start, end]. The question is: How is ci_req-b_len getting corrupted? Is it simply never initialized, or does something trash that value later? ci_ep_alloc_request() appears to calloc() the whole struct ci_req, so I imagine an initialization/allocating error isn't happening. The only issue there might be some code somehow creating its own struct usb_request instead of calling into the controller's -alloc_request() function. I vaguely recall fixing some of those, but might have missed some in protocols that I didn't test (i.e. anything other than USB Mass Storage or DFU, although I might have very briefly tested netconsole once?). I would suggest adding a whole ton of printfs() to catch where ci_reqs are being allocated, and where ci_req-b_len is getting written in which ci_req objects, and then mapping that back to the ci_req that the cache alignment error message complains about. Sorry, this will be a bit painful. If the ci_req is always at the same address on different boots of the code, that will make it easier, especially if you have a debugger with a data watchpoint, or can write some code to use any data watchpoint self-hosted debug capability in your CPU. I think I found the answer. I used a lot of debug messages and tried to understand the involved drivers. I will try to sum up my investigations. NetLoop is entered first for the ping protocol and then for the netconsole protocol: --- NetLoop Entry (PING) --- NetLoop Entry (NETCONSOLE) ci_udc is probed and ci_ep_alloc_request() is called for EP0: ci_ep_alloc_request usb_ep:0x43fd0028 ci_req:0x43b83220 In eth_bind() ci_ep_alloc_request() is called for status EP: ci_ep_alloc_request usb_ep:0x43fd00a0 ci_req:0x43b7b4a8 Everything is fine: using ci_udc, OUT ep- IN ep- STATUS ep- MAC 00:19:b8:00:00:02 HOST MAC 00:19:b8:00:00:01 In eth_set_config() ci_ep_alloc_request() is invoked again for tx_req and rx_req: ci_ep_alloc_request usb_ep:0x43fd0050 ci_req:0x43b7b568 ci_ep_alloc_request usb_ep:0x43fd0078 ci_req:0x43b7b5b0 Everything is fine: high speed config #1: 2 mA, Ethernet Gadget, using CDC Ethernet USB network up! Now the NetLoop is available for netconsole: --- NetState set to 0 (CONTINUE) --- NetLoop Init (NETCONSOLE) --- NetLoop ARP handler set (43fa3b14) [..] Got ARP REPLY, set eth addr (00:19:b8:00:00:01) --- NetState set to 2 (SUCCESS) --- NetLoop UDP handler set () --- NetLoop ARP handler set () --- NetLoop timeout handler cancelled --- NetLoop Success! (NETCONSOLE) Now it's pings turn in the NetLoop. The if (eth_is_on_demand_init()) branch is executed. eth_halt() and later eth_disconnect() and eth_reset_config() are invoked. There the in and out EPs are freed: ci_ep_free_request ci_req:0x43b7b568 ci_ep_free_request ci_req:0x43b7b5b0 That sounds like a problem. I would assume that once netconsole is enabled, the Ethernet connection is no longer on-demand, but should be initialized once, and then never taken down. Take a look at the definition of eth_is_on_demand_init() in include/net.h. It has a special case for CONFIG_NETCONSOLE, based on variable net_loop_last_protocol. Perhaps that isn't getting set correctly, or perhaps the variable is getting set to something other than netconsole, thus causing the connection to get taken down? However, netconsole tries to send every printf() as an UDP packet to the host. sending UDP to 10.0.0.1/00:19:b8:00:00:01 But the usb_request [1] pointer in usb_eth_send is NULL after the free request: usb_eth_send usb_request: length: 82 usb_eth_send() calls ci_ep_queue() which calls ci_bounce() and because of the corrupted ci_req pointer I get a misaligned cache. So, as far as I understand, the main problem is that netconsole does
Re: [U-Boot] [PATCH] mx53loco: Fix boot hang during reboot stress test
Hi Fabio, On 09/02/2015 10:29, Fabio Estevam wrote: From: Fabio Estevam fabio.este...@freescale.com Currently by running the following test: = setenv bootcmd reset = save = reset , we observe a hang after approximately 20-30 minutes of stress reboot test. Investigation of this issue revealed that when a single DDR chip select is used, the hang does not happen. It only happens when the two chip selects are active. MX53 reference manual states at 28.6.2 Memory ZQ calibration sequence: The controller must keep the memory lines quiet (except for CK) for the ZQ calibration time as defined in the Jedec (512 cycles for ZQCL after reset, 256 for other ZQCL and 64 for ZQCS). According to the SDE_0 and SDE_1 bit descriptions from register ESDCTL_ESDCTL: Writing 1 to SDE0 or SDE1 will initiate power up delays as JEDEC defines. Power up delays are a function of the configured memory type (DDR2/DDR3/LPDDR2) So make sure to activate one chip select at time (CS0 first and then CS1 later), so that the required JEDEC delay is respected for each chip select. With this change applied the board has gone through three days of reboot stress test without any hang. Signed-off-by: Fabio Estevam fabio.este...@freescale.com --- board/freescale/mx53loco/imximage.cfg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/board/freescale/mx53loco/imximage.cfg b/board/freescale/mx53loco/imximage.cfg index d1c1931..a5f1d98 100644 --- a/board/freescale/mx53loco/imximage.cfg +++ b/board/freescale/mx53loco/imximage.cfg @@ -59,7 +59,7 @@ DATA 4 0x63fd9090 0x4d444c44 DATA 4 0x63fd907c 0x01370138 DATA 4 0x63fd9080 0x013b013c DATA 4 0x63fd9018 0x00011740 -DATA 4 0x63fd9000 0xc319 +DATA 4 0x63fd9000 0x8319 DATA 4 0x63fd900c 0x9f5152e3 DATA 4 0x63fd9010 0xb68e8a63 DATA 4 0x63fd9014 0x01ff00db @@ -72,6 +72,7 @@ DATA 4 0x63fd901c 0x8033 DATA 4 0x63fd901c 0x00028031 DATA 4 0x63fd901c 0x052080b0 DATA 4 0x63fd901c 0x04008040 +DATA 4 0x63fd9000 0xc319 DATA 4 0x63fd901c 0x803a DATA 4 0x63fd901c 0x803b DATA 4 0x63fd901c 0x00028039 Good catch ! Acked-by: Stefano Babic sba...@denx.de Best regards, Stefano Babic -- = DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2] config_distro_bootcmd.h: Enable CONFIG_CMD_PART
On 02/07/2015 05:38 AM, Hans de Goede wrote: The recent changes to config_distro_bootcmd.h require CONFIG_CMD_PART to be defined, as the default bootcmd now uses the part command. This fixes sunxi boards not booting with v2015.04-rc1. Acked-by: Stephen Warren swar...@nvidia.com ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] arm: rmobile: Add SILK board support
Hi, 2015-02-09 9:18 GMT+09:00 Vladimir Barinov vladimir.bari...@cogentembedded.com: Hi Nobuhiro, I apologize for missed qos.h header file in this commit. Please do find it in upcoming patch. Yes, I noticed that the build test has failed now. I will wait for the patch. Thanks! Nobuhiro Regards, Vladimir On 06.02.2015 08:10, Nobuhiro Iwamatsu wrote: Hi, Vladimir. Applied, thanks. Best regards, Nobuhiro 2015-01-13 1:17 GMT+09:00 Vladimir Barinov vladimir.bari...@cogentembedded.com: SILK is an entry level development board based on R-Car E2 SoC (R8A7794) This commit supports the following peripherals: - SCIF, I2C, Ethernet, QSPI, MMC, USB Host Signed-off-by: Vladimir Barinov vladimir.bari...@cogentembedded.com --- arch/arm/cpu/armv7/rmobile/Kconfig | 6 +- board/renesas/silk/Kconfig | 12 + board/renesas/silk/MAINTAINERS | 6 + board/renesas/silk/Makefile| 10 + board/renesas/silk/qos.c | 951 + board/renesas/silk/silk.c | 175 +++ configs/silk_defconfig | 3 + include/configs/silk.h | 117 + 8 files changed, 1279 insertions(+), 1 deletion(-) create mode 100644 board/renesas/silk/Kconfig create mode 100644 board/renesas/silk/MAINTAINERS create mode 100644 board/renesas/silk/Makefile create mode 100644 board/renesas/silk/qos.c create mode 100644 board/renesas/silk/silk.c create mode 100644 configs/silk_defconfig create mode 100644 include/configs/silk.h ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot -- Nobuhiro Iwamatsu ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 09/11] ARM: armada100: remove aspenite and gplugd board support
-Original Message- From: Ajay Bhargav [mailto:ajay.bhar...@einfochips.com] Sent: 10 February 2015 10:37 To: Masahiro Yamada; u-boot@lists.denx.de Cc: Tom Rini; Albert Aribaud; Prafulla Wadaskar; Roman Byshko; Matthias Fuchs; Marek Vasut; Ivan Khoronzhuk; Jiandong Zheng; Oleksandr Tymoshenko; Jagannadha Sutradharudu Teki; Joe Hershberger; Sergey Kostanbaev; Steve Rae; WingMan Kwok; Siva Durga Prasad Paladugu; Stefan Roese; Michal Simek; Nobuhiro Iwamatsu; Simon Glass; Wolfgang Denk; Ian Campbell; Georges Savoundararadj; Daniel Schwierzeck Subject: Re: [PATCH 09/11] ARM: armada100: remove aspenite and gplugd board support From: Masahiro Yamada yamad...@jp.panasonic.com Sent: Tuesday, February 10, 2015 10:14 AM To: u-boot@lists.denx.de Cc: Tom Rini; Albert Aribaud; Masahiro Yamada; Prafulla Wadaskar; Ajay Bhargav; Roman Byshko; Matthias Fuchs; Marek Vasut; Ivan Khoronzhuk; Jiandong Zheng; Oleksandr Tymoshenko; Jagannadha Sutradharudu Teki; Joe Hershberger; Sergey Kostanbaev; Steve Rae; WingMan Kwok; Siva Durga Prasad Paladugu; Stefan Roese; Michal Simek; Nobuhiro Iwamatsu; Simon Glass; Wolfgang Denk; Ian Campbell; Georges Savoundararadj; Daniel Schwierzeck Subject: [PATCH 09/11] ARM: armada100: remove aspenite and gplugd board support These are still non-generic boards. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Cc: Prafulla Wadaskar prafu...@marvell.com Cc: Ajay Bhargav ajay.bhar...@einfochips.com --- arch/arm/Kconfig | 10 - arch/arm/cpu/arm926ejs/Makefile| 1 - arch/arm/cpu/arm926ejs/armada100/Makefile | 9 - arch/arm/cpu/arm926ejs/armada100/cpu.c | 92 --- arch/arm/cpu/arm926ejs/armada100/dram.c| 116 arch/arm/cpu/arm926ejs/armada100/timer.c | 194 -- arch/arm/include/asm/arch-armada100/armada100.h| 60 -- arch/arm/include/asm/arch-armada100/config.h | 42 -- arch/arm/include/asm/arch-armada100/cpu.h | 162 - arch/arm/include/asm/arch-armada100/gpio.h | 32 - arch/arm/include/asm/arch-armada100/mfp.h | 80 --- arch/arm/include/asm/arch-armada100/spi.h | 79 --- .../include/asm/arch-armada100/utmi-armada100.h| 63 -- board/Marvell/aspenite/Kconfig | 15 - board/Marvell/aspenite/MAINTAINERS | 6 - board/Marvell/aspenite/Makefile| 10 - board/Marvell/aspenite/aspenite.c | 43 -- board/Marvell/gplugd/Kconfig | 15 - board/Marvell/gplugd/MAINTAINERS | 6 - board/Marvell/gplugd/Makefile | 15 - board/Marvell/gplugd/gplugd.c | 130 configs/aspenite_defconfig | 2 - configs/gplugd_defconfig | 2 - doc/README.scrapyard | 2 + drivers/net/Makefile | 1 - drivers/net/armada100_fec.c| 726 - drivers/net/armada100_fec.h| 209 -- drivers/spi/Makefile | 1 - drivers/spi/armada100_spi.c| 203 -- drivers/usb/host/Makefile | 1 - drivers/usb/host/ehci-armada100.c | 48 -- drivers/usb/host/utmi-armada100.c | 80 --- include/configs/aspenite.h | 55 -- include/configs/gplugd.h | 134 include/netdev.h | 1 - 35 files changed, 2 insertions(+), 2643 deletions(-) delete mode 100644 arch/arm/cpu/arm926ejs/armada100/Makefile delete mode 100644 arch/arm/cpu/arm926ejs/armada100/cpu.c delete mode 100644 arch/arm/cpu/arm926ejs/armada100/dram.c delete mode 100644 arch/arm/cpu/arm926ejs/armada100/timer.c delete mode 100644 arch/arm/include/asm/arch-armada100/armada100.h delete mode 100644 arch/arm/include/asm/arch-armada100/config.h delete mode 100644 arch/arm/include/asm/arch-armada100/cpu.h delete mode 100644 arch/arm/include/asm/arch-armada100/gpio.h delete mode 100644 arch/arm/include/asm/arch-armada100/mfp.h delete mode 100644 arch/arm/include/asm/arch-armada100/spi.h delete mode 100644 arch/arm/include/asm/arch-armada100/utmi-armada100.h delete mode 100644 board/Marvell/aspenite/Kconfig delete mode 100644 board/Marvell/aspenite/MAINTAINERS delete mode 100644 board/Marvell/aspenite/Makefile delete mode 100644 board/Marvell/aspenite/aspenite.c delete mode 100644 board/Marvell/gplugd/Kconfig delete mode 100644 board/Marvell/gplugd/MAINTAINERS delete mode 100644 board/Marvell/gplugd/Makefile delete mode 100644 board/Marvell/gplugd/gplugd.c delete mode 100644 configs/aspenite_defconfig delete mode 100644
[U-Boot] [PATCH 07/11] ARM: remove cm4008 and cm41xx board support
These are still non-generic boards. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Cc: Greg Ungerer greg.unge...@opengear.com --- arch/arm/Kconfig| 10 - arch/arm/cpu/arm920t/Makefile | 1 - arch/arm/cpu/arm920t/ks8695/Makefile| 9 - arch/arm/cpu/arm920t/ks8695/lowlevel_init.S | 189 - arch/arm/cpu/arm920t/ks8695/timer.c | 77 -- arch/arm/include/asm/arch-ks8695/platform.h | 294 - board/cm4008/Kconfig| 12 - board/cm4008/MAINTAINERS| 6 - board/cm4008/Makefile | 8 - board/cm4008/cm4008.c | 88 --- board/cm4008/config.mk | 1 - board/cm4008/flash.c| 395 board/cm41xx/Kconfig| 12 - board/cm41xx/MAINTAINERS| 6 - board/cm41xx/Makefile | 8 - board/cm41xx/cm41xx.c | 88 --- board/cm41xx/config.mk | 1 - board/cm41xx/flash.c| 395 configs/cm4008_defconfig| 2 - configs/cm41xx_defconfig| 2 - doc/README.scrapyard| 2 + drivers/net/Makefile| 1 - drivers/net/ks8695eth.c | 229 drivers/serial/Makefile | 1 - drivers/serial/serial.c | 2 - drivers/serial/serial_ks8695.c | 121 - include/configs/cm4008.h| 104 include/configs/cm41xx.h| 104 include/netdev.h| 1 - include/serial.h| 1 - 30 files changed, 2 insertions(+), 2168 deletions(-) delete mode 100644 arch/arm/cpu/arm920t/ks8695/Makefile delete mode 100644 arch/arm/cpu/arm920t/ks8695/lowlevel_init.S delete mode 100644 arch/arm/cpu/arm920t/ks8695/timer.c delete mode 100644 arch/arm/include/asm/arch-ks8695/platform.h delete mode 100644 board/cm4008/Kconfig delete mode 100644 board/cm4008/MAINTAINERS delete mode 100644 board/cm4008/Makefile delete mode 100644 board/cm4008/cm4008.c delete mode 100644 board/cm4008/config.mk delete mode 100644 board/cm4008/flash.c delete mode 100644 board/cm41xx/Kconfig delete mode 100644 board/cm41xx/MAINTAINERS delete mode 100644 board/cm41xx/Makefile delete mode 100644 board/cm41xx/cm41xx.c delete mode 100644 board/cm41xx/config.mk delete mode 100644 board/cm41xx/flash.c delete mode 100644 configs/cm4008_defconfig delete mode 100644 configs/cm41xx_defconfig delete mode 100644 drivers/net/ks8695eth.c delete mode 100644 drivers/serial/serial_ks8695.c delete mode 100644 include/configs/cm4008.h delete mode 100644 include/configs/cm41xx.h diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 74dd164..d6bb5c3 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -97,14 +97,6 @@ config TARGET_SCB9328 bool Support scb9328 select CPU_ARM920T -config TARGET_CM4008 - bool Support cm4008 - select CPU_ARM920T - -config TARGET_CM41XX - bool Support cm41xx - select CPU_ARM920T - config TARGET_VCMA9 bool Support VCMA9 select CPU_ARM920T @@ -871,8 +863,6 @@ source board/calao/sbc35_a9g20/Kconfig source board/calao/tny_a9260/Kconfig source board/calao/usb_a9263/Kconfig source board/cirrus/edb93xx/Kconfig -source board/cm4008/Kconfig -source board/cm41xx/Kconfig source board/compulab/cm_t335/Kconfig source board/compulab/cm_fx6/Kconfig source board/congatec/cgtqmx6eval/Kconfig diff --git a/arch/arm/cpu/arm920t/Makefile b/arch/arm/cpu/arm920t/Makefile index a72e5de..a30a572 100644 --- a/arch/arm/cpu/arm920t/Makefile +++ b/arch/arm/cpu/arm920t/Makefile @@ -14,5 +14,4 @@ obj-$(if $(filter a320,$(SOC)),y) += a320/ obj-$(CONFIG_AT91FAMILY) += at91/ obj-$(CONFIG_EP93XX) += ep93xx/ obj-$(CONFIG_IMX) += imx/ -obj-$(CONFIG_KS8695) += ks8695/ obj-$(CONFIG_S3C24X0) += s3c24x0/ diff --git a/arch/arm/cpu/arm920t/ks8695/Makefile b/arch/arm/cpu/arm920t/ks8695/Makefile deleted file mode 100644 index 400aa89..000 --- a/arch/arm/cpu/arm920t/ks8695/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# -# (C) Copyright 2000-2006 -# Wolfgang Denk, DENX Software Engineering, w...@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y = lowlevel_init.o -obj-y += timer.o diff --git a/arch/arm/cpu/arm920t/ks8695/lowlevel_init.S b/arch/arm/cpu/arm920t/ks8695/lowlevel_init.S deleted file mode 100644 index a2a07f2..000 --- a/arch/arm/cpu/arm920t/ks8695/lowlevel_init.S +++ /dev/null @@ -1,189 +0,0 @@ -/* - * lowlevel_init.S - basic hardware initialization for the KS8695 CPU - * - * Copyright (c) 2004-2005, Greg Ungerer greg.unge...@opengear.com - * - * SPDX-License-Identifier:GPL-2.0+ - */ - -#include
Re: [U-Boot] [PATCH 09/11] ARM: armada100: remove aspenite and gplugd board support
From: Masahiro Yamada yamad...@jp.panasonic.com Sent: Tuesday, February 10, 2015 10:14 AM To: u-boot@lists.denx.de Cc: Tom Rini; Albert Aribaud; Masahiro Yamada; Prafulla Wadaskar; Ajay Bhargav; Roman Byshko; Matthias Fuchs; Marek Vasut; Ivan Khoronzhuk; Jiandong Zheng; Oleksandr Tymoshenko; Jagannadha Sutradharudu Teki; Joe Hershberger; Sergey Kostanbaev; Steve Rae; WingMan Kwok; Siva Durga Prasad Paladugu; Stefan Roese; Michal Simek; Nobuhiro Iwamatsu; Simon Glass; Wolfgang Denk; Ian Campbell; Georges Savoundararadj; Daniel Schwierzeck Subject: [PATCH 09/11] ARM: armada100: remove aspenite and gplugd board support These are still non-generic boards. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Cc: Prafulla Wadaskar prafu...@marvell.com Cc: Ajay Bhargav ajay.bhar...@einfochips.com --- arch/arm/Kconfig | 10 - arch/arm/cpu/arm926ejs/Makefile| 1 - arch/arm/cpu/arm926ejs/armada100/Makefile | 9 - arch/arm/cpu/arm926ejs/armada100/cpu.c | 92 --- arch/arm/cpu/arm926ejs/armada100/dram.c| 116 arch/arm/cpu/arm926ejs/armada100/timer.c | 194 -- arch/arm/include/asm/arch-armada100/armada100.h| 60 -- arch/arm/include/asm/arch-armada100/config.h | 42 -- arch/arm/include/asm/arch-armada100/cpu.h | 162 - arch/arm/include/asm/arch-armada100/gpio.h | 32 - arch/arm/include/asm/arch-armada100/mfp.h | 80 --- arch/arm/include/asm/arch-armada100/spi.h | 79 --- .../include/asm/arch-armada100/utmi-armada100.h| 63 -- board/Marvell/aspenite/Kconfig | 15 - board/Marvell/aspenite/MAINTAINERS | 6 - board/Marvell/aspenite/Makefile| 10 - board/Marvell/aspenite/aspenite.c | 43 -- board/Marvell/gplugd/Kconfig | 15 - board/Marvell/gplugd/MAINTAINERS | 6 - board/Marvell/gplugd/Makefile | 15 - board/Marvell/gplugd/gplugd.c | 130 configs/aspenite_defconfig | 2 - configs/gplugd_defconfig | 2 - doc/README.scrapyard | 2 + drivers/net/Makefile | 1 - drivers/net/armada100_fec.c| 726 - drivers/net/armada100_fec.h| 209 -- drivers/spi/Makefile | 1 - drivers/spi/armada100_spi.c| 203 -- drivers/usb/host/Makefile | 1 - drivers/usb/host/ehci-armada100.c | 48 -- drivers/usb/host/utmi-armada100.c | 80 --- include/configs/aspenite.h | 55 -- include/configs/gplugd.h | 134 include/netdev.h | 1 - 35 files changed, 2 insertions(+), 2643 deletions(-) delete mode 100644 arch/arm/cpu/arm926ejs/armada100/Makefile delete mode 100644 arch/arm/cpu/arm926ejs/armada100/cpu.c delete mode 100644 arch/arm/cpu/arm926ejs/armada100/dram.c delete mode 100644 arch/arm/cpu/arm926ejs/armada100/timer.c delete mode 100644 arch/arm/include/asm/arch-armada100/armada100.h delete mode 100644 arch/arm/include/asm/arch-armada100/config.h delete mode 100644 arch/arm/include/asm/arch-armada100/cpu.h delete mode 100644 arch/arm/include/asm/arch-armada100/gpio.h delete mode 100644 arch/arm/include/asm/arch-armada100/mfp.h delete mode 100644 arch/arm/include/asm/arch-armada100/spi.h delete mode 100644 arch/arm/include/asm/arch-armada100/utmi-armada100.h delete mode 100644 board/Marvell/aspenite/Kconfig delete mode 100644 board/Marvell/aspenite/MAINTAINERS delete mode 100644 board/Marvell/aspenite/Makefile delete mode 100644 board/Marvell/aspenite/aspenite.c delete mode 100644 board/Marvell/gplugd/Kconfig delete mode 100644 board/Marvell/gplugd/MAINTAINERS delete mode 100644 board/Marvell/gplugd/Makefile delete mode 100644 board/Marvell/gplugd/gplugd.c delete mode 100644 configs/aspenite_defconfig delete mode 100644 configs/gplugd_defconfig delete mode 100644 drivers/net/armada100_fec.c delete mode 100644 drivers/net/armada100_fec.h delete mode 100644 drivers/spi/armada100_spi.c delete mode 100644 drivers/usb/host/ehci-armada100.c delete mode 100644 drivers/usb/host/utmi-armada100.c delete mode 100644 include/configs/aspenite.h delete mode 100644 include/configs/gplugd.h Is it late to send patch for these boards? These boards are generic boards but SYS_GENERIC_BOARD config is not enabled for them. Sorry for being late but Can I send patches now to keep this alive? Regards, Ajay Bhargav
[U-Boot] [PATCH] arm: rmobile: r8a7794: Enable SMP mode of Auxiliary Control Register
R8a7794 uses ARM SoC of CA7 base. If we want to use dcache on CA7, we need to enable SMP bit of Auxiliary Control Register. Signed-off-by: Nobuhiro Iwamatsu nobuhiro.iwamatsu...@renesas.com --- arch/arm/cpu/armv7/rmobile/lowlevel_init_ca15.S | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/arch/arm/cpu/armv7/rmobile/lowlevel_init_ca15.S b/arch/arm/cpu/armv7/rmobile/lowlevel_init_ca15.S index d47546a..fc839ea 100644 --- a/arch/arm/cpu/armv7/rmobile/lowlevel_init_ca15.S +++ b/arch/arm/cpu/armv7/rmobile/lowlevel_init_ca15.S @@ -40,7 +40,7 @@ do_lowlevel_init: and r1, r1, #0x7F00 lsrsr1, r1, #8 cmp r1, #0x4C /* 0x4C is ID of r8a7794 */ - beq _exit_init_l2_a15 + beq _enable_actlr_smp /* surpress wfe if ca15 */ tst r4, #4 @@ -64,6 +64,14 @@ do_lowlevel_init: orrne r0, r0, #0x20 /* L2CTLR[5] */ #endif mcrne p15, 1, r0, c9, c0, 2 + + b _exit_init_l2_a15 + +_enable_actlr_smp: /* R8A7794 only (CA7) */ + mrcp15, 0, r0, c1, c0, 1 + orrr0, r0, #0x40 + mcrp15, 0, r0, c1, c0, 1 + _exit_init_l2_a15: ldr r3, =(CONFIG_SYS_INIT_SP_ADDR) sub sp, r3, #4 -- 2.1.3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/2] cmd: Add getenv_long to support reading signed integers from the uboot env
This patch adds a function to read a signed integer from the uboot environment
for the Micrel ksz9031 Phy driver to read postive and negatice skew values
from the uboot environment.
Signed-off-by: Vince Bridgers vbrid...@opensource.altera.com
---
common/cmd_nvedit.c | 22 +-
include/common.h| 1 +
2 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index 855808c..ec23696 100644
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -665,7 +665,27 @@ int getenv_f(const char *name, char *buf, unsigned len)
}
/**
- * Decode the integer value of an environment variable and return it.
+ * Decode the signed integer value of an environment variable and return it.
+ *
+ * @param name Name of environemnt variable
+ * @param base Number base to use (normally 10, or 16 for hex)
+ * @param default_val Default value to return if the variable is not
+ * found
+ * @return the decoded value, or default_val if not found
+ */
+long getenv_long(const char *name, int base, long default_val)
+{
+ /*
+* We can use getenv() here, even before relocation, since the
+* environment variable value is an integer and thus short.
+*/
+ const char *str = getenv(name);
+
+ return str ? simple_strtol(str, NULL, base) : default_val;
+}
+
+/**
+ * Decode the unsigned integer value of an environment variable and return it.
*
* @param name Name of environemnt variable
* @param base Number base to use (normally 10, or 16 for hex)
diff --git a/include/common.h b/include/common.h
index 97c8f79..55a8cb3 100644
--- a/include/common.h
+++ b/include/common.h
@@ -304,6 +304,7 @@ int envmatch (uchar *, int);
char *getenv (const char *);
intgetenv_f (const char *name, char *buf, unsigned len);
ulong getenv_ulong(const char *name, int base, ulong default_val);
+long getenv_long(const char *name, int base, long default_val);
/**
* getenv_hex() - Return an environment variable as a hex value
--
1.9.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request: u-boot-uniphier
On Sat, Feb 07, 2015 at 01:05:23AM +0900, Masahiro YAMADA wrote: Hi Tom, The following changes since commit 7f641d53bbb3a426a3bfb132d8346153e86a9d08: Merge branch 'master' of git://git.denx.de/u-boot-ubi (2015-02-04 13:30:00 -0500) are available in the git repository at: git://git.denx.de/u-boot-uniphier.git master for you to fetch changes up to 4e79908044e4ebf186464cf118497458faf0903c: ARM: UniPhier: leave the last element of boot_device_table empty (2015-02-07 00:15:03 +0900) Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 0/2] Add getenv_long and Micrel ksz9031 skew settings
This patch series first adds the ability to read a signed integer from the UBoot environment, then adds a patch to the Micrel ksz9031 phy driver to program the skew values per settings in the UBoot environment. The strings chosen to use in the UBoot environment are equivalent to those used by the Micrel devicetree settings when that is eventually supported. Vince Bridgers (2): cmd: Add getenv_long to support reading signed integers from the uboot env net: phy: Add ability to program the ksz9031 skew values from the uboot env common/cmd_nvedit.c | 22 +++- drivers/net/phy/micrel.c | 299 ++- include/common.h | 1 + 3 files changed, 320 insertions(+), 2 deletions(-) -- 1.9.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 2/2] net: phy: Add ability to program the ksz9031 skew values from the uboot env
This patch adds the ability for the Micrel ksz9031 PHY driver to detect
skew settings from the UBoot environment and program those values at PHY
initialization time. This is a first step towards setting these values from
the UBoot environment or the Micrel PHY devicetree once supported. The skew
values may be negative or positive, therefore depends on UBoot environment
support to read positive or negative values in units of picoseconds.
Signed-off-by: Vince Bridgers vbrid...@opensource.altera.com
---
drivers/net/phy/micrel.c | 299 ++-
1 file changed, 298 insertions(+), 1 deletion(-)
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
index 1815b29..d8819a8 100644
--- a/drivers/net/phy/micrel.c
+++ b/drivers/net/phy/micrel.c
@@ -211,6 +211,13 @@ static struct phy_driver ksz9021_driver = {
/* PHY Registers */
#define MII_KSZ9031_MMD_ACCES_CTRL 0x0d
#define MII_KSZ9031_MMD_REG_DATA 0x0e
+#define KSZ9031_PS_TO_REG 60
+
+/* Extended registers */
+#define MII_KSZ9031RN_CONTROL_PAD_SKEW 4
+#define MII_KSZ9031RN_RX_DATA_PAD_SKEW 5
+#define MII_KSZ9031RN_TX_DATA_PAD_SKEW 6
+#define MII_KSZ9031RN_CLK_PAD_SKEW 8
/* Accessors to extended registers*/
int ksz9031_phy_extended_write(struct phy_device *phydev,
@@ -256,13 +263,303 @@ static int ksz9031_phy_extwrite(struct phy_device
*phydev, int addr,
MII_KSZ9031_MOD_DATA_POST_INC_RW, val);
};
+u8
+ksz9031_get_rxc_skew(struct phy_device *phydev)
+{
+ u16 reg;
+
+ reg = ksz9031_phy_extended_read(phydev, 2, 8,
+ MII_KSZ9031_MOD_DATA_NO_POST_INC);
+ reg = 0x1f;
+ return (u8)reg;
+}
+
+u8
+ksz9031_get_txc_skew(struct phy_device *phydev)
+{
+ u16 reg;
+
+ reg = ksz9031_phy_extended_read(phydev, 2, 8,
+ MII_KSZ9031_MOD_DATA_NO_POST_INC);
+ reg = reg 5;
+ reg = 0x1f;
+ return (u8)reg;
+}
+
+u8
+ksz9031_get_txen_skew(struct phy_device *phydev)
+{
+ u16 reg;
+
+ reg = ksz9031_phy_extended_read(phydev, 2, 4,
+ MII_KSZ9031_MOD_DATA_NO_POST_INC);
+ reg = 0xf;
+ return (u8)reg;
+}
+
+u8
+ksz9031_get_rxdv_skew(struct phy_device *phydev)
+{
+ u16 reg;
+
+ reg = ksz9031_phy_extended_read(phydev, 2, 4,
+ MII_KSZ9031_MOD_DATA_NO_POST_INC);
+ reg = reg 4;
+ reg = 0xf;
+ return (u8)reg;
+}
+
+u8
+ksz9031_get_rxdx_skew(struct phy_device *phydev, int index)
+{
+ u16 reg;
+
+ reg = ksz9031_phy_extended_read(phydev, 2, 5,
+ MII_KSZ9031_MOD_DATA_NO_POST_INC);
+ reg = reg (index*4);
+ reg = 0xf;
+ return (u8)reg;
+}
+
+u8
+ksz9031_get_txdx_skew(struct phy_device *phydev, int index)
+{
+ u16 reg;
+
+ reg = ksz9031_phy_extended_read(phydev, 2, 6,
+ MII_KSZ9031_MOD_DATA_NO_POST_INC);
+ reg = reg (index*4);
+ reg = 0xf;
+ return (u8)reg;
+}
+
+void
+ksz9031_set_rxc_skew(struct phy_device *phydev, u8 val)
+{
+ u16 reg;
+
+ reg = ksz9031_phy_extended_read(phydev, 2, 8,
+ MII_KSZ9031_MOD_DATA_NO_POST_INC);
+
+ reg = reg 0xffe0;
+ reg |= (u16)val;
+
+ ksz9031_phy_extended_write(phydev, 2, 8,
+ MII_KSZ9031_MOD_DATA_NO_POST_INC, reg);
+}
+
+void
+ksz9031_set_txc_skew(struct phy_device *phydev, u8 val)
+{
+ u16 reg;
+
+ reg = ksz9031_phy_extended_read(phydev, 2, 8,
+ MII_KSZ9031_MOD_DATA_NO_POST_INC);
+ reg = reg 0xfc1f;
+ reg |= ((u16)val) 5;
+
+ ksz9031_phy_extended_write(phydev, 2, 8,
+ MII_KSZ9031_MOD_DATA_NO_POST_INC, reg);
+}
+
+void
+ksz9031_set_txen_skew(struct phy_device *phydev, u8 val)
+{
+ u16 reg;
+
+ reg = ksz9031_phy_extended_read(phydev, 2, 4,
+ MII_KSZ9031_MOD_DATA_NO_POST_INC);
+
+ reg = reg 0xfff0;
+ reg |= ((u16)val);
+ ksz9031_phy_extended_write(phydev, 2, 4,
+ MII_KSZ9031_MOD_DATA_NO_POST_INC, reg);
+}
+
+void
+ksz9031_set_rxdv_skew(struct phy_device *phydev, u8 val)
+{
+ u16 reg;
+
+ reg = ksz9031_phy_extended_read(phydev, 2, 4,
+ MII_KSZ9031_MOD_DATA_NO_POST_INC);
+
+ reg = reg 0xff0f;
+ reg |= ((u16)val) 4;
+ ksz9031_phy_extended_write(phydev, 2, 4,
+ MII_KSZ9031_MOD_DATA_NO_POST_INC, reg);
+}
+
+void
+ksz9031_set_rxdx_skew(struct phy_device *phydev, int index, u8 val)
+{
+ u16 reg;
+ u16 mask;
+
+ mask = ~(0xf (index * 4));
+
+ reg = ksz9031_phy_extended_read(phydev, 2, 5,
+
[U-Boot] [Q] SPL uses uImage load address as entry point
Hi,
I'm doing some work with U-Boot SPL, and noticed the following code in the
spl_parse_image_header function (common/spl/spl.c):
if (image_get_magic(header) == IH_MAGIC) {
if (spl_image.flags SPL_COPY_PAYLOAD_ONLY) {
...
} else {
spl_image.entry_point = image_get_load(header);
/* Load including the header */
spl_image.load_addr = spl_image.entry_point -
header_size;
...
}
Could anyone tell me why SPL uses the load address from the header as the entry
point address, and then calculates the entry point?
Thanks
Phil
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/2] cmd: Add getenv_long to support reading signed integers from the uboot env
On Monday, February 09, 2015 at 03:44:32 PM, Vince Bridgers wrote: This patch adds a function to read a signed integer from the uboot environment for the Micrel ksz9031 Phy driver to read postive and negatice skew values from the uboot environment. Signed-off-by: Vince Bridgers vbrid...@opensource.altera.com Reviewed-by: Marek Vasut ma...@denx.de Best regards, Marek Vasut ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 2/2] net: phy: Add ability to program the ksz9031 skew values from the uboot env
On Monday, February 09, 2015 at 03:44:33 PM, Vince Bridgers wrote: This patch adds the ability for the Micrel ksz9031 PHY driver to detect skew settings from the UBoot environment and program those values at PHY initialization time. This is a first step towards setting these values from the UBoot environment or the Micrel PHY devicetree once supported. The skew values may be negative or positive, therefore depends on UBoot environment support to read positive or negative values in units of picoseconds. Signed-off-by: Vince Bridgers vbrid...@opensource.altera.com Hi! We already do this kind of a programming in board/altera/socfpga/socfpga.c in board_phy_config(), don't we ? Also, see [1], once I apply this, the DT support (not DM) for SoCFPGA will become mandatory. Won't it make more sense to pull these values from the DT instead of poluting the board environment with those please ? Thanks! [1] http://git.denx.de/?p=u-boot/u-boot- socfpga.git;a=shortlog;h=refs/heads/topic/vip-arriav Best regards, Marek Vasut ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V2 06/10] arm: socfpga: Zap checkboard()
On Wednesday, February 04, 2015 at 02:39:52 PM, Pavel Machek wrote: On Fri 2015-01-30 23:08:46, Marek Vasut wrote: Since all boards now have a DT, instead of hard-coding the board name into the U-Boot binary, read the board name from DT model property. Signed-off-by: Marek Vasut ma...@denx.de Cc: Chin Liang See cl...@opensource.altera.com Cc: Dinh Nguyen dingu...@opensource.altera.com Acked-by: Pavel Machek pa...@denx.de Thanks Best regards, Marek Vasut ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V2 08/10] arm: socfpga: Add Altera Arria V DK support
On Monday, February 02, 2015 at 08:47:52 AM, Stefan Roese wrote: On 30.01.2015 23:08, Marek Vasut wrote: Add support for the Altera Arria V development kit. Signed-off-by: Marek Vasut ma...@denx.de Cc: Chin Liang See cl...@opensource.altera.com Cc: Dinh Nguyen dingu...@opensource.altera.com Cc: Pavel Machek pa...@denx.de Cc: Stefan Roese s...@denx.de Cc: Vince Bridgers vbrid...@opensource.altera.com --- [...] +/* The rest of the configuration is shared */ +#include configs/socfpga_common.h + +#endif /* __CONFIG_SOCFPGA_ARRIA5_H__ */ Without really diff'ing this file with socfpga_cyclone5.h, I'm pretty sure that they share many lines. Wouldn't it make sense to move those common defines / configs to a common file instead (socfpga_common.h)? Hi! I agree they share a lot, but I would not recommend moving any of this into socfpga_common.h . Not all boards which include socfpga_common.h will want all that's common between socfpga_cyclone5.h and socfpga_arria5.h as well. We need to switch to DM really soon, since without DM, we cannot really make any common configuration. The socfpga_cyclone5.h file in fact represents a configuration for SoCDK with Cyclone 5, same for Arria 5. Unless you have any suggestion, I'd just apply this stuff as is for now with the note that these config files must be cleaned up once DM is in place. Or do you have any suggestions please ? Best regards, Marek Vasut ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Please pull u-boot-arc master
On Mon, Feb 09, 2015 at 01:46:39PM +, Alexey Brodkin wrote:
On Thu, 2015-01-15 at 23:39 +0300, Alexey Brodkin wrote:
Dear Tom,
The following changes since commit
28c4dae114c9b94b2ad81d4da716e9fc2cba:
Merge branch 'next' of git://git.denx.de/u-boot-video (2015-01-14
16:26:15 -0500)
are available in the git repository at:
git://git.denx.de/u-boot-arc.git
for you to fetch changes up to fdff23702a361e89a15333231af4d00d6e2a:
arc: rename arc700 in arcv1 (2015-01-15 22:40:50 +0300)
Alexey Brodkin (6):
arc: add dependences on MMU presence
arc: relocate - minor refactoring and clean-up
arc: move linker script in arch/arc/cpu folder
arc: move common sources in library
board/synopsys: remove selection of CPU from the board
arc: rename arc700 in arcv1
Igor Guryanov (4):
arc: check caches existence before use
arc: add ECR (exception cause register) output
arc: interrupts - fix mask setup
arc: introduce separate section for interrupt vector table
arch/arc/Kconfig | 3 +++
arch/arc/Makefile | 2 --
arch/arc/config.mk| 4
arch/arc/cpu/arc700/Makefile | 13
arch/arc/cpu/arcv1/Makefile | 7 +++
arch/arc/cpu/{arc700 = arcv1}/config.mk | 0
arch/arc/cpu/{arc700 = arcv1}/start.S| 77
-
arch/arc/cpu/{arc700 = }/u-boot.lds | 15 +-
arch/arc/include/asm/arcregs.h| 2 ++
arch/arc/include/asm/sections.h | 3 +++
arch/arc/lib/Makefile | 6 ++
arch/arc/{cpu/arc700 = lib}/cache.c | 29
++
arch/arc/{cpu/arc700 = lib}/cpu.c| 0
arch/arc/{cpu/arc700 = lib}/interrupts.c | 3 ++-
arch/arc/lib/relocate.c | 19 ++---
arch/arc/{cpu/arc700 = lib}/reset.c | 0
arch/arc/lib/sections.c | 2 ++
arch/arc/{cpu/arc700 = lib}/timer.c | 0
board/synopsys/Kconfig| 6 --
board/synopsys/axs101/Kconfig | 3 ---
20 files changed, 123 insertions(+), 71 deletions(-)
delete mode 100644 arch/arc/cpu/arc700/Makefile
create mode 100644 arch/arc/cpu/arcv1/Makefile
rename arch/arc/cpu/{arc700 = arcv1}/config.mk (100%)
rename arch/arc/cpu/{arc700 = arcv1}/start.S (87%)
rename arch/arc/cpu/{arc700 = }/u-boot.lds (88%)
rename arch/arc/{cpu/arc700 = lib}/cache.c (79%)
rename arch/arc/{cpu/arc700 = lib}/cpu.c (100%)
rename arch/arc/{cpu/arc700 = lib}/interrupts.c (97%)
rename arch/arc/{cpu/arc700 = lib}/reset.c (100%)
rename arch/arc/{cpu/arc700 = lib}/timer.c (100%)
Applied to u-boot/master, thanks!
--
Tom
signature.asc
Description: Digital signature
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [GIT PULL] microblaze changes
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 02/09/2015 09:28 AM, Michal Simek wrote: Hi Tom, please consider to add these microblaze changes to your tree. It is moving Microblaze to use generic board support. I have also added one patch from Andreas which is the part avr32 series because it is also needed for Microblaze. The first patch in this series (Move drram_init()) was asked by Simon and it was also reviewed by him. Thanks, Michal The following changes since commit 7f641d53bbb3a426a3bfb132d8346153e86a9d08: Merge branch 'master' of git://git.denx.de/u-boot-ubi (2015-02-04 13:30:00 -0500) are available in the git repository at: git://www.denx.de/git/u-boot-microblaze.git microblaze for you to fetch changes up to 7f33899221e4235900760add69ffbb5f66f1229d: microblaze: spl: Add LISTS to linker script (2015-02-09 15:13:12 +0100) Andreas Bießmann (1): common/board_r: manual relocation for cmd table Michal Simek (19): common: Move dram_init() declaration to common location microblaze: Fix stack usage in interrupt handler microblaze: Show return address from exception microblaze: Fix coding style in exception.c microblaze: Remove DEBUG_INT macro and use debug() instead microblaze: Fix coding style microblaze: Add debug message about enabling interrupts microblaze: Remove unneeded data section adding from DTB microblaze: Use standard interrupt_init() function microblaze: Remove unused asm label microblaze: Fix gd_t address which is placed at the end of BRAM microblaze: Enable SPL_NOR support when FLASH_BASE is setup microblaze: Move architecture to use generic board init microblaze: Speedup code copy bdinfo: Show information about fdt blob via bdinfo microblaze: Do not use CONFIG_SYS_GENERIC_GLOBAL_DATA microblaze: Add support for CONFIG_SYS_MALLOC_F_LEN microblaze: spl: Do not call mem_malloc_init and use early alloc microblaze: spl: Add LISTS to linker script arch/arm/include/asm/u-boot-arm.h| 1 - arch/microblaze/config.mk| 5 ++ arch/microblaze/cpu/exception.c | 35 +++--- arch/microblaze/cpu/interrupts.c | 76 ++--- arch/microblaze/cpu/irq.S| 121 +++--- arch/microblaze/cpu/spl.c| 2 - arch/microblaze/cpu/start.S | 126 +++- arch/microblaze/cpu/u-boot-spl.lds | 6 +++ arch/microblaze/cpu/u-boot.lds | 12 +++-- arch/microblaze/include/asm/asm.h| 4 ++ arch/microblaze/include/asm/config.h | 7 +++ arch/microblaze/include/asm/microblaze_intc.h| 2 - arch/microblaze/include/asm/u-boot.h | 11 + arch/microblaze/lib/Makefile | 1 - arch/microblaze/lib/board.c | 201 - arch/nds32/include/asm/u-boot-nds32.h| 1 - arch/sandbox/include/asm/u-boot-sandbox.h| 1 - arch/x86/include/asm/u-boot-x86.h| 6 --- board/xilinx/microblaze-generic/microblaze-generic.c | 46 ++ common/board_f.c | 4 +- common/board_r.c | 14 +- common/cmd_bdinfo.c | 16 ++- include/common.h | 1 + include/configs/microblaze-generic.h | 101 ++- 24 files changed, 371 insertions(+), 429 deletions(-) delete mode 100644 arch/microblaze/lib/board.c [u-boot]$ ./tools/buildman/buildman -b microblaze microblaze -sSed boards.cfg is up to date. Nothing to do. Summary of 21 commits for 1 boards (1 thread, 8 jobs per thread) 01: Merge branch 'master' of git://git.denx.de/u-boot-ubi microblaze: + microblaze-generic w+../common/spl/spl_nor.c: In function 'spl_nor_load_image': w+../common/spl/spl_nor.c:26:10: warning: assignment discards 'const' qualifier from pointer target type [enabled by default] 02: common: Move dram_init() declaration to common location 03: common/board_r: manual relocation for cmd table 04: microblaze: Fix stack usage in interrupt handler 05: microblaze: Show return address from exception microblaze: (for 1/1 boards) all +44.0 bss -16.0 rodata +36.0 text +24.0 microblaze-generic: all +44 bss -16 rodata +36 text +24 06: microblaze: Fix coding style in exception.c 07: microblaze: Remove DEBUG_INT
Re: [U-Boot] [PATCH] kwbimage: Make the Makefile pass in CONFIG_SYS_SPI_U_BOOT_OFFS
On Mon, Feb 09, 2015 at 10:17:14AM -0500, Tom Rini wrote: We can't use config.h directly as some platforms include headers that aren't safe to use in normal Linux userland. Signed-off-by: Tom Rini tr...@ti.com Applied to u-boot/master (testing of this is what held up the other PRs), thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Please pull u-boot-marvell master
On Fri, Feb 06, 2015 at 04:35:54PM +, Luka Perkov wrote: Hi Tom, this series contains the last bits of pending kirkwood/mvebu patches that I'm aware of. The changes from Gerald are minimal and I've merged Stefan's series which have reached v3 on the list. The following changes since commit 7f641d53bbb3a426a3bfb132d8346153e86a9d08: Merge branch 'master' of git://git.denx.de/u-boot-ubi (2015-02-04 13:30:00 -0500) are available in the git repository at: git://git.denx.de/u-boot-marvell.git for you to fetch changes up to 68102b81e8fb699087ec5757a75676c6c65af3fd: arm: mvebu: maxbcm: Fix compilation warning and add Spansion SPI NOR support (2015-02-06 17:25:08 +0100) Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [RFC PATCH 1/7] dm: usb: Add a uclass for USB controllers
On Friday, January 30, 2015 at 08:04:51 PM, Simon Glass wrote:
Add a uclass that can represent a USB controller. For now we do not create
devices for things attached to the controller.
Signed-off-by: Simon Glass s...@chromium.org
[...]
+UCLASS_DRIVER(usb) = {
+ .id = UCLASS_USB,
+ .name = usb,
+ .flags = DM_UC_FLAG_SEQ_ALIAS,
+/*
+ .child_pre_probe = usb_child_pre_probe,
+ .post_probe = i2c_post_probe,
Certainly this is USB, right ? ;-)
+*/
What's the reason for this commented-out stuff please ?
+ .per_device_auto_alloc_size = sizeof(struct dm_usb_info),
+/*
+ .per_child_auto_alloc_size = sizeof(struct usb_device),
+ .per_child_platdata_auto_alloc_size = sizeof(struct dm_i2c_chip),
+ .child_post_bind = i2c_child_post_bind,
+*/
+};
diff --git a/include/dm/uclass-id.h b/include/dm/uclass-id.h
index 91bb90d..baab810 100644
--- a/include/dm/uclass-id.h
+++ b/include/dm/uclass-id.h
@@ -34,6 +34,7 @@ enum uclass_id {
UCLASS_I2C_GENERIC, /* Generic I2C device */
UCLASS_I2C_EEPROM, /* I2C EEPROM device */
UCLASS_MOD_EXP, /* RSA Mod Exp device */
+ UCLASS_USB, /* USB bus */
UCLASS_COUNT,
UCLASS_INVALID = -1,
Best regards,
Marek Vasut
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [RFC PATCH 0/7] RFC: dm: Add USB support
On Friday, January 30, 2015 at 11:41:33 PM, Simon Glass wrote: Hi Marek, Hi! On 30 January 2015 at 15:16, Marek Vasut ma...@denx.de wrote: On Friday, January 30, 2015 at 08:04:50 PM, Simon Glass wrote: This series adds basic driver model support to USB. The intent is to permit the various subsystems (OHCI, EHCI, XHCI) to co-exist and allow any number of USB ports of different types. So far the absolute limit on the number of USB devices is only slightly relaxed. Only USB controllers have a real driver model device. USB devices (including the hub in the controller) are not modelled as driver model devices. This is for two reasons: - it is easier since we don't need to bind a whole lot of devices when scanning - the two main USB devices (block devices and Ethernet) don't have driver mode support yet anyway, so it would be pointless. However the recent network RFC has encouraged me to send this. The basic approach is to set up the driver model structures in parallel to what already exists rather than to replace them. This allows both driver model and legacy to be used for USB, although not with the same board. So far only XHCI is supported. As an example the Exynos XHCI driver is converted to driver model. I would appreciate comments before going further. Caveats: - sandbox code is incomplete and there are no tests - 'usb stop' does not remove existing devices (I have not yet settled on the best approach) - the usb.h changes need to be split correctly into the patches once they are final This series is available at u-boot-dm/usb-working. Hi! I'll look at this by the end of next week, I will be free by then. It's not possible for me to do it earlier, sorry. Does this still work for you please? Definitely, that sounds good. I was planning to leave it a week or two anyway, although I might fiddle more with the sandbox side in the meantime. I skimmed through the series finally, it looks mostly good for but a few minor coding style things. I would prefer if this went in for the next MW, what do you think please ? Best regards, Marek Vasut ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2] imx6: Added DEK blob generator command
From: Raul Cardenas ulises.carde...@freescale.com
Freescale's SEC block has built-in Data Encryption
Key(DEK) Blob Protocol which provides a method for
protecting a DEK for non-secure memory storage.
SEC block protects data in a data structure called
a Secret Key Blob, which provides both confidentiality
and integrity protection.
Every time the blob encapsulation is executed,
a SHA-256 key is randomly generated to encrypt the DEK.
This key is itself encrypted with the OTP Secret key
from SoC. The ending blob consists of the encrypted
SHA-256 key, the encrypted DEK, and a 16-bit MAC.
During decapsulation, the reverse process is performed
to get back the original DEK. A caveat to the blob
decapsulation process, is that the DEK is decrypted
in secure-memory and can only be read by FSL SEC HW.
The DEK is used to decrypt data during encrypted boot.
Commands added
--
dek_blob - encapsulating DEK as a cryptgraphic blob
Commands Syntax
---
dek_blob src dst len
Encapsulate and create blob of a len-bits DEK at
address src and store the result at address dst.
Signed-off-by: Raul Cardenas ulises.carde...@freescale.com
Signed-off-by: Nitin Garg nitin.g...@freescale.com
---
Changes in v2:
-Remove weak symbol as recommended by Ruchika
arch/arm/imx-common/Makefile |1 +
arch/arm/imx-common/cmd_dek.c| 89 +++
arch/arm/imx-common/timer.c | 17
arch/arm/include/asm/arch-mx6/imx-regs.h |4 +
doc/README.mxc_hab | 48 ++
drivers/crypto/fsl/Makefile |2 +-
drivers/crypto/fsl/desc.h| 15
drivers/crypto/fsl/fsl_blob.c| 50 +++
drivers/crypto/fsl/jobdesc.c | 142 +-
drivers/crypto/fsl/jobdesc.h |5 ++
drivers/crypto/fsl/jr.c | 24 -
include/fsl_sec.h| 60 +
12 files changed, 451 insertions(+), 6 deletions(-)
create mode 100644 arch/arm/imx-common/cmd_dek.c
diff --git a/arch/arm/imx-common/Makefile b/arch/arm/imx-common/Makefile
index 25a9d4c..606482f 100644
--- a/arch/arm/imx-common/Makefile
+++ b/arch/arm/imx-common/Makefile
@@ -24,6 +24,7 @@ obj-$(CONFIG_IMX_VIDEO_SKIP) += video.o
endif
obj-$(CONFIG_CMD_BMODE) += cmd_bmode.o
obj-$(CONFIG_CMD_HDMIDETECT) += cmd_hdmidet.o
+obj-$(CONFIG_CMD_DEKBLOB) += cmd_dek.o
quiet_cmd_cpp_cfg = CFGS$@
cmd_cpp_cfg = $(CPP) $(cpp_flags) -x c -o $@ $
diff --git a/arch/arm/imx-common/cmd_dek.c b/arch/arm/imx-common/cmd_dek.c
new file mode 100644
index 000..1a3a996a
--- /dev/null
+++ b/arch/arm/imx-common/cmd_dek.c
@@ -0,0 +1,89 @@
+/*
+ * Command for encapsulating DEK blob
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#include common.h
+#include command.h
+#include environment.h
+#include malloc.h
+#include asm/byteorder.h
+#include linux/compiler.h
+#include fsl_sec.h
+#include asm/arch/clock.h
+
+DECLARE_GLOBAL_DATA_PTR;
+
+/**
+* blob_dek() - Encapsulate the DEK as a blob using CAM's Key
+* @src: - Address of data to be encapsulated
+* @dst: - Address of data to be encapsulated
+* @len: - Size of data to be encapsulated
+*
+* Returns zero on success,and negative on error.
+*/
+static int blob_encap_dek(u8 *src, u8 *dst, u32 len)
+{
+ int ret = 0;
+ u32 jr_size = 4;
+
+ u32 out_jr_size = sec_in32(CONFIG_SYS_FSL_JR0_ADDR + 0x102c);
+ if (out_jr_size != jr_size) {
+ hab_caam_clock_enable(1);
+ sec_init();
+ }
+
+ if (!((len == 128)|(len == 192)|(len == 256))) {
+ debug(Invalid DEK size. Valid sizes are 128, 192 and 256b\n);
+ return -1;
+ }
+
+ len /= 8;
+ ret = blob_dek(src, dst, len);
+
+ return ret;
+}
+
+/**
+ * do_dek_blob() - Handle the dek_blob command-line command
+ * @cmdtp: Command data struct pointer
+ * @flag: Command flag
+ * @argc: Command-line argument count
+ * @argv: Array of command-line arguments
+ *
+ * Returns zero on success, CMD_RET_USAGE in case of misuse and negative
+ * on error.
+ */
+static int do_dek_blob(cmd_tbl_t *cmdtp, int flag, int argc, char *const
argv[])
+{
+ uint32_t src_addr, dst_addr, len;
+ uint8_t *src_ptr, *dst_ptr;
+ int ret = 0;
+
+ if (argc != 4)
+ return CMD_RET_USAGE;
+
+ src_addr = simple_strtoul(argv[1], NULL, 16);
+ dst_addr = simple_strtoul(argv[2], NULL, 16);
+ len = simple_strtoul(argv[3], NULL, 10);
+
+ src_ptr = (uint8_t *)src_addr;
+ dst_ptr = (uint8_t *)dst_addr;
+
+ ret = blob_encap_dek(src_ptr, dst_ptr, len);
+
+ return ret;
+}
+
+/***/
+static char dek_blob_help_text[] =
+ src dst len- Encapsulate and create blob of data\n
+$len bits long at address $src and\n
+
Re: [U-Boot] [PATCH] ARMv8: Bug fix of dcache_disable()
On Mon, Feb 09, 2015 at 08:51:59AM +, feng...@phytium.com.cn wrote: From: David Feng feng...@phytium.com.cn The cache disable operation shoud be performed after flush_dcache_all(). If cache disable operation is performed before flush_dcache_all(), flush_dcache_all() store data directly to memory and may be overrided by data copy in cache. The reasoning above (and hence this patch) is wrong. While the caches are on, they can allocate lines for any portion of the address space with cacheable attributes, and can acquire dirty cache lines from other CPUs. Additionally, there is no restriction preventing lines from migrating between levels of cache while they are active. So calling flush_dcache_all (which performs maintenance by Set/Way) while the caches are enabled is wrong. Per the architecture it provides no guarantee whatsoever. To empty the caches by Set/Way, they must first be disabled. Note that this only guarantees that the caches are empty; not where the data went. Other CPUs might acquire dirty lines, or the data might only reach a system cache rather than memory. If you need certain portions of data to be flushed out to memory, then those must be flushed by VA. If flush_dcache_all performs any memory accesses before it has completed Set/Way maintenance, it is buggy. Thanks, Mark. Signed-off-by: David Feng feng...@phytium.com.cn --- arch/arm/cpu/armv8/cache_v8.c |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/cpu/armv8/cache_v8.c b/arch/arm/cpu/armv8/cache_v8.c index 9dbcdf2..dc2fc8c 100644 --- a/arch/arm/cpu/armv8/cache_v8.c +++ b/arch/arm/cpu/armv8/cache_v8.c @@ -124,9 +124,10 @@ void dcache_disable(void) if (!(sctlr CR_C)) return; + flush_dcache_all(); + set_sctlr(sctlr ~(CR_C|CR_M)); - flush_dcache_all(); __asm_invalidate_tlb_all(); } -- 1.7.9.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v1 0/4] Jetson-TK1 support for PSCI
[...] The solution that was discussed internally would involve having the secure monitor (U-Boot's PSCI implementation in this case) program the flow controller appropriately, point the CPU reset vectors to a location containing a WFI instruction and power up the CPUs. That way they should immediately be powergated when they reach the WFI instruction and the PSCI implementation would then be able to wake them up without accessing the PMC registers once the kernel has booted. That sounds far, far better than I had hoped! I guess we need to tell the kernel that portions of the PMC are reserved by FW (in the sense that they must not be modified by the kernel rather than that FW is going to poke them), to avoid mishaps. I'm not sure we need even that. As I understand it the kernel can still touch all the registers and none of it should influence the CPU power- gating done by the secure monitor. Well, I guess you'd need to make sure that the PMC driver doesn't try to powergate or unpowergate the CPU partitions, but since the cpuidle driver is the only one doing that it should resolve itself if a generic, PSCI-based cpuidle driver takes over instead of a Tegra-specific one. This was my concern. It would be good to avoid a case where we accidentally rely on some subtle interactiion where both the FW and kernel poke some registers in a particular way. I guess we can check for the presence of an enable-method, and if there is one don't register the Tegra-specific cpuidle driver; in that case we expect the FW to own that side of things. Adding Peter. Please correct me if I misunderstood what we discussed. Can you also provide Ian with pointers to the registers that need to be programmed to make this work? I suspect that a lot of it can be gleaned from the cpuidle drivers in arch/arm/mach-tegra in the upstream Linux kernel. Also adding Paul for visibility. One thing to bear in mind is that PSCI is only one user of the SMC space. Per SMC calling convention, portions of the SMC ID space are there to be used for other (vendor-specific) purposes. So rather than extending PSCI, a parallel API could be implemented for power control of other devices, and the backend could arbitrate the two without the non-secure OS requiring implementation-specific mutual exclusion. I think this has been brought up internally previously; I'll go and poke around in the area to see if we managed to figure out anything useful. Unfortunately this doesn't change on 64-bit Tegra at all. I suspected as much. :/ How does this bode for the tegra132 dts [1] on LAKML at the moment? Is it just the nvidia,tegra132-pmc device that needs to be poked by both FW and kernel, or are other devices involved? As I understand it, only the flow controller is involved with CPU power management once the above steps have been performed by the secure monitor. And I don't think anyone in the kernel would need access to the flow controller at that point either, so I think that problem resolved itself nicely. Also note that the above should work as far back as Tegra30. It would be amazing if we could gain PSCI for all the platforms that covers! It should be relatively easy to support at least Tegra114 with much the same code as Tegra124, and some slight changes on Tegra30. But yeah, it would be great to see this work. Nice! I should look into getting hold of a relevant platform; I only have a (T20) AC100, and I guess that's a bit different at the system-level. Thanks, Mark. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] imx6: Added DEK blob generator command
Hi Ulises,
-Original Message-
From: ulises.carde...@freescale.com [mailto:ulises.carde...@freescale.com]
Sent: Thursday, February 05, 2015 2:38 AM
To: Gupta Ruchika-R66431
Cc: u-boot@lists.denx.de; Estevam Fabio-R49496; sba...@denx.de; Ulises
Cardenas Casas; Garg Nitin-B37173
Subject: [PATCH] imx6: Added DEK blob generator command
From: Raul Cardenas ulises.carde...@freescale.com
Freescale's SEC block has built-in Data Encryption
Key(DEK) Blob Protocol which provides a method for protecting a DEK for non-
secure memory storage.
SEC block protects data in a data structure called a Secret Key Blob, which
provides both confidentiality and integrity protection.
Every time the blob encapsulation is executed, a SHA-256 key is randomly
generated to encrypt the DEK.
This key is itself encrypted with the OTP Secret key from SoC. The ending
blob consists of the encrypted
SHA-256 key, the encrypted DEK, and a 16-bit MAC.
During decapsulation, the reverse process is performed to get back the
original DEK. A caveat to the blob decapsulation process, is that the DEK is
decrypted in secure-memory and can only be read by FSL SEC HW.
The DEK is used to decrypt data during encrypted boot.
Commands added
--
dek_blob - encapsulating DEK as a cryptgraphic blob
Commands Syntax
---
dek_blob src dst len
Encapsulate and create blob of a len-bits DEK at
address src and store the result at address dst.
Signed-off-by: Raul Cardenas ulises.carde...@freescale.com
Signed-off-by: Nitin Garg nitin.g...@freescale.com
---
arch/arm/imx-common/Makefile |1 +
arch/arm/imx-common/cmd_dek.c| 89 +++
arch/arm/imx-common/timer.c | 17
arch/arm/include/asm/arch-mx6/imx-regs.h |4 +
doc/README.mxc_hab | 48 ++
drivers/crypto/fsl/Makefile |2 +-
drivers/crypto/fsl/desc.h| 15
drivers/crypto/fsl/fsl_blob.c| 50 +++
drivers/crypto/fsl/jobdesc.c | 142
+-
drivers/crypto/fsl/jobdesc.h |5 ++
drivers/crypto/fsl/jr.c | 24 -
include/fsl_sec.h| 60 +
12 files changed, 451 insertions(+), 6 deletions(-) create mode 100644
arch/arm/imx-common/cmd_dek.c
diff --git a/arch/arm/imx-common/Makefile b/arch/arm/imx-common/Makefile
index 25a9d4c..606482f 100644
--- a/arch/arm/imx-common/Makefile
+++ b/arch/arm/imx-common/Makefile
@@ -24,6 +24,7 @@ obj-$(CONFIG_IMX_VIDEO_SKIP) += video.o endif
obj-$(CONFIG_CMD_BMODE) += cmd_bmode.o
obj-$(CONFIG_CMD_HDMIDETECT) += cmd_hdmidet.o
+obj-$(CONFIG_CMD_DEKBLOB) += cmd_dek.o
quiet_cmd_cpp_cfg = CFGS$@
cmd_cpp_cfg = $(CPP) $(cpp_flags) -x c -o $@ $ diff --git
a/arch/arm/imx-common/cmd_dek.c b/arch/arm/imx-common/cmd_dek.c new file mode
100644 index 000..e3748d2
--- /dev/null
+++ b/arch/arm/imx-common/cmd_dek.c
@@ -0,0 +1,89 @@
+/*
+ * Command for encapsulating DEK blob
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#include common.h
+#include command.h
+#include environment.h
+#include malloc.h
+#include asm/byteorder.h
+#include linux/compiler.h
+#include fsl_sec.h
+#include asm/arch/clock.h
+
+DECLARE_GLOBAL_DATA_PTR;
+
+/**
+* blob_dek() - Encapsulate the DEK as a blob using CAM's Key
+* @src: - Address of data to be encapsulated
+* @dst: - Address of data to be encapsulated
+* @len: - Size of data to be encapsulated
+*
+* Returns zero on success,and negative on error.
+*/
+__weak int blob_encap_dek(u8 *src, u8 *dst, u32 len) {
This should not be a weak function.
+ int ret = 0;
+ u32 jr_size = 4;
+
+ u32 out_jr_size = sec_in32(CONFIG_SYS_FSL_JR0_ADDR + 0x102c);
+ if (out_jr_size != jr_size) {
+ hab_caam_clock_enable(1);
+ sec_init();
+ }
+
+ if (!((len == 128)|(len == 192)|(len == 256))) {
+ debug(Invalid DEK size. Valid sizes are 128, 192 and 256b\n);
+ return -1;
+ }
+
+ len /= 8;
+ ret = blob_dek(src, dst, len);
+
+ return ret;
+}
+
+/**
+ * do_dek_blob() - Handle the dek_blob command-line command
+ * @cmdtp: Command data struct pointer
+ * @flag: Command flag
+ * @argc: Command-line argument count
+ * @argv: Array of command-line arguments
+ *
+ * Returns zero on success, CMD_RET_USAGE in case of misuse and
+negative
+ * on error.
+ */
+static int do_dek_blob(cmd_tbl_t *cmdtp, int flag, int argc, char
+*const argv[]) {
+ uint32_t src_addr, dst_addr, len;
+ uint8_t *src_ptr, *dst_ptr;
+ int ret = 0;
+
+ if (argc != 4)
+ return CMD_RET_USAGE;
+
+ src_addr = simple_strtoul(argv[1], NULL, 16);
+ dst_addr = simple_strtoul(argv[2], NULL, 16);
+ len = simple_strtoul(argv[3], NULL, 10);
+
+
Re: [U-Boot] [RFC PATCH] dm: Add support for all targets which requires MANUAL_RELOC
Hi Simon, On 02/06/2015 06:45 AM, Simon Glass wrote: On 4 February 2015 at 23:31, Michal Simek michal.si...@xilinx.com wrote: Hi, On 02/05/2015 04:07 AM, Simon Glass wrote: Hi Michal, On 3 February 2015 at 17:40, Simon Glass s...@chromium.org wrote: Hi Michal, On 3 February 2015 at 02:11, Michal Simek michal.si...@xilinx.com wrote: Hi Simon, On 02/03/2015 03:02 AM, Masahiro Yamada wrote: Hi. On Mon, 2 Feb 2015 16:57:15 -0700 Simon Glass s...@chromium.org wrote: Hi Michal, On 2 February 2015 at 08:31, Michal Simek michal.si...@xilinx.com wrote: Targets with CONFIG_NEEDS_MANUAL_RELOC do not use REL/RELA relocation (mostly only GOT) where functions aray are not updated. This patch is fixing function pointers for DM core and serial-uclass to ensure that relocated functions are called. Signed-off-by: Michal Simek michal.si...@xilinx.com --- drivers/core/root.c| 64 ++ drivers/serial/serial-uclass.c | 16 +++ 2 files changed, 80 insertions(+) How long will we have to carry this patch? It seems that if we add any new driver we will have to add more code like this? This patch is unfortunate. Can we discontinue CONFIG_NEEDS_MANUAL_RELOC some day? This patch (or similar one) has to be alive when we have platform which requires CONFIG_NEEDS_MANUAL_RELOC for full u-boot. There is an option to move to REL/RELA but the question is if all platforms have it/support it. Unfortunately I think that it will be in the tree for a long time. If we use SPL, we do not have to relocate code, I think. SPL doesn't have relocation that's why this code is not used there. Maybe I asked this before, but when can we remove CONFIG_NEEDS_MANUAL_RELOC? What platforms need it? Sorry if you answered these questions but can you please resend if so as I missed it. Graeme has answered it + my response here. http://lists.denx.de/pipermail/u-boot/2015-February/203911.html removing: When all platforms are moved to REL/RELA we can remove this manual reloc option. With a heavy heart: Acked-by: Simon Glass s...@chromium.org Are you going to take this patch to your DM tree? Thanks, Michal ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Please pull u-boot-arc master
-Original Message-From: Alexey Brodkin abrod...@synopsys.com
Reply-to: abrod...@synopsys.com
To: Tom Rini tr...@ti.com
Cc: u-boot@lists.denx.de
Subject: Please pull u-boot-arc master
Date: Thu, 15 Jan 2015 23:39:45 +0300
Dear Tom,
The following changes since commit
28c4dae114c9b94b2ad81d4da716e9fc2cba:
Merge branch 'next' of git://git.denx.de/u-boot-video (2015-01-14
16:26:15 -0500)
are available in the git repository at:
git://git.denx.de/u-boot-arc.git
for you to fetch changes up to fdff23702a361e89a15333231af4d00d6e2a:
arc: rename arc700 in arcv1 (2015-01-15 22:40:50 +0300)
Alexey Brodkin (6):
arc: add dependences on MMU presence
arc: relocate - minor refactoring and clean-up
arc: move linker script in arch/arc/cpu folder
arc: move common sources in library
board/synopsys: remove selection of CPU from the board
arc: rename arc700 in arcv1
Igor Guryanov (4):
arc: check caches existence before use
arc: add ECR (exception cause register) output
arc: interrupts - fix mask setup
arc: introduce separate section for interrupt vector table
arch/arc/Kconfig | 3 +++
arch/arc/Makefile | 2 --
arch/arc/config.mk| 4
arch/arc/cpu/arc700/Makefile | 13
arch/arc/cpu/arcv1/Makefile | 7 +++
arch/arc/cpu/{arc700 = arcv1}/config.mk | 0
arch/arc/cpu/{arc700 = arcv1}/start.S| 77
-
arch/arc/cpu/{arc700 = }/u-boot.lds | 15 +-
arch/arc/include/asm/arcregs.h| 2 ++
arch/arc/include/asm/sections.h | 3 +++
arch/arc/lib/Makefile | 6 ++
arch/arc/{cpu/arc700 = lib}/cache.c | 29
++
arch/arc/{cpu/arc700 = lib}/cpu.c| 0
arch/arc/{cpu/arc700 = lib}/interrupts.c | 3 ++-
arch/arc/lib/relocate.c | 19 ++---
arch/arc/{cpu/arc700 = lib}/reset.c | 0
arch/arc/lib/sections.c | 2 ++
arch/arc/{cpu/arc700 = lib}/timer.c | 0
board/synopsys/Kconfig| 6 --
board/synopsys/axs101/Kconfig | 3 ---
20 files changed, 123 insertions(+), 71 deletions(-)
delete mode 100644 arch/arc/cpu/arc700/Makefile
create mode 100644 arch/arc/cpu/arcv1/Makefile
rename arch/arc/cpu/{arc700 = arcv1}/config.mk (100%)
rename arch/arc/cpu/{arc700 = arcv1}/start.S (87%)
rename arch/arc/cpu/{arc700 = }/u-boot.lds (88%)
rename arch/arc/{cpu/arc700 = lib}/cache.c (79%)
rename arch/arc/{cpu/arc700 = lib}/cpu.c (100%)
rename arch/arc/{cpu/arc700 = lib}/interrupts.c (97%)
rename arch/arc/{cpu/arc700 = lib}/reset.c (100%)
rename arch/arc/{cpu/arc700 = lib}/timer.c (100%)
--
Best regards,
Alexey
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH][v3] powerpc/mpc85xx: SECURE BOOT- NAND secure boot target for P3041
Secure Boot Target is added for NAND for P3041.
Changes:
In PowerPC, the core begins execution from address 0xFFFC.
In case of secure boot, this default address maps to Boot ROM.
The Boot ROM code requires that the bootloader(U-boot) must lie
in 0 to 3.5G address space i.e. 0x0 - 0xDFFF.
In case of NAND Secure Boot, CONFIG_SYS_RAMBOOT is enabled and CPC is
configured as SRAM. U-Boot binary will be located on this SRAM at
location 0xBFF4 with entry point as 0xBFFC.
Signed-off-by: Ruchika Gupta ruchika.gu...@freescale.com
Signed-off-by: Aneesh Bansal aneesh.ban...@freescale.com
---
Changes in v3:
- Updated MAINTAINERS file
- In cpu_init_r, TLB for L3 is to be disabled only in case of SECURE_BOOT
and CONFIG_SYS_RAMBOOT
Makefile | 4
arch/powerpc/cpu/mpc85xx/cpu_init.c| 17 +
board/freescale/common/p_corenet/tlb.c | 18 +-
board/freescale/corenet_ds/MAINTAINERS | 5 +
configs/P3041DS_NAND_SECURE_BOOT_defconfig | 4
include/configs/corenet_ds.h | 9 +
6 files changed, 56 insertions(+), 1 deletion(-)
create mode 100644 configs/P3041DS_NAND_SECURE_BOOT_defconfig
diff --git a/Makefile b/Makefile
index 92faed6..4bc83d6 100644
--- a/Makefile
+++ b/Makefile
@@ -714,8 +714,12 @@ ALL-$(CONFIG_ONENAND_U_BOOT) += u-boot-onenand.bin
ifeq ($(CONFIG_SPL_FSL_PBL),y)
ALL-$(CONFIG_RAMBOOT_PBL) += u-boot-with-spl-pbl.bin
else
+ifneq ($(CONFIG_SECURE_BOOT), y)
+# For Secure Boot The Image needs to be signed and Header must also
+# be included. So The image has to be built explicitly
ALL-$(CONFIG_RAMBOOT_PBL) += u-boot.pbl
endif
+endif
ALL-$(CONFIG_SPL) += spl/u-boot-spl.bin
ALL-$(CONFIG_SPL_FRAMEWORK) += u-boot.img
ALL-$(CONFIG_TPL) += tpl/u-boot-tpl.bin
diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c
b/arch/powerpc/cpu/mpc85xx/cpu_init.c
index 4cf8853..ef56cc0 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c
@@ -843,6 +843,23 @@ int cpu_init_r(void)
setup_mp();
#endif
+#if defined(CONFIG_SYS_RAMBOOT) defined(CONFIG_SYS_INIT_L3_ADDR) \
+ defined(CONFIG_SECURE_BOOT)
+ /* Disable the TLB Created for L3 and create the TLB required for
+* PCIE (CONFIG_SYS_PCIE1_MEM_VIRT) which was not created earlier.
+*/
+ int tlb_index;
+ tlb_index = find_tlb_idx((void *)CONFIG_BPTR_VIRT_ADDR, 1);
+ if (tlb_index != -1) {
+ disable_tlb(tlb_index);
+
+ set_tlb(1, CONFIG_SYS_PCIE1_MEM_VIRT,
+ CONFIG_SYS_PCIE1_MEM_PHYS,
+ MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
+ 0, tlb_index, BOOKE_PAGESZ_1G, 1);
+ }
+#endif
+
#ifdef CONFIG_SYS_FSL_ERRATUM_ESDHC13
{
if (SVR_MAJ(svr) 3) {
diff --git a/board/freescale/common/p_corenet/tlb.c
b/board/freescale/common/p_corenet/tlb.c
index 8148e46..1b60cfb 100644
--- a/board/freescale/common/p_corenet/tlb.c
+++ b/board/freescale/common/p_corenet/tlb.c
@@ -42,7 +42,9 @@ struct fsl_e_tlb_entry tlb_table[] = {
/* TLB 1 */
/* *I*** - Covers boot page */
-#if defined(CONFIG_SYS_RAMBOOT) defined(CONFIG_SYS_INIT_L3_ADDR)
+ /* In Case of Secure RAM Boot L3 address is defined at 0xbff0 */
+#if defined(CONFIG_SYS_RAMBOOT) defined(CONFIG_SYS_INIT_L3_ADDR) \
+ !defined(CONFIG_SECURE_BOOT)
/*
* *I*G - L3SRAM. When L3 is used as 1M SRAM, the address of the
* SRAM is at 0xfff0, it covered the 0xf000.
@@ -76,11 +78,25 @@ struct fsl_e_tlb_entry tlb_table[] = {
MAS3_SX|MAS3_SR, MAS2_W|MAS2_G,
0, 2, BOOKE_PAGESZ_256M, 1),
+#if defined(CONFIG_SYS_RAMBOOT) defined(CONFIG_SYS_INIT_L3_ADDR) \
+ defined(CONFIG_SECURE_BOOT)
+ /* In case of Secure Boot, L3 is used as 1M SRAM
+* and the address of the SRAM is at 0xbff0.
+* The PCIE TLB entry conflicts with the above entry.
+* So, the entry for PCIE is not created at this point of time.
+* It will be created later on in cpu_init_r()
+* when U-Boot has relocated to DDR
+*/
+ SET_TLB_ENTRY(1, CONFIG_SYS_INIT_L3_ADDR, CONFIG_SYS_INIT_L3_ADDR,
+ MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
+ 0, 3, BOOKE_PAGESZ_1M, 1),
+#else
/* *I*G* - PCI */
SET_TLB_ENTRY(1, CONFIG_SYS_PCIE1_MEM_VIRT, CONFIG_SYS_PCIE1_MEM_PHYS,
MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
0, 3, BOOKE_PAGESZ_1G, 1),
+#endif
/* *I*G* - PCI */
SET_TLB_ENTRY(1, CONFIG_SYS_PCIE1_MEM_VIRT + 0x4000,
CONFIG_SYS_PCIE1_MEM_PHYS + 0x4000,
diff --git a/board/freescale/corenet_ds/MAINTAINERS
b/board/freescale/corenet_ds/MAINTAINERS
index 745847c..6855446 100644
--- a/board/freescale/corenet_ds/MAINTAINERS
+++ b/board/freescale/corenet_ds/MAINTAINERS
@@ -28,3 +28,8
Re: [U-Boot] [PATCH] mtd: atmel_nand: according to pmecc version to perform 0xff page correction
Hi Scott, On 09.02.15 18:04, Scott Wood wrote: On Mon, 2015-02-02 at 14:08 +0800, Josh Wu wrote: Hi, Scott On 1/16/2015 4:24 PM, Andreas Bießmann wrote: Hi Bo, Josh, On 01/16/2015 07:50 AM, Josh Wu wrote: Hi, Bo On 1/16/2015 1:27 PM, Bo Shen wrote: Hi Josh, On 01/16/2015 11:54 AM, Josh Wu wrote: As the PMECC hardware has different version. In SAMA5D4 chip, the PMECC ip can generate 0xff pmecc ECC value for all 0xff sector. According to this, add PMECC version check, if it's SAMA5D4 then we always let PMECC hardware to correct it. Signed-off-by: Josh Wu josh...@atmel.com except the nitpick. Acked-by: Bo Shen voice.s...@atmel.com Acked-by: Andreas Bießmann andreas.de...@googlemail.com Would you pick this patch into your tree with Bo and Andreas's Acked-by? Thanks. I won't be able to apply anything for at least a week and a half... I'll look at it then if it hasn't been applied yet, but I'm fine with the custodian for the relevant hardware taking it in the meantime. I picked it up already Best regards Andreas Bießmann ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [RFC PATCH] dm: Add support for all targets which requires MANUAL_RELOC
Hi MIchal, On 9 February 2015 at 03:27, Michal Simek michal.si...@xilinx.com wrote: Hi Simon, On 02/06/2015 06:45 AM, Simon Glass wrote: On 4 February 2015 at 23:31, Michal Simek michal.si...@xilinx.com wrote: Hi, On 02/05/2015 04:07 AM, Simon Glass wrote: Hi Michal, On 3 February 2015 at 17:40, Simon Glass s...@chromium.org wrote: Hi Michal, On 3 February 2015 at 02:11, Michal Simek michal.si...@xilinx.com wrote: Hi Simon, On 02/03/2015 03:02 AM, Masahiro Yamada wrote: Hi. On Mon, 2 Feb 2015 16:57:15 -0700 Simon Glass s...@chromium.org wrote: Hi Michal, On 2 February 2015 at 08:31, Michal Simek michal.si...@xilinx.com wrote: Targets with CONFIG_NEEDS_MANUAL_RELOC do not use REL/RELA relocation (mostly only GOT) where functions aray are not updated. This patch is fixing function pointers for DM core and serial-uclass to ensure that relocated functions are called. Signed-off-by: Michal Simek michal.si...@xilinx.com --- drivers/core/root.c| 64 ++ drivers/serial/serial-uclass.c | 16 +++ 2 files changed, 80 insertions(+) How long will we have to carry this patch? It seems that if we add any new driver we will have to add more code like this? This patch is unfortunate. Can we discontinue CONFIG_NEEDS_MANUAL_RELOC some day? This patch (or similar one) has to be alive when we have platform which requires CONFIG_NEEDS_MANUAL_RELOC for full u-boot. There is an option to move to REL/RELA but the question is if all platforms have it/support it. Unfortunately I think that it will be in the tree for a long time. If we use SPL, we do not have to relocate code, I think. SPL doesn't have relocation that's why this code is not used there. Maybe I asked this before, but when can we remove CONFIG_NEEDS_MANUAL_RELOC? What platforms need it? Sorry if you answered these questions but can you please resend if so as I missed it. Graeme has answered it + my response here. http://lists.denx.de/pipermail/u-boot/2015-February/203911.html removing: When all platforms are moved to REL/RELA we can remove this manual reloc option. With a heavy heart: Acked-by: Simon Glass s...@chromium.org Are you going to take this patch to your DM tree? I'm hoping to bring in the Kconfig patches and send a pull request this week, so could do that if it suits. But it is up to you, so let's do whatever makes your life easier. Let me know. Regards, Simon ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH sunxi-tools v2 0/2] Support unified u-boot SPL for SD cards and FEL mode
Hi Siarhei, On 8 February 2015 at 19:37, Siarhei Siamashka siarhei.siamas...@gmail.com wrote: An updated variant of the older patch http://lists.denx.de/pipermail/u-boot/2015-February/204024.html These patches are not for the u-boot code (unless u-boot decides to cannibalize the 'fel' tool later) but still provide a glue layer between the Allwinner BROM code and the u-boot SPL code. And need to play nice with both of them. It's an interesting idea actually - I wonder what people think about putting these tools in the source tree. I suspect it could get a bit out of hand? But it would make it easier to keep things in sync, [snip] Regards, Simon ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 2/2] net: phy: Add ability to program the ksz9031 skew values from the uboot env
Hi Marek! We already do this kind of a programming in board/altera/socfpga/socfpga.c in board_phy_config(), don't we ? Yes, good point. This patch series is a first in some upcoming patches to make this better. The Linux implementation uses devicetree settings to set the skews, so if we were to follow that same model the code in socfpga.c would become deprecated in favor of setting the skews through the phy driver and subsequently removed. That way other users could take advantage of this through devicetree. The other problem with the current implementation is the skew values are part specific - we set the actual register values in the environment when it would be better to use a skewed time value (in +/- picoseconds). Also, see [1], once I apply this, the DT support (not DM) for SoCFPGA will become mandatory. Won't it make more sense to pull these values from the DT instead of poluting the board environment with those please ? I agree it would make more sense to pull these from devicetree - I'm planning on adding that in a future patch. I thought it would be a good idea to pull these values from the environment first, overriding the devicetree (if present in the environment). This approach is helpful during bringup debug since it doesn't require one to change the devicetree to try something quickly. I'm ok with any approach you think would work for the community. I'm ok with whatever the community decides considering my rationale above. All the best! Vince vbrid...@opensource.altera.com ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 17/17] sunxi: Hookup OTG USB controller support
On 9 February 2015 at 04:54, Siarhei Siamashka siarhei.siamas...@gmail.com wrote: On Sat, 31 Jan 2015 04:54:47 +0200 Siarhei Siamashka siarhei.siamas...@gmail.com wrote: On Sun, 11 Jan 2015 20:34:55 +0100 Hans de Goede hdego...@redhat.com wrote: Hookup OTG USB controller support and enable the otg controller + USB-keyb on various tablets. This allows tablet owners to interact with u-boot without needing to solder a serial console onto their tablet PCB. Thanks. Works great on my Primo73 and Primo81 tablets. However I have just one naive question before happily taking it into use by default. Is the hardcoded otg host mode (without checking the id pin) always safe? For example, what happens if somebody connects a charger instead of a usb keyboard to the tablet? So, does anyone have any idea if it is theoretically safe to have two USB hosts connected to each other and both driving VBUS at +5V? A somewhat realistic scenario is booting an Allwinner tablet over USB using the FEL mode. Is it a good idea for such tablet to have CONFIG_USB_MUSB_SUNXI=y and CONFIG_USB0_VBUS_PIN=axp_drivebus in defconfig? From my past experiments with some non-standard-compliant cables which allow connecting a tablet with a PC without telling the tablet to go OTG mode it seems the tablet battery is drained really quick in this case. There is a protocol for telling the tablet not to power the bus (or telling the PC not to power it for that matter) but both sides have to support matching part of the protocol. Either way, ideal case is that tablet gets power form PC or powered hub even in host mode which is not standards-compliant and obviously does not work with stuff like keyboards. However, it should be possible to detect that there is bus power at the moment a device is connected and not power the device in that case regardless of usb mode negotiated after the connection. Thanks Michal ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2 3/3] sunxi: Normalise FEL support
Hi Siarhei,
On 7 February 2015 at 20:48, Siarhei Siamashka
siarhei.siamas...@gmail.com wrote:
On Sat, 7 Feb 2015 10:47:30 -0700
Simon Glass s...@chromium.org wrote:
Make sunxi's FEL code fit with the normal U-Boot boot sequence instead of
creating its own. There are some #ifdefs required in start.S. Future work
will hopefully remove these.
This series is available at u-boot-dm, branch sunxi-working.
Signed-off-by: Simon Glass s...@chromium.org
---
Changes in v2:
- Adjust for new save_boot_params() API
- Drop patch to change r0 to r2 in start.S
- Add #ifdefs to start.S to deal with FEL
- Use 'Fast Early Loader' as the full name for FEL
Thanks for working on these patches. It looks like we are finally
getting really close to resolving the sunxi FEL boot problem.
Some comments are below.
arch/arm/cpu/armv7/start.S | 5 +-
arch/arm/cpu/armv7/sunxi/Makefile | 4 +-
arch/arm/cpu/armv7/sunxi/board.c| 21
arch/arm/cpu/armv7/sunxi/config.mk | 2 -
arch/arm/cpu/armv7/sunxi/fel_utils.S| 25 +
arch/arm/cpu/armv7/sunxi/u-boot-spl-fel.lds | 82
-
arch/arm/include/asm/arch-sunxi/sys_proto.h | 10
board/sunxi/Kconfig | 10
include/configs/sunxi-common.h | 6 +--
scripts/Makefile.spl| 2 -
10 files changed, 73 insertions(+), 94 deletions(-)
create mode 100644 arch/arm/cpu/armv7/sunxi/fel_utils.S
delete mode 100644 arch/arm/cpu/armv7/sunxi/u-boot-spl-fel.lds
diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S
index 9b49ece..098a83a 100644
--- a/arch/arm/cpu/armv7/start.S
+++ b/arch/arm/cpu/armv7/start.S
@@ -54,7 +54,8 @@ save_boot_params_ret:
* (OMAP4 spl TEXT_BASE is not 32 byte aligned.
* Continue to use ROM code vector only in OMAP4 spl)
*/
-#if !(defined(CONFIG_OMAP44XX) defined(CONFIG_SPL_BUILD))
+#if !(defined(CONFIG_OMAP44XX) defined(CONFIG_SPL_BUILD)) \
+ !defined(CONFIG_SPL_FEL)
Maybe we can just update the 'save_boot_params' function to save the
important configuration registers and then undo this configuration
in 'return_to_fel'? This allows us to avoid the sunxi specific ifdefs
in the core ARM code.
In this particular case, restoring VBAR and CPSR is important because
the BROM code uses an IRQ handler for FEL (presumably USB related).
And we want to ensure that this IRQ handler works properly again
after resuming the FEL code.
We could indeed.
It would avoid the #ifdef but my understanding is that you might be
able to avoid having to 'return' to the BROM through another means. In
any case we could perhaps leave that change until the next release?
/* Set V=0 in CP15 SCTLR register - for VBAR to point to vector */
mrc p15, 0, r0, c1, c0, 0 @ Read CP15 SCTLR Register
bic r0, #CR_V @ V = 0
@@ -67,7 +68,9 @@ save_boot_params_ret:
/* the mask ROM code should have PLL and others stable */
#ifndef CONFIG_SKIP_LOWLEVEL_INIT
+#ifndef CONFIG_SPL_FEL
Same here.
bl cpu_init_cp15
+#endif
bl cpu_init_crit
#endif
diff --git a/arch/arm/cpu/armv7/sunxi/Makefile
b/arch/arm/cpu/armv7/sunxi/Makefile
index 48db744..c1b975a 100644
--- a/arch/arm/cpu/armv7/sunxi/Makefile
+++ b/arch/arm/cpu/armv7/sunxi/Makefile
@@ -38,7 +38,5 @@ obj-$(CONFIG_MACH_SUN5I)+= dram_sun4i.o
obj-$(CONFIG_MACH_SUN6I) += dram_sun6i.o
obj-$(CONFIG_MACH_SUN7I) += dram_sun4i.o
obj-$(CONFIG_MACH_SUN8I) += dram_sun8i.o
-ifdef CONFIG_SPL_FEL
-obj-y+= start.o
-endif
+obj-y+= fel_utils.o
endif
diff --git a/arch/arm/cpu/armv7/sunxi/board.c
b/arch/arm/cpu/armv7/sunxi/board.c
index 6e28bcd..b7492ac 100644
--- a/arch/arm/cpu/armv7/sunxi/board.c
+++ b/arch/arm/cpu/armv7/sunxi/board.c
@@ -27,6 +27,13 @@
#include linux/compiler.h
+struct fel_stash {
+ uint32_t sp;
+ uint32_t lr;
+};
struct fel_stash {
uint32_t sp;
uint32_t lr;
uint32_t cpsr;
uint32_t sctlr;
uint32_t vbar;
uint32_t cr;
};
+struct fel_stash fel_stash __attribute__((section(.data)));
+
static int gpio_init(void)
{
#if CONFIG_CONS_INDEX == 1 defined(CONFIG_UART0_PORT_F)
@@ -65,6 +72,12 @@ static int gpio_init(void)
return 0;
}
+void spl_board_load_image(void)
+{
+ debug(Returning to FEL sp=%x, lr=%x\n, fel_stash.sp, fel_stash.lr);
+ return_to_fel(fel_stash.sp, fel_stash.lr);
+}
+
void s_init(void)
{
#if defined CONFIG_MACH_SUN6I || defined CONFIG_MACH_SUN8I
@@ -95,6 +108,14 @@ void s_init(void)
*/
u32 spl_boot_device(void)
{
+ /*
+ * Have we been asked to return to the FEL portion of the boot ROM?
+ * TODO: We need a more robust test here, or bracket this with
+ * #ifdef CONFIG_SPL_FEL.
+ */
+ if (fel_stash.lr = 0x fel_stash.lr
Re: [U-Boot] Please pull u-boot-arc master
-Original Message-From: Alexey Brodkin abrod...@synopsys.com
Reply-to: abrod...@synopsys.com
To: Tom Rini tr...@ti.com
Cc: u-boot@lists.denx.de
Subject: Please pull u-boot-arc master
Date: Thu, 15 Jan 2015 23:39:45 +0300
Dear Tom,
The following changes since commit
28c4dae114c9b94b2ad81d4da716e9fc2cba:
Merge branch 'next' of git://git.denx.de/u-boot-video (2015-01-14
16:26:15 -0500)
are available in the git repository at:
git://git.denx.de/u-boot-arc.git
for you to fetch changes up to fdff23702a361e89a15333231af4d00d6e2a:
arc: rename arc700 in arcv1 (2015-01-15 22:40:50 +0300)
Alexey Brodkin (6):
arc: add dependences on MMU presence
arc: relocate - minor refactoring and clean-up
arc: move linker script in arch/arc/cpu folder
arc: move common sources in library
board/synopsys: remove selection of CPU from the board
arc: rename arc700 in arcv1
Igor Guryanov (4):
arc: check caches existence before use
arc: add ECR (exception cause register) output
arc: interrupts - fix mask setup
arc: introduce separate section for interrupt vector table
arch/arc/Kconfig | 3 +++
arch/arc/Makefile | 2 --
arch/arc/config.mk| 4
arch/arc/cpu/arc700/Makefile | 13
arch/arc/cpu/arcv1/Makefile | 7 +++
arch/arc/cpu/{arc700 = arcv1}/config.mk | 0
arch/arc/cpu/{arc700 = arcv1}/start.S| 77
-
arch/arc/cpu/{arc700 = }/u-boot.lds | 15 +-
arch/arc/include/asm/arcregs.h| 2 ++
arch/arc/include/asm/sections.h | 3 +++
arch/arc/lib/Makefile | 6 ++
arch/arc/{cpu/arc700 = lib}/cache.c | 29
++
arch/arc/{cpu/arc700 = lib}/cpu.c| 0
arch/arc/{cpu/arc700 = lib}/interrupts.c | 3 ++-
arch/arc/lib/relocate.c | 19 ++---
arch/arc/{cpu/arc700 = lib}/reset.c | 0
arch/arc/lib/sections.c | 2 ++
arch/arc/{cpu/arc700 = lib}/timer.c | 0
board/synopsys/Kconfig| 6 --
board/synopsys/axs101/Kconfig | 3 ---
20 files changed, 123 insertions(+), 71 deletions(-)
delete mode 100644 arch/arc/cpu/arc700/Makefile
create mode 100644 arch/arc/cpu/arcv1/Makefile
rename arch/arc/cpu/{arc700 = arcv1}/config.mk (100%)
rename arch/arc/cpu/{arc700 = arcv1}/start.S (87%)
rename arch/arc/cpu/{arc700 = }/u-boot.lds (88%)
rename arch/arc/{cpu/arc700 = lib}/cache.c (79%)
rename arch/arc/{cpu/arc700 = lib}/cpu.c (100%)
rename arch/arc/{cpu/arc700 = lib}/interrupts.c (97%)
rename arch/arc/{cpu/arc700 = lib}/reset.c (100%)
rename arch/arc/{cpu/arc700 = lib}/timer.c (100%)
--
Best regards,
Alexey
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/4] mx6sx: pins: Enable SION for I2C3 iomux setting
Hi Stefano, Nikolay,
On 1/30/2015 1:54 AM, Stefano Babic wrote:
Hi,
On 12/01/2015 11:37, Nikolay Dimitrov wrote:
Hi Ye.Li,
On 01/12/2015 10:46 AM, Ye.Li wrote:
The I2C SDA and SCL require the IOMUX SION bit set to get input signal.
Signed-off-by: Ye.Li b37...@freescale.com
---
arch/arm/include/asm/arch-mx6/mx6sx_pins.h |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/include/asm/arch-mx6/mx6sx_pins.h
b/arch/arm/include/asm/arch-mx6/mx6sx_pins.h
index 7c6c1e8..da8c698 100644
--- a/arch/arm/include/asm/arch-mx6/mx6sx_pins.h
+++ b/arch/arm/include/asm/arch-mx6/mx6sx_pins.h
@@ -420,7 +420,7 @@ enum {
MX6_PAD_KEY_COL4__KPP_COL_4=
IOMUX_PAD(0x03FC, 0x00B4, 0, 0x, 0, 0),
MX6_PAD_KEY_COL4__ENET2_MDC=
IOMUX_PAD(0x03FC, 0x00B4, 1, 0x, 0, 0),
- MX6_PAD_KEY_COL4__I2C3_SCL =
IOMUX_PAD(0x03FC, 0x00B4, 2, 0x07B8, 2, 0),
+ MX6_PAD_KEY_COL4__I2C3_SCL =
IOMUX_PAD(0x03FC, 0x00B4, IOMUX_CONFIG_SION | 2, 0x07B8, 2, 0),
MX6_PAD_KEY_COL4__USDHC2_LCTL =
IOMUX_PAD(0x03FC, 0x00B4, 3, 0x, 0, 0),
MX6_PAD_KEY_COL4__AUDMUX_AUD5_RXC =
IOMUX_PAD(0x03FC, 0x00B4, 4, 0x0664, 0, 0),
MX6_PAD_KEY_COL4__GPIO2_IO_14 =
IOMUX_PAD(0x03FC, 0x00B4, 5, 0x, 0, 0),
@@ -467,7 +467,7 @@ enum {
MX6_PAD_KEY_ROW4__KPP_ROW_4=
IOMUX_PAD(0x0410, 0x00C8, 0, 0x, 0, 0),
MX6_PAD_KEY_ROW4__ENET2_MDIO =
IOMUX_PAD(0x0410, 0x00C8, 1, 0x0770, 3, 0),
- MX6_PAD_KEY_ROW4__I2C3_SDA =
IOMUX_PAD(0x0410, 0x00C8, 2, 0x07BC, 2, 0),
+ MX6_PAD_KEY_ROW4__I2C3_SDA =
IOMUX_PAD(0x0410, 0x00C8, IOMUX_CONFIG_SION | 2, 0x07BC, 2, 0),
MX6_PAD_KEY_ROW4__USDHC1_LCTL =
IOMUX_PAD(0x0410, 0x00C8, 3, 0x, 0, 0),
MX6_PAD_KEY_ROW4__AUDMUX_AUD5_RXFS =
IOMUX_PAD(0x0410, 0x00C8, 4, 0x0668, 0, 0),
MX6_PAD_KEY_ROW4__GPIO2_IO_19 =
IOMUX_PAD(0x0410, 0x00C8, 5, 0x, 0, 0),
Usually the SCL is output-only, driven by the I2C master. Why do you
need to enable SION bit on SCL, if the pin will be used as output-only?
Right - I do not see why SION should be set.
Regards,
Stefano Babic
Setting SION to both SDA and SCL is required by i.MX6 reference manual. You
can find the information below from i2c chapter.
34.2 External Signals
This section discusses I2C signals that connect off-chip.
For I2C compliance, all devices connected to the I2Cn_SCL and I2Cn_SDA signals
must
have open-drain or open-collector outputs. The logic AND function is
implemented on
both lines with external pull-up resistors.
Inputs of I2Cn_SCL and I2Cn_SDA also need to be manually enabled by setting the
SION bit in the IOMUX after the corresponding PADs are selected as I2C function.
Best regards,
Ye Li
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Please pull u-boot-arc master
On Thu, 2015-01-15 at 23:39 +0300, Alexey Brodkin wrote:
Dear Tom,
The following changes since commit
28c4dae114c9b94b2ad81d4da716e9fc2cba:
Merge branch 'next' of git://git.denx.de/u-boot-video (2015-01-14
16:26:15 -0500)
are available in the git repository at:
git://git.denx.de/u-boot-arc.git
for you to fetch changes up to fdff23702a361e89a15333231af4d00d6e2a:
arc: rename arc700 in arcv1 (2015-01-15 22:40:50 +0300)
Alexey Brodkin (6):
arc: add dependences on MMU presence
arc: relocate - minor refactoring and clean-up
arc: move linker script in arch/arc/cpu folder
arc: move common sources in library
board/synopsys: remove selection of CPU from the board
arc: rename arc700 in arcv1
Igor Guryanov (4):
arc: check caches existence before use
arc: add ECR (exception cause register) output
arc: interrupts - fix mask setup
arc: introduce separate section for interrupt vector table
arch/arc/Kconfig | 3 +++
arch/arc/Makefile | 2 --
arch/arc/config.mk| 4
arch/arc/cpu/arc700/Makefile | 13
arch/arc/cpu/arcv1/Makefile | 7 +++
arch/arc/cpu/{arc700 = arcv1}/config.mk | 0
arch/arc/cpu/{arc700 = arcv1}/start.S| 77
-
arch/arc/cpu/{arc700 = }/u-boot.lds | 15 +-
arch/arc/include/asm/arcregs.h| 2 ++
arch/arc/include/asm/sections.h | 3 +++
arch/arc/lib/Makefile | 6 ++
arch/arc/{cpu/arc700 = lib}/cache.c | 29
++
arch/arc/{cpu/arc700 = lib}/cpu.c| 0
arch/arc/{cpu/arc700 = lib}/interrupts.c | 3 ++-
arch/arc/lib/relocate.c | 19 ++---
arch/arc/{cpu/arc700 = lib}/reset.c | 0
arch/arc/lib/sections.c | 2 ++
arch/arc/{cpu/arc700 = lib}/timer.c | 0
board/synopsys/Kconfig| 6 --
board/synopsys/axs101/Kconfig | 3 ---
20 files changed, 123 insertions(+), 71 deletions(-)
delete mode 100644 arch/arc/cpu/arc700/Makefile
create mode 100644 arch/arc/cpu/arcv1/Makefile
rename arch/arc/cpu/{arc700 = arcv1}/config.mk (100%)
rename arch/arc/cpu/{arc700 = arcv1}/start.S (87%)
rename arch/arc/cpu/{arc700 = }/u-boot.lds (88%)
rename arch/arc/{cpu/arc700 = lib}/cache.c (79%)
rename arch/arc/{cpu/arc700 = lib}/cpu.c (100%)
rename arch/arc/{cpu/arc700 = lib}/interrupts.c (97%)
rename arch/arc/{cpu/arc700 = lib}/reset.c (100%)
rename arch/arc/{cpu/arc700 = lib}/timer.c (100%)
--
Best regards,
Alexey
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Please pull u-boot-arc master
On Thu, 2015-01-15 at 23:39 +0300, Alexey Brodkin wrote:
Dear Tom,
The following changes since commit
28c4dae114c9b94b2ad81d4da716e9fc2cba:
Merge branch 'next' of git://git.denx.de/u-boot-video (2015-01-14
16:26:15 -0500)
are available in the git repository at:
git://git.denx.de/u-boot-arc.git
for you to fetch changes up to fdff23702a361e89a15333231af4d00d6e2a:
arc: rename arc700 in arcv1 (2015-01-15 22:40:50 +0300)
Alexey Brodkin (6):
arc: add dependences on MMU presence
arc: relocate - minor refactoring and clean-up
arc: move linker script in arch/arc/cpu folder
arc: move common sources in library
board/synopsys: remove selection of CPU from the board
arc: rename arc700 in arcv1
Igor Guryanov (4):
arc: check caches existence before use
arc: add ECR (exception cause register) output
arc: interrupts - fix mask setup
arc: introduce separate section for interrupt vector table
arch/arc/Kconfig | 3 +++
arch/arc/Makefile | 2 --
arch/arc/config.mk| 4
arch/arc/cpu/arc700/Makefile | 13
arch/arc/cpu/arcv1/Makefile | 7 +++
arch/arc/cpu/{arc700 = arcv1}/config.mk | 0
arch/arc/cpu/{arc700 = arcv1}/start.S| 77
-
arch/arc/cpu/{arc700 = }/u-boot.lds | 15 +-
arch/arc/include/asm/arcregs.h| 2 ++
arch/arc/include/asm/sections.h | 3 +++
arch/arc/lib/Makefile | 6 ++
arch/arc/{cpu/arc700 = lib}/cache.c | 29
++
arch/arc/{cpu/arc700 = lib}/cpu.c| 0
arch/arc/{cpu/arc700 = lib}/interrupts.c | 3 ++-
arch/arc/lib/relocate.c | 19 ++---
arch/arc/{cpu/arc700 = lib}/reset.c | 0
arch/arc/lib/sections.c | 2 ++
arch/arc/{cpu/arc700 = lib}/timer.c | 0
board/synopsys/Kconfig| 6 --
board/synopsys/axs101/Kconfig | 3 ---
20 files changed, 123 insertions(+), 71 deletions(-)
delete mode 100644 arch/arc/cpu/arc700/Makefile
create mode 100644 arch/arc/cpu/arcv1/Makefile
rename arch/arc/cpu/{arc700 = arcv1}/config.mk (100%)
rename arch/arc/cpu/{arc700 = arcv1}/start.S (87%)
rename arch/arc/cpu/{arc700 = }/u-boot.lds (88%)
rename arch/arc/{cpu/arc700 = lib}/cache.c (79%)
rename arch/arc/{cpu/arc700 = lib}/cpu.c (100%)
rename arch/arc/{cpu/arc700 = lib}/interrupts.c (97%)
rename arch/arc/{cpu/arc700 = lib}/reset.c (100%)
rename arch/arc/{cpu/arc700 = lib}/timer.c (100%)
--
Best regards,
Alexey
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Please pull u-boot-arc master
On Thu, 2015-01-15 at 23:39 +0300, Alexey Brodkin wrote:
Dear Tom,
The following changes since commit
28c4dae114c9b94b2ad81d4da716e9fc2cba:
Merge branch 'next' of git://git.denx.de/u-boot-video (2015-01-14
16:26:15 -0500)
are available in the git repository at:
git://git.denx.de/u-boot-arc.git
for you to fetch changes up to fdff23702a361e89a15333231af4d00d6e2a:
arc: rename arc700 in arcv1 (2015-01-15 22:40:50 +0300)
Alexey Brodkin (6):
arc: add dependences on MMU presence
arc: relocate - minor refactoring and clean-up
arc: move linker script in arch/arc/cpu folder
arc: move common sources in library
board/synopsys: remove selection of CPU from the board
arc: rename arc700 in arcv1
Igor Guryanov (4):
arc: check caches existence before use
arc: add ECR (exception cause register) output
arc: interrupts - fix mask setup
arc: introduce separate section for interrupt vector table
arch/arc/Kconfig | 3 +++
arch/arc/Makefile | 2 --
arch/arc/config.mk| 4
arch/arc/cpu/arc700/Makefile | 13
arch/arc/cpu/arcv1/Makefile | 7 +++
arch/arc/cpu/{arc700 = arcv1}/config.mk | 0
arch/arc/cpu/{arc700 = arcv1}/start.S| 77
-
arch/arc/cpu/{arc700 = }/u-boot.lds | 15 +-
arch/arc/include/asm/arcregs.h| 2 ++
arch/arc/include/asm/sections.h | 3 +++
arch/arc/lib/Makefile | 6 ++
arch/arc/{cpu/arc700 = lib}/cache.c | 29
++
arch/arc/{cpu/arc700 = lib}/cpu.c| 0
arch/arc/{cpu/arc700 = lib}/interrupts.c | 3 ++-
arch/arc/lib/relocate.c | 19 ++---
arch/arc/{cpu/arc700 = lib}/reset.c | 0
arch/arc/lib/sections.c | 2 ++
arch/arc/{cpu/arc700 = lib}/timer.c | 0
board/synopsys/Kconfig| 6 --
board/synopsys/axs101/Kconfig | 3 ---
20 files changed, 123 insertions(+), 71 deletions(-)
delete mode 100644 arch/arc/cpu/arc700/Makefile
create mode 100644 arch/arc/cpu/arcv1/Makefile
rename arch/arc/cpu/{arc700 = arcv1}/config.mk (100%)
rename arch/arc/cpu/{arc700 = arcv1}/start.S (87%)
rename arch/arc/cpu/{arc700 = }/u-boot.lds (88%)
rename arch/arc/{cpu/arc700 = lib}/cache.c (79%)
rename arch/arc/{cpu/arc700 = lib}/cpu.c (100%)
rename arch/arc/{cpu/arc700 = lib}/interrupts.c (97%)
rename arch/arc/{cpu/arc700 = lib}/reset.c (100%)
rename arch/arc/{cpu/arc700 = lib}/timer.c (100%)
--
Best regards,
Alexey
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v1 1/1] fastboot: oem format command implementation
On 30 January 2015 at 22:27, Lukasz Majewski l.majew...@samsung.com wrote:
Hi Dileep,
This is the Modified version of
http://patchwork.ozlabs.org/patch/388084/
- As flash support is already in mainline, it is removed
- 'oem' command support is present
- 'oem format' command is implemented
- Handled review comments of the original patch
Signed-off-by: Dileep Katta dileep.ka...@linaro.org
---
common/cmd_fastboot.c | 4 +
common/cmd_mmc.c| 2 +-
disk/Makefile | 1 +
disk/part_fastboot.c| 363
doc/README.android-fastboot | 5 +-
drivers/usb/gadget/f_fastboot.c | 85 ++
include/usb/fastboot.h | 108 7 files changed,
564 insertions(+), 4 deletions(-) create mode 100644
disk/part_fastboot.c create mode 100644 include/usb/fastboot.h
diff --git a/common/cmd_fastboot.c b/common/cmd_fastboot.c
index b72f4f3..efdf461 100644
--- a/common/cmd_fastboot.c
+++ b/common/cmd_fastboot.c
@@ -10,12 +10,16 @@
#include common.h
#include command.h
#include g_dnl.h
+#include usb/fastboot.h
static int do_fastboot(cmd_tbl_t *cmdtp, int flag, int argc, char
*const argv[]) {
int ret;
g_dnl_clear_detach();
+#ifdef CONFIG_FASTBOOT_FLASH_MMC_DEV
+ board_partition_init();
+#endif
ret = g_dnl_register(usb_dnl_fastboot);
if (ret)
return ret;
diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c
index 4e28c9d..0ce747b 100644
--- a/common/cmd_mmc.c
+++ b/common/cmd_mmc.c
@@ -809,7 +809,7 @@ static cmd_tbl_t cmd_mmc[] = {
U_BOOT_CMD_MKENT(setdsr, 2, 0, do_mmc_setdsr, , ),
};
-static int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char *
const argv[]) +int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc,
char * const argv[]) {
cmd_tbl_t *cp;
diff --git a/disk/Makefile b/disk/Makefile
index 6970cec..4969656 100644
--- a/disk/Makefile
+++ b/disk/Makefile
@@ -13,3 +13,4 @@ obj-$(CONFIG_DOS_PARTITION) += part_dos.o
obj-$(CONFIG_ISO_PARTITION) += part_iso.o
obj-$(CONFIG_AMIGA_PARTITION) += part_amiga.o
obj-$(CONFIG_EFI_PARTITION) += part_efi.o
+obj-$(CONFIG_FASTBOOT_FLASH_MMC_DEV) +=part_fastboot.o
diff --git a/disk/part_fastboot.c b/disk/part_fastboot.c
new file mode 100644
index 000..adf37af
--- /dev/null
+++ b/disk/part_fastboot.c
@@ -0,0 +1,363 @@
+/*
+ * Copyright (C) 2013 Texas Instruments
+ *
+ * Author : Pankaj Bharadiya pankaj.bharad...@ti.com
+ *
+ * Tom Rix tom@windriver.com and Sitara 2011 u-boot by
+ * Mohammed Afzal M A af...@ti.com
+ *
+ * Copyright (C) 2008 The Android Open Source Project
+ * All rights reserved.
+ *
+ * Copyright 2014 Linaro, Ltd.
+ * Dileep Katta dileep.ka...@linaro.org
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#include common.h
+#include command.h
+#include usb/fastboot.h
+#include linux/usb/ch9.h
+#include linux/usb/gadget.h
+#include environment.h
+#include mmc.h
+#include dfu.h
+#include asm/arch/mmc_host_def.h
+
+#define EFI_VERSION 0x0001
+#define EFI_ENTRIES 128
+#define EFI_NAMELEN 36
+
+struct partition_emmc {
+ const char *name;
+ unsigned size_kb;
+};
+
+/* eMMC partition layout (All sizes are in kB)
+ * Modify the below partition table to change the GPT configuration.
+ * The entry for each partition can be modified as per the
requirement.
+ */
+static struct partition_emmc partitions[] = {
Defining mmc partitions as a static struct in the code IMHO is not
flexible.
+ { -, 128 }, /* Master Boot Record and GUID
Partition Table */
+ { spl, 128 }, /* First stage bootloader */
+ { bootloader, 512 }, /* Second stage bootloader */
+ { misc, 128 },/* Rserved for internal
purpose */
+ { -, 128 }, /* Reserved */
+ { recovery, 8*1024 }, /* Recovery partition */
+ { boot, 8*1024 }, /* Partition contains kernel +
ramdisk images */
+ { system, 256*1024 }, /* Android file
system */
+ { cache, 256*1024 }, /* Store Application
Cache */
+ { userdata, 256*1024 }, /* User data */
+ { media, 0 }, /* Media files */
+ { 0, 0 },
+};
Maybe it would be better if we could reuse $partitions ?
With above code we introduce another (not compatible and flexible) way
to specify eMMC partitions for the board.
+
+
+static const u8 partition_type[16] = {
+ 0xa2, 0xa0, 0xd0, 0xeb, 0xe5, 0xb9, 0x33, 0x44,
+ 0x87, 0xc0, 0x68, 0xb6, 0xb7, 0x26, 0x99, 0xc7,
+};
+
Please look into ./include/part_efi.h [1]
+static const u8 random_uuid[16] = {
+ 0xff, 0x1f, 0xf2, 0xf9, 0xd4, 0xa8, 0x0e, 0x5f,
+ 0x97, 0x46, 0x59, 0x48, 0x69, 0xae, 0xc3, 0x4e,
+};
I'm not sure if specifying random
Re: [U-Boot] sandbox on FreeBSD
Hello Simon, On 02/07/15 16:10, Simon Glass wrote: I am not giving up, I think it is sane if a tool which adds a header and a checksum does not use linker magic. Sandbox biggest problem is not the linking, but the fact that linux headers and std* are included, it is a different topic. This should be easy to fix in os.c since all the inclusions are isolated to there. I'd been keen to see a patch for that. Also if you want LCD support, sdl.c. I had a look at this and hacked my way through and linked it with a GNU ld (GNU Binutils) 2.25. So at least I have a binary, but unfortunately it doesn't work, and errors out with: Fatal error 'Can't allocate initial thread' at line 350 in file /usr/src/lib/libthr/thread/thr_init.c (errno = 2) The reason for this seems to be void _thread_init_hack(void) __attribute__ ((constructor)); which calls _libpthread_init - _thr_alloc - calloc and that calls the version in u-boots version of dl-malloc which is not initialized yet. Did you encounter such problems on linux as well? Or does libpthread simply not allocate memory before reaching main? Regards, Jeroen ldd ../u-boot-build/u-boot ../u-boot-build/u-boot: librt.so.1 = /usr/lib/librt.so.1 (0x800896000) libSDL-1.2.so.0 = /usr/local/lib/libSDL-1.2.so.0 (0x800a9c000) libthr.so.3 = /lib/libthr.so.3 (0x800d02000) libc.so.7 = /lib/libc.so.7 (0x800f27000) libm.so.5 = /lib/libm.so.5 (0x8012d) libvgl.so.6 = /usr/lib/libvgl.so.6 (0x8014f8000) libaa.so.1 = /usr/local/lib/libaa.so.1 (0x801701000) libusbhid.so.4 = /usr/lib/libusbhid.so.4 (0x801919000) libncurses.so.8 = /lib/libncurses.so.8 (0x801b1d000) ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] arm: rmobile: Add missed header file for Silk board
Hi! Applied, thanks! Nobuhiro 2015-02-09 9:27 GMT+09:00 Vladimir Barinov vladimir.bari...@cogentembedded.com: This file was missed in the commit https://patchwork.ozlabs.org/patch/427801/ Signed-off-by: Vladimir Barinov vladimir.bari...@cogentembedded.com --- board/renesas/silk/qos.h | 13 + 1 file changed, 13 insertions(+) create mode 100644 board/renesas/silk/qos.h diff --git a/board/renesas/silk/qos.h b/board/renesas/silk/qos.h new file mode 100644 index 000..75a20bb --- /dev/null +++ b/board/renesas/silk/qos.h @@ -0,0 +1,13 @@ +/* + * Copyright (C) 2015 Renesas Electronics Corporation + * Copyright (C) 2015 Cogent Embedded, Inc. + * + * SPDX-License-Identifier: GPL-2.0 + */ + +#ifndef __QOS_H__ +#define __QOS_H__ + +void qos_init(void); + +#endif -- 1.9.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot -- Nobuhiro Iwamatsu ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 0/11] ARM: remove non-generic boards
Based on Tom's announce mail (http://lists.denx.de/pipermail/u-boot/2015-February/203606.html), let's start removing non-generic ARM boards. No conversion patches have been posted for these boards. Masahiro Yamada (11): ARM: remove mx31ads board support ARM: mx31: remove imx31_phycore board ARM: remove jadecpu board support ARM: remove zmx25 board support ARM: remove devkit3250 board support ARM: remove dkb board support ARM: remove cm4008 and cm41xx board support ARM: remove a320evb board support ARM: armada100: remove aspenite and gplugd board support ARM: remove tnetv107x board support ARM: davinci: remove hawkboard support arch/arm/Kconfig | 60 -- arch/arm/cpu/arm1176/Makefile | 1 - arch/arm/cpu/arm1176/start.S | 22 - arch/arm/cpu/arm1176/tnetv107x/Makefile| 6 - arch/arm/cpu/arm1176/tnetv107x/aemif.c | 78 --- arch/arm/cpu/arm1176/tnetv107x/clock.c | 432 arch/arm/cpu/arm1176/tnetv107x/init.c | 22 - arch/arm/cpu/arm1176/tnetv107x/lowlevel_init.S | 10 - arch/arm/cpu/arm1176/tnetv107x/mux.c | 319 - arch/arm/cpu/arm1176/tnetv107x/timer.c | 93 --- arch/arm/cpu/arm920t/Makefile | 2 - arch/arm/cpu/arm920t/a320/Makefile | 9 - arch/arm/cpu/arm920t/a320/reset.S | 10 - arch/arm/cpu/arm920t/a320/timer.c | 118 arch/arm/cpu/arm920t/ks8695/Makefile | 9 - arch/arm/cpu/arm920t/ks8695/lowlevel_init.S| 189 -- arch/arm/cpu/arm920t/ks8695/timer.c| 77 --- arch/arm/cpu/arm926ejs/Makefile| 4 - arch/arm/cpu/arm926ejs/armada100/Makefile | 9 - arch/arm/cpu/arm926ejs/armada100/cpu.c | 92 --- arch/arm/cpu/arm926ejs/armada100/dram.c| 116 arch/arm/cpu/arm926ejs/armada100/timer.c | 194 -- arch/arm/cpu/arm926ejs/davinci/Kconfig | 4 - arch/arm/cpu/arm926ejs/lpc32xx/Makefile| 8 - arch/arm/cpu/arm926ejs/lpc32xx/clk.c | 104 --- arch/arm/cpu/arm926ejs/lpc32xx/cpu.c | 57 -- arch/arm/cpu/arm926ejs/lpc32xx/devices.c | 39 -- arch/arm/cpu/arm926ejs/lpc32xx/timer.c | 82 --- arch/arm/cpu/arm926ejs/mb86r0x/Makefile| 8 - arch/arm/cpu/arm926ejs/mb86r0x/clock.c | 27 - arch/arm/cpu/arm926ejs/mb86r0x/reset.c | 24 - arch/arm/cpu/arm926ejs/mb86r0x/timer.c | 115 arch/arm/cpu/arm926ejs/pantheon/Makefile | 9 - arch/arm/cpu/arm926ejs/pantheon/cpu.c | 85 --- arch/arm/cpu/arm926ejs/pantheon/dram.c | 117 arch/arm/cpu/arm926ejs/pantheon/timer.c| 201 -- arch/arm/include/asm/arch-a320/a320.h | 22 - arch/arm/include/asm/arch-armada100/armada100.h| 60 -- arch/arm/include/asm/arch-armada100/config.h | 42 -- arch/arm/include/asm/arch-armada100/cpu.h | 162 - arch/arm/include/asm/arch-armada100/gpio.h | 32 - arch/arm/include/asm/arch-armada100/mfp.h | 80 --- arch/arm/include/asm/arch-armada100/spi.h | 79 --- .../include/asm/arch-armada100/utmi-armada100.h| 63 -- arch/arm/include/asm/arch-ks8695/platform.h| 294 - arch/arm/include/asm/arch-lpc32xx/clk.h| 157 - arch/arm/include/asm/arch-lpc32xx/config.h | 59 -- arch/arm/include/asm/arch-lpc32xx/cpu.h| 51 -- arch/arm/include/asm/arch-lpc32xx/emc.h| 79 --- arch/arm/include/asm/arch-lpc32xx/sys_proto.h | 12 - arch/arm/include/asm/arch-lpc32xx/timer.h | 61 -- arch/arm/include/asm/arch-lpc32xx/uart.h | 101 --- arch/arm/include/asm/arch-lpc32xx/wdt.h| 38 -- arch/arm/include/asm/arch-mb86r0x/hardware.h | 15 - arch/arm/include/asm/arch-mb86r0x/mb86r0x.h| 599 - arch/arm/include/asm/arch-pantheon/config.h| 53 -- arch/arm/include/asm/arch-pantheon/cpu.h | 77 --- arch/arm/include/asm/arch-pantheon/gpio.h | 0 arch/arm/include/asm/arch-pantheon/mfp.h | 39 -- arch/arm/include/asm/arch-pantheon/pantheon.h | 38 -- arch/arm/include/asm/arch-tnetv107x/clock.h| 53 -- arch/arm/include/asm/arch-tnetv107x/hardware.h | 160 - arch/arm/include/asm/arch-tnetv107x/mux.h | 291 - arch/arm/lib/asm-offsets.c | 46 -- board/Marvell/aspenite/Kconfig | 15 - board/Marvell/aspenite/MAINTAINERS | 6 - board/Marvell/aspenite/Makefile| 10 - board/Marvell/aspenite/aspenite.c | 43 -- board/Marvell/dkb/Kconfig | 15 - board/Marvell/dkb/MAINTAINERS | 6 -
[U-Boot] [PATCH 05/11] ARM: remove devkit3250 board support
This is still a non-generic board. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Cc: Vladimir Zapolskiy v...@mleia.com --- arch/arm/Kconfig | 5 - arch/arm/cpu/arm926ejs/Makefile | 1 - arch/arm/cpu/arm926ejs/lpc32xx/Makefile | 8 -- arch/arm/cpu/arm926ejs/lpc32xx/clk.c | 104 - arch/arm/cpu/arm926ejs/lpc32xx/cpu.c | 57 -- arch/arm/cpu/arm926ejs/lpc32xx/devices.c | 39 --- arch/arm/cpu/arm926ejs/lpc32xx/timer.c| 82 -- arch/arm/include/asm/arch-lpc32xx/clk.h | 157 -- arch/arm/include/asm/arch-lpc32xx/config.h| 59 -- arch/arm/include/asm/arch-lpc32xx/cpu.h | 51 - arch/arm/include/asm/arch-lpc32xx/emc.h | 79 - arch/arm/include/asm/arch-lpc32xx/sys_proto.h | 12 -- arch/arm/include/asm/arch-lpc32xx/timer.h | 61 -- arch/arm/include/asm/arch-lpc32xx/uart.h | 101 - arch/arm/include/asm/arch-lpc32xx/wdt.h | 38 --- board/timll/devkit3250/Kconfig| 15 --- board/timll/devkit3250/MAINTAINERS| 6 - board/timll/devkit3250/Makefile | 8 -- board/timll/devkit3250/devkit3250.c | 52 - configs/devkit3250_defconfig | 2 - doc/README.scrapyard | 1 + drivers/serial/Makefile | 1 - drivers/serial/lpc32xx_hsuart.c | 89 --- drivers/serial/serial.c | 2 - include/configs/devkit3250.h | 101 - include/serial.h | 1 - 26 files changed, 1 insertion(+), 1131 deletions(-) delete mode 100644 arch/arm/cpu/arm926ejs/lpc32xx/Makefile delete mode 100644 arch/arm/cpu/arm926ejs/lpc32xx/clk.c delete mode 100644 arch/arm/cpu/arm926ejs/lpc32xx/cpu.c delete mode 100644 arch/arm/cpu/arm926ejs/lpc32xx/devices.c delete mode 100644 arch/arm/cpu/arm926ejs/lpc32xx/timer.c delete mode 100644 arch/arm/include/asm/arch-lpc32xx/clk.h delete mode 100644 arch/arm/include/asm/arch-lpc32xx/config.h delete mode 100644 arch/arm/include/asm/arch-lpc32xx/cpu.h delete mode 100644 arch/arm/include/asm/arch-lpc32xx/emc.h delete mode 100644 arch/arm/include/asm/arch-lpc32xx/sys_proto.h delete mode 100644 arch/arm/include/asm/arch-lpc32xx/timer.h delete mode 100644 arch/arm/include/asm/arch-lpc32xx/uart.h delete mode 100644 arch/arm/include/asm/arch-lpc32xx/wdt.h delete mode 100644 board/timll/devkit3250/Kconfig delete mode 100644 board/timll/devkit3250/MAINTAINERS delete mode 100644 board/timll/devkit3250/Makefile delete mode 100644 board/timll/devkit3250/devkit3250.c delete mode 100644 configs/devkit3250_defconfig delete mode 100644 drivers/serial/lpc32xx_hsuart.c delete mode 100644 include/configs/devkit3250.h diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index cbed2f4..b0b7eaf 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -241,10 +241,6 @@ config TARGET_MAXBCM bool Support maxbcm select CPU_V7 -config TARGET_DEVKIT3250 - bool Support devkit3250 - select CPU_ARM926EJS - config TARGET_MX25PDK bool Support mx25pdk select CPU_ARM926EJS @@ -968,7 +964,6 @@ source board/ti/am43xx/Kconfig source board/ti/ti814x/Kconfig source board/ti/ti816x/Kconfig source board/ti/tnetv107xevm/Kconfig -source board/timll/devkit3250/Kconfig source board/toradex/colibri_pxa270/Kconfig source board/tqc/tqma6/Kconfig source board/trizepsiv/Kconfig diff --git a/arch/arm/cpu/arm926ejs/Makefile b/arch/arm/cpu/arm926ejs/Makefile index 607d29f..bfa365e 100644 --- a/arch/arm/cpu/arm926ejs/Makefile +++ b/arch/arm/cpu/arm926ejs/Makefile @@ -18,7 +18,6 @@ obj-$(CONFIG_ARMADA100) += armada100/ obj-$(CONFIG_AT91FAMILY) += at91/ obj-$(CONFIG_ARCH_DAVINCI) += davinci/ obj-$(CONFIG_KIRKWOOD) += kirkwood/ -obj-$(if $(filter lpc32xx,$(SOC)),y) += lpc32xx/ obj-$(CONFIG_MX25) += mx25/ obj-$(CONFIG_MX27) += mx27/ obj-$(if $(filter mxs,$(SOC)),y) += mxs/ diff --git a/arch/arm/cpu/arm926ejs/lpc32xx/Makefile b/arch/arm/cpu/arm926ejs/lpc32xx/Makefile deleted file mode 100644 index 314f004..000 --- a/arch/arm/cpu/arm926ejs/lpc32xx/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# -# (C) Copyright 2000-2006 -# Wolfgang Denk, DENX Software Engineering, w...@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y = cpu.o clk.o devices.o timer.o diff --git a/arch/arm/cpu/arm926ejs/lpc32xx/clk.c b/arch/arm/cpu/arm926ejs/lpc32xx/clk.c deleted file mode 100644 index b7a44d5..000 --- a/arch/arm/cpu/arm926ejs/lpc32xx/clk.c +++ /dev/null @@ -1,104 +0,0 @@ -/* - * Copyright (C) 2011 by Vladimir Zapolskiy v...@mleia.com - * - * SPDX-License-Identifier:GPL-2.0+ - */ - -#include common.h -#include div64.h -#include asm/arch/cpu.h -#include asm/arch/clk.h -#include asm/io.h - -static struct clk_pm_regs
[U-Boot] [PATCH 09/11] ARM: armada100: remove aspenite and gplugd board support
These are still non-generic boards. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Cc: Prafulla Wadaskar prafu...@marvell.com Cc: Ajay Bhargav ajay.bhar...@einfochips.com --- arch/arm/Kconfig | 10 - arch/arm/cpu/arm926ejs/Makefile| 1 - arch/arm/cpu/arm926ejs/armada100/Makefile | 9 - arch/arm/cpu/arm926ejs/armada100/cpu.c | 92 --- arch/arm/cpu/arm926ejs/armada100/dram.c| 116 arch/arm/cpu/arm926ejs/armada100/timer.c | 194 -- arch/arm/include/asm/arch-armada100/armada100.h| 60 -- arch/arm/include/asm/arch-armada100/config.h | 42 -- arch/arm/include/asm/arch-armada100/cpu.h | 162 - arch/arm/include/asm/arch-armada100/gpio.h | 32 - arch/arm/include/asm/arch-armada100/mfp.h | 80 --- arch/arm/include/asm/arch-armada100/spi.h | 79 --- .../include/asm/arch-armada100/utmi-armada100.h| 63 -- board/Marvell/aspenite/Kconfig | 15 - board/Marvell/aspenite/MAINTAINERS | 6 - board/Marvell/aspenite/Makefile| 10 - board/Marvell/aspenite/aspenite.c | 43 -- board/Marvell/gplugd/Kconfig | 15 - board/Marvell/gplugd/MAINTAINERS | 6 - board/Marvell/gplugd/Makefile | 15 - board/Marvell/gplugd/gplugd.c | 130 configs/aspenite_defconfig | 2 - configs/gplugd_defconfig | 2 - doc/README.scrapyard | 2 + drivers/net/Makefile | 1 - drivers/net/armada100_fec.c| 726 - drivers/net/armada100_fec.h| 209 -- drivers/spi/Makefile | 1 - drivers/spi/armada100_spi.c| 203 -- drivers/usb/host/Makefile | 1 - drivers/usb/host/ehci-armada100.c | 48 -- drivers/usb/host/utmi-armada100.c | 80 --- include/configs/aspenite.h | 55 -- include/configs/gplugd.h | 134 include/netdev.h | 1 - 35 files changed, 2 insertions(+), 2643 deletions(-) delete mode 100644 arch/arm/cpu/arm926ejs/armada100/Makefile delete mode 100644 arch/arm/cpu/arm926ejs/armada100/cpu.c delete mode 100644 arch/arm/cpu/arm926ejs/armada100/dram.c delete mode 100644 arch/arm/cpu/arm926ejs/armada100/timer.c delete mode 100644 arch/arm/include/asm/arch-armada100/armada100.h delete mode 100644 arch/arm/include/asm/arch-armada100/config.h delete mode 100644 arch/arm/include/asm/arch-armada100/cpu.h delete mode 100644 arch/arm/include/asm/arch-armada100/gpio.h delete mode 100644 arch/arm/include/asm/arch-armada100/mfp.h delete mode 100644 arch/arm/include/asm/arch-armada100/spi.h delete mode 100644 arch/arm/include/asm/arch-armada100/utmi-armada100.h delete mode 100644 board/Marvell/aspenite/Kconfig delete mode 100644 board/Marvell/aspenite/MAINTAINERS delete mode 100644 board/Marvell/aspenite/Makefile delete mode 100644 board/Marvell/aspenite/aspenite.c delete mode 100644 board/Marvell/gplugd/Kconfig delete mode 100644 board/Marvell/gplugd/MAINTAINERS delete mode 100644 board/Marvell/gplugd/Makefile delete mode 100644 board/Marvell/gplugd/gplugd.c delete mode 100644 configs/aspenite_defconfig delete mode 100644 configs/gplugd_defconfig delete mode 100644 drivers/net/armada100_fec.c delete mode 100644 drivers/net/armada100_fec.h delete mode 100644 drivers/spi/armada100_spi.c delete mode 100644 drivers/usb/host/ehci-armada100.c delete mode 100644 drivers/usb/host/utmi-armada100.c delete mode 100644 include/configs/aspenite.h delete mode 100644 include/configs/gplugd.h diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 3ec570b..702302f 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -109,14 +109,6 @@ config TARGET_INTEGRATORCP_CM926EJS bool Support integratorcp_cm926ejs select CPU_ARM926EJS -config TARGET_ASPENITE - bool Support aspenite - select CPU_ARM926EJS - -config TARGET_GPLUGD - bool Support gplugd - select CPU_ARM926EJS - config TARGET_AFEB9260 bool Support afeb9260 select CPU_ARM926EJS @@ -825,9 +817,7 @@ source board/BuR/tseries/Kconfig source board/BuS/eb_cpux9k2/Kconfig source board/BuS/vl_ma2sc/Kconfig source board/CarMediaLab/flea3/Kconfig -source board/Marvell/aspenite/Kconfig source board/Marvell/db-mv784mp-gp/Kconfig -source board/Marvell/gplugd/Kconfig source board/afeb9260/Kconfig source board/altera/socfpga/Kconfig source board/armadeus/apf27/Kconfig diff --git a/arch/arm/cpu/arm926ejs/Makefile b/arch/arm/cpu/arm926ejs/Makefile index 38ab0d4..f6000af 100644 --- a/arch/arm/cpu/arm926ejs/Makefile +++
[U-Boot] [PATCH 10/11] ARM: remove tnetv107x board support
This is still a non-generic board. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Cc: Chan-Taek Park c-p...@ti.com --- arch/arm/Kconfig | 5 - arch/arm/cpu/arm1176/Makefile | 1 - arch/arm/cpu/arm1176/start.S | 22 -- arch/arm/cpu/arm1176/tnetv107x/Makefile| 6 - arch/arm/cpu/arm1176/tnetv107x/aemif.c | 78 - arch/arm/cpu/arm1176/tnetv107x/clock.c | 432 - arch/arm/cpu/arm1176/tnetv107x/init.c | 22 -- arch/arm/cpu/arm1176/tnetv107x/lowlevel_init.S | 10 - arch/arm/cpu/arm1176/tnetv107x/mux.c | 319 -- arch/arm/cpu/arm1176/tnetv107x/timer.c | 93 -- arch/arm/include/asm/arch-tnetv107x/clock.h| 53 --- arch/arm/include/asm/arch-tnetv107x/hardware.h | 160 - arch/arm/include/asm/arch-tnetv107x/mux.h | 291 - board/ti/tnetv107xevm/Kconfig | 15 - board/ti/tnetv107xevm/MAINTAINERS | 6 - board/ti/tnetv107xevm/Makefile | 5 - board/ti/tnetv107xevm/config.mk| 5 - board/ti/tnetv107xevm/sdb_board.c | 134 configs/tnetv107x_evm_defconfig| 2 - doc/README.scrapyard | 1 + drivers/watchdog/Makefile | 1 - drivers/watchdog/tnetv107x_wdt.c | 165 -- include/configs/tnetv107x_evm.h| 139 23 files changed, 1 insertion(+), 1964 deletions(-) delete mode 100644 arch/arm/cpu/arm1176/tnetv107x/Makefile delete mode 100644 arch/arm/cpu/arm1176/tnetv107x/aemif.c delete mode 100644 arch/arm/cpu/arm1176/tnetv107x/clock.c delete mode 100644 arch/arm/cpu/arm1176/tnetv107x/init.c delete mode 100644 arch/arm/cpu/arm1176/tnetv107x/lowlevel_init.S delete mode 100644 arch/arm/cpu/arm1176/tnetv107x/mux.c delete mode 100644 arch/arm/cpu/arm1176/tnetv107x/timer.c delete mode 100644 arch/arm/include/asm/arch-tnetv107x/clock.h delete mode 100644 arch/arm/include/asm/arch-tnetv107x/hardware.h delete mode 100644 arch/arm/include/asm/arch-tnetv107x/mux.h delete mode 100644 board/ti/tnetv107xevm/Kconfig delete mode 100644 board/ti/tnetv107xevm/MAINTAINERS delete mode 100644 board/ti/tnetv107xevm/Makefile delete mode 100644 board/ti/tnetv107xevm/config.mk delete mode 100644 board/ti/tnetv107xevm/sdb_board.c delete mode 100644 configs/tnetv107x_evm_defconfig delete mode 100644 drivers/watchdog/tnetv107x_wdt.c delete mode 100644 include/configs/tnetv107x_evm.h diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 702302f..48d6964 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -367,10 +367,6 @@ config TARGET_RPI bool Support rpi select CPU_ARM1176 -config TARGET_TNETV107X_EVM - bool Support tnetv107x_evm - select CPU_ARM1176 - config TARGET_INTEGRATORAP_CM946ES bool Support integratorap_cm946es select CPU_ARM946ES @@ -933,7 +929,6 @@ source board/ti/am335x/Kconfig source board/ti/am43xx/Kconfig source board/ti/ti814x/Kconfig source board/ti/ti816x/Kconfig -source board/ti/tnetv107xevm/Kconfig source board/toradex/colibri_pxa270/Kconfig source board/tqc/tqma6/Kconfig source board/trizepsiv/Kconfig diff --git a/arch/arm/cpu/arm1176/Makefile b/arch/arm/cpu/arm1176/Makefile index ead2303..480e130 100644 --- a/arch/arm/cpu/arm1176/Makefile +++ b/arch/arm/cpu/arm1176/Makefile @@ -12,4 +12,3 @@ extra-y = start.o obj-y = cpu.o obj-$(CONFIG_BCM2835) += bcm2835/ -obj-$(CONFIG_TNETV107X) += tnetv107x/ diff --git a/arch/arm/cpu/arm1176/start.S b/arch/arm/cpu/arm1176/start.S index 0704bdd..ac937bf 100644 --- a/arch/arm/cpu/arm1176/start.S +++ b/arch/arm/cpu/arm1176/start.S @@ -96,28 +96,6 @@ mmu_disable: mov pc, r2 mmu_disable_phys: -#ifdef CONFIG_DISABLE_TCM - /* -* Disable the TCMs -*/ - mrc p15, 0, r0, c0, c0, 2 /* Return TCM details */ - cmp r0, #0 - beq skip_tcmdisable - mov r1, #0 - mov r2, #1 - tst r0, r2 - mcrne p15, 0, r1, c9, c1, 1 /* Disable Instruction TCM if present*/ - tst r0, r2, LSL #16 - mcrne p15, 0, r1, c9, c1, 0 /* Disable Data TCM if present*/ -skip_tcmdisable: -#endif -#endif - -#ifdef CONFIG_PERIPORT_REMAP - /* Peri port setup */ - ldr r0, =CONFIG_PERIPORT_BASE - orr r0, r0, #CONFIG_PERIPORT_SIZE - mcr p15,0,r0,c15,c2,4 #endif /* diff --git a/arch/arm/cpu/arm1176/tnetv107x/Makefile b/arch/arm/cpu/arm1176/tnetv107x/Makefile deleted file mode 100644 index a4c1edf..000 --- a/arch/arm/cpu/arm1176/tnetv107x/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y += aemif.o clock.o init.o mux.o timer.o -obj-y += lowlevel_init.o diff --git a/arch/arm/cpu/arm1176/tnetv107x/aemif.c
[U-Boot] [PATCH 06/11] ARM: remove dkb board support
This is still a non-generic board.
Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com
Cc: Lei Wen lei...@marvell.com
---
arch/arm/Kconfig | 5 -
arch/arm/cpu/arm926ejs/Makefile | 1 -
arch/arm/cpu/arm926ejs/pantheon/Makefile | 9 --
arch/arm/cpu/arm926ejs/pantheon/cpu.c | 85 ---
arch/arm/cpu/arm926ejs/pantheon/dram.c| 117 ---
arch/arm/cpu/arm926ejs/pantheon/timer.c | 201 --
arch/arm/include/asm/arch-pantheon/config.h | 53 ---
arch/arm/include/asm/arch-pantheon/cpu.h | 77 --
arch/arm/include/asm/arch-pantheon/gpio.h | 0
arch/arm/include/asm/arch-pantheon/mfp.h | 39 -
arch/arm/include/asm/arch-pantheon/pantheon.h | 38 -
board/Marvell/dkb/Kconfig | 15 --
board/Marvell/dkb/MAINTAINERS | 6 -
board/Marvell/dkb/Makefile| 9 --
board/Marvell/dkb/dkb.c | 85 ---
configs/dkb_defconfig | 2 -
doc/README.scrapyard | 1 +
include/configs/dkb.h | 51 ---
18 files changed, 1 insertion(+), 793 deletions(-)
delete mode 100644 arch/arm/cpu/arm926ejs/pantheon/Makefile
delete mode 100644 arch/arm/cpu/arm926ejs/pantheon/cpu.c
delete mode 100644 arch/arm/cpu/arm926ejs/pantheon/dram.c
delete mode 100644 arch/arm/cpu/arm926ejs/pantheon/timer.c
delete mode 100644 arch/arm/include/asm/arch-pantheon/config.h
delete mode 100644 arch/arm/include/asm/arch-pantheon/cpu.h
delete mode 100644 arch/arm/include/asm/arch-pantheon/gpio.h
delete mode 100644 arch/arm/include/asm/arch-pantheon/mfp.h
delete mode 100644 arch/arm/include/asm/arch-pantheon/pantheon.h
delete mode 100644 board/Marvell/dkb/Kconfig
delete mode 100644 board/Marvell/dkb/MAINTAINERS
delete mode 100644 board/Marvell/dkb/Makefile
delete mode 100644 board/Marvell/dkb/dkb.c
delete mode 100644 configs/dkb_defconfig
delete mode 100644 include/configs/dkb.h
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index b0b7eaf..74dd164 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -316,10 +316,6 @@ config ORION5X
bool Marvell Orion
select CPU_ARM926EJS
-config TARGET_DKB
- bool Support dkb
- select CPU_ARM926EJS
-
config TARGET_SPEAR300
bool Support spear300
select CPU_ARM926EJS
@@ -843,7 +839,6 @@ source board/BuS/vl_ma2sc/Kconfig
source board/CarMediaLab/flea3/Kconfig
source board/Marvell/aspenite/Kconfig
source board/Marvell/db-mv784mp-gp/Kconfig
-source board/Marvell/dkb/Kconfig
source board/Marvell/gplugd/Kconfig
source board/afeb9260/Kconfig
source board/altera/socfpga/Kconfig
diff --git a/arch/arm/cpu/arm926ejs/Makefile b/arch/arm/cpu/arm926ejs/Makefile
index bfa365e..38ab0d4 100644
--- a/arch/arm/cpu/arm926ejs/Makefile
+++ b/arch/arm/cpu/arm926ejs/Makefile
@@ -23,6 +23,5 @@ obj-$(CONFIG_MX27) += mx27/
obj-$(if $(filter mxs,$(SOC)),y) += mxs/
obj-$(CONFIG_ARCH_NOMADIK) += nomadik/
obj-$(CONFIG_ORION5X) += orion5x/
-obj-$(CONFIG_PANTHEON) += pantheon/
obj-$(if $(filter spear,$(SOC)),y) += spear/
obj-$(CONFIG_ARCH_VERSATILE) += versatile/
diff --git a/arch/arm/cpu/arm926ejs/pantheon/Makefile
b/arch/arm/cpu/arm926ejs/pantheon/Makefile
deleted file mode 100644
index 988341f..000
--- a/arch/arm/cpu/arm926ejs/pantheon/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# (C) Copyright 2011
-# Marvell Semiconductor www.marvell.com
-# Written-by: Lei Wen lei...@marvell.com
-#
-# SPDX-License-Identifier: GPL-2.0+
-#
-
-obj-y = cpu.o timer.o dram.o
diff --git a/arch/arm/cpu/arm926ejs/pantheon/cpu.c
b/arch/arm/cpu/arm926ejs/pantheon/cpu.c
deleted file mode 100644
index 4e2a177..000
--- a/arch/arm/cpu/arm926ejs/pantheon/cpu.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * (C) Copyright 2011
- * Marvell Semiconductor www.marvell.com
- * Written-by: Lei Wen lei...@marvell.com
- *
- * SPDX-License-Identifier:GPL-2.0+
- */
-
-#include common.h
-#include asm/arch/cpu.h
-#include asm/arch/pantheon.h
-
-#define UARTCLK14745KHZ(APBC_APBCLK | APBC_FNCLK | APBC_FNCLKSEL(1))
-#define SET_MRVL_ID(18)
-#define L2C_RAM_SEL(14)
-
-int arch_cpu_init(void)
-{
- u32 val;
- struct panthcpu_registers *cpuregs =
- (struct panthcpu_registers*) PANTHEON_CPU_BASE;
-
- struct panthapb_registers *apbclkres =
- (struct panthapb_registers*) PANTHEON_APBC_BASE;
-
- struct panthmpmu_registers *mpmu =
- (struct panthmpmu_registers*) PANTHEON_MPMU_BASE;
-
- struct panthapmu_registers *apmu =
- (struct panthapmu_registers *) PANTHEON_APMU_BASE;
-
- /* set SEL_MRVL_ID bit in PANTHEON_CPU_CONF register */
- val = readl(cpuregs-cpu_conf);
- val = val | SET_MRVL_ID;
- writel(val, cpuregs-cpu_conf);
-
- /* Turn on clock gating (PMUM_CCGR) */
-
[U-Boot] [PATCH 11/11] ARM: davinci: remove hawkboard support
This is still a non-generic board. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Cc: Syed Mohammed Khasim sm.kha...@gmail.com Cc: Sughosh Ganu urwithsugh...@gmail.com --- arch/arm/cpu/arm926ejs/davinci/Kconfig| 4 - board/davinci/da8xxevm/Kconfig| 13 -- board/davinci/da8xxevm/MAINTAINERS| 8 - board/davinci/da8xxevm/Makefile | 1 - board/davinci/da8xxevm/README.hawkboard | 92 --- board/davinci/da8xxevm/hawkboard-ais-nand.cfg | 4 - board/davinci/da8xxevm/hawkboard.c| 120 -- board/davinci/da8xxevm/u-boot-spl-hawk.lds| 69 configs/hawkboard_defconfig | 4 - configs/hawkboard_uart_defconfig | 5 - doc/README.scrapyard | 1 + include/configs/hawkboard.h | 220 -- 12 files changed, 1 insertion(+), 540 deletions(-) delete mode 100644 board/davinci/da8xxevm/README.hawkboard delete mode 100644 board/davinci/da8xxevm/hawkboard-ais-nand.cfg delete mode 100644 board/davinci/da8xxevm/hawkboard.c delete mode 100644 board/davinci/da8xxevm/u-boot-spl-hawk.lds delete mode 100644 configs/hawkboard_defconfig delete mode 100644 configs/hawkboard_uart_defconfig delete mode 100644 include/configs/hawkboard.h diff --git a/arch/arm/cpu/arm926ejs/davinci/Kconfig b/arch/arm/cpu/arm926ejs/davinci/Kconfig index 613f04d..6827721 100644 --- a/arch/arm/cpu/arm926ejs/davinci/Kconfig +++ b/arch/arm/cpu/arm926ejs/davinci/Kconfig @@ -21,10 +21,6 @@ config TARGET_CAM_ENC_4XX bool CAM ENC 4xx board select SUPPORT_SPL -config TARGET_HAWKBOARD - bool Hawkboard - select SUPPORT_SPL - config TARGET_DAVINCI_DM355EVM bool DM355 EVM board diff --git a/board/davinci/da8xxevm/Kconfig b/board/davinci/da8xxevm/Kconfig index 1a841ce..1108e4b 100644 --- a/board/davinci/da8xxevm/Kconfig +++ b/board/davinci/da8xxevm/Kconfig @@ -23,16 +23,3 @@ config SYS_CONFIG_NAME default da850evm endif - -if TARGET_HAWKBOARD - -config SYS_BOARD - default da8xxevm - -config SYS_VENDOR - default davinci - -config SYS_CONFIG_NAME - default hawkboard - -endif diff --git a/board/davinci/da8xxevm/MAINTAINERS b/board/davinci/da8xxevm/MAINTAINERS index dd66f07..10c4e2f 100644 --- a/board/davinci/da8xxevm/MAINTAINERS +++ b/board/davinci/da8xxevm/MAINTAINERS @@ -12,11 +12,3 @@ F: include/configs/da850evm.h F: configs/da850_am18xxevm_defconfig F: configs/da850evm_defconfig F: configs/da850evm_direct_nor_defconfig - -HAWKBOARD BOARD -M: Syed Mohammed Khasim sm.kha...@gmail.com -M: Sughosh Ganu urwithsugh...@gmail.com -S: Maintained -F: include/configs/hawkboard.h -F: configs/hawkboard_defconfig -F: configs/hawkboard_uart_defconfig diff --git a/board/davinci/da8xxevm/Makefile b/board/davinci/da8xxevm/Makefile index d3acacc..4da509b 100644 --- a/board/davinci/da8xxevm/Makefile +++ b/board/davinci/da8xxevm/Makefile @@ -9,4 +9,3 @@ obj-$(CONFIG_MACH_DAVINCI_DA830_EVM) += da830evm.o obj-$(CONFIG_MACH_DAVINCI_DA850_EVM) += da850evm.o -obj-$(CONFIG_MACH_DAVINCI_HAWK)+= hawkboard.o diff --git a/board/davinci/da8xxevm/README.hawkboard b/board/davinci/da8xxevm/README.hawkboard deleted file mode 100644 index d6ae02e..000 --- a/board/davinci/da8xxevm/README.hawkboard +++ /dev/null @@ -1,92 +0,0 @@ -Summary -=== -The README is for the boot procedure used for TI's OMAP-L138 based -hawkboard. The hawkboard comes with a 128MiB Nand flash and a 128MiB -DDR SDRAM along with a host of other controllers. - -The hawkboard is booted in three stages. The initial bootloader which -executes upon reset is the Rom Boot Loader(RBL) which sits in the -internal ROM of the omap. The RBL initialises the memory and the nand -controller, and copies the image stored at a predefined location(block -1) of the nand flash. The image loaded by the RBL to the memory is the -AIS signed spl image. This, in turns copies the u-boot binary from the -nand flash to the memory and jumps to the u-boot entry point. - -AIS is an image format defined by TI for the images that are to be -loaded to memory by the RBL. The image is divided into a series of -sections and the image's entry point is specified. Each section comes -with meta data like the target address the section is to be copied to -and the size of the section, which is used by the RBL to load the -image. At the end of the image the RBL jumps to the image entry -point. - -The secondary stage bootloader(spl) which is loaded by the RBL then -loads the u-boot from a predefined location in the nand to the memory -and jumps to the u-boot entry point. - -The reason a secondary stage bootloader is used is because the ECC -layout expected by the RBL is not the same as that used by -u-boot/linux. This also implies that for flashing the spl image,we -need to use the u-boot which uses the ECC layout
[U-Boot] [PATCH 08/11] ARM: remove a320evb board support
This is still a non-generic board.
Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com
Cc: Po-Yu Chuang ratb...@faraday-tech.com
---
arch/arm/Kconfig | 5 -
arch/arm/cpu/arm920t/Makefile | 1 -
arch/arm/cpu/arm920t/a320/Makefile| 9 --
arch/arm/cpu/arm920t/a320/reset.S | 10 --
arch/arm/cpu/arm920t/a320/timer.c | 118 ---
arch/arm/include/asm/arch-a320/a320.h | 22
board/faraday/a320evb/Kconfig | 15 ---
board/faraday/a320evb/MAINTAINERS | 6 -
board/faraday/a320evb/Makefile| 9 --
board/faraday/a320evb/a320evb.c | 59 --
board/faraday/a320evb/lowlevel_init.S | 106 -
configs/a320evb_defconfig | 2 -
doc/README.scrapyard | 1 +
include/configs/a320evb.h | 211 --
14 files changed, 1 insertion(+), 573 deletions(-)
delete mode 100644 arch/arm/cpu/arm920t/a320/Makefile
delete mode 100644 arch/arm/cpu/arm920t/a320/reset.S
delete mode 100644 arch/arm/cpu/arm920t/a320/timer.c
delete mode 100644 arch/arm/include/asm/arch-a320/a320.h
delete mode 100644 board/faraday/a320evb/Kconfig
delete mode 100644 board/faraday/a320evb/MAINTAINERS
delete mode 100644 board/faraday/a320evb/Makefile
delete mode 100644 board/faraday/a320evb/a320evb.c
delete mode 100644 board/faraday/a320evb/lowlevel_init.S
delete mode 100644 configs/a320evb_defconfig
delete mode 100644 include/configs/a320evb.h
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index d6bb5c3..3ec570b 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -73,10 +73,6 @@ config TARGET_INTEGRATORCP_CM920T
bool Support integratorcp_cm920t
select CPU_ARM920T
-config TARGET_A320EVB
- bool Support a320evb
- select CPU_ARM920T
-
config TARGET_AT91RM9200EK
bool Support at91rm9200ek
select CPU_ARM920T
@@ -877,7 +873,6 @@ source board/esd/otc570/Kconfig
source board/esg/ima3-mx53/Kconfig
source board/eukrea/cpu9260/Kconfig
source board/eukrea/cpuat91/Kconfig
-source board/faraday/a320evb/Kconfig
source board/freescale/ls2085a/Kconfig
source board/freescale/ls1021aqds/Kconfig
source board/freescale/ls1021atwr/Kconfig
diff --git a/arch/arm/cpu/arm920t/Makefile b/arch/arm/cpu/arm920t/Makefile
index a30a572..b07e13a 100644
--- a/arch/arm/cpu/arm920t/Makefile
+++ b/arch/arm/cpu/arm920t/Makefile
@@ -10,7 +10,6 @@ extra-y = start.o
obj-y += cpu.o
obj-$(CONFIG_USE_IRQ) += interrupts.o
-obj-$(if $(filter a320,$(SOC)),y) += a320/
obj-$(CONFIG_AT91FAMILY) += at91/
obj-$(CONFIG_EP93XX) += ep93xx/
obj-$(CONFIG_IMX) += imx/
diff --git a/arch/arm/cpu/arm920t/a320/Makefile
b/arch/arm/cpu/arm920t/a320/Makefile
deleted file mode 100644
index bbdab58..000
--- a/arch/arm/cpu/arm920t/a320/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# (C) Copyright 2000-2006
-# Wolfgang Denk, DENX Software Engineering, w...@denx.de.
-#
-# SPDX-License-Identifier: GPL-2.0+
-#
-
-obj-y += reset.o
-obj-y += timer.o
diff --git a/arch/arm/cpu/arm920t/a320/reset.S
b/arch/arm/cpu/arm920t/a320/reset.S
deleted file mode 100644
index 81f9dc9..000
--- a/arch/arm/cpu/arm920t/a320/reset.S
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * (C) Copyright 2009 Faraday Technology
- * Po-Yu Chuang ratb...@faraday-tech.com
- *
- * SPDX-License-Identifier:GPL-2.0+
- */
-
-.global reset_cpu
-reset_cpu:
- b reset_cpu
diff --git a/arch/arm/cpu/arm920t/a320/timer.c
b/arch/arm/cpu/arm920t/a320/timer.c
deleted file mode 100644
index 1ac5b60..000
--- a/arch/arm/cpu/arm920t/a320/timer.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * (C) Copyright 2009 Faraday Technology
- * Po-Yu Chuang ratb...@faraday-tech.com
- *
- * SPDX-License-Identifier:GPL-2.0+
- */
-
-#include common.h
-#include div64.h
-#include asm/io.h
-#include faraday/ftpmu010.h
-#include faraday/fttmr010.h
-
-DECLARE_GLOBAL_DATA_PTR;
-
-#define TIMER_CLOCK32768
-#define TIMER_LOAD_VAL 0x
-
-static inline unsigned long long tick_to_time(unsigned long long tick)
-{
- tick *= CONFIG_SYS_HZ;
- do_div(tick, gd-arch.timer_rate_hz);
-
- return tick;
-}
-
-static inline unsigned long long usec_to_tick(unsigned long long usec)
-{
- usec *= gd-arch.timer_rate_hz;
- do_div(usec, 100);
-
- return usec;
-}
-
-int timer_init(void)
-{
- struct fttmr010 *tmr = (struct fttmr010 *)CONFIG_FTTMR010_BASE;
- unsigned int cr;
-
- debug(%s()\n, __func__);
-
- /* disable timers */
- writel(0, tmr-cr);
-
- /* use 32768Hz oscillator for RTC, WDT, TIMER */
- ftpmu010_32768osc_enable();
-
- /* setup timer */
- writel(TIMER_LOAD_VAL, tmr-timer3_load);
- writel(TIMER_LOAD_VAL, tmr-timer3_counter);
- writel(0, tmr-timer3_match1);
- writel(0, tmr-timer3_match2);
-
- /* we don't want timer to issue interrupts */
- writel(FTTMR010_TM3_MATCH1 |
-
[U-Boot] [PATCH 01/11] ARM: remove mx31ads board support
This is still a non-generic board. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Cc: Guennadi Liakhovetski g.liakhovet...@gmx.de --- arch/arm/Kconfig| 5 - board/freescale/mx31ads/Kconfig | 15 -- board/freescale/mx31ads/MAINTAINERS | 6 - board/freescale/mx31ads/Makefile| 8 - board/freescale/mx31ads/lowlevel_init.S | 268 board/freescale/mx31ads/mx31ads.c | 114 -- board/freescale/mx31ads/u-boot.lds | 110 - configs/mx31ads_defconfig | 2 - doc/README.scrapyard| 35 +++-- include/configs/mx31ads.h | 188 -- 10 files changed, 18 insertions(+), 733 deletions(-) delete mode 100644 board/freescale/mx31ads/Kconfig delete mode 100644 board/freescale/mx31ads/MAINTAINERS delete mode 100644 board/freescale/mx31ads/Makefile delete mode 100644 board/freescale/mx31ads/lowlevel_init.S delete mode 100644 board/freescale/mx31ads/mx31ads.c delete mode 100644 board/freescale/mx31ads/u-boot.lds delete mode 100644 configs/mx31ads_defconfig delete mode 100644 include/configs/mx31ads.h diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 986b4c5..f12dac9 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -373,10 +373,6 @@ config TARGET_QONG bool Support qong select CPU_ARM1136 -config TARGET_MX31ADS - bool Support mx31ads - select CPU_ARM1136 - config TARGET_MX31PDK bool Support mx31pdk select CPU_ARM1136 @@ -919,7 +915,6 @@ source board/freescale/ls1021atwr/Kconfig source board/freescale/mx23evk/Kconfig source board/freescale/mx25pdk/Kconfig source board/freescale/mx28evk/Kconfig -source board/freescale/mx31ads/Kconfig source board/freescale/mx31pdk/Kconfig source board/freescale/mx35pdk/Kconfig source board/freescale/mx51evk/Kconfig diff --git a/board/freescale/mx31ads/Kconfig b/board/freescale/mx31ads/Kconfig deleted file mode 100644 index eeeb6f4..000 --- a/board/freescale/mx31ads/Kconfig +++ /dev/null @@ -1,15 +0,0 @@ -if TARGET_MX31ADS - -config SYS_BOARD - default mx31ads - -config SYS_VENDOR - default freescale - -config SYS_SOC - default mx31 - -config SYS_CONFIG_NAME - default mx31ads - -endif diff --git a/board/freescale/mx31ads/MAINTAINERS b/board/freescale/mx31ads/MAINTAINERS deleted file mode 100644 index 5f6ec26..000 --- a/board/freescale/mx31ads/MAINTAINERS +++ /dev/null @@ -1,6 +0,0 @@ -MX31ADS BOARD -#M:(resigned) Guennadi Liakhovetski g.liakhovet...@gmx.de -S: Orphan (since 2013-09) -F: board/freescale/mx31ads/ -F: include/configs/mx31ads.h -F: configs/mx31ads_defconfig diff --git a/board/freescale/mx31ads/Makefile b/board/freescale/mx31ads/Makefile deleted file mode 100644 index 5e1440d..000 --- a/board/freescale/mx31ads/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# -# Copyright (C) 2008, Guennadi Liakhovetski l...@denx.de -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y := mx31ads.o -obj-y += lowlevel_init.o diff --git a/board/freescale/mx31ads/lowlevel_init.S b/board/freescale/mx31ads/lowlevel_init.S deleted file mode 100644 index fcb5549..000 --- a/board/freescale/mx31ads/lowlevel_init.S +++ /dev/null @@ -1,268 +0,0 @@ -/* - * Copyright (C) 2008, Guennadi Liakhovetski l...@denx.de - * - * SPDX-License-Identifier:GPL-2.0+ - */ - -#include asm/arch/imx-regs.h - -.macro REG reg, val - ldr r2, =\reg - ldr r3, =\val - str r3, [r2] -.endm - -.macro REG8 reg, val - ldr r2, =\reg - ldr r3, =\val - strb r3, [r2] -.endm - -.macro DELAY loops - ldr r2, =\loops -1: - subsr2, r2, #1 - nop - bcs 1b -.endm - -/* RedBoot: AIPS setup - Only setup MPROTx registers. - * The PACR default values are good.*/ -.macro init_aips - /* -* Set all MPROTx to be non-bufferable, trusted for R/W, -* not forced to user-mode. -*/ - ldr r0, =0x43F0 - ldr r1, =0x - str r1, [r0, #0x00] - str r1, [r0, #0x04] - ldr r0, =0x53F0 - str r1, [r0, #0x00] - str r1, [r0, #0x04] - - /* -* Clear the on and off peripheral modules Supervisor Protect bit -* for SDMA to access them. Did not change the AIPS control registers -* (offset 0x20) access type -*/ - ldr r0, =0x43F0 - ldr r1, =0x0 - str r1, [r0, #0x40] - str r1, [r0, #0x44] - str r1, [r0, #0x48] - str r1, [r0, #0x4C] - ldr r1, [r0, #0x50] - and r1, r1, #0x00FF - str r1, [r0, #0x50] - - ldr r0, =0x53F0 - ldr r1, =0x0 - str r1, [r0, #0x40] - str r1, [r0, #0x44] - str r1, [r0, #0x48] - str r1, [r0, #0x4C] - ldr r1, [r0, #0x50] - and r1, r1, #0x00FF - str r1, [r0, #0x50] -.endm /* init_aips */ - -/* RedBoot: MAX (Multi-Layer AHB Crossbar Switch) setup */
[U-Boot] [PATCH 04/11] ARM: remove zmx25 board support
This is still a non-generic board. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Cc: Matthias Weisser weiss...@arcor.de --- arch/arm/Kconfig | 5 -- board/syteco/zmx25/Kconfig | 15 board/syteco/zmx25/MAINTAINERS | 6 -- board/syteco/zmx25/Makefile| 9 -- board/syteco/zmx25/lowlevel_init.S | 97 - board/syteco/zmx25/zmx25.c | 174 - configs/zmx25_defconfig| 2 - doc/README.scrapyard | 1 + include/configs/zmx25.h| 162 -- 9 files changed, 1 insertion(+), 470 deletions(-) delete mode 100644 board/syteco/zmx25/Kconfig delete mode 100644 board/syteco/zmx25/MAINTAINERS delete mode 100644 board/syteco/zmx25/Makefile delete mode 100644 board/syteco/zmx25/lowlevel_init.S delete mode 100644 board/syteco/zmx25/zmx25.c delete mode 100644 configs/zmx25_defconfig delete mode 100644 include/configs/zmx25.h diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 3ade156..cbed2f4 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -254,10 +254,6 @@ config TARGET_TX25 select CPU_ARM926EJS select SUPPORT_SPL -config TARGET_ZMX25 - bool Support zmx25 - select CPU_ARM926EJS - config TARGET_APF27 bool Support apf27 select CPU_ARM926EJS @@ -965,7 +961,6 @@ source board/st-ericsson/snowball/Kconfig source board/st-ericsson/u8500/Kconfig source board/st/stv0991/Kconfig source board/sunxi/Kconfig -source board/syteco/zmx25/Kconfig source board/taskit/stamp9g20/Kconfig source board/tbs/tbs2910/Kconfig source board/ti/am335x/Kconfig diff --git a/board/syteco/zmx25/Kconfig b/board/syteco/zmx25/Kconfig deleted file mode 100644 index 59a415d..000 --- a/board/syteco/zmx25/Kconfig +++ /dev/null @@ -1,15 +0,0 @@ -if TARGET_ZMX25 - -config SYS_BOARD - default zmx25 - -config SYS_VENDOR - default syteco - -config SYS_SOC - default mx25 - -config SYS_CONFIG_NAME - default zmx25 - -endif diff --git a/board/syteco/zmx25/MAINTAINERS b/board/syteco/zmx25/MAINTAINERS deleted file mode 100644 index 90f9fab..000 --- a/board/syteco/zmx25/MAINTAINERS +++ /dev/null @@ -1,6 +0,0 @@ -ZMX25 BOARD -M: Matthias Weisser weiss...@arcor.de -S: Maintained -F: board/syteco/zmx25/ -F: include/configs/zmx25.h -F: configs/zmx25_defconfig diff --git a/board/syteco/zmx25/Makefile b/board/syteco/zmx25/Makefile deleted file mode 100644 index d5edb48..000 --- a/board/syteco/zmx25/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# -# (c) 2010 Graf-Syteco, Matthias Weisser -# weiss...@arcor.de -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y += zmx25.o -obj-y += lowlevel_init.o diff --git a/board/syteco/zmx25/lowlevel_init.S b/board/syteco/zmx25/lowlevel_init.S deleted file mode 100644 index 5eccf09..000 --- a/board/syteco/zmx25/lowlevel_init.S +++ /dev/null @@ -1,97 +0,0 @@ -/* - * (C) Copyright 2011 - * Matthias Weisser weiss...@arcor.de - * - * (C) Copyright 2009 DENX Software Engineering - * Author: John Rigby jri...@gmail.com - * - * Based on U-Boot and RedBoot sources for several different i.mx - * platforms. - * - * SPDX-License-Identifier:GPL-2.0+ - */ - -#include asm/macro.h -#include asm/arch/macro.h -#include asm/arch/imx-regs.h -#include generated/asm-offsets.h - -/* - * clocks - */ -.macro init_clocks - - /* disable clock output */ - write32 IMX_CCM_BASE + CCM_MCR, 0x - write32 IMX_CCM_BASE + CCM_CCTL, 0x5003 - - /* -* enable all implemented clocks in all three -* clock control registers -*/ - write32 IMX_CCM_BASE + CCM_CGCR0, 0x1fff - write32 IMX_CCM_BASE + CCM_CGCR1, 0x - write32 IMX_CCM_BASE + CCM_CGCR2, 0xf - - /* Devide NAND clock by 32 */ - write32 IMX_CCM_BASE + CCM_PCDR2, 0x0101011F -.endm - -/* - * sdram controller init - */ -.macro init_lpddr - ldr r0, =IMX_ESDRAMC_BASE - ldr r2, =IMX_SDRAM_BANK0_BASE - - /* -* reset SDRAM controller -* then wait for initialization to complete -*/ - ldr r1, =(1 1) | (1 2) - str r1, [r0, #ESDRAMC_ESDMISC] -1: ldr r3, [r0, #ESDRAMC_ESDMISC] - tst r3, #(1 31) - beq 1b - ldr r1, =(1 2) - str r1, [r0, #ESDRAMC_ESDMISC] - - ldr r1, =0x002a7420 - str r1, [r0, #ESDRAMC_ESDCFG0] - - /* control | precharge */ - ldr r1, =0x92216008 - str r1, [r0, #ESDRAMC_ESDCTL0] - /* dram command encoded in address */ - str r1, [r2, #0x400] - - /* auto refresh */ - ldr r1, =0xa2216008 - str r1, [r0, #ESDRAMC_ESDCTL0] - /* read dram twice to auto refresh */ - ldr r3, [r2] - ldr r3, [r2] - - /* control | load mode */ - ldr r1, =0xb2216008 - str r1,
[U-Boot] [PATCH 03/11] ARM: remove jadecpu board support
This is still a non-generic board.
Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com
Cc: Matthias Weisser weiss...@arcor.de
---
arch/arm/Kconfig | 5 -
arch/arm/cpu/arm926ejs/Makefile | 1 -
arch/arm/cpu/arm926ejs/mb86r0x/Makefile | 8 -
arch/arm/cpu/arm926ejs/mb86r0x/clock.c | 27 --
arch/arm/cpu/arm926ejs/mb86r0x/reset.c | 24 --
arch/arm/cpu/arm926ejs/mb86r0x/timer.c | 115 -
arch/arm/include/asm/arch-mb86r0x/hardware.h | 15 -
arch/arm/include/asm/arch-mb86r0x/mb86r0x.h | 599 ---
arch/arm/lib/asm-offsets.c | 46 --
board/syteco/jadecpu/Kconfig | 15 -
board/syteco/jadecpu/MAINTAINERS | 6 -
board/syteco/jadecpu/Makefile| 13 -
board/syteco/jadecpu/jadecpu.c | 160 ---
board/syteco/jadecpu/lowlevel_init.S | 249 ---
configs/jadecpu_defconfig| 2 -
doc/README.scrapyard | 1 +
drivers/video/Makefile | 1 -
drivers/video/mb86r0xgdc.c | 168
include/configs/jadecpu.h| 273
include/serial.h | 2 +-
20 files changed, 2 insertions(+), 1728 deletions(-)
delete mode 100644 arch/arm/cpu/arm926ejs/mb86r0x/Makefile
delete mode 100644 arch/arm/cpu/arm926ejs/mb86r0x/clock.c
delete mode 100644 arch/arm/cpu/arm926ejs/mb86r0x/reset.c
delete mode 100644 arch/arm/cpu/arm926ejs/mb86r0x/timer.c
delete mode 100644 arch/arm/include/asm/arch-mb86r0x/hardware.h
delete mode 100644 arch/arm/include/asm/arch-mb86r0x/mb86r0x.h
delete mode 100644 board/syteco/jadecpu/Kconfig
delete mode 100644 board/syteco/jadecpu/MAINTAINERS
delete mode 100644 board/syteco/jadecpu/Makefile
delete mode 100644 board/syteco/jadecpu/jadecpu.c
delete mode 100644 board/syteco/jadecpu/lowlevel_init.S
delete mode 100644 configs/jadecpu_defconfig
delete mode 100644 drivers/video/mb86r0xgdc.c
delete mode 100644 include/configs/jadecpu.h
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index d49142e..3ade156 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -245,10 +245,6 @@ config TARGET_DEVKIT3250
bool Support devkit3250
select CPU_ARM926EJS
-config TARGET_JADECPU
- bool Support jadecpu
- select CPU_ARM926EJS
-
config TARGET_MX25PDK
bool Support mx25pdk
select CPU_ARM926EJS
@@ -969,7 +965,6 @@ source board/st-ericsson/snowball/Kconfig
source board/st-ericsson/u8500/Kconfig
source board/st/stv0991/Kconfig
source board/sunxi/Kconfig
-source board/syteco/jadecpu/Kconfig
source board/syteco/zmx25/Kconfig
source board/taskit/stamp9g20/Kconfig
source board/tbs/tbs2910/Kconfig
diff --git a/arch/arm/cpu/arm926ejs/Makefile b/arch/arm/cpu/arm926ejs/Makefile
index adcea9f..607d29f 100644
--- a/arch/arm/cpu/arm926ejs/Makefile
+++ b/arch/arm/cpu/arm926ejs/Makefile
@@ -19,7 +19,6 @@ obj-$(CONFIG_AT91FAMILY) += at91/
obj-$(CONFIG_ARCH_DAVINCI) += davinci/
obj-$(CONFIG_KIRKWOOD) += kirkwood/
obj-$(if $(filter lpc32xx,$(SOC)),y) += lpc32xx/
-obj-$(CONFIG_MB86R0x) += mb86r0x/
obj-$(CONFIG_MX25) += mx25/
obj-$(CONFIG_MX27) += mx27/
obj-$(if $(filter mxs,$(SOC)),y) += mxs/
diff --git a/arch/arm/cpu/arm926ejs/mb86r0x/Makefile
b/arch/arm/cpu/arm926ejs/mb86r0x/Makefile
deleted file mode 100644
index 365892c..000
--- a/arch/arm/cpu/arm926ejs/mb86r0x/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# (C) Copyright 2000-2006
-# Wolfgang Denk, DENX Software Engineering, w...@denx.de.
-#
-# SPDX-License-Identifier: GPL-2.0+
-#
-
-obj-y = clock.o reset.o timer.o
diff --git a/arch/arm/cpu/arm926ejs/mb86r0x/clock.c
b/arch/arm/cpu/arm926ejs/mb86r0x/clock.c
deleted file mode 100644
index 1f6f66e..000
--- a/arch/arm/cpu/arm926ejs/mb86r0x/clock.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * (C) Copyright 2010
- * Matthias Weisser weiss...@arcor.de
- *
- * SPDX-License-Identifier:GPL-2.0+
- */
-
-#include common.h
-#include asm/io.h
-#include asm/arch/hardware.h
-
-/*
- * Get the peripheral bus frequency depending on pll pin settings
- */
-ulong get_bus_freq(ulong dummy)
-{
- struct mb86r0x_crg * crg = (struct mb86r0x_crg *)
- MB86R0x_CRG_BASE;
- uint32_t pllmode;
-
- pllmode = readl(crg-crpr) MB86R0x_CRG_CRPR_PLLMODE;
-
- if (pllmode == MB86R0x_CRG_CRPR_PLLMODE_X20)
- return 4000;
-
- return 41164767;
-}
diff --git a/arch/arm/cpu/arm926ejs/mb86r0x/reset.c
b/arch/arm/cpu/arm926ejs/mb86r0x/reset.c
deleted file mode 100644
index 7bd77ff..000
--- a/arch/arm/cpu/arm926ejs/mb86r0x/reset.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * (C) Copyright 2010
- * Matthias Weisser weiss...@arcor.de
- *
- * SPDX-License-Identifier:GPL-2.0+
- */
-
-#include common.h
-#include asm/io.h
-#include asm/arch/hardware.h
-
-/*
- * Reset the cpu by setting software reset
[U-Boot] [PATCH 02/11] ARM: mx31: remove imx31_phycore board
This is still a non-generic board.
Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com
Cc: Guennadi Liakhovetski g.liakhovet...@gmx.de
---
arch/arm/Kconfig| 5 -
board/imx31_phycore/Kconfig | 12 ---
board/imx31_phycore/MAINTAINERS | 11 --
board/imx31_phycore/Makefile| 9 --
board/imx31_phycore/imx31_phycore.c | 153 ---
board/imx31_phycore/lowlevel_init.S | 88
configs/imx31_phycore_defconfig | 2 -
configs/imx31_phycore_eet_defconfig | 3 -
doc/README.scrapyard| 1 +
include/configs/imx31_phycore.h | 202
10 files changed, 1 insertion(+), 485 deletions(-)
delete mode 100644 board/imx31_phycore/Kconfig
delete mode 100644 board/imx31_phycore/MAINTAINERS
delete mode 100644 board/imx31_phycore/Makefile
delete mode 100644 board/imx31_phycore/imx31_phycore.c
delete mode 100644 board/imx31_phycore/lowlevel_init.S
delete mode 100644 configs/imx31_phycore_defconfig
delete mode 100644 configs/imx31_phycore_eet_defconfig
delete mode 100644 include/configs/imx31_phycore.h
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index f12dac9..d49142e 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -365,10 +365,6 @@ config TARGET_INTEGRATORCP_CM1136
bool Support integratorcp_cm1136
select CPU_ARM1136
-config TARGET_IMX31_PHYCORE
- bool Support imx31_phycore
- select CPU_ARM1136
-
config TARGET_QONG
bool Support qong
select CPU_ARM1136
@@ -934,7 +930,6 @@ source board/gumstix/pepper/Kconfig
source board/h2200/Kconfig
source board/hale/tt01/Kconfig
source board/icpdas/lp8x4x/Kconfig
-source board/imx31_phycore/Kconfig
source board/isee/igep0033/Kconfig
source board/jornada/Kconfig
source board/karo/tx25/Kconfig
diff --git a/board/imx31_phycore/Kconfig b/board/imx31_phycore/Kconfig
deleted file mode 100644
index d3d2025..000
--- a/board/imx31_phycore/Kconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-if TARGET_IMX31_PHYCORE
-
-config SYS_BOARD
- default imx31_phycore
-
-config SYS_SOC
- default mx31
-
-config SYS_CONFIG_NAME
- default imx31_phycore
-
-endif
diff --git a/board/imx31_phycore/MAINTAINERS b/board/imx31_phycore/MAINTAINERS
deleted file mode 100644
index 41f6cae..000
--- a/board/imx31_phycore/MAINTAINERS
+++ /dev/null
@@ -1,11 +0,0 @@
-IMX31_PHYCORE BOARD
-#M:-
-S: Maintained
-F: board/imx31_phycore/
-F: include/configs/imx31_phycore.h
-F: configs/imx31_phycore_defconfig
-
-IMX31_PHYCORE_EET BOARD
-#M:(resigned) Guennadi Liakhovetski g.liakhovet...@gmx.de
-S: Orphan (since 2013-09)
-F: configs/imx31_phycore_eet_defconfig
diff --git a/board/imx31_phycore/Makefile b/board/imx31_phycore/Makefile
deleted file mode 100644
index e781c13..000
--- a/board/imx31_phycore/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# (C) Copyright 2000-2006
-# Wolfgang Denk, DENX Software Engineering, w...@denx.de.
-#
-# SPDX-License-Identifier: GPL-2.0+
-#
-
-obj-y := imx31_phycore.o
-obj-y += lowlevel_init.o
diff --git a/board/imx31_phycore/imx31_phycore.c
b/board/imx31_phycore/imx31_phycore.c
deleted file mode 100644
index 3f45e4e..000
--- a/board/imx31_phycore/imx31_phycore.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- *
- * (c) 2007 Pengutronix, Sascha Hauer s.ha...@pengutronix.de
- *
- * SPDX-License-Identifier:GPL-2.0+
- */
-
-
-#include common.h
-#include s6e63d6.h
-#include netdev.h
-#include asm/arch/clock.h
-#include asm/arch/imx-regs.h
-#include asm/arch/sys_proto.h
-
-DECLARE_GLOBAL_DATA_PTR;
-
-int dram_init(void)
-{
- /* dram_init must store complete ramsize in gd-ram_size */
- gd-ram_size = get_ram_size((void *)PHYS_SDRAM_1,
- PHYS_SDRAM_1_SIZE);
- return 0;
-}
-
-int board_init(void)
-{
-
- gd-bd-bi_arch_number = MACH_TYPE_PCM037; /* board id for linux */
- gd-bd-bi_boot_params = (0x8100); /* adress of boot parameters */
-
- return 0;
-}
-
-int board_early_init_f(void)
-{
- /* CS0: Nor Flash */
- static const struct mxc_weimcs cs0 = {
- /*sp wp bcd bcs psz pme sync dol cnc wsc ew wws edc */
- CSCR_U(0, 0, 0, 0, 0, 0, 0, 0, 3, 15, 0, 0, 3),
- /* oea oen ebwa ebwn csa ebc dsz csn psr cre wrap csen */
- CSCR_L(1, 0, 0, 0, 0, 1, 5, 0, 0, 0, 1, 1),
- /* ebra ebrn rwa rwn mum lah lbn lba dww dct wwu age cnc2 fce*/
- CSCR_A(0, 0, 7, 2, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0)
- };
-
- /* CS1: Network Controller */
- static const struct mxc_weimcs cs1 = {
- /*sp wp bcd bcs psz pme sync dol cnc wsc ew wws edc */
- CSCR_U(0, 0, 0, 0, 0, 0, 0, 0, 3, 31, 0, 0, 6),
- /* oea oen ebwa ebwn csa ebc dsz csn psr cre wrap csen */
- CSCR_L(4, 4, 4, 10, 4, 0,
Re: [U-Boot] [PATCH v2 13/19] dm: omap3: Move driver model CONFIGs to Kconfig
Hi Masahiro, On 8 February 2015 at 22:35, Masahiro Yamada yamad...@jp.panasonic.com wrote: Hi Simon, On Thu, 5 Feb 2015 21:41:44 -0700 Simon Glass s...@chromium.org wrote: Remove driver model CONFIGs from the board config headers and use Kconfig instead. Signed-off-by: Simon Glass s...@chromium.org --- Changes in v2: None arch/arm/cpu/armv7/omap3/Kconfig | 9 + board/compulab/cm_t335/Kconfig | 9 + board/gumstix/pepper/Kconfig | 9 + board/isee/igep0033/Kconfig| 9 + board/phytec/pcm051/Kconfig| 9 + board/silica/pengwyn/Kconfig | 9 + board/ti/am335x/Kconfig| 10 ++ configs/am3517_crane_defconfig | 3 +++ configs/am3517_evm_defconfig | 3 +++ configs/cm_t3517_defconfig | 3 +++ configs/cm_t35_defconfig | 3 +++ configs/devkit8000_defconfig | 3 +++ configs/dig297_defconfig | 3 +++ configs/eco5pk_defconfig | 3 +++ configs/mcx_defconfig | 3 +++ configs/mt_ventoux_defconfig | 3 +++ configs/nokia_rx51_defconfig | 3 +++ configs/omap3_beagle_defconfig | 3 +++ configs/omap3_evm_defconfig| 3 +++ configs/omap3_evm_quick_mmc_defconfig | 3 +++ configs/omap3_evm_quick_nand_defconfig | 3 +++ configs/omap3_ha_defconfig | 3 +++ configs/omap3_logic_defconfig | 3 +++ configs/omap3_mvblx_defconfig | 3 +++ configs/omap3_pandora_defconfig| 3 +++ configs/omap3_sdp3430_defconfig| 3 +++ configs/tao3530_defconfig | 3 +++ configs/tricorder_defconfig| 3 +++ configs/tricorder_flash_defconfig | 3 +++ configs/twister_defconfig | 3 +++ include/configs/nokia_rx51.h | 1 + include/configs/ti_am335x_common.h | 5 - include/configs/ti_omap3_common.h | 4 33 files changed, 134 insertions(+), 9 deletions(-) diff --git a/arch/arm/cpu/armv7/omap3/Kconfig b/arch/arm/cpu/armv7/omap3/Kconfig index a029379..2fe3232 100644 --- a/arch/arm/cpu/armv7/omap3/Kconfig +++ b/arch/arm/cpu/armv7/omap3/Kconfig @@ -93,6 +93,15 @@ config TARGET_TWISTER endchoice +config DM + default y if !SPL_BUILD + +config DM_GPIO + default y if DM !SPL_BUILD + +config DM_SERIAL + default y if DM !SPL_BUILD + config SYS_SOC default omap3 I realized a problem when I looked at this patch. In order to put the default values into board-Kconfig files, we have to describe the if ... part correctly. (otherwise, the dependencies between CONFIGs get broken.) We had already added the same dependencies in the common parts: config DM bool Enable Driver Model depends on !SPL_BUILD config DM_SERIAL bool Enable Driver Model for serial drivers depends on DM Now, we are duplicating the same dependencies in each board-Kconfig. This is not nice. I am very sorry, I have misguided you. (What is worse, I can not suggest a good idea to solve this problem.) Yes it is unfortunate. However the problem of SPL not working for DM is only waiting on the removal of gdata. In fact I have a series which adds an #ifndef CONFIG_DM to the gdata and enables SPL for Tegra. I'll send it soon. So I think we can live with this for a while until we can remove the 'depends on !SPL_BUILD' everywhere. It does seem to work well enough... Regards, Simon ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2 12/19] dm: at91: snapper: Move driver model CONFIGs to Kconfig
Hi Masahiro,
On 8 February 2015 at 20:43, Masahiro Yamada yamad...@jp.panasonic.com wrote:
Hi Simon,
On Thu, 5 Feb 2015 21:41:43 -0700
Simon Glass s...@chromium.org wrote:
Remove driver model CONFIGs from the board config headers and use Kconfig
instead.
Signed-off-by: Simon Glass s...@chromium.org
---
Changes in v2: None
arch/arm/include/asm/arch-at91/at91_pio.h | 12
configs/snapper9260_defconfig | 3 +++
configs/snapper9g20_defconfig | 3 +++
include/configs/snapper9260.h | 4
4 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/arch/arm/include/asm/arch-at91/at91_pio.h
b/arch/arm/include/asm/arch-at91/at91_pio.h
index 50464ff..3012278 100644
--- a/arch/arm/include/asm/arch-at91/at91_pio.h
+++ b/arch/arm/include/asm/arch-at91/at91_pio.h
@@ -114,14 +114,10 @@ typedef union at91_pio {
at91_port_t pioa;
at91_port_t piob;
at91_port_t pioc;
- #if (ATMEL_PIO_PORTS 3)
- at91_port_t piod;
- #endif
- #if (ATMEL_PIO_PORTS 4)
- at91_port_t pioe;
- #endif
- } ;
- at91_port_t port[ATMEL_PIO_PORTS];
+ at91_port_t piod; /* not present in all hardware */
+ at91_port_t pioe;/* not present in all hardware */
+ };
+ at91_port_t port[5];
} at91_pio_t;
#ifdef CONFIG_AT91_GPIO
I could not understand why this change is
related to Move driver model CONFIGs to Kconfig.
Nothing's mentioned about this change in your commit description.
Perhaps, split into two patches?
With driver model, ATMEL_PIO_PORTS is defined by the platform data so
we can't have a #define for it. I will see if I can split it.
Regards,
Simon
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 09/11] ARM: armada100: remove aspenite and gplugd board support
Hi Ajay, On Tue, 10 Feb 2015 05:06:45 + Ajay Bhargav ajay.bhar...@einfochips.com wrote: From: Masahiro Yamada yamad...@jp.panasonic.com Sent: Tuesday, February 10, 2015 10:14 AM To: u-boot@lists.denx.de Cc: Tom Rini; Albert Aribaud; Masahiro Yamada; Prafulla Wadaskar; Ajay Bhargav; Roman Byshko; Matthias Fuchs; Marek Vasut; Ivan Khoronzhuk; Jiandong Zheng; Oleksandr Tymoshenko; Jagannadha Sutradharudu Teki; Joe Hershberger; Sergey Kostanbaev; Steve Rae; WingMan Kwok; Siva Durga Prasad Paladugu; Stefan Roese; Michal Simek; Nobuhiro Iwamatsu; Simon Glass; Wolfgang Denk; Ian Campbell; Georges Savoundararadj; Daniel Schwierzeck Subject: [PATCH 09/11] ARM: armada100: remove aspenite and gplugd board support These are still non-generic boards. Is it late to send patch for these boards? These boards are generic boards but SYS_GENERIC_BOARD config is not enabled for them. Sorry for being late but Can I send patches now to keep this alive? Thanks for your reply. It is not too late at all. Please send a patch to keep these boards. And then I will take back this patch. Best Regards Masahiro Yamada ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
