[U-Boot] [PATCH 2/4] qe: add u-qe support to arm board
ls1021 is arm-core and support qe which is u-qe.
add u-qe init for arm board.
Signed-off-by: Zhao Qiang b45...@freescale.com
---
arch/arm/include/asm/arch-ls102xa/config.h | 4
arch/arm/include/asm/global_data.h | 8
drivers/Makefile | 1 +
drivers/qe/Makefile| 3 ++-
drivers/qe/fdt.c | 2 ++
drivers/qe/qe.c| 13 +
drivers/qe/qe.h| 1 +
7 files changed, 31 insertions(+), 1 deletion(-)
diff --git a/arch/arm/include/asm/arch-ls102xa/config.h
b/arch/arm/include/asm/arch-ls102xa/config.h
index ed78c33..526ceb4 100644
--- a/arch/arm/include/asm/arch-ls102xa/config.h
+++ b/arch/arm/include/asm/arch-ls102xa/config.h
@@ -65,6 +65,10 @@
#define DCU_LAYER_MAX_NUM 16
+#define QE_MURAM_SIZE 0x6000UL
+#define MAX_QE_RISC1
+#define QE_NUM_OF_SNUM 28
+
#define CONFIG_SYS_FSL_SRDS_1
#ifdef CONFIG_LS102XA
diff --git a/arch/arm/include/asm/global_data.h
b/arch/arm/include/asm/global_data.h
index 63e4ad5..900f127 100644
--- a/arch/arm/include/asm/global_data.h
+++ b/arch/arm/include/asm/global_data.h
@@ -17,6 +17,14 @@ struct arch_global_data {
#if defined(CONFIG_FSL_ESDHC)
u32 sdhc_clk;
#endif
+
+#if defined(CONFIG_U_QE)
+ u32 qe_clk;
+ u32 brg_clk;
+ uint mp_alloc_base;
+ uint mp_alloc_top;
+#endif /* CONFIG_U_QE */
+
#ifdef CONFIG_AT91FAMILY
/* static data needed by at91's clock.c */
unsigned long cpu_clk_rate_hz;
diff --git a/drivers/Makefile b/drivers/Makefile
index b23076f..f4ae477 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -14,4 +14,5 @@ obj-y += twserial/
obj-y += video/
obj-y += watchdog/
obj-$(CONFIG_QE) += qe/
+obj-$(CONFIG_U_QE) += qe/
obj-y += memory/
diff --git a/drivers/qe/Makefile b/drivers/qe/Makefile
index 7f1bd06..8fa4866 100644
--- a/drivers/qe/Makefile
+++ b/drivers/qe/Makefile
@@ -4,5 +4,6 @@
# SPDX-License-Identifier: GPL-2.0+
#
-obj-y := qe.o uccf.o uec.o uec_phy.o
+obj-$(CONFIG_QE) += qe.o uccf.o uec.o uec_phy.o
+obj-$(CONFIG_U_QE) += qe.o
obj-$(CONFIG_OF_LIBFDT) += fdt.o
diff --git a/drivers/qe/fdt.c b/drivers/qe/fdt.c
index d9a7d82..dfae4bf 100644
--- a/drivers/qe/fdt.c
+++ b/drivers/qe/fdt.c
@@ -12,6 +12,7 @@
#include fdt_support.h
#include qe.h
+#ifdef CONFIG_QE
DECLARE_GLOBAL_DATA_PTR;
/*
@@ -72,3 +73,4 @@ void ft_qe_setup(void *blob)
clock-frequency, gd-arch.qe_clk / 2, 1);
fdt_fixup_qe_firmware(blob);
}
+#endif
diff --git a/drivers/qe/qe.c b/drivers/qe/qe.c
index be09a17..075fd48 100644
--- a/drivers/qe/qe.c
+++ b/drivers/qe/qe.c
@@ -40,6 +40,7 @@ void qe_issue_cmd(uint cmd, uint sbc, u8 mcn, u32 cmd_data)
return;
}
+#ifdef CONFIG_QE
uint qe_muram_alloc(uint size, uint align)
{
uintretloc;
@@ -70,6 +71,7 @@ uint qe_muram_alloc(uint size, uint align)
return retloc;
}
+#endif
void *qe_muram_addr(uint offset)
{
@@ -180,6 +182,15 @@ void qe_init(uint qe_base)
qe_snums_init();
}
+void u_qe_init(void)
+{
+ uint qe_base = CONFIG_SYS_IMMR + 0x0140; /* QE immr base */
+ qe_immr = (qe_map_t *)qe_base;
+
+ qe_upload_firmware((const void *)CONFIG_SYS_QE_FW_ADDR);
+ out_be32(qe_immr-iram.iready, QE_IRAM_READY);
+}
+
void qe_reset(void)
{
qe_issue_cmd(QE_RESET, QE_CR_SUBBLOCK_INVALID,
@@ -212,6 +223,7 @@ void qe_assign_page(uint snum, uint para_ram_base)
#define BRG_CLK(gd-arch.brg_clk)
+#ifdef CONFIG_QE
int qe_set_brg(uint brg, uint rate)
{
volatile uint *bp;
@@ -239,6 +251,7 @@ int qe_set_brg(uint brg, uint rate)
return 0;
}
+#endif
/* Set ethernet MII clock master
*/
diff --git a/drivers/qe/qe.h b/drivers/qe/qe.h
index ebb7c5f..30484b8 100644
--- a/drivers/qe/qe.h
+++ b/drivers/qe/qe.h
@@ -275,6 +275,7 @@ void *qe_muram_addr(uint offset);
int qe_get_snum(void);
void qe_put_snum(u8 snum);
void qe_init(uint qe_base);
+void u_qe_init(void);
void qe_reset(void);
void qe_assign_page(uint snum, uint para_ram_base);
int qe_set_brg(uint brg, uint rate);
--
2.1.0.27.g96db324
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/7] spl: pbl: Add new SPL image for pblimage tool
Hi, York, On 9/22/14 7:43 PM, Wang Huan-B18965 alison.w...@freescale.com wrote: Hi, York, On 09/21/2014 11:17 PM, Wang Huan-B18965 wrote: [Alison Wang] Let me explain the sequence. 1. u-boot-spl.bin is produced. The size of it is not a fixed value. 2. u-boot-spl-pbl-pad.bin is produced. The size of it is defined by CONFIG_SPL_MAX_SIZE. For detail, u-boot-spl-pbl-pad.bin is generated by padding u-boot-spl.bin to the size of CONFIG_SPL_MAX_SIZE. The following is the reason for using u-boot-spl-pbl-pad.bin. First of all, the SPL part need to be reorganized for the recognition of PBL through the pblimage tool. For the pblimage tool, the SPL image is splitted into 64 byte chunks, and PBL needs a command for each piece. In current pblimage tool, the size of the SPL image(u-boot-spl.bin) should be a fixed value like PowerPC. Well, for LS102xA and some other ARM platforms, the size of the SPL image (u-boot-spl.bin) is changeable. So a new image spl/u-boot-spl-pbl-pad.bin is produced, and the size of it is a fixed value CONFIG_SPL_MAX_SIZE. Then use u-boot-spl-pbl-pad.bin instead of spl/u-boot-spl.bin to generate spl/u-boot-spl.pbl. 3. spl/u-boot-spl.pbl is produced through pblimage tool. As CONFIG_SPL_PBL_PAD is enabled, spl/u-boot-spl-pbl-pad.bin is used as the source file instead of spl/u-boot-spl.bin. 4. u-boot-with-spl-pbl.bin is produced. For detail, u-boot-with-spl-pbl.bin is generated by padding spl/u-boot-spl.pbl to the offset of CONFIG_SPL_PAD_TO and adding u-boot.img. As the size of spl/u-boot-spl.pbl is not a fixed value, we pad it to the offset of CONFIG_SPL_PAD_TO. So it is convenient for us to determine the location of u-boot.img in SD card. Sorry for the late respond. I was away for an urgent project. If I understand you correctly, you define a CONFIG_SPL_MAX_SIZE and pad the final binary file to this size. How do you determine the size? I understand PBL loading mechanism. Would it be possible to pad to 64 byte boundary (or any practical size since it is adjustable) and avoid the definition of CONFIG_SPL_MAX_SIZE? [Alison Wang] I checked the size of spl/u-boot-spl.bin, then determined CONFIG_SPL_MAX_SIZE which is larger than the size of spl/u-boot- spl.bin. For Pblimage tool, the size of SPL image need to be a fixed value. For example, for PowerPC, no matter how the SPL code is changed, the size of spl/u-boot-spl.bin is always 0x28000 (so the pbl_cmd_initaddr is always 0x8200). But for LS1, the size of spl/u-boot-spl.bin is not a fixed size. When the SPL code is changed, the size of spl/u-boot-spl.bin is changed, so pbl_cmd_initaddr is changed too. It's unacceptable for pblimage tool(pbl_cmd_initaddr need to be a fixed value). To fix this issue, I use CONFIG_SPL_MAX_SIZE. Do you mean there is some approach to pad spl/u-boot-spl.bin to any practical size and avoid the definition of CONFIG_SPL_MAX_SIZE? PBL image is created this way A) Create the RCW header B) Determine u-boot image size C) Subtract the size from top of 24-bit space, that's what you see 0x8200-size. The magic number 0x8200 is used to make the result as 0x81xx. The highest of 0x8 is ACS=1, the lowest bit of 0x81 is CONTINUE=1, the xx is the 24-bit offset. By changing the offset, you can load the data into memory, up to 64 byte a time. By making a lot of 0x81xx, you make a sequence of commands to load 64 byte a time, until all image is loaded. Given the above mechanism, do you still think the image has to be a fixed size? I think you need to adjust pblimage.c to deal with the variable size, and pad the last chunk to be aligned with 2^n byte. [Alison Wang] Yes, you are right. I will adjust pblimage.c to deal with the variable size in v2. The old approach to make it as a fixed size is not a good one. Thanks. Best Regards, Alison Wang ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 6/7] arm: ls102xa: Add SD boot support for LS1021AQDS board
Hi, Albert,
On Mon, 22 Sep 2014 06:46:20 +, Huan Wang
alison.w...@freescale.com wrote:
Hi, Albert,
On Thu, 18 Sep 2014 13:47:18 +0800, Alison Wang
b18...@freescale.com
wrote:
+
+ . = ALIGN(4);
+ .u_boot_list : {
+ KEEP(*(SORT(.u_boot_list*_i2c_*)));
+ }
IS this required? And if it is, could it not be added to the
arch/arm/cpu/u-boot-spl.lds file? This way you would not need an
.lds file at all.
[Alison Wang] Yes, it is required.
Ok -- what for? :)
[Alison Wang] In SPL part, DDR is initialized by reading SPD through
I2C interface.
For I2C, ll_entry_count() is called, and it returns the number of
elements of a linker-generated array placed into subsection of
.u_boot_list section specified by _list argument. So I need to add
this to make I2C work in SPL.
Understood. So your SPL code uses I2C, and for I2C, you need a linker
list. But then:
I would like to add it in arch/arm/cpu/u-boot-spl.lds. I was not
sure adding it in arch/arm/cpu/u-boot-spl.lds is acceptable or
not.
(assuming the reason why it is needed is valid) If it causes no
change to boards which do not use it right now (and I mean 'no
change' ad 'binary identical') then this is acceptable. Make sure
you check the binary invariance and that you mention it in the
commit.
[Alison Wang] It will cause the binary is not identical for other
board.
Is this a prediction or an actual observation of compared builds with
and without the I2C linker liste addition to the generic SPL .lds?
[Alison Wang] I use mx31pdk as example. I compared the binaries with and
Without the I2C linker list in arch/arm/cpu/u-boot-spl.lds. The binaries
are not identical.
I think
it may be not good to add in arch/arm/cpu/u-boot-spl.lds. What's your
opinion about it?
If there are SPLs which use I2C linker lists *and* the generic .lds and
build without an error, then this should be fixed, because it means the
build process should complain when an input section is not mapped to an
output section.
(and that should be fixed even though in this case, adding the I2C
linker lists in the .lds would 'fix' the build, but they would actually
paper over the real issue of sections being mapped without control)
Best Regards,
Alison Wang
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] cmd_mmc: fix bootpart-resize maxarg to 4
sub-command 'bootpart-resize' check for argc == 4,
it will retrun CMD_RET_FAILURE when argc value not matched.
but bootpart-resize's maxarg is 3, which means you never execute
this sub-command successfully.
fix it by change bootpart-resize maxarg to 4.
Signed-off-by: wally.yeh wally@atrustcorp.com
---
common/cmd_mmc.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c
index 1e40983..4286e26 100644
--- a/common/cmd_mmc.c
+++ b/common/cmd_mmc.c
@@ -602,7 +602,7 @@ static cmd_tbl_t cmd_mmc[] = {
U_BOOT_CMD_MKENT(list, 1, 1, do_mmc_list, , ),
#ifdef CONFIG_SUPPORT_EMMC_BOOT
U_BOOT_CMD_MKENT(bootbus, 5, 0, do_mmc_bootbus, , ),
- U_BOOT_CMD_MKENT(bootpart-resize, 3, 0, do_mmc_boot_resize, , ),
+ U_BOOT_CMD_MKENT(bootpart-resize, 4, 0, do_mmc_boot_resize, , ),
U_BOOT_CMD_MKENT(partconf, 5, 0, do_mmc_partconf, , ),
U_BOOT_CMD_MKENT(rst-function, 3, 0, do_mmc_rst_func, , ),
#endif
--
1.7.10.4
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] ARM: mx6: Add support for Kosagi Novena
On 29/8/2014 5:30 PM, Marek Vasut wrote:
Add support for the Kosagi Novena board. Currently supported are:
- I2C busses
- FEC Ethernet
- MMC0, MMC1, Booting from MMC
- SATA
- USB ports
- USB Ethernet
Signed-off-by: Marek Vasut ma...@denx.de
---
arch/arm/Kconfig | 4 +
board/kosagi/novena/Kconfig | 23 ++
board/kosagi/novena/Makefile | 11 +
board/kosagi/novena/novena.c | 346 +
board/kosagi/novena/novena_spl.c | 529 +++
board/kosagi/novena/setup.cfg| 47
configs/novena_defconfig | 4 +
drivers/video/ipu_common.c | 2 +-
include/configs/imx6_spl.h | 2 +-
include/configs/novena.h | 306 ++
10 files changed, 1272 insertions(+), 2 deletions(-)
create mode 100644 board/kosagi/novena/Kconfig
create mode 100644 board/kosagi/novena/Makefile
create mode 100644 board/kosagi/novena/novena.c
create mode 100644 board/kosagi/novena/novena_spl.c
create mode 100644 board/kosagi/novena/setup.cfg
create mode 100644 configs/novena_defconfig
create mode 100644 include/configs/novena.h
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index f01ff8f..56f29a3 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -536,6 +536,9 @@ config TARGET_GW_VENTANA
config TARGET_HUMMINGBOARD
bool Support hummingboard
+config TARGET_KOSAGI_NOVENA
+ bool Support Kosagi Novena
+
config TARGET_OMAP3_OVERO
bool Support omap3_overo
@@ -907,6 +910,7 @@ source board/karo/tk71/Kconfig
source board/karo/tx25/Kconfig
source board/keymile/km_arm/Kconfig
source board/kmc/kzm9g/Kconfig
+source board/kosagi/novena/Kconfig
source board/logicpd/am3517evm/Kconfig
source board/logicpd/imx27lite/Kconfig
source board/logicpd/imx31_litekit/Kconfig
diff --git a/board/kosagi/novena/Kconfig b/board/kosagi/novena/Kconfig
new file mode 100644
index 000..4e52be9
--- /dev/null
+++ b/board/kosagi/novena/Kconfig
@@ -0,0 +1,23 @@
+if TARGET_KOSAGI_NOVENA
+
+config SYS_CPU
+ string
+ default armv7
+
+config SYS_BOARD
+ string
+ default novena
+
+config SYS_VENDOR
+ string
+ default kosagi
+
+config SYS_SOC
+ string
+ default mx6
+
+config SYS_CONFIG_NAME
+ string
+ default novena
+
+endif
diff --git a/board/kosagi/novena/Makefile b/board/kosagi/novena/Makefile
new file mode 100644
index 000..f67bbc9
--- /dev/null
+++ b/board/kosagi/novena/Makefile
@@ -0,0 +1,11 @@
+#
+# Copyright (C) 2014 Marek Vasut ma...@denx.de
+#
+# SPDX-License-Identifier: GPL-2.0+
+#
+
+ifndef CONFIG_SPL_BUILD
+obj-y := novena.o
+else
+obj-y := novena_spl.o
+endif
diff --git a/board/kosagi/novena/novena.c b/board/kosagi/novena/novena.c
new file mode 100644
index 000..727ce1c
--- /dev/null
+++ b/board/kosagi/novena/novena.c
@@ -0,0 +1,346 @@
+/*
+ * Novena board support
+ *
+ * Copyright (C) 2014 Marek Vasut ma...@denx.de
+ *
+ * SPDX-License-Identifier:GPL-2.0+
+ */
+
[...]
+
+int drv_keyboard_init(void)
+{
+ int error;
+ struct stdio_dev dev = {
+ .name = button,
+ .flags = DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM,
+ .start = novena_gpio_button_init,
+ .getc = novena_gpio_button_getc,
+ .tstc = novena_gpio_button_tstc,
+ };
+
+ error = input_init(button_input, 0);
+ if (error) {
+ debug(%s: Cannot set up input\n, __func__);
+ return -1;
+ }
+ button_input.read_keys = novena_gpio_button_read_keys;
+
+ /* Register the device. init_tegra_keyboard() will be called soon */
This may have been answered already, but will the function named
init_tegra_keyboard() be called? Or is there some more generic name?
+ error = input_stdio_register(dev);
+ if (error)
+ return error;
+
+ return 0;
+}
+#endif
+
[...]
+int board_early_init_f(void)
+{
+#if defined(CONFIG_VIDEO_IPUV3)
+ setup_display();
+#endif
If board_early_init_f() gets called early, then this is where you should
set DISP0_DAT13 (GPIO5 IO13) to low, in order to ensure the FPGA is in
reset, so it isn't pulling the DDR3 I2C lines low.
This would also be a good time to bring the sound chip out of reset, by
driving GPIO5 IO17 high, When the sound chip is in reset, the EEPROM
cannot be read.
+
+ /* Bring Ethernet PHY out of reset. */
+ gpio_set_value(IMX_GPIO_NR(3, 23), 1);
+
+ return 0;
+}
+
+int board_init(void)
+{
+ /* address of boot parameters */
+ gd-bd-bi_boot_params = PHYS_SDRAM + 0x100;
+
+#ifdef CONFIG_CMD_SATA
+ setup_sata();
+#endif
+
+ return 0;
+}
+
+int checkboard(void)
+{
+ puts(Board: Novena 4x\n);
+ return 0;
+}
+
+int dram_init(void)
+{
+ gd-ram_size = imx_ddr_size();
+ return 0;
+}
+
+/* setup board specific PMIC */
+int power_init_board(void)
+{
+ struct
[U-Boot] u-boot bootargs not passing to kernel command line
Hello All, i'm trying to fix the bootargs in the u-boot but the kernel seems to not reflecting the change as http://pastebin.com/nXgcGKkY can anyone please help? -- Nilesh ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v4 5/5] i.mx6q: mx6qsabrelite: Update the network configuration
___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3 09/10] kconfig: move CONFIG_OF_* to Kconfig
On 09/25/2014 01:08 AM, Simon Glass wrote: Hi Masahiro, On 22 September 2014 04:59, Masahiro Yamada yamad...@jp.panasonic.com wrote: This commit moves: CONFIG_OF_CONTROL CONFIG_OF_SEPARATE CONFIG_OF_EMBED CONFIG_OF_HOSTFILE Because these options are currently not supported for SPL, the Device Tree Control menu does not appear in the SPL configuration. Note: zynq-common.h should be adjusted so as not to change the default value of CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Cc: Simon Glass s...@chromium.org Cc: Stephen Warren swar...@nvidia.com Cc: Minkyu Kang mk7.k...@samsung.com Cc: Michal Simek michal.si...@xilinx.com From the bits that I understand (not zynq and microblaze) Acked-by: Simon Glass s...@chromium.org :-) No problem for zynq and Microblaze. Acked-by: Michal Simek michal.si...@xilinx.com Thanks, Michal -- Michal Simek, Ing. (M.Eng), OpenPGP - KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/ Maintainer of Linux kernel - Xilinx Zynq ARM architecture Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform signature.asc Description: OpenPGP digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [RFC PATCH v1] powerpc: add --bss-plt to LDFLAGS
On 09/09/2014 09:03 PM, Chris Packham wrote: With some versions of gcc (that we know of 4.6.3 and 4.8.2 are affected) it is necessary to specify --bss-plt to get the final blrl in the _GOT2_TABLE_. Without this the last symbol does not get it's address relocated. For the P2041RDB board this ended up being NetArpWaitTimerStart which caused the ARP packets to timeout immediately. Helped-by: Joakim Tjernlund joakim.tjernl...@transmode.se Signed-off-by: Chris Packham judge.pack...@gmail.com --- Dear Wolfgang, I am trying to apply this patch. Shall I drop the Helped-by: line. I understand Chris is giving credit to Joakim. But Helped-by: is not a standard signature. I am happy with Acked-by or Sign-off-by, you choose. Jocke ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v10] nand/denali: Adding Denali NAND driver support
Hi Scott, On Wed, 24 Sep 2014 18:34:52 -0500 Scott Wood scottw...@freescale.com wrote: On Wed, 2014-09-24 at 23:05 +0900, Masahiro YAMADA wrote: Hi Scott, Tom, 2014-09-12 19:43 GMT+09:00 Masahiro Yamada yamad...@jp.panasonic.com: On Fri, 12 Sep 2014 00:42:17 -0500 Chin Liang See cl...@altera.com wrote: To add the Denali NAND driver support into U-Boot. This driver is leveraged from Linux with commit ID fdbad98dff8007f2b8bee6698b5d25ebba0471c9. For Denali controller 64 variance, you need to declare macro CONFIG_SYS_NAND_DENALI_64BIT. Signed-off-by: Chin Liang See cl...@altera.com Cc: Scott Wood scottw...@freescale.com Cc: Masahiro Yamada yamad...@jp.panasonic.com --- Changes for v10 - Updated the commit message to include Linux driver commit ID, usage of macro CONFIG_SYS_NAND_DENALI_64BIT - Removed casting for memcpy function - Removed NAND_CMD_LOCK_TIGHT support as no longer in latest NAND driver Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Reviewed-by: Masahiro Yamada yamad...@jp.panasonic.com Tested-by: Masahiro Yamada yamad...@jp.panasonic.com I am looking forward to get this driver in. How about this patch? There are only some cosmetic updates in v10. I think enough time has passed for the review. If Scott could apply it, that would be the best, but he seems really busy for Linux work these days as he stated in http://lists.denx.de/pipermail/u-boot/2014-May/180399.html. Tom, If Scott is too busy to take care of this patch, could you apply it directly onto u-boot/master, please? How would I go about testing that this builds? I don't see any code in the tree that defines CONFIG_NAND_DENALI, nor is it obvious which board I should add it to as a test. If you want to do build test, apply the following patches in this order: [U-Boot,v10] nand/denali: Adding Denali NAND driver support http://patchwork.ozlabs.org/patch/388486/ [U-Boot,v3,1/6] nand: denali: add Denali NAND driver for SPL http://patchwork.ozlabs.org/patch/385078/ [U-Boot,v3,2/6] serial: add UniPhier serial driver http://patchwork.ozlabs.org/patch/385077/ [U-Boot,v3,3/6] arm: uniphier: add UniPhier SoC support code http://patchwork.ozlabs.org/patch/385082/ [U-Boot,v3,4/6] arm: uniphier: add Kconfig and defconfig http://patchwork.ozlabs.org/patch/385080/ Or you can use a branch I prepared for you: $ git clone git://github.com/masahir0y/u-boot-kbuild.git Cloning into 'u-boot-kbuild'... remote: Counting objects: 10073, done. remote: Compressing objects: 100% (4378/4378), done. remote: Total 10073 (delta 4231), reused 8489 (delta 3511) Receiving objects: 100% (10073/10073), 1.84 MiB | 265.00 KiB/s, done. Resolving deltas: 100% (4231/4231), done. Checking connectivity... done. $ cd u-boot-kbuild/ $ git checkout -b denali_test origin/denali_test Branch denali_test set up to track remote branch denali_test from origin. Switched to a new branch 'denali_test' $ make ph1_ld4_defconfig HOSTCC scripts/basic/fixdep HOSTCC scripts/kconfig/conf.o SHIPPED scripts/kconfig/zconf.tab.c SHIPPED scripts/kconfig/zconf.lex.c SHIPPED scripts/kconfig/zconf.hash.c HOSTCC scripts/kconfig/zconf.tab.o HOSTLD scripts/kconfig/conf # # configuration written to .config # # # configuration written to spl/.config # $ make CROSS_COMPILE=arm-linux-gnueabi- scripts/kconfig/conf --silentoldconfig Kconfig scripts/kconfig/conf --silentoldconfig Kconfig CHK include/config.h UPD include/config.h GEN include/autoconf.mk GEN include/autoconf.mk.dep GEN spl/include/autoconf.mk CHK include/config/uboot.release UPD include/config/uboot.release CHK include/generated/version_autogenerated.h UPD include/generated/version_autogenerated.h CHK include/generated/timestamp_autogenerated.h [ snip ] CC drivers/mtd/mtdcore.o CC drivers/mtd/cfi_flash.o LD drivers/mtd/built-in.o CC drivers/mtd/nand/nand.o CC drivers/mtd/nand/nand_bbt.o CC drivers/mtd/nand/nand_ids.o CC drivers/mtd/nand/nand_util.o CC drivers/mtd/nand/nand_ecc.o CC drivers/mtd/nand/nand_base.o CC drivers/mtd/nand/denali.o = LD drivers/mtd/nand/built-in.o LD drivers/mtd/onenand/built-in.o LD drivers/mtd/spi/built-in.o Also, CONFIG_SYS_NAND_DENALI_64BIT should be documented in a README, not just in the git changelog. I will send a follow up patch. Anyway, it is an old style to document each option in README. I will add it to Kconfig with a help doc, something like this: config SYS_NAND_DENALI_64BIT bool Support Denali NAND controller with 64bit AXI interface depends on NAND_DENALI help The Denali NAND controller has some variations depending on the bus interface. DMA setup sequence is completely differenct between 32bit
Re: [U-Boot] [PATCH v3 09/10] kconfig: move CONFIG_OF_* to Kconfig
Hi Simon, On Wed, 24 Sep 2014 17:08:11 -0600 Simon Glass s...@chromium.org wrote: +config OF_EMBED + bool Embedded DTB for DT control + help + If this option is enabled, the device tree will be picked up and + built into the U-Boot image. Can you please add This is suitable for debugging and development only and is not recommended for production devices. Why is CONFIG_OF_EMBED not recommended for production devices? Best Regards Masahiro Yamada ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [GIT] Pull request: u-boot-dfu
Hi Marek, On Wednesday, September 24, 2014 at 02:24:44 PM, Lukasz Majewski wrote: Hi Marek, The following changes since commit 68bc8b4f2946c3da06c2b05d4f4c7e594cb1fa48: usb: kbd: Allow usb reset to continue when an usb kbd is used (2014-09-21 12:26:19 +0200) are available in the git repository at: u-boot-denx-usb/master I know where your repository is, but you should really consider fixing this u- boot-denx-usb/master string above. Just use the full git:// path when doing git request-pull . Aggr I will fix this with next PR. for you to fetch changes up to 772ca4fe05bf89f77efea80f5a6ff373d1ee92a9: usb: gadget: fastboot: improve download progress bar (2014-09-24 13:11:35 +0200) Bo Shen (1): usb: gadget: fastboot: improve download progress bar Eric Nelson (1): usb: f_mass_storage: set removable flag in do_inquiry based on LUN Heiko Schocher (2): usb: dfu: add fullspeed support for DFU arm: am335x: siemens board use in DFU mode fullspeed only Are you sure this is for master ? This is what Heiko need for Siemens boards. As fair as I know they need this fullspeed to be able to flash their devices on a production line. Łukasz Majewski (1): usb: dfu: thor: gadget: Remove dead code Pulled it into master though, thanks! Thanks. Best regards, Marek Vasut -- Best regards, Lukasz Majewski Samsung RD Institute Poland (SRPOL) | Linux Platform Group ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3 10/10] kconfig: move CONFIG_DEFAULT_DEVICE_TREE to kconfig
Hi Simon, On Wed, 24 Sep 2014 17:09:35 -0600 Simon Glass s...@chromium.org wrote: diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig index af7ceca..e257143 100644 --- a/configs/am335x_boneblack_vboot_defconfig +++ b/configs/am335x_boneblack_vboot_defconfig @@ -3,3 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS=SERIAL1,CONS_INDEX=1,EMMC_BOOT,ENABLE_VBOOT +S:CONFIG_ARM=y +S:CONFIG_TARGET_AM335X_EVM=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE=am335x-boneblack Do we want to include this for SPL too? At some point we might support this. But if you want to define it only for U-Boot, that's OK. Regards, I was planning to expand this for SPL in the future, but if you want to do that now, I am fine with it. (The series is just moving CONFIGs verbatim from headers to defconfigs) I am afraid the current SPL implementation is too special. - special Makefile (scripts/Makefile.spl) - special linker scripts (u-boot-spl.lds) - special boot sequence (common/spl/spl.c) etc. We need extra efforts because of that. My long-term goal is to implement the normal image and the SPL image as more symetirical ones, and I hope CONFIG_SPL_* will go away eventually. If we had implemented SPL as a generic case, you would not have needed a separate work for CONFIG_SPL_DM, right? Perhaps, you would have implemented the Driver Model for both of the normal and SPL in the first place (and just enable CONFIG_DM for SPL and it would work). But unfortunately, we don't. Nor can I do that now. I guess we need more refactoring. If the device tree control for SPL is urgent necessity, I am fine with CONFIG_SPL_OF_CONTROL like before, or another implementation. Comments are welcome on this issue, of course. Best Regards Masahiro Yamada ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/5] usb: ehci: mxs: Add board-specific callbacks
On 24/09/2014 12:53, Marek Vasut wrote: On Monday, April 28, 2014 at 03:38:39 AM, Marek Vasut wrote: Add board-specific callbacks for enabling/disabling port power into the MXS EHCI controller driver. This is in-line with the names of callbacks on other systems. Signed-off-by: Marek Vasut ma...@denx.de Cc: Stefano Babic sba...@denx.de This series seems to be still not applied. Right, I pick it up Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 2/2] kconfig: add CONFIG_SUPPORT_TPL
CONFIG_TPL should not be enabled for boards that do not have TPL. CONFIG_SUPPORT_TPL introduced by this commit should be selected by boards with TPL support and CONFIG_TPL should depend on it. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com --- Kconfig | 5 - arch/powerpc/cpu/mpc85xx/Kconfig | 5 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Kconfig b/Kconfig index 29e0b92..0b9be50 100644 --- a/Kconfig +++ b/Kconfig @@ -73,6 +73,9 @@ config TPL_BUILD config SUPPORT_SPL bool +config HAVE_TPL_SUPPORT + bool + config SPL bool depends on SUPPORT_SPL @@ -83,7 +86,7 @@ config SPL config TPL bool - depends on SPL + depends on SPL HAVE_TPL_SUPPORT prompt Enable TPL if !SPL_BUILD default y if TPL_BUILD default n diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index 6dcc45a..c5ebd40 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -31,6 +31,7 @@ config TARGET_BSC9132QDS config TARGET_C29XPCIE bool Support C29XPCIE select SUPPORT_SPL + select SUPPORT_TPL config TARGET_P3041DS bool Support P3041DS @@ -77,10 +78,12 @@ config TARGET_MPC8572DS config TARGET_P1010RDB bool Support P1010RDB select SUPPORT_SPL + select SUPPORT_TPL config TARGET_P1022DS bool Support P1022DS select SUPPORT_SPL + select SUPPORT_TPL config TARGET_P1023RDB bool Support P1023RDB @@ -88,10 +91,12 @@ config TARGET_P1023RDB config TARGET_P1_P2_RDB bool Support P1_P2_RDB select SUPPORT_SPL + select SUPPORT_TPL config TARGET_P1_P2_RDB_PC bool Support p1_p2_rdb_pc select SUPPORT_SPL + select SUPPORT_TPL config TARGET_P1_TWR bool Support p1_twr -- 1.9.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 0/2] Introduce CONFIG_SUPPORT_SPL/TPL
Masahiro Yamada (2): kconfig: add CONFIG_SUPPORT_SPL kconfig: add CONFIG_SUPPORT_TPL Kconfig| 9 ++- arch/arm/Kconfig | 44 ++ arch/arm/cpu/arm926ejs/davinci/Kconfig | 4 arch/arm/cpu/armv7/exynos/Kconfig | 7 ++ arch/arm/cpu/armv7/omap3/Kconfig | 16 + arch/microblaze/Kconfig| 1 + arch/powerpc/cpu/mpc5xxx/Kconfig | 1 + arch/powerpc/cpu/mpc83xx/Kconfig | 1 + arch/powerpc/cpu/mpc85xx/Kconfig | 17 + arch/powerpc/cpu/ppc4xx/Kconfig| 1 + 10 files changed, 100 insertions(+), 1 deletion(-) -- 1.9.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/2] kconfig: add CONFIG_SUPPORT_SPL
CONFIG_SPL should not be enabled for boards that do not have SPL. CONFIG_SUPPORT_SPL introduced by this commit should be selected by boards with SPL support and CONFIG_SPL should depend on it. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com --- Kconfig| 4 arch/arm/Kconfig | 44 ++ arch/arm/cpu/arm926ejs/davinci/Kconfig | 4 arch/arm/cpu/armv7/exynos/Kconfig | 7 ++ arch/arm/cpu/armv7/omap3/Kconfig | 16 + arch/microblaze/Kconfig| 1 + arch/powerpc/cpu/mpc5xxx/Kconfig | 1 + arch/powerpc/cpu/mpc83xx/Kconfig | 1 + arch/powerpc/cpu/mpc85xx/Kconfig | 12 ++ arch/powerpc/cpu/ppc4xx/Kconfig| 1 + 10 files changed, 91 insertions(+) diff --git a/Kconfig b/Kconfig index e0c8992..29e0b92 100644 --- a/Kconfig +++ b/Kconfig @@ -70,8 +70,12 @@ config TPL_BUILD depends on $KCONFIG_OBJDIR=tpl default y +config SUPPORT_SPL + bool + config SPL bool + depends on SUPPORT_SPL prompt Enable SPL if !SPL_BUILD default y if SPL_BUILD help diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 16cbb5e..f0ca403 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -152,12 +152,14 @@ config TARGET_MX25PDK config TARGET_TX25 bool Support tx25 + select SUPPORT_SPL config TARGET_ZMX25 bool Support zmx25 config TARGET_APF27 bool Support apf27 + select SUPPORT_SPL config TARGET_IMX27LITE bool Support imx27lite @@ -167,30 +169,39 @@ config TARGET_MAGNESIUM config TARGET_APX4DEVKIT bool Support apx4devkit + select SUPPORT_SPL config TARGET_XFI3 bool Support xfi3 + select SUPPORT_SPL config TARGET_M28EVK bool Support m28evk + select SUPPORT_SPL config TARGET_MX23EVK bool Support mx23evk + select SUPPORT_SPL config TARGET_MX28EVK bool Support mx28evk + select SUPPORT_SPL config TARGET_MX23_OLINUXINO bool Support mx23_olinuxino + select SUPPORT_SPL config TARGET_BG0900 bool Support bg0900 + select SUPPORT_SPL config TARGET_SANSA_FUZE_PLUS bool Support sansa_fuze_plus + select SUPPORT_SPL config TARGET_SC_SPS_1 bool Support sc_sps_1 + select SUPPORT_SPL config ARCH_NOMADIK bool ST-Ericsson Nomadik @@ -215,6 +226,7 @@ config TARGET_SPEAR600 config TARGET_X600 bool Support x600 + select SUPPORT_SPL config ARCH_VERSATILE bool ARM Ltd. Versatile family @@ -233,6 +245,7 @@ config TARGET_MX31ADS config TARGET_MX31PDK bool Support mx31pdk + select SUPPORT_SPL config TARGET_TT01 bool Support tt01 @@ -245,6 +258,7 @@ config TARGET_WOODBURN config TARGET_WOODBURN_SD bool Support woodburn_sd + select SUPPORT_SPL config TARGET_FLEA3 bool Support flea3 @@ -275,54 +289,71 @@ config TARGET_VEXPRESS_CA9X4 config TARGET_KWB bool Support kwb + select SUPPORT_SPL config TARGET_TSERIES bool Support tseries + select SUPPORT_SPL config TARGET_CM_T335 bool Support cm_t335 + select SUPPORT_SPL config TARGET_PEPPER bool Support pepper + select SUPPORT_SPL config TARGET_AM335X_IGEP0033 bool Support am335x_igep0033 + select SUPPORT_SPL config TARGET_PCM051 bool Support pcm051 + select SUPPORT_SPL config TARGET_DRACO bool Support draco + select SUPPORT_SPL config TARGET_DXR2 bool Support dxr2 + select SUPPORT_SPL config TARGET_PXM2 bool Support pxm2 + select SUPPORT_SPL config TARGET_RUT bool Support rut + select SUPPORT_SPL config TARGET_PENGWYN bool Support pengwyn + select SUPPORT_SPL config TARGET_AM335X_EVM bool Support am335x_evm + select SUPPORT_SPL config TARGET_AM43XX_EVM bool Support am43xx_evm + select SUPPORT_SPL config TARGET_TI814X_EVM bool Support ti814x_evm + select SUPPORT_SPL config TARGET_TI816X_EVM bool Support ti816x_evm + select SUPPORT_SPL config TARGET_SAMA5D3_XPLAINED bool Support sama5d3_xplained + select SUPPORT_SPL config TARGET_SAMA5D3XEK bool Support sama5d3xek + select SUPPORT_SPL config TARGET_BCM28155_AP bool Support bcm28155_ap @@ -344,6 +375,7 @@ config ARCH_KEYSTONE config TARGET_M53EVK bool Support m53evk + select SUPPORT_SPL config TARGET_IMA3_MX53 bool Support ima3-mx53 @@ -407,6 +439,7 @@ config TARGET_MX6SXSABRESD config TARGET_GW_VENTANA bool Support gw_ventana + select SUPPORT_SPL config TARGET_HUMMINGBOARD bool Support hummingboard @@ -419,15 +452,18 @@ config OMAP34XX config OMAP44XX bool OMAP44XX SoC +
Re: [U-Boot] u-boot bootargs not passing to kernel command line
Dear Nilesh Kokane, In message caozatazye334qw+w4x3dsok_xzadnaslal1dt8gpvtb6tt2...@mail.gmail.com you wrote: i'm trying to fix the bootargs in the u-boot but the kernel seems to not reflecting the change as http://pastebin.com/nXgcGKkY can anyone please help? After setting bootargs, you run the bootcmd script. It is likely that this modifies bootargs again. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de You don't get paid for the hour. You get paid for the value you bring to the hour. - Jim Rohn ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] ARM: rpi_b: query internal MAC address from firmware
On Thursday, September 25, 2014 at 04:25:37 AM, Stephen Warren wrote: [...] Normally this should be within a check for if (!getenv(usbethaddr)). Any reason to deviate from that? That makes sense. I simply wasn't aware of the convention. I'll amend the patch. Oh, actually... When this code runs, there's no way that usbethaddr can already be set. There's no usbethaddr value set in the default environment Unless you place it there because you know what you're doing ... , there is no persistent environment storage on this board There is SD/MMC slot, that's enough to implement persistent storage. so the default environment is always used, and misc_init_r() happens well before any kind script that the user might modify (such as uEnv.txt or boot.scr) can run. If the user wants to override usbethaddr, they can just set a new value in uEnv.txt. Does it still make sense to add this guard anyway, or does this justify the existing version of the patch? I'd guard it to be future proof. Best regards, Marek Vasut ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [GIT] Pull request: u-boot-dfu
On Thursday, September 25, 2014 at 09:35:09 AM, Lukasz Majewski wrote: Hi Marek, On Wednesday, September 24, 2014 at 02:24:44 PM, Lukasz Majewski wrote: Hi Marek, The following changes since commit 68bc8b4f2946c3da06c2b05d4f4c7e594cb1fa48: usb: kbd: Allow usb reset to continue when an usb kbd is used (2014-09-21 12:26:19 +0200) are available in the git repository at: u-boot-denx-usb/master I know where your repository is, but you should really consider fixing this u- boot-denx-usb/master string above. Just use the full git:// path when doing git request-pull . Aggr I will fix this with next PR. Thanks! for you to fetch changes up to 772ca4fe05bf89f77efea80f5a6ff373d1ee92a9: usb: gadget: fastboot: improve download progress bar (2014-09-24 13:11:35 +0200) Bo Shen (1): usb: gadget: fastboot: improve download progress bar Eric Nelson (1): usb: f_mass_storage: set removable flag in do_inquiry based on LUN Heiko Schocher (2): usb: dfu: add fullspeed support for DFU arm: am335x: siemens board use in DFU mode fullspeed only Are you sure this is for master ? This is what Heiko need for Siemens boards. As fair as I know they need this fullspeed to be able to flash their devices on a production line. OK then. Best regards, Marek Vasut ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] u-boot bootargs not passing to kernel command line
Hi Wolfgang Denk, Thanks I successfully passed the parameters to kernel by bootcmd script. Thanks a lot for the clue. -- Nilesh ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3 09/10] kconfig: move CONFIG_OF_* to Kconfig
On Thu, Sep 25, 2014 at 04:38:09PM +0900, Masahiro Yamada wrote: Hi Simon, On Wed, 24 Sep 2014 17:08:11 -0600 Simon Glass s...@chromium.org wrote: +config OF_EMBED + bool Embedded DTB for DT control + help + If this option is enabled, the device tree will be picked up and + built into the U-Boot image. Can you please add This is suitable for debugging and development only and is not recommended for production devices. Why is CONFIG_OF_EMBED not recommended for production devices? It's kind-of a question for the devicetree folks. The last time (a while back now) I asked for some general advice on how a DT should be shipped with hardware, being able to update the DT without replacing the whole of firmware was seen as a good thing. Combine this with that we should try (yes, we can't today due to incompatible bindings) share the DT between U-Boot and the kernel (or really, U-Boot and anything but again, last I checked the BSD bindings were very very different), embedding doesn't seem good. -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2 0/9] Add a better USB keyboard polling method
Hi, On 09/24/2014 09:04 PM, Marek Vasut wrote: On Wednesday, September 24, 2014 at 02:06:02 PM, Hans de Goede wrote: Hi Marek, Here is v2 of my Add a better USB keyboard polling method patch-set. Changes in v2: -Added 2 new patches: usb: kbd: Fix memleak on usb_kbd_deregister() stdio: Fix memleak on stdio_deregister -Fixed use after free in: usb: kbd: Add (optional) support for using an interrupt queue for polling Applied all to u-boot-usb/next . Please verify if all is in place. Verified, everything is in place. Thanks and Regards, Hans ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3 09/10] kconfig: move CONFIG_OF_* to Kconfig
Hi, On 25 September 2014 07:18, Tom Rini tr...@ti.com wrote: On Thu, Sep 25, 2014 at 04:38:09PM +0900, Masahiro Yamada wrote: Hi Simon, On Wed, 24 Sep 2014 17:08:11 -0600 Simon Glass s...@chromium.org wrote: +config OF_EMBED + bool Embedded DTB for DT control + help + If this option is enabled, the device tree will be picked up and + built into the U-Boot image. Can you please add This is suitable for debugging and development only and is not recommended for production devices. Why is CONFIG_OF_EMBED not recommended for production devices? It's kind-of a question for the devicetree folks. The last time (a while back now) I asked for some general advice on how a DT should be shipped with hardware, being able to update the DT without replacing the whole of firmware was seen as a good thing. Combine this with that we should try (yes, we can't today due to incompatible bindings) share the DT between U-Boot and the kernel (or really, U-Boot and anything but again, last I checked the BSD bindings were very very different), embedding doesn't seem good. Addressing the binding differences, it's hard to see what these are right now since the sorting and other churn in the Linux device tree files. I think it would be good to sync the U-Boot files to the Linux ones so we can see what bindings still differ. Regards, Simon ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3 10/10] kconfig: move CONFIG_DEFAULT_DEVICE_TREE to kconfig
Hi Masahiro, On 25 September 2014 02:06, Masahiro Yamada yamad...@jp.panasonic.com wrote: Hi Simon, On Wed, 24 Sep 2014 17:09:35 -0600 Simon Glass s...@chromium.org wrote: diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig index af7ceca..e257143 100644 --- a/configs/am335x_boneblack_vboot_defconfig +++ b/configs/am335x_boneblack_vboot_defconfig @@ -3,3 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS=SERIAL1,CONS_INDEX=1,EMMC_BOOT,ENABLE_VBOOT +S:CONFIG_ARM=y +S:CONFIG_TARGET_AM335X_EVM=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE=am335x-boneblack Do we want to include this for SPL too? At some point we might support this. But if you want to define it only for U-Boot, that's OK. Regards, I was planning to expand this for SPL in the future, but if you want to do that now, I am fine with it. (The series is just moving CONFIGs verbatim from headers to defconfigs) I am afraid the current SPL implementation is too special. - special Makefile (scripts/Makefile.spl) - special linker scripts (u-boot-spl.lds) - special boot sequence (common/spl/spl.c) etc. We need extra efforts because of that. My long-term goal is to implement the normal image and the SPL image as more symetirical ones, and I hope CONFIG_SPL_* will go away eventually. If we had implemented SPL as a generic case, you would not have needed a separate work for CONFIG_SPL_DM, right? Perhaps, you would have implemented the Driver Model for both of the normal and SPL in the first place (and just enable CONFIG_DM for SPL and it would work). But unfortunately, we don't. Nor can I do that now. I guess we need more refactoring. If the device tree control for SPL is urgent necessity, I am fine with CONFIG_SPL_OF_CONTROL like before, or another implementation. Comments are welcome on this issue, of course. Yes SPL should become less special, all of this sounds good. With the DM SPL series we are getting close to just being able to enable FDT in SPL just like any other feature. I'm not planning to look at that imminently though as the DM SPL stuff is still pretty new. Note that the reason for CONFIG_SPL_DM is mostly a migration exercise. It allows boards to decide when they are ready to switch to DM. I expect the option will be removed one day (since boards with SPL are mostly the well maintained ones I think). Regards, Simon ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request: u-boot-spi/master
On Wed, Sep 24, 2014 at 06:15:43PM +0530, Jagannadha Sutradharudu Teki wrote: Hi Tom, Please pull this PR. thanks! Jagan. The following changes since commit 47d3debe1ab8315dc9ade22279e02f60eceda25b: Merge git://git.denx.de/u-boot-dm (2014-09-23 15:21:43 -0400) are available in the git repository at: git://git.denx.de/u-boot-spi.git master for you to fetch changes up to bf9b86dc47988a404964c97c74e541a129719f9c: spi: kirkwood_spi.c: cosmetic: Fix minor coding style issues (2014-09-24 17:48:56 +0530) Nikita Kiryanov (3): mtd: spi: add support for M25PE16 and M25PX16 spi: mxc: fix sf probe when using mxc_spi spl: replace CONFIG_SPL_SPI_* with CONFIG_SF_DEFAULT_* Stefan Roese (5): sf: Add M25PX64 SPI NOR flash ID arm: kirkwood: spi.h: Add some missing parenthesis spi: kirkwood_spi.c: Some fixes and cleanup spi: kirkwood_spi.c: Make global variable static spi: kirkwood_spi.c: cosmetic: Fix minor coding style issues arch/arm/include/asm/arch-kirkwood/spi.h | 8 ++--- board/boundary/nitrogen6x/nitrogen6x.c| 5 +++ board/embest/mx6boards/mx6boards.c| 5 +++ board/freescale/mx6qsabreauto/mx6qsabreauto.c | 7 board/freescale/mx6sabresd/mx6sabresd.c | 7 board/freescale/mx6slevk/mx6slevk.c | 5 +++ board/gateworks/gw_ventana/gw_ventana.c | 7 +++- board/genesi/mx51_efikamx/efikamx.c | 5 +++ board/ttcontrol/vision2/vision2.c | 5 +++ common/cmd_sf.c | 13 drivers/mtd/spi/sf_params.c | 3 ++ drivers/mtd/spi/spi_spl_load.c| 6 ++-- drivers/spi/kirkwood_spi.c| 27 +++ drivers/spi/mxc_spi.c | 48 ++- include/configs/am335x_evm.h | 2 -- include/configs/da850evm.h| 4 --- include/configs/dra7xx_evm.h | 2 -- include/configs/embestmx6boards.h | 2 +- include/configs/gw_ventana.h | 2 +- include/configs/ks2_evm.h | 2 -- include/configs/mx51_efikamx.h| 4 +-- include/configs/mx6sabre_common.h | 2 +- include/configs/mx6slevk.h| 2 +- include/configs/nitrogen6x.h | 2 +- include/configs/pcm051.h | 2 -- include/configs/sama5d3xek.h | 2 -- include/configs/siemens-am33x-common.h| 2 -- include/configs/tseries.h | 2 -- include/configs/vision2.h | 4 +-- include/configs/zynq-common.h | 2 -- include/spi_flash.h | 13 31 files changed, 115 insertions(+), 87 deletions(-) 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] [U-Boot, v6, 1/4] usb/gadget: fastboot: add eMMC support for flash command
On Tue, Aug 26, 2014 at 11:47:27AM -0700, Steve Rae wrote: - add support for 'fastboot flash' command for eMMC devices Signed-off-by: Steve Rae s...@broadcom.com 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] [U-Boot, v6, 2/4] usb/gadget: fastboot: add support for flash command
On Tue, Aug 26, 2014 at 11:47:28AM -0700, Steve Rae wrote: - implement 'fastboot flash' for eMMC devices Signed-off-by: Steve Rae s...@broadcom.com Acked-by: Lukasz Majewski l.majew...@samsung.com Reviewed-by: Marek Vasut ma...@denx.de 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] [U-Boot,v6,3/4] usb/gadget: fastboot: minor cleanup
On Tue, Aug 26, 2014 at 11:47:29AM -0700, Steve Rae wrote: - update static function - additional debugging statements - update fastboot command information - add missing include file - update spelling Signed-off-by: Steve Rae s...@broadcom.com 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] [U-Boot, v6, 4/4] usb/gadget: fastboot: implement sparse format
On Tue, Aug 26, 2014 at 11:47:30AM -0700, Steve Rae wrote: - add capability to fastboot flash with sparse format images Signed-off-by: Steve Rae s...@broadcom.com Acked-by: Lukasz Majewski l.majew...@samsung.com 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] tools/env: change stripping strategy to allow no-stripping
On Wed, Aug 27, 2014 at 02:29:00PM +0200, Thomas Petazzoni wrote: When building the U-Boot tools for non-ELF platforms (such as Blackfin FLAT), since commit 79fc0c5f498c3982aa4740c273ab1a9255063d9c (tools/env: cross-compile fw_printenv without setting HOSTCC), the build fails because it tries to strip a FLAT binary, which does not make sense. This commit solves this by changing the stripping logic in tools/env/Makefile to be similar to the one in tools/Makefile. This logic continues to apply strip to the final binary, but does not abort the build if it fails, and does the stripping in place on the final binary. This allows the logic to work fine if stripping doesn't work, as it leaves the final binary untouched. Signed-off-by: Thomas Petazzoni thomas.petazz...@free-electrons.com Cc: Masahiro Yamada yamad...@jp.panasonic.com Cc: Sonic Zhang sonic.zh...@analog.com Reviewed-by: Masahiro Yamada yamad...@jp.panasonic.com Reviewed-by: Sonic Zhang sonic.zh...@analog.com 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] e1000: fix no nvm build
On Mon, Sep 08, 2014 at 12:02:11AM +0200, Marcel Ziswiler wrote: Fix the following build error in case CONFIG_E1000_NO_NVM is enabled: CC drivers/net/e1000.o drivers/net/e1000.c: In function ‘e1000_initialize’: drivers/net/e1000.c:5365:5: error: ‘struct e1000_hw’ has no member named ‘eeprom_semaphore_present’ make[1]: *** [drivers/net/e1000.o] Error 1 make: *** [drivers/net] Error 2 Acked-by: Marek Vasut ma...@denx.de 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] mpc8xx: move common linker scripts into the CPU directory
On Tue, Sep 09, 2014 at 03:12:08PM +0900, Masahiro Yamada wrote: Each CPU of PowerPC has its default linker script under the CPU directory, except mpc8xx. Every mpc8xx board has its own linker script under the board directory, resulting in lots of duplication of linker scripts. I notice eight mpc8xx boards have the same linker script. We can decrease the number of linker scripts by putting a single default linker script, arch/powerpc/cpu/mpc8xx/u-boot.lds. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Cc: Wolfgang Denk w...@denx.de Acked-by: Stefan Roese s...@denx.de 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] cleanup disk/part.c whitespace
On Tue, Sep 09, 2014 at 03:19:42PM +0200, Pavel Machek wrote: Cleanup disk/part.c Signed-off-by: Pavel Machek pa...@denx.de 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] [U-Boot,v2,2/4] sandbox: Disable Ctrl-C
On Sun, Sep 14, 2014 at 12:40:15PM -0600, Simon Glass wrote: This is not supported properly on sandbox, and interferes with running tests, since when a test script is piped in, some commands will call ctrlc() which will drop characters from the test script. Signed-off-by: Simon Glass s...@chromium.org 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] [U-Boot,v2,3/4] test: Remove tabs from trace test
On Sun, Sep 14, 2014 at 12:40:16PM -0600, Simon Glass wrote: These cause U-Boot to print a list of available commands. It doesn't break the test, but it is best to remove them from the output. Signed-off-by: Simon Glass s...@chromium.org 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] [U-Boot,v2,4/4] test: Add a test for command repeat
On Sun, Sep 14, 2014 at 12:40:17PM -0600, Simon Glass wrote: This performs a command, then repeats it, and checks that the repeat happens. Signed-off-by: Simon Glass s...@chromium.org 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] [U-Boot,v2,1/4] Reactivate the tracing feature
On Sun, Sep 14, 2014 at 12:40:14PM -0600, Simon Glass wrote: This was lost sometime in the Kbuild conversion. Add it back. Check that the trace test now passes: $ ./test/trace/test-trace.sh Simple trace test / sanity check using sandbox /tmp/filemHKPGw Build sandbox O=sandbox FTRACE=1 GEN /home/sjg/c/src/third_party/u-boot/files/sandbox/Makefile Configuring for sandbox board... Check results Test passed Signed-off-by: Simon Glass s...@chromium.org 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] [U-Boot,3/3] MAINTAINERS: comment out blank M: field
On Tue, Sep 16, 2014 at 02:11:51PM +0900, Masahiro Yamada wrote: Since commit ddaf5c8f3030050fcd356a1e49e3ee8f8f52c6d4 (patman: RunPipe() should not pipe stdout/stderr unless asked), Patman spits lots of Invalid MAINTAINERS address: '-' error messages for patches with global changes. It takes too long for Patman to process them. Anyway, M:- does not carry any important information. Rather, it is just like a place holder in case of assigning a new board maintainer. Let's comment out. This commit can be reproduced by the following command: find . -name MAINTAINERS | xargs sed -i -e '/^M:[[:blank:]]*-$/s/^/#/' Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com 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] [U-Boot, 2/3] MAINTAINERS: comment out invalid maintainers
On Tue, Sep 16, 2014 at 02:11:50PM +0900, Masahiro Yamada wrote:
The S:Orphan in MAINTAINERS means that the maintainer in the
M: field is unreachable (i.e. the email address is not working).
(Refer to the definition of Orphan adopted in U-Boot
in the log of commit 31f1b654b2f395b69faa5d0d3c1eb0803923bd3b,
boards.cfg: move boards with invalid emails to Orphan)
For patch files adding global changes, scripts/get_maintainer.pl
adds bunch of such invalid email addresses, which results in
tons of annoying bounce emails.
This commit can be reproduced by the following command:
find . -name MAINTAINERS | xargs sed -i -e '
/^M:[[:blank:]]/ {
N
/S:[[:blank:]]Orphan/s/^/#/
}
'
Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com
Acked-by: Simon Glass s...@chromium.org
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] config_distro_bootcmd: Run 'scsi scan' before trying scsi disks
On Tue, Sep 16, 2014 at 09:26:23AM +0200, Hans de Goede wrote: Scsi disks need to be probed before we try to access them, otherwise all accesses fail with: ** Bad device size - scsi 0 **. Reported-by: Karsten Merker mer...@debian.org Signed-off-by: Hans de Goede hdego...@redhat.com Reviewed-by: Stephen Warren swar...@nvidia.com Tested-by: Karsten Merker mer...@debian.org 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] [U-Boot, 1/3] tools/genboardscfg.py: pick up also commented maitainers
On Tue, Sep 16, 2014 at 02:11:49PM +0900, Masahiro Yamada wrote: We are still keeping invalid email addressed in MAINTAINERS because they carry information. The problem is that scripts/get_maintainer.pl adds emails in the M: field including invalid ones. We want to comment out invalid email addresses in MAINTAINERS to prevent scripts/get_maintainer.pl from picking them up. On the other hand, we want to collect them for boards.cfg to know the last known maintainer of each board. This commit adjusts tools/genboardscfg.py to parse also the commented M: fields, which is useful for the next commit. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com 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] [U-Boot, v2, 04/10] kconfig: move CONFIG_CMD_CRC32 to Kconfig
On Tue, Sep 16, 2014 at 04:33:01PM +0900, Masahiro Yamada wrote: Since CONFIG_CMD_CRC32 is defined in config_cmd_defaults.h, it is enabled for all the boards except the ones undefining it explicitly: kwb tseries_mmc tseries_nand tseries_spi vct_platinum_onenand_small vct_platinum_small vct_platinumavc_onenand_small vct_platinumavc_small vct_premium_onenand_small vct_premium_small The default value of this config option should be y and # CONFIG_CMD_CRC32 is not set should be added for those exceptions. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Acked-by: Simon Glass s...@chromium.org 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] [U-Boot, v2, 03/10] kconfig: move CONFIG_CMD_BOOTM to Kconfig
On Tue, Sep 16, 2014 at 04:33:00PM +0900, Masahiro Yamada wrote: CONFIG_CMD_BOOTM is defined in config_cmd_defaults.h which is forcebly included from each board. So, the default value of config CMD_BOOTM should be y. For some boards undefining it (bf506f-ezkit, controlcenterd_TRAILBLA, controlcenterd_TRAILBLAZER_DEVELOP, controlcenterd_TRAILBLAZER), # CONFIG_CMD_BOOTM is not set should be added to their defconfig. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Acked-by: Simon Glass s...@chromium.org 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] [U-Boot, v2, 02/10] kconfig: move CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED to Kconfig
On Tue, Sep 16, 2014 at 04:32:59PM +0900, Masahiro Yamada wrote: If this option is enabled, the objects under lib/ directory are compiled with speed optimization, not size optimization. (Currently, only used by some Blackfin boards.) Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Acked-by: Simon Glass s...@chromium.org Tested-by: Simon Glass s...@chromium.org 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] [U-Boot, v2, 08/10] kconfig: remove config_cmd_defaults.h
On Tue, Sep 16, 2014 at 04:33:05PM +0900, Masahiro Yamada wrote: Now config_cmd_defaults.h is empty so it can be deleted safely. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Acked-by: Simon Glass s...@chromium.org 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] [U-Boot, v2, 06/10] kconfig: move CONFIG_CMD_GO to Kconfig
On Tue, Sep 16, 2014 at 04:33:03PM +0900, Masahiro Yamada wrote: Since CONFIG_CMD_GO is defined in config_cmd_defaults.h (and no board undefs it its own header), it can be moved to Kconfig with the default value y. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Acked-by: Simon Glass s...@chromium.org Tested-by: Simon Glass s...@chromium.org 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] linker_lists: fix comment
On Tue, Sep 16, 2014 at 08:21:15PM +0900, Masahiro Yamada wrote: The section name and the C variable name seem to be opposite. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Cc: Marek Vasut ma...@denx.de Acked-by: Marek Vasut ma...@denx.de 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] [U-Boot, 3/3] compiler.h: remove duplicated uninitialized_var
On Wed, Sep 17, 2014 at 08:33:48PM +0200, Jeroen Hofstee wrote: Since clang has a different definition for uninitialized_var it will complain that it is redefined in include/compiler.h. Since these are already defined in linux/compiler.h just remove this instance. Cc: Masahiro Yamada yamad...@jp.panasonic.com Cc: Tom Rini tr...@ti.com Signed-off-by: Jeroen Hofstee jer...@myspectrum.nl 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] [U-Boot, v2, 07/10] kconfig: move CONFIG_CMD_IMPORTENV to Kconfig
On Tue, Sep 16, 2014 at 04:33:04PM +0900, Masahiro Yamada wrote: Since CONFIG_CMD_IMPORTENV is defined in config_cmd_defaults.h, it should be enabled for all the boards except bf506f-ezkit that undefs it explicitely. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Acked-by: Simon Glass s...@chromium.org Tested-by: Simon Glass s...@chromium.org 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] cmd_nand: Update (nand_info_t*)nand after arg_off(_size) call
On Tue, Sep 16, 2014 at 02:38:52PM +0200, Rostislav Lisovy wrote: The arg_off() and arg_off_size() update the 'current NAND device' variable (dev). This is then used when assigning the (nand_info_t*)nand value. Place the assignment after the arg_off(_size) calls to prevent using incorrect (nand_info_t*) nand value. Signed-off-by: Rostislav Lisovy lis...@merica.cz 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] [U-Boot, v2, 1/2] cosmetic: replace MIN, MAX with min, max
On Thu, Sep 18, 2014 at 01:28:06PM +0900, Masahiro Yamada wrote: The macro MIN, MAX is defined as the aliase of min, max, respectively. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com 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] kbuild: refactor some makefiles
On Thu, Sep 18, 2014 at 03:43:41PM +0900, Masahiro Yamada wrote: [1] Move driver/core/, driver/input/ and drivers/input/ entries from the top Makefile to drivers/Makefile [2] Remove the conditional by CONFIG_DM in drivers/core/Makefile because the whole drivers/core directory is already selected by CONFIG_DM in the upper level [3] Likewise for CONFIG_DM_DEMO in drivers/demo/Makefile [4] Simplify common/Makefile - both CONFIG_DDR_SPD and CONFIG_SPD_EEPROM are boolean macros so they can directly select objects Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Acked-by: Marek Vasut ma...@denx.de 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] [U-Boot, v2, 2/2] common.h: remove MIN, MAX, MIN3, MAX3 macros
On Thu, Sep 18, 2014 at 01:28:07PM +0900, Masahiro Yamada wrote: Now MIN, MAX, MIN3, MAX are not used. Going forward, use min, max, min3, max3. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com 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] [U-Boot, v2, 1/3] compiler_gcc: prevent redefining attributes
On Thu, Sep 18, 2014 at 08:10:27PM +0200, Jeroen Hofstee wrote: The libc headers on FreeBSD and likely related projects as well contain an header file, cdefs.h which provides similiar functionality as linux/compiler.h. It provides compiler independent defines like __weak __packed, to allow compiling with multiple compilers which might have a different syntax for such extension. Since that header file is included in multiple standard headers, like stddef.h and stdarg.h, multiple definitions of those defines will be present if both are included. When compiling u-boot the compiler will warn about it hundreds of times since e.g. common.h will include both files indirectly. commit 7ea50d52849fe8ffa5b5b74c979b60b1045d6fc9 compiler_gcc: do not redefine __gnu_attributes prevented such redefinitions, but this was undone by commit fb8ffd7cfc68b3dc44e182356a207d784cb30b34 compiler*.h: sync include/linux/compiler*.h with Linux 3.16. Add the checks back where necessary to prevent such warnings. As the original patch this checkpatch warning is ignored: WARNING: Adding new packed members is to be done with care Cc: Masahiro Yamada yamad...@jp.panasonic.com Cc: Tom Rini tr...@ti.com Signed-off-by: Jeroen Hofstee jer...@myspectrum.nl Acked-by: Masahiro Yamada yamad...@jp.panasonic.com 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] [U-Boot, v3, 09/10] kconfig: move CONFIG_OF_* to Kconfig
On Mon, Sep 22, 2014 at 07:59:05PM +0900, Masahiro Yamada wrote: This commit moves: CONFIG_OF_CONTROL CONFIG_OF_SEPARATE CONFIG_OF_EMBED CONFIG_OF_HOSTFILE Because these options are currently not supported for SPL, the Device Tree Control menu does not appear in the SPL configuration. Note: zynq-common.h should be adjusted so as not to change the default value of CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Acked-by: Simon Glass s...@chromium.org Cc: Stephen Warren swar...@nvidia.com Cc: Minkyu Kang mk7.k...@samsung.com Acked-by: Michal Simek michal.si...@xilinx.com 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] [U-Boot, v2, 2/3] README.clang: update FreeBSD instructions
On Sun, Sep 21, 2014 at 10:20:22AM +0200, Jeroen Hofstee wrote: The mentioned binutils port got removed while the patch was pending. As Ian pointed out there is another port providing the binutils for arm now. Update the instructions accordingly. Cc: i...@freebsd.org Cc: Tom Rini tr...@ti.com Signed-off-by: Jeroen Hofstee jer...@myspectrum.nl 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] tools: remove reformat.py
On Mon, Sep 22, 2014 at 03:06:15PM +0900, Masahiro Yamada wrote: This tools is unnecessary since commit f6c8f38ec601 (tools/genboardscfg.py: improve performance more with Kconfiglib). Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com 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] [U-Boot, v3, 10/10] kconfig: move CONFIG_DEFAULT_DEVICE_TREE to kconfig
On Mon, Sep 22, 2014 at 07:59:06PM +0900, Masahiro Yamada wrote: This option specifies the default Device Tree used for the run-time configuration of U-Boot. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Cc: Simon Glass s...@chromium.org Cc: Stephen Warren swar...@nvidia.com Cc: Minkyu Kang mk7.k...@samsung.com Cc: Michal Simek michal.si...@xilinx.com 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] checkpatch: remove unnecessary + after {8,8}
On Tue, Sep 23, 2014 at 12:41:02PM +0200, Marek Vasut wrote:
From: Joe Perches j...@perches.com
Pick the following commit from Linux kernel:
commit 66cb4ee0e52ca721f609fd5eec16187189ae5fda
Author: Joe Perches j...@perches.com
Date: Wed Sep 10 09:40:47 2014 +1000
checkpatch: remove unnecessary + after {8,8}
There's a useless + use that needs to be removed as perl 5.20 emits a
Useless use of greediness modifier '+' message each time it's hit.
Signed-off-by: Marek Vasut ma...@denx.de
Cc: Tom Rini tr...@ti.com
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] [U-Boot,v2,01/10] kconfig: add blank Kconfig files
On Tue, Sep 16, 2014 at 04:32:58PM +0900, Masahiro Yamada wrote: This would be useful to start moving various config options. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Acked-by: Simon Glass s...@chromium.org Tested-by: Simon Glass s...@chromium.org 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] ls102x: configs - Add hash command in freescale LS1 platforms
Hardware accelerated support for SHA-1 and SHA-256 has been added.
Hash command enabled along with hardware accelerated support for
SHA-1 and SHA-256 for platforms which have CAAM block.
Signed-off-by: Ruchika Gupta ruchika.gu...@freescale.com
CC: York Sun york...@freescale.com
---
arch/arm/include/asm/arch-ls102xa/config.h | 10 ++
board/freescale/ls1021aqds/ls1021aqds.c| 10 ++
board/freescale/ls1021atwr/ls1021atwr.c| 9 +
include/configs/ls1021aqds.h | 6 ++
include/configs/ls1021atwr.h | 6 ++
5 files changed, 41 insertions(+)
diff --git a/arch/arm/include/asm/arch-ls102xa/config.h
b/arch/arm/include/asm/arch-ls102xa/config.h
index ed78c33..b6cb857 100644
--- a/arch/arm/include/asm/arch-ls102xa/config.h
+++ b/arch/arm/include/asm/arch-ls102xa/config.h
@@ -20,6 +20,8 @@
#define CONFIG_SYS_FSL_ESDHC_ADDR (CONFIG_SYS_IMMR + 0x0056)
#define CONFIG_SYS_FSL_SCFG_ADDR (CONFIG_SYS_IMMR + 0x0057)
#define CONFIG_SYS_FSL_SERDES_ADDR (CONFIG_SYS_IMMR + 0x00ea)
+#define CONFIG_SYS_FSL_SEC_ADDR(CONFIG_SYS_IMMR +
0x70)
+#define CONFIG_SYS_FSL_JR0_ADDR(CONFIG_SYS_IMMR +
0x71)
#define CONFIG_SYS_FSL_GUTS_ADDR (CONFIG_SYS_IMMR + 0x00ee)
#define CONFIG_SYS_FSL_LS1_CLK_ADDR(CONFIG_SYS_IMMR + 0x00ee1000)
#define CONFIG_SYS_NS16550_COM1(CONFIG_SYS_IMMR +
0x011c0500)
@@ -71,8 +73,16 @@
#define CONFIG_MAX_CPUS2
#define CONFIG_SYS_FSL_IFC_BANK_COUNT 8
#define CONFIG_NUM_DDR_CONTROLLERS 1
+#define CONFIG_SYS_FSL_SEC_OFFSET 0x0070
+#define CONFIG_SYS_FSL_SEC_COMPAT 5
#else
#error SoC not defined
#endif
+#define CONFIG_SYS_FSL_SEC_LE
+
+#if CONFIG_SYS_FSL_SEC_COMPAT = 4
+#define CONFIG_FSL_CAAM
+#endif
+
#endif /* _ASM_ARMV7_LS102XA_CONFIG_ */
diff --git a/board/freescale/ls1021aqds/ls1021aqds.c
b/board/freescale/ls1021aqds/ls1021aqds.c
index 12e83f7..d6278b9 100644
--- a/board/freescale/ls1021aqds/ls1021aqds.c
+++ b/board/freescale/ls1021aqds/ls1021aqds.c
@@ -13,6 +13,7 @@
#include mmc.h
#include fsl_esdhc.h
#include fsl_ifc.h
+#include fsl_sec.h
#include ../common/qixis.h
#include ls1021aqds_qixis.h
@@ -213,6 +214,15 @@ int config_serdes_mux(void)
return 0;
}
+#if defined(CONFIG_MISC_INIT_R)
+int misc_init_r(void)
+{
+ if (sec_init() 0)
+ return -1;
+ return 0;
+}
+#endif
+
int board_init(void)
{
struct ccsr_cci400 *cci = (struct ccsr_cci400 *)CONFIG_SYS_CCI400_ADDR;
diff --git a/board/freescale/ls1021atwr/ls1021atwr.c
b/board/freescale/ls1021atwr/ls1021atwr.c
index b522ff2..80903f6 100644
--- a/board/freescale/ls1021atwr/ls1021atwr.c
+++ b/board/freescale/ls1021atwr/ls1021atwr.c
@@ -280,6 +280,15 @@ int board_init(void)
return 0;
}
+#if defined(CONFIG_MISC_INIT_R)
+int misc_init_r(void)
+{
+ if (sec_init() 0)
+ return -1;
+ return 0;
+}
+#endif
+
void ft_board_setup(void *blob, bd_t *bd)
{
ft_cpu_setup(blob, bd);
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 657e3b6..df2fc09 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -386,4 +386,10 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_OF_BOARD_SETUP
#define CONFIG_CMD_BOOTZ
+#define CONFIG_MISC_INIT_R
+
+/* Hash command with SHA acceleration supported in hardware */
+#define CONFIG_CMD_HASH
+#define CONFIG_SHA_HW_ACCEL
+
#endif
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index 45b2272..7199c92 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -288,4 +288,10 @@
#define CONFIG_OF_BOARD_SETUP
#define CONFIG_CMD_BOOTZ
+#define CONFIG_MISC_INIT_R
+
+/* Hash command with SHA acceleration supported in hardware */
+#define CONFIG_CMD_HASH
+#define CONFIG_SHA_HW_ACCEL
+
#endif
--
1.8.1.4
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 3/3] ls102x: Add support for secure boot and enable blob command
Signed-off-by: Ruchika Gupta ruchika.gu...@freescale.com CC: York Sun york...@freescale.com --- configs/ls1021aqds_nor_SECURE_BOOT_defconfig | 3 +++ configs/ls1021atwr_nor_SECURE_BOOT_defconfig | 3 +++ include/configs/ls1021aqds.h | 4 include/configs/ls1021atwr.h | 4 4 files changed, 14 insertions(+) create mode 100644 configs/ls1021aqds_nor_SECURE_BOOT_defconfig create mode 100644 configs/ls1021atwr_nor_SECURE_BOOT_defconfig diff --git a/configs/ls1021aqds_nor_SECURE_BOOT_defconfig b/configs/ls1021aqds_nor_SECURE_BOOT_defconfig new file mode 100644 index 000..2b47995 --- /dev/null +++ b/configs/ls1021aqds_nor_SECURE_BOOT_defconfig @@ -0,0 +1,3 @@ +CONFIG_SYS_EXTRA_OPTIONS=SECURE_BOOT +CONFIG_ARM=y +CONFIG_TARGET_LS1021AQDS=y diff --git a/configs/ls1021atwr_nor_SECURE_BOOT_defconfig b/configs/ls1021atwr_nor_SECURE_BOOT_defconfig new file mode 100644 index 000..eeeb0d5 --- /dev/null +++ b/configs/ls1021atwr_nor_SECURE_BOOT_defconfig @@ -0,0 +1,3 @@ +CONFIG_SYS_EXTRA_OPTIONS=SECURE_BOOT +CONFIG_ARM=y +CONFIG_TARGET_LS1021ATWR=y diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index df2fc09..1da5523 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -392,4 +392,8 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_CMD_HASH #define CONFIG_SHA_HW_ACCEL +#ifdef CONFIG_SECURE_BOOT +#define CONFIG_CMD_FSL_BLOB +#endif + #endif diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 7199c92..2ece663 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -294,4 +294,8 @@ #define CONFIG_CMD_HASH #define CONFIG_SHA_HW_ACCEL +#ifdef CONFIG_SECURE_BOOT +#define CONFIG_CMD_FSL_BLOB +#endif + #endif -- 1.8.1.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/3] crypto/fsl: Add command for encapsulating/decapsulating blobs
Freescale's SEC block has built-in Blob Protocol which provides
a method for protecting user-defined data across system power
cycles. SEC block protects data in a data structure called a Blob,
which provides both confidentiality and integrity protection.
Encapsulating data as a blob
Each time that the Blob Protocol is used to protect data, a
different randomly generated key is used to encrypt the data.
This random key is itself encrypted using a key which is derived
from SoC's non volatile secret key and a 16 bit Key identifier.
The resulting encrypted key along with encrypted data is called a blob.
The non volatile secure key is available for use only during secure boot.
During decapsulation, the reverse process is performed to get back
the original data.
Commands added
--
blob enc - encapsulating data as a cryptgraphic blob
blob dec - decapsulating cryptgraphic blob to get the data
Commands Syntax
---
blob enc src dst len km
Encapsulate and create blob of data $len bytes long
at address $src and store the result at address $dst.
$km is the 16 byte key modifier is also required for
generation/use as key for cryptographic operation. Key
modifier should be 16 byte long.
blob dec src dst len km
Decapsulate the blob of data at address $src and
store result of $len byte at addr $dst.
$km is the 16 byte key modifier is also required for
generation/use as key for cryptographic operation. Key
modifier should be 16 byte long.
Signed-off-by: Ruchika Gupta ruchika.gu...@freescale.com
CC: York Sun york...@freescale.com
---
common/Makefile | 2 +
common/cmd_blob.c | 110
drivers/crypto/fsl/Makefile | 1 +
drivers/crypto/fsl/fsl_blob.c | 61
drivers/crypto/fsl/jobdesc.c | 80 ++
drivers/crypto/fsl/jobdesc.h | 11
drivers/crypto/fsl/jr.c | 127 +-
include/configs/corenet_ds.h | 1 +
include/fsl_sec.h | 34 ++-
9 files changed, 425 insertions(+), 2 deletions(-)
create mode 100644 common/cmd_blob.c
create mode 100644 drivers/crypto/fsl/fsl_blob.c
diff --git a/common/Makefile b/common/Makefile
index aca0f7f..2c07636 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -264,4 +264,6 @@ obj-$(CONFIG_IO_TRACE) += iotrace.o
obj-y += memsize.o
obj-y += stdio.o
+obj-$(CONFIG_CMD_BLOB) += cmd_blob.o
+
CFLAGS_env_embedded.o := -Wa,--no-warn -DENV_CRC=$(shell tools/envcrc
2/dev/null)
diff --git a/common/cmd_blob.c b/common/cmd_blob.c
new file mode 100644
index 000..26a28d9
--- /dev/null
+++ b/common/cmd_blob.c
@@ -0,0 +1,110 @@
+/*
+ *
+ * Command for encapsulating/decapsulating blob of memory.
+ *
+ * SPDX-License-Identifier:GPL-2.0+
+ */
+
+#include common.h
+#include command.h
+#include environment.h
+#include aes.h
+#include malloc.h
+#include asm/byteorder.h
+#include linux/compiler.h
+
+DECLARE_GLOBAL_DATA_PTR;
+
+/**
+ * blob_decap() - Decapsulate the data as a blob
+ * @key_mod: - Pointer to key modifier/key
+ * @src: - Address of data to be decapsulated
+ * @dst: - Address of data to be decapsulated
+ * @len: - Size of data to be decapsulated
+ *
+ * Returns zero on success,and negative on error.
+ */
+__weak int blob_decap(u8 *key_mod, u8 *src, u8 *dst, u32 len)
+{
+ return 0;
+}
+
+/**
+ * blob_encap() - Encapsulate the data as a blob
+ * @key_mod: - Pointer to key modifier/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(u8 *key_mod, u8 *src, u8 *dst, u32 len)
+{
+ return 0;
+}
+
+/**
+ * do_blob() - Handle the 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_blob(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
+{
+ uint32_t key_addr, src_addr, dst_addr, len;
+ uint8_t *km_ptr, *src_ptr, *dst_ptr;
+ int enc, ret = 0;
+
+ if (argc != 6)
+ return CMD_RET_USAGE;
+
+ if (!strncmp(argv[1], enc, 3))
+ enc = 1;
+ else if (!strncmp(argv[1], dec, 3))
+ enc = 0;
+ else
+ return CMD_RET_USAGE;
+
+ src_addr = simple_strtoul(argv[2], NULL, 16);
+ dst_addr = simple_strtoul(argv[3], NULL, 16);
+ len = simple_strtoul(argv[4], NULL, 16);
+ key_addr = simple_strtoul(argv[5], NULL, 16);
+
+ km_ptr = (uint8_t *)key_addr;
+ src_ptr = (uint8_t *)src_addr;
+ dst_ptr = (uint8_t
[U-Boot] [PATCH 2/3] mpc85xx: configs - Enable blob command in freescale platforms
Enable blob commands for platforms having SEC 4.0 or greater for secure boot scenarios Signed-off-by: Ruchika Gupta ruchika.gu...@freescale.com CC: York Sun york...@freescale.com --- include/configs/B4860QDS.h | 4 include/configs/BSC9132QDS.h | 4 include/configs/P1010RDB.h | 4 include/configs/P2041RDB.h | 4 include/configs/T1040QDS.h | 1 + include/configs/T104xRDB.h | 1 + include/configs/T208xQDS.h | 1 + include/configs/T208xRDB.h | 1 + include/configs/T4240QDS.h | 4 include/configs/T4240RDB.h | 1 + include/configs/corenet_ds.h | 3 +++ 11 files changed, 28 insertions(+) diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index 58932ad..9217f37 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -909,4 +909,8 @@ unsigned long get_board_ddr_clk(void); #include asm/fsl_secure_boot.h +#ifdef CONFIG_SECURE_BOOT +#define CONFIG_CMD_BLOB +#endif + #endif /* __CONFIG_H */ diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index 922ac00..32fc099 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -708,4 +708,8 @@ combinations. this should be removed later #include asm/fsl_secure_boot.h +#ifdef CONFIG_SECURE_BOOT +#define CONFIG_CMD_BLOB +#endif + #endif /* __CONFIG_H */ diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 45ef53d..54365a2 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -960,4 +960,8 @@ extern unsigned long get_sdram_size(void); #include asm/fsl_secure_boot.h +#ifdef CONFIG_SECURE_BOOT +#define CONFIG_CMD_BLOB +#endif + #endif /* __CONFIG_H */ diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index 7ff2dd5..0b12cf5 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -747,4 +747,8 @@ unsigned long get_board_sys_clk(unsigned long dummy); #include asm/fsl_secure_boot.h +#ifdef CONFIG_SECURE_BOOT +#define CONFIG_CMD_BLOB +#endif + #endif /* __CONFIG_H */ diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index 5870a49..bbe54bf 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -822,6 +822,7 @@ unsigned long get_board_ddr_clk(void); #ifdef CONFIG_SECURE_BOOT #include asm/fsl_secure_boot.h +#define CONFIG_CMD_BLOB #endif #endif /* __CONFIG_H */ diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 8e43931..bcfa410 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -864,6 +864,7 @@ #ifdef CONFIG_SECURE_BOOT #include asm/fsl_secure_boot.h +#define CONFIG_CMD_BLOB #endif #endif /* __CONFIG_H */ diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 9a8a3b6..70ce540 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -913,6 +913,7 @@ unsigned long get_board_ddr_clk(void); #ifdef CONFIG_SECURE_BOOT #include asm/fsl_secure_boot.h +#include CONFIG_CMD_BLOB #undef CONFIG_CMD_USB #endif diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 4ff31e6..8d4b02f 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -872,6 +872,7 @@ unsigned long get_board_ddr_clk(void); #ifdef CONFIG_SECURE_BOOT #include asm/fsl_secure_boot.h +#define CONFIG_CMD_BLOB #undef CONFIG_CMD_USB #endif diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h index d2faf94..e3bbfeb 100644 --- a/include/configs/T4240QDS.h +++ b/include/configs/T4240QDS.h @@ -629,4 +629,8 @@ unsigned long get_board_ddr_clk(void); #include asm/fsl_secure_boot.h +#ifdef CONFIG_SECURE_BOOT +#define CONFIG_CMD_BLOB +#endif + #endif /* __CONFIG_H */ diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index b3fbbe3..82e5efd 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -755,6 +755,7 @@ unsigned long get_board_ddr_clk(void); * which is anyways not used in Secure Environment. */ #undef CONFIG_CMD_USB +#define CONFIG_CMD_BLOB #endif #endif /* __CONFIG_H */ diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index aff0f9c..b0c8277 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -748,6 +748,9 @@ #define CONFIG_BOOTCOMMAND CONFIG_HDBOOT #include asm/fsl_secure_boot.h + +#ifdef CONFIG_SECURE_BOOT #define CONFIG_CMD_BLOB +#endif #endif /* __CONFIG_H */ -- 1.8.1.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 2/2] mpc85xx: configs - Add hash command in freescale platforms
On 09/10/2014 08:58 PM, Ruchika Gupta wrote: Hardware accelerated support for SHA-1 and SHA-256 has been added. Hash command enabled along with hardware accelerated support for SHA-1 and SHA-256 for platforms which have CAAM block. Signed-off-by: Ruchika Gupta ruchika.gu...@freescale.com CC: York Sun york...@freescale.com --- The patch series is dependent on https://patchwork.ozlabs.org/patch/387174/ https://patchwork.ozlabs.org/patch/387175/ Ruchika, This patch further increases the size of image. This board failed to compile P1010RDB-PB_SPIFLASH_SECBOOT York ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/2] fsl_sec : Add hardware accelerated SHA256 and SHA1
On 09/10/2014 08:58 PM, Ruchika Gupta wrote: SHA-256 and SHA-1 accelerated using SEC hardware in Freescale SoC's The driver for SEC (CAAM) IP is based on linux drivers/crypto/caam. Signed-off-by: Ruchika Gupta ruchika.gu...@freescale.com CC: York Sun york...@freescale.com --- The patch series is dependent on https://patchwork.ozlabs.org/patch/387174/ https://patchwork.ozlabs.org/patch/387175/ Ruchika, This patch increases the image size and causes a problem for these boards, kmcoge4 kmlion1 P1010RDB-PB_36BIT_SPIFLASH_SECBOOT Please check. York ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] powerpc/mpc85xx: SECURE BOOT - Bypass PAMU in case of secure boot
On 09/17/2014 03:35 AM, Ruchika Gupta wrote: By default, PAMU's (IOMMU) are enabled in case of secure boot. Disable/bypass them , once the control reached the bootloader. For non-secure boot, PAMU's are already bypassed in the default SoC configuration Signed-off-by: Ruchika Gupta ruchika.gu...@freescale.com CC: York Sun york...@freescale.com --- arch/powerpc/cpu/mpc85xx/cpu_init.c | 6 +- arch/powerpc/include/asm/immap_85xx.h | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) Ruchika, This patch broken these boards BSC9132QDS_SDCARD_DDRCLK133_SECURE BSC9132QDS_SDCARD_DDRCLK100_SECURE BSC9132QDS_NAND_DDRCLK133_SECURE P1010RDB-PA_36BIT_SPIFLASH_SECBOOT P1010RDB-PA_SPIFLASH_SECBOOT P1010RDB-PB_36BIT_NOR_SECBOOT BSC9132QDS_NOR_DDRCLK100_SECURE P1010RDB-PB_NAND_SECBOOT BSC9132QDS_SPIFLASH_DDRCLK100_SECURE P1010RDB-PA_36BIT_NOR_SECBOOT P1010RDB-PB_36BIT_NAND_SECBOOT BSC9132QDS_NAND_DDRCLK100_SECURE P1010RDB-PB_NOR_SECBOOT BSC9132QDS_NOR_DDRCLK133_SECURE P1010RDB-PA_NAND_SECBOOT BSC9132QDS_SPIFLASH_DDRCLK133_SECURE P1010RDB-PA_NOR_SECBOOT P1010RDB-PA_36BIT_NAND_SECBOOT Please check. York ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 3/3][v2] ls102x: Add support for secure boot and enable blob command
Signed-off-by: Ruchika Gupta ruchika.gu...@freescale.com CC: York Sun york...@freescale.com --- Changes from v1: No changes configs/ls1021aqds_nor_SECURE_BOOT_defconfig | 3 +++ configs/ls1021atwr_nor_SECURE_BOOT_defconfig | 3 +++ include/configs/ls1021aqds.h | 4 include/configs/ls1021atwr.h | 4 4 files changed, 14 insertions(+) create mode 100644 configs/ls1021aqds_nor_SECURE_BOOT_defconfig create mode 100644 configs/ls1021atwr_nor_SECURE_BOOT_defconfig diff --git a/configs/ls1021aqds_nor_SECURE_BOOT_defconfig b/configs/ls1021aqds_nor_SECURE_BOOT_defconfig new file mode 100644 index 000..2b47995 --- /dev/null +++ b/configs/ls1021aqds_nor_SECURE_BOOT_defconfig @@ -0,0 +1,3 @@ +CONFIG_SYS_EXTRA_OPTIONS=SECURE_BOOT +CONFIG_ARM=y +CONFIG_TARGET_LS1021AQDS=y diff --git a/configs/ls1021atwr_nor_SECURE_BOOT_defconfig b/configs/ls1021atwr_nor_SECURE_BOOT_defconfig new file mode 100644 index 000..eeeb0d5 --- /dev/null +++ b/configs/ls1021atwr_nor_SECURE_BOOT_defconfig @@ -0,0 +1,3 @@ +CONFIG_SYS_EXTRA_OPTIONS=SECURE_BOOT +CONFIG_ARM=y +CONFIG_TARGET_LS1021ATWR=y diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index df2fc09..1da5523 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -392,4 +392,8 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_CMD_HASH #define CONFIG_SHA_HW_ACCEL +#ifdef CONFIG_SECURE_BOOT +#define CONFIG_CMD_FSL_BLOB +#endif + #endif diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 7199c92..2ece663 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -294,4 +294,8 @@ #define CONFIG_CMD_HASH #define CONFIG_SHA_HW_ACCEL +#ifdef CONFIG_SECURE_BOOT +#define CONFIG_CMD_FSL_BLOB +#endif + #endif -- 1.8.1.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/3][v2] crypto/fsl: Add command for encapsulating/decapsulating blobs
Freescale's SEC block has built-in Blob Protocol which provides
a method for protecting user-defined data across system power
cycles. SEC block protects data in a data structure called a Blob,
which provides both confidentiality and integrity protection.
Encapsulating data as a blob
Each time that the Blob Protocol is used to protect data, a
different randomly generated key is used to encrypt the data.
This random key is itself encrypted using a key which is derived
from SoC's non volatile secret key and a 16 bit Key identifier.
The resulting encrypted key along with encrypted data is called a blob.
The non volatile secure key is available for use only during secure boot.
During decapsulation, the reverse process is performed to get back
the original data.
Commands added
--
blob enc - encapsulating data as a cryptgraphic blob
blob dec - decapsulating cryptgraphic blob to get the data
Commands Syntax
---
blob enc src dst len km
Encapsulate and create blob of data $len bytes long
at address $src and store the result at address $dst.
$km is the 16 byte key modifier is also required for
generation/use as key for cryptographic operation. Key
modifier should be 16 byte long.
blob dec src dst len km
Decapsulate the blob of data at address $src and
store result of $len byte at addr $dst.
$km is the 16 byte key modifier is also required for
generation/use as key for cryptographic operation. Key
modifier should be 16 byte long.
Signed-off-by: Ruchika Gupta ruchika.gu...@freescale.com
CC: York Sun york...@freescale.com
---
Changes from v1:
Removed inclusion of command from corenet_ds.h from this patch.
Command is added in the config files as part of next patch in this series
common/Makefile | 2 +
common/cmd_blob.c | 109
drivers/crypto/fsl/Makefile | 1 +
drivers/crypto/fsl/fsl_blob.c | 61
drivers/crypto/fsl/jobdesc.c | 80 ++
drivers/crypto/fsl/jobdesc.h | 11
drivers/crypto/fsl/jr.c | 127 +-
include/fsl_sec.h | 34 ++-
8 files changed, 423 insertions(+), 2 deletions(-)
create mode 100644 common/cmd_blob.c
create mode 100644 drivers/crypto/fsl/fsl_blob.c
diff --git a/common/Makefile b/common/Makefile
index aca0f7f..2c07636 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -264,4 +264,6 @@ obj-$(CONFIG_IO_TRACE) += iotrace.o
obj-y += memsize.o
obj-y += stdio.o
+obj-$(CONFIG_CMD_BLOB) += cmd_blob.o
+
CFLAGS_env_embedded.o := -Wa,--no-warn -DENV_CRC=$(shell tools/envcrc
2/dev/null)
diff --git a/common/cmd_blob.c b/common/cmd_blob.c
new file mode 100644
index 000..82ecaf0
--- /dev/null
+++ b/common/cmd_blob.c
@@ -0,0 +1,109 @@
+/*
+ *
+ * Command for encapsulating/decapsulating blob of memory.
+ *
+ * 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
+
+DECLARE_GLOBAL_DATA_PTR;
+
+/**
+ * blob_decap() - Decapsulate the data as a blob
+ * @key_mod: - Pointer to key modifier/key
+ * @src: - Address of data to be decapsulated
+ * @dst: - Address of data to be decapsulated
+ * @len: - Size of data to be decapsulated
+ *
+ * Returns zero on success,and negative on error.
+ */
+__weak int blob_decap(u8 *key_mod, u8 *src, u8 *dst, u32 len)
+{
+ return 0;
+}
+
+/**
+ * blob_encap() - Encapsulate the data as a blob
+ * @key_mod: - Pointer to key modifier/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(u8 *key_mod, u8 *src, u8 *dst, u32 len)
+{
+ return 0;
+}
+
+/**
+ * do_blob() - Handle the 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_blob(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
+{
+ uint32_t key_addr, src_addr, dst_addr, len;
+ uint8_t *km_ptr, *src_ptr, *dst_ptr;
+ int enc, ret = 0;
+
+ if (argc != 6)
+ return CMD_RET_USAGE;
+
+ if (!strncmp(argv[1], enc, 3))
+ enc = 1;
+ else if (!strncmp(argv[1], dec, 3))
+ enc = 0;
+ else
+ return CMD_RET_USAGE;
+
+ src_addr = simple_strtoul(argv[2], NULL, 16);
+ dst_addr = simple_strtoul(argv[3], NULL, 16);
+ len = simple_strtoul(argv[4], NULL, 16);
+ key_addr = simple_strtoul(argv[5], NULL, 16);
+
+
[U-Boot] [PATCH 2/3][v2] mpc85xx: configs - Enable blob command in freescale platforms
Enable blob commands for platforms having SEC 4.0 or greater for secure boot scenarios Signed-off-by: Ruchika Gupta ruchika.gu...@freescale.com CC: York Sun york...@freescale.com --- Changes from v1: Added command in corenet_ds.h include/configs/B4860QDS.h | 4 include/configs/BSC9132QDS.h | 4 include/configs/P1010RDB.h | 4 include/configs/P2041RDB.h | 4 include/configs/T1040QDS.h | 1 + include/configs/T104xRDB.h | 1 + include/configs/T208xQDS.h | 1 + include/configs/T208xRDB.h | 1 + include/configs/T4240QDS.h | 4 include/configs/T4240RDB.h | 1 + include/configs/corenet_ds.h | 4 11 files changed, 29 insertions(+) diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index 58932ad..9217f37 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -909,4 +909,8 @@ unsigned long get_board_ddr_clk(void); #include asm/fsl_secure_boot.h +#ifdef CONFIG_SECURE_BOOT +#define CONFIG_CMD_BLOB +#endif + #endif /* __CONFIG_H */ diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index 922ac00..32fc099 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -708,4 +708,8 @@ combinations. this should be removed later #include asm/fsl_secure_boot.h +#ifdef CONFIG_SECURE_BOOT +#define CONFIG_CMD_BLOB +#endif + #endif /* __CONFIG_H */ diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 45ef53d..54365a2 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -960,4 +960,8 @@ extern unsigned long get_sdram_size(void); #include asm/fsl_secure_boot.h +#ifdef CONFIG_SECURE_BOOT +#define CONFIG_CMD_BLOB +#endif + #endif /* __CONFIG_H */ diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index 7ff2dd5..0b12cf5 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -747,4 +747,8 @@ unsigned long get_board_sys_clk(unsigned long dummy); #include asm/fsl_secure_boot.h +#ifdef CONFIG_SECURE_BOOT +#define CONFIG_CMD_BLOB +#endif + #endif /* __CONFIG_H */ diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index 5870a49..bbe54bf 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -822,6 +822,7 @@ unsigned long get_board_ddr_clk(void); #ifdef CONFIG_SECURE_BOOT #include asm/fsl_secure_boot.h +#define CONFIG_CMD_BLOB #endif #endif /* __CONFIG_H */ diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 8e43931..bcfa410 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -864,6 +864,7 @@ #ifdef CONFIG_SECURE_BOOT #include asm/fsl_secure_boot.h +#define CONFIG_CMD_BLOB #endif #endif /* __CONFIG_H */ diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 9a8a3b6..70ce540 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -913,6 +913,7 @@ unsigned long get_board_ddr_clk(void); #ifdef CONFIG_SECURE_BOOT #include asm/fsl_secure_boot.h +#include CONFIG_CMD_BLOB #undef CONFIG_CMD_USB #endif diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 4ff31e6..8d4b02f 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -872,6 +872,7 @@ unsigned long get_board_ddr_clk(void); #ifdef CONFIG_SECURE_BOOT #include asm/fsl_secure_boot.h +#define CONFIG_CMD_BLOB #undef CONFIG_CMD_USB #endif diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h index d2faf94..e3bbfeb 100644 --- a/include/configs/T4240QDS.h +++ b/include/configs/T4240QDS.h @@ -629,4 +629,8 @@ unsigned long get_board_ddr_clk(void); #include asm/fsl_secure_boot.h +#ifdef CONFIG_SECURE_BOOT +#define CONFIG_CMD_BLOB +#endif + #endif /* __CONFIG_H */ diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index b3fbbe3..82e5efd 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -755,6 +755,7 @@ unsigned long get_board_ddr_clk(void); * which is anyways not used in Secure Environment. */ #undef CONFIG_CMD_USB +#define CONFIG_CMD_BLOB #endif #endif /* __CONFIG_H */ diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index 4fd290e..b0c8277 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -749,4 +749,8 @@ #include asm/fsl_secure_boot.h +#ifdef CONFIG_SECURE_BOOT +#define CONFIG_CMD_BLOB +#endif + #endif /* __CONFIG_H */ -- 1.8.1.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 3/3][v2] ls102x: Add support for secure boot and enable blob command
Signed-off-by: Ruchika Gupta ruchika.gu...@freescale.com --- Changes from v1: Command MACRO corrected configs/ls1021aqds_nor_SECURE_BOOT_defconfig | 3 +++ configs/ls1021atwr_nor_SECURE_BOOT_defconfig | 3 +++ include/configs/ls1021aqds.h | 4 include/configs/ls1021atwr.h | 4 4 files changed, 14 insertions(+) create mode 100644 configs/ls1021aqds_nor_SECURE_BOOT_defconfig create mode 100644 configs/ls1021atwr_nor_SECURE_BOOT_defconfig diff --git a/configs/ls1021aqds_nor_SECURE_BOOT_defconfig b/configs/ls1021aqds_nor_SECURE_BOOT_defconfig new file mode 100644 index 000..2b47995 --- /dev/null +++ b/configs/ls1021aqds_nor_SECURE_BOOT_defconfig @@ -0,0 +1,3 @@ +CONFIG_SYS_EXTRA_OPTIONS=SECURE_BOOT +CONFIG_ARM=y +CONFIG_TARGET_LS1021AQDS=y diff --git a/configs/ls1021atwr_nor_SECURE_BOOT_defconfig b/configs/ls1021atwr_nor_SECURE_BOOT_defconfig new file mode 100644 index 000..eeeb0d5 --- /dev/null +++ b/configs/ls1021atwr_nor_SECURE_BOOT_defconfig @@ -0,0 +1,3 @@ +CONFIG_SYS_EXTRA_OPTIONS=SECURE_BOOT +CONFIG_ARM=y +CONFIG_TARGET_LS1021ATWR=y diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index df2fc09..1da5523 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -392,4 +392,8 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_CMD_HASH #define CONFIG_SHA_HW_ACCEL +#ifdef CONFIG_SECURE_BOOT +#define CONFIG_CMD_BLOB +#endif + #endif diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 7199c92..2ece663 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -294,4 +294,8 @@ #define CONFIG_CMD_HASH #define CONFIG_SHA_HW_ACCEL +#ifdef CONFIG_SECURE_BOOT +#define CONFIG_CMD_BLOB +#endif + #endif -- 1.8.1.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [Patch v3, 2/2] board/ls1021aqds: Add DDR4 support
LS1021AQDS has a variant with DDR4 slot. This patch adds a new defconfig
for this variant to enable DDR4 support. RAW timing parameters are not
added for DDR4. The board timing parameters are only tuned for single-
rank 1600 and 1800MT/s with Micron DIMM 9ASF51272AZ-2G1A1 due to DIMM
availability.
Signed-off-by: York Sun york...@freescale.com
---
Chagne log
v3: Fix commit message, drop name of ls1021aqds_d4.
v2: Drop the name of TARGET_LS1021AQDS_D4 in Kconfig.
arch/arm/include/asm/arch-ls102xa/config.h |5 +
board/freescale/ls1021aqds/ddr.c |9 -
board/freescale/ls1021aqds/ddr.h | 10 ++
configs/ls1021aqds_ddr4_nor_defconfig |3 +++
include/configs/ls1021aqds.h |4 +++-
5 files changed, 29 insertions(+), 2 deletions(-)
create mode 100644 configs/ls1021aqds_ddr4_nor_defconfig
diff --git a/arch/arm/include/asm/arch-ls102xa/config.h
b/arch/arm/include/asm/arch-ls102xa/config.h
index ed78c33..a500b5b 100644
--- a/arch/arm/include/asm/arch-ls102xa/config.h
+++ b/arch/arm/include/asm/arch-ls102xa/config.h
@@ -50,7 +50,11 @@
#ifdef CONFIG_DDR_SPD
#define CONFIG_SYS_FSL_DDR_BE
#define CONFIG_VERY_BIG_RAM
+#ifdef CONFIG_SYS_FSL_DDR4
+#define CONFIG_SYS_FSL_DDRC_GEN4
+#else
#define CONFIG_SYS_FSL_DDRC_ARM_GEN3
+#endif
#define CONFIG_SYS_FSL_DDR
#define CONFIG_SYS_LS1_DDR_BLOCK1_SIZE ((phys_size_t)2 30)
#define CONFIG_MAX_MEM_MAPPED CONFIG_SYS_LS1_DDR_BLOCK1_SIZE
@@ -71,6 +75,7 @@
#define CONFIG_MAX_CPUS2
#define CONFIG_SYS_FSL_IFC_BANK_COUNT 8
#define CONFIG_NUM_DDR_CONTROLLERS 1
+#define CONFIG_SYS_FSL_DDR_VER FSL_DDR_VER_5_0
#else
#error SoC not defined
#endif
diff --git a/board/freescale/ls1021aqds/ddr.c b/board/freescale/ls1021aqds/ddr.c
index 679c654..5898e33 100644
--- a/board/freescale/ls1021aqds/ddr.c
+++ b/board/freescale/ls1021aqds/ddr.c
@@ -79,7 +79,6 @@ found:
*/
popts-wrlvl_override = 1;
popts-wrlvl_sample = 0xf;
- popts-cswl_override = DDR_CSWL_CS0;
/*
* Rtt and Rtt_WR override
@@ -89,9 +88,17 @@ found:
/* Enable ZQ calibration */
popts-zq_en = 1;
+#ifdef CONFIG_SYS_FSL_DDR4
+ popts-ddr_cdr1 = DDR_CDR1_DHC_EN | DDR_CDR1_ODT(DDR_CDR_ODT_80ohm);
+ popts-ddr_cdr2 = DDR_CDR2_ODT(DDR_CDR_ODT_80ohm) |
+ DDR_CDR2_VREF_OVRD(70); /* Vref = 70% */
+#else
+ popts-cswl_override = DDR_CSWL_CS0;
+
/* DHC_EN =1, ODT = 75 Ohm */
popts-ddr_cdr1 = DDR_CDR1_DHC_EN | DDR_CDR1_ODT(DDR_CDR_ODT_75ohm);
popts-ddr_cdr2 = DDR_CDR2_ODT(DDR_CDR_ODT_75ohm);
+#endif
}
#ifdef CONFIG_SYS_DDR_RAW_TIMING
diff --git a/board/freescale/ls1021aqds/ddr.h b/board/freescale/ls1021aqds/ddr.h
index 16d87cb..f819c99 100644
--- a/board/freescale/ls1021aqds/ddr.h
+++ b/board/freescale/ls1021aqds/ddr.h
@@ -30,6 +30,13 @@ static const struct board_specific_parameters udimm0[] = {
* num| hi| rank| clk| wrlvl | wrlvl | wrlvl | cpo |wrdata|2T
* ranks| mhz| GB |adjst| start | ctl2| ctl3 | |delay |
*/
+#ifdef CONFIG_SYS_FSL_DDR4
+ {2, 1666, 0, 4, 7, 0x0808090B, 0x0C0D0E0A,},
+ {2, 1900, 0, 4, 6, 0x08080A0C, 0x0D0E0F0A,},
+ {1, 1666, 0, 4, 8, 0x090A0B0B, 0x0C0D0E0C,},
+ {1, 1900, 0, 4, 9, 0x0A0B0C0B, 0x0D0E0F0D,},
+ {1, 2200, 0, 4,10, 0x0B0C0D0C, 0x0E0F110E,},
+#elif defined(CONFIG_SYS_FSL_DDR3)
{1, 833, 1, 6, 8, 0x06060607, 0x08080807, 0x1f,2, 0},
{1, 1350, 1, 6, 8, 0x0708080A, 0x0A0B0C09, 0x1f,2, 0},
{1, 833, 2, 6, 8, 0x06060607, 0x08080807, 0x1f,2, 0},
@@ -39,6 +46,9 @@ static const struct board_specific_parameters udimm0[] = {
{2, 1350, 0, 6, 8, 0x0708080A, 0x0A0B0C09, 0x1f,2, 0},
{2, 1666, 4, 4, 0xa, 0x0B08090C, 0x0B0E0D0A, 0x1f,2, 0},
{2, 1666, 0, 4, 0xa, 0x0B08090C, 0x0B0E0D0A, 0x1f,2, 0},
+#else
+#error DDR type not defined
+#endif
{}
};
diff --git a/configs/ls1021aqds_ddr4_nor_defconfig
b/configs/ls1021aqds_ddr4_nor_defconfig
new file mode 100644
index 000..3c57481
--- /dev/null
+++ b/configs/ls1021aqds_ddr4_nor_defconfig
@@ -0,0 +1,3 @@
+CONFIG_SYS_EXTRA_OPTIONS=SYS_FSL_DDR4
+CONFIG_ARM=y
+CONFIG_TARGET_LS1021AQDS=y
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 657e3b6..bb47813 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -49,10 +49,12 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_DDR_SPD
#define SPD_EEPROM_ADDRESS 0x51
#define CONFIG_SYS_SPD_BUS_NUM 0
-#define CONFIG_SYS_DDR_RAW_TIMING
#define CONFIG_FSL_DDR_INTERACTIVE /* Interactive debugging */
+#ifndef CONFIG_SYS_FSL_DDR4
#define CONFIG_SYS_FSL_DDR3/* Use DDR3 memory */
+#define
[U-Boot] [PATCH] cmd_mmc: fix bootpart-resize maxarg to 4
sub-command 'bootpart-resize' check for argc == 4,
it will retrun CMD_RET_FAILURE when argc value not matched.
but bootpart-resize's maxarg is 3, which means you never execute
this sub-command successfully.
fix it by change bootpart-resize maxarg to 4.
Signed-off-by: wally.yeh wally@atrustcorp.com
Cc: Wolfgang Denk w...@denx.de
Cc: Pierre Aubert p.aub...@staubli.com
---
common/cmd_mmc.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c
index 1e40983..4286e26 100644
--- a/common/cmd_mmc.c
+++ b/common/cmd_mmc.c
@@ -602,7 +602,7 @@ static cmd_tbl_t cmd_mmc[] = {
U_BOOT_CMD_MKENT(list, 1, 1, do_mmc_list, , ),
#ifdef CONFIG_SUPPORT_EMMC_BOOT
U_BOOT_CMD_MKENT(bootbus, 5, 0, do_mmc_bootbus, , ),
- U_BOOT_CMD_MKENT(bootpart-resize, 3, 0, do_mmc_boot_resize, , ),
+ U_BOOT_CMD_MKENT(bootpart-resize, 4, 0, do_mmc_boot_resize, , ),
U_BOOT_CMD_MKENT(partconf, 5, 0, do_mmc_partconf, , ),
U_BOOT_CMD_MKENT(rst-function, 3, 0, do_mmc_rst_func, , ),
#endif
--
1.7.10.4
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [Patch v4, 2/2] board/ls1021aqds: Add DDR4 support
LS1021AQDS has a variant with DDR4 slot. This patch adds a new defconfig
for this variant to enable DDR4 support. RAW timing parameters are not
added for DDR4. The board timing parameters are only tuned for single-
rank 1600 and 1800MT/s with Micron DIMM 9ASF51272AZ-2G1A1 due to DIMM
availability.
Signed-off-by: York Sun york...@freescale.com
CC: Alison Wang alison.w...@freescale.com
---
Change log
v4: Update maintainer file with defconfig.
v3: Fix commit message, drop name of ls1021aqds_d4.
v2: Drop the name of TARGET_LS1021AQDS_D4 in Kconfig.
arch/arm/include/asm/arch-ls102xa/config.h |5 +
board/freescale/ls1021aqds/MAINTAINERS |1 +
board/freescale/ls1021aqds/ddr.c |9 -
board/freescale/ls1021aqds/ddr.h | 10 ++
configs/ls1021aqds_ddr4_nor_defconfig |3 +++
include/configs/ls1021aqds.h |4 +++-
6 files changed, 30 insertions(+), 2 deletions(-)
create mode 100644 configs/ls1021aqds_ddr4_nor_defconfig
diff --git a/arch/arm/include/asm/arch-ls102xa/config.h
b/arch/arm/include/asm/arch-ls102xa/config.h
index ed78c33..a500b5b 100644
--- a/arch/arm/include/asm/arch-ls102xa/config.h
+++ b/arch/arm/include/asm/arch-ls102xa/config.h
@@ -50,7 +50,11 @@
#ifdef CONFIG_DDR_SPD
#define CONFIG_SYS_FSL_DDR_BE
#define CONFIG_VERY_BIG_RAM
+#ifdef CONFIG_SYS_FSL_DDR4
+#define CONFIG_SYS_FSL_DDRC_GEN4
+#else
#define CONFIG_SYS_FSL_DDRC_ARM_GEN3
+#endif
#define CONFIG_SYS_FSL_DDR
#define CONFIG_SYS_LS1_DDR_BLOCK1_SIZE ((phys_size_t)2 30)
#define CONFIG_MAX_MEM_MAPPED CONFIG_SYS_LS1_DDR_BLOCK1_SIZE
@@ -71,6 +75,7 @@
#define CONFIG_MAX_CPUS2
#define CONFIG_SYS_FSL_IFC_BANK_COUNT 8
#define CONFIG_NUM_DDR_CONTROLLERS 1
+#define CONFIG_SYS_FSL_DDR_VER FSL_DDR_VER_5_0
#else
#error SoC not defined
#endif
diff --git a/board/freescale/ls1021aqds/MAINTAINERS
b/board/freescale/ls1021aqds/MAINTAINERS
index 021d82b..ccf4513 100644
--- a/board/freescale/ls1021aqds/MAINTAINERS
+++ b/board/freescale/ls1021aqds/MAINTAINERS
@@ -4,3 +4,4 @@ S: Maintained
F: board/freescale/ls1021aqds/
F: include/configs/ls1021aqds.h
F: configs/ls1021aqds_nor_defconfig
+F: configs/ls1021aqds_ddr4_nor_defconfig
diff --git a/board/freescale/ls1021aqds/ddr.c b/board/freescale/ls1021aqds/ddr.c
index 679c654..5898e33 100644
--- a/board/freescale/ls1021aqds/ddr.c
+++ b/board/freescale/ls1021aqds/ddr.c
@@ -79,7 +79,6 @@ found:
*/
popts-wrlvl_override = 1;
popts-wrlvl_sample = 0xf;
- popts-cswl_override = DDR_CSWL_CS0;
/*
* Rtt and Rtt_WR override
@@ -89,9 +88,17 @@ found:
/* Enable ZQ calibration */
popts-zq_en = 1;
+#ifdef CONFIG_SYS_FSL_DDR4
+ popts-ddr_cdr1 = DDR_CDR1_DHC_EN | DDR_CDR1_ODT(DDR_CDR_ODT_80ohm);
+ popts-ddr_cdr2 = DDR_CDR2_ODT(DDR_CDR_ODT_80ohm) |
+ DDR_CDR2_VREF_OVRD(70); /* Vref = 70% */
+#else
+ popts-cswl_override = DDR_CSWL_CS0;
+
/* DHC_EN =1, ODT = 75 Ohm */
popts-ddr_cdr1 = DDR_CDR1_DHC_EN | DDR_CDR1_ODT(DDR_CDR_ODT_75ohm);
popts-ddr_cdr2 = DDR_CDR2_ODT(DDR_CDR_ODT_75ohm);
+#endif
}
#ifdef CONFIG_SYS_DDR_RAW_TIMING
diff --git a/board/freescale/ls1021aqds/ddr.h b/board/freescale/ls1021aqds/ddr.h
index 16d87cb..f819c99 100644
--- a/board/freescale/ls1021aqds/ddr.h
+++ b/board/freescale/ls1021aqds/ddr.h
@@ -30,6 +30,13 @@ static const struct board_specific_parameters udimm0[] = {
* num| hi| rank| clk| wrlvl | wrlvl | wrlvl | cpo |wrdata|2T
* ranks| mhz| GB |adjst| start | ctl2| ctl3 | |delay |
*/
+#ifdef CONFIG_SYS_FSL_DDR4
+ {2, 1666, 0, 4, 7, 0x0808090B, 0x0C0D0E0A,},
+ {2, 1900, 0, 4, 6, 0x08080A0C, 0x0D0E0F0A,},
+ {1, 1666, 0, 4, 8, 0x090A0B0B, 0x0C0D0E0C,},
+ {1, 1900, 0, 4, 9, 0x0A0B0C0B, 0x0D0E0F0D,},
+ {1, 2200, 0, 4,10, 0x0B0C0D0C, 0x0E0F110E,},
+#elif defined(CONFIG_SYS_FSL_DDR3)
{1, 833, 1, 6, 8, 0x06060607, 0x08080807, 0x1f,2, 0},
{1, 1350, 1, 6, 8, 0x0708080A, 0x0A0B0C09, 0x1f,2, 0},
{1, 833, 2, 6, 8, 0x06060607, 0x08080807, 0x1f,2, 0},
@@ -39,6 +46,9 @@ static const struct board_specific_parameters udimm0[] = {
{2, 1350, 0, 6, 8, 0x0708080A, 0x0A0B0C09, 0x1f,2, 0},
{2, 1666, 4, 4, 0xa, 0x0B08090C, 0x0B0E0D0A, 0x1f,2, 0},
{2, 1666, 0, 4, 0xa, 0x0B08090C, 0x0B0E0D0A, 0x1f,2, 0},
+#else
+#error DDR type not defined
+#endif
{}
};
diff --git a/configs/ls1021aqds_ddr4_nor_defconfig
b/configs/ls1021aqds_ddr4_nor_defconfig
new file mode 100644
index 000..3c57481
--- /dev/null
+++ b/configs/ls1021aqds_ddr4_nor_defconfig
@@ -0,0 +1,3 @@
+CONFIG_SYS_EXTRA_OPTIONS=SYS_FSL_DDR4
+CONFIG_ARM=y
+CONFIG_TARGET_LS1021AQDS=y
diff --git
[U-Boot] Please pull u-boot-mpc85xx
Tom, The following changes since commit 47d3debe1ab8315dc9ade22279e02f60eceda25b: Merge git://git.denx.de/u-boot-dm (2014-09-23 15:21:43 -0400) are available in the git repository at: git://git.denx.de/u-boot-mpc85xx.git master for you to fetch changes up to 039b77396abb0ed78af34dadbd0786dfaf0e6aa9: powerpc: add --bss-plt to LDFLAGS (2014-09-25 09:22:37 -0700) Chris Packham (1): powerpc: add --bss-plt to LDFLAGS Ebony Zhu (1): powerpc/mpc85xx: Serdes protocol 00 is supported Priyanka Jain (2): powerpc/t104xrdb: Set DDR ODT to 75ohm board/t1040qds: Add sgmii ports support in 0xA7 protocol Shaveta Leekha (2): powerpc/b4860: Updated default hwconfig to enable only cpc2 B4860QDS: Enable mac command support ramneek mehresh (1): powerpc/8xxx: Fix in USB device-tree fixup vijay rai (2): powerpc/t104xrdb: Add Support of rcw for T1042RDB in u-boot powerpc/t104xrdb: Add T1042RDB board support arch/powerpc/config.mk |1 + arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c |5 - arch/powerpc/cpu/mpc8xxx/fdt.c | 20 +--- board/freescale/t1040qds/eth.c |4 board/freescale/t104xrdb/MAINTAINERS |1 + board/freescale/t104xrdb/README| 23 ++- board/freescale/t104xrdb/ddr.c |4 ++-- board/freescale/t104xrdb/eth.c | 10 ++ board/freescale/t104xrdb/t1042_pi_rcw.cfg |7 +++ board/freescale/t104xrdb/t1042_rcw.cfg |8 configs/T1042RDB_defconfig |4 drivers/net/fm/t1040.c |2 -- include/configs/B4860QDS.h | 12 ++-- include/configs/T104xRDB.h | 20 14 files changed, 82 insertions(+), 39 deletions(-) create mode 100644 board/freescale/t104xrdb/t1042_pi_rcw.cfg create mode 100644 configs/T1042RDB_defconfig Thanks, York ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2] powerpc/t104xrdb: Add Support of rcw for T1042RDB in u-boot
On 07/23/2014 05:55 AM, Vijay Rai wrote: This patch adds support of rcw for T1042RDB, it makes following changes : - Adds t1042_rcw.cfg file for serdes protocol 0x86 for T1042RDB - Renames t1042_pi_rcw.cfg file from t1042_rcw.cfg and also updates comments for valid serdes protocol which is 0x06 - Also updates CONFIG_SYS_FSL_PBL_RCW for T1042RDB Signed-off-by: Vijay Rai vijay@freescale.com Signed-off-by: Priyanka Jain priyanka.j...@freescale.com --- Applied to u-boot-mpc85xx master, awaiting upstream. York ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v4] powerpc/t104xrdb: Add T1042RDB board support
On 08/19/2014 12:16 AM, Vijay Rai wrote: T1042RDB is a Freescale reference board that hosts the T1042 SoC (and variants). The board is similar to T1040RDB, T1042 is a reduced personality of T1040 SoC without Integrated 8-port Gigabit(L2 Switch). T1042RDB is configured with serdes protocol 0x86 which can support following interfaces - 2 RGMII's on DTSEC4, DTSEC5 - 1 SGMII on DTSEC3 DTSEC1, DTSEC2 are not connected on board. This Patch - add T1042RDB support - updates README file for T1042RDB details and update commands for switching to alternate banks from vBank0 to vBank4 and vice versa This patch also does minor clean ups for fdt defines for T1042RDB and T1042RDB_PI board Signed-off-by: Vijay Rai vijay@freescale.com Signed-off-by: Priyanka Jain priyanka.j...@freescale.com --- changes for v4: There are some changes regarding Kconfig, Added configs/T1042RDB_defconfig file to support T1042RDB,added T1042RDB as config option into board/freescale/t104xrdb/MAINTAINERS Applied to u-boot-mpc85xx, awaiting upstream. York ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] powerpc/8xxx: Fix in USB device-tree fixup
On 08/21/2014 10:26 PM, Ramneek Mehresh wrote: Fix following issues in USB device-tree fixup: - returns when either dr_mode or phy_type not defined. This was terminating fix-up when only either property was defined in hwconfig string - updates dr_mode_type or dr_phy_type with junk value when their index is -1. Now these are updated only when their respective index is pointing to relevant types in modes[] and phys[] array - dr_mode_type and dr_phy_type were not NULL for each controller Signed-off-by: Ramneek Mehresh ramneek.mehr...@freescale.com --- Applied to u-boot-mpc85xx, awaiting upstream. York ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH][v2] powerpc/b4860: Updated default hwconfig so as to enable only
On 09/03/2014 11:13 PM, Shaveta Leekha wrote: CPC1 is not being enabled by default as powerpc is supposed to use only CPC2. Though by editing hwconfig en_cpc option, CPC1 can also be enabled Signed-off-by: Shaveta Leekha shav...@freescale.com Signed-off-by: Sandeep Singh sand...@freescale.com --- Tested on B4860QDS Changes in V2: Inserted en_cpc:cpc2 at right place, not to broke into the settings for DDR Appended cpc2 to the subject. Applied to u-boot-mpc85xx, awaiting upstream. York ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] B4860QDS: Enable mac command support
On 09/04/2014 03:47 AM, Shaveta Leekha wrote: One of the I2C EEPROM is used to store/save and edit mac addresses of ports. this patch add required CONFIG to support the same Signed-off-by: Shaveta Leekha shav...@freescale.com --- Applied to u-boot-mpc85xx, awaiting upstream. York ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] powerpc/mpc85xx: Serdes protocol 00 is supported
On 09/04/2014 09:53 AM, Ebony Zhu wrote: 0x00 is a valid serdes protocol for QorIQ parts, and can not be used to test whether the serdes is enabled or disabled. Signed-off-by: Ebony Zhu b45...@freescale.com --- arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c | 5 - 1 file changed, 5 deletions(-) Applied to u-boot-mpc85xx, awaiting upstream. York ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] powerpc/t104xrdb: Set DDR ODT to 75ohm
On 09/05/2014 02:48 AM, Priyanka Jain wrote: DDR-ODT require cfg_dram_type switch set properly as per DDR type. T1040RDB, T1042RDB boards have DDR3L type DDR, so cfg_dram_type should be set to OFF for DDR3L Update t104xrdb/README for switch setting Signed-off-by: Priyanka Jain priyanka.j...@freescale.com --- Applied to u-boot-mpc85xx, awaiting upstream. York ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] board/t1040qds: Add sgmii ports support in 0xA7 protocol
On 09/08/2014 12:50 AM, Priyanka Jain wrote: T1042QDS (T1042 is T1040 Personality without L2 switch) supports following sgmii interfaces with serdes protocol 0xA7 -SGMII-MAC3 on Lane B - slot 7 -SGMII-MAC5 on Lane H - slot 7 -SGMII2.5G-MAC1 on Lane C - slot 6 -SGMII2.5G-MAC2 on Lane D - slot 5 Add support of above sgmii interfaces Signed-off-by: Priyanka Jain priyanka.j...@freescale.com --- Applied to u-boot-mpc85xx, awaiting upstream. York ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [RFC PATCH v1] powerpc: add --bss-plt to LDFLAGS
On 09/09/2014 09:03 PM, Chris Packham wrote: With some versions of gcc (that we know of 4.6.3 and 4.8.2 are affected) it is necessary to specify --bss-plt to get the final blrl in the _GOT2_TABLE_. Without this the last symbol does not get it's address relocated. For the P2041RDB board this ended up being NetArpWaitTimerStart which caused the ARP packets to timeout immediately. Helped-by: Joakim Tjernlund joakim.tjernl...@transmode.se Signed-off-by: Chris Packham judge.pack...@gmail.com --- Applied to u-boot-mpc85xx, awaiting upstream. York ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2 01/10] ARM: sunxi: Use macro values for setting UART GPIO pull-ups
On Wed, 2014-09-24 at 16:01 +0800, Chen-Yu Tsai wrote: We have already defined macros for pull-up/down values in the GPIO header. Use them instead of magic numbers when configuring the UART pins. Signed-off-by: Chen-Yu Tsai w...@csie.org Acked-by: Ian Campbell i...@hellion.org.uk ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2 04/10] ARM: sun6i: Add support for the power reset control module found on the A31
On Wed, 2014-09-24 at 16:01 +0800, Chen-Yu Tsai wrote: From: Oliver Schinagl oli...@schinagl.nl The A31 has a new module called PRCM, or Power, Reset Control Module. This module controls clocks and resets for RTC block modules, and also PLL biasing in the main clock module. This patch adds the register definitions, and also enables the clocks and resets for the RTC block PIO (pin controller) and P2WI (push-pull 2 wire interface) which is used to talk to the PMIC. Signed-off-by: Oliver Schinagl oli...@schinagl.nl Signed-off-by: Hans de Goede hdego...@redhat.com [w...@csie.org: spacing fixes reported by checkpatch.pl] [w...@csie.org: Use setbits helper in PRCM init function] [w...@csie.org: rephrase commit message to explain what the hardware supports and what we actually enable] Signed-off-by: Chen-Yu Tsai w...@csie.org Acked-by: Ian Campbell i...@hellion.org.uk ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2 05/10] ARM: sun6i: Add clock support
On Wed, 2014-09-24 at 16:01 +0800, Chen-Yu Tsai wrote:
This patch adds the basic clocks support for the Allwinner A31 (sun6i)
processor. This code will not been compiled until the build is hooked
up in a later patch. It has been split out to keep the patches manageable.
This includes changes from the following commits from u-boot-sunxi:
a92051b ARM: sunxi: Add sun6i clock controller structure
1f72c6f ARM: sun6i: Setup the UART0 clocks
5f2e712 ARM: sunxi: Enable pll6 by default on all models
2be2f2a ARM: sunxi-mmc: Add mmc support for sun6i / A31
12e1633 ARM: sun6i: Add initial clock setup for SPL
1a9c9c6 ARM: sunxi: Split clock code into common, sun4i and sun6i code
0b194ee ARM: sun6i: Properly setup the PLL LDO in clock_init_safe
b54c626 sunxi: avoid sr32 for APB1 clock setup.
68fe29c sunxi: remove magic numbers from clock_get_pll{5,6}
c89867d sunxi: clocks: clock_get_pll5 prototype and coding style
501ab1e ARM: sunxi: Fix sun6i PLL6 settings
37f669b ARM: sunxi: Fix macro names for mmc and uart reset offsets
61de1e6 ARM: sunxi: Correct comment for MBUS1 register in sun6i clock
definitions
Signed-off-by: Maxime Ripard maxime.rip...@free-electrons.com
Signed-off-by: Ian Campbell i...@hellion.org.uk
Signed-off-by: Hans de Goede hdego...@redhat.com
[w...@csie.org: styling fixes reported by checkpatch.pl]
[w...@csie.org: drop unsupported SPL code block and unused gpio.h header]
Signed-off-by: Chen-Yu Tsai w...@csie.org
Cc: Tom Cubie mr.hip...@gmail.com
Acked-by: Ian Campbell i...@hellion.org.uk
(my contributions to what became this patch were minor enough that I
think this doesn't constitute a double dealing self-ack, if that might
have been a problem)
___
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: sunxi-mmc: Add mmc support for sun6i / A31
On Wed, 2014-09-24 at 16:01 +0800, Chen-Yu Tsai wrote:
From: Hans de Goede hdego...@redhat.com
The mmc hardware on sun6i has an extra reset control that needs to
be de-asserted prior to usage. Also the FIFO address is different.
Signed-off-by: Hans de Goede hdego...@redhat.com
[w...@csie.org: use setbits_le32 for reset control, drop obsolete changes,
rewrite different FIFO address handling, add commit message]
Signed-off-by: Chen-Yu Tsai w...@csie.org
Acked-by: Ian Campbell i...@hellion.org.uk
Pantelis, unless you object I'd like to eventually take this into
u-boot-sunxi.git#next and merge for v2015.04.
---
arch/arm/include/asm/arch-sunxi/mmc.h | 5 -
drivers/mmc/sunxi_mmc.c | 11 +++
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/arch/arm/include/asm/arch-sunxi/mmc.h
b/arch/arm/include/asm/arch-sunxi/mmc.h
index 53196e3..6a31184 100644
--- a/arch/arm/include/asm/arch-sunxi/mmc.h
+++ b/arch/arm/include/asm/arch-sunxi/mmc.h
@@ -43,7 +43,10 @@ struct sunxi_mmc {
u32 chda; /* 0x90 */
u32 cbda; /* 0x94 */
u32 res1[26];
- u32 fifo; /* 0x100 FIFO access address */
+#if defined(CONFIG_SUN6I)
+ u32 res2[64];
+#endif
+ u32 fifo; /* 0x100 (0x200 on sun6i) FIFO access address */
};
#define SUNXI_MMC_CLK_POWERSAVE (0x1 17)
diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c
index d4e574f..1982988 100644
--- a/drivers/mmc/sunxi_mmc.c
+++ b/drivers/mmc/sunxi_mmc.c
@@ -19,7 +19,6 @@
struct sunxi_mmc_host {
unsigned mmc_no;
uint32_t *mclkreg;
- unsigned database;
unsigned fatal_err;
unsigned mod_clk;
struct sunxi_mmc *reg;
@@ -57,7 +56,6 @@ static int mmc_resource_init(int sdc_no)
printf(Wrong mmc number %d\n, sdc_no);
return -1;
}
- mmchost-database = (unsigned int)mmchost-reg + 0x100;
mmchost-mmc_no = sdc_no;
return 0;
@@ -75,6 +73,11 @@ static int mmc_clk_io_on(int sdc_no)
/* config ahb clock */
setbits_le32(ccm-ahb_gate0, 1 AHB_GATE_OFFSET_MMC(sdc_no));
+#if defined(CONFIG_SUN6I)
+ /* unassert reset */
+ setbits_le32(ccm-ahb_reset0_cfg, 1 AHB_RESET_OFFSET_MMC(sdc_no));
+#endif
+
/* config mod clock */
pll_clk = clock_get_pll6();
/* should be close to 100 MHz but no more, so round up */
@@ -194,9 +197,9 @@ static int mmc_trans_data_by_cpu(struct mmc *mmc, struct
mmc_data *data)
}
if (reading)
- buff[i] = readl(mmchost-database);
+ buff[i] = readl(mmchost-reg-fifo);
else
- writel(buff[i], mmchost-database);
+ writel(buff[i], mmchost-reg-fifo);
}
return 0;
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2 07/10] ARM: sun6i: Define UART0 pins for A31
On Wed, 2014-09-24 at 16:01 +0800, Chen-Yu Tsai wrote: UART0 is the default debug/console UART on the A31. Signed-off-by: Chen-Yu Tsai w...@csie.org Acked-by: Ian Campbell i...@hellion.org.uk ___ 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: sun6i: Setup the A31 UART0 muxing
On Wed, 2014-09-24 at 16:01 +0800, Chen-Yu Tsai wrote: From: Maxime Ripard maxime.rip...@free-electrons.com Signed-off-by: Maxime Ripard maxime.rip...@free-electrons.com Signed-off-by: Hans de Goede hdego...@redhat.com [w...@csie.org: commit message was ARM: sunxi: Setup the A31 UART0 muxing] [w...@csie.org: reorder #ifs by SUN?I] [w...@csie.org: replace magic numbers with GPIO definitions] Signed-off-by: Chen-Yu Tsai w...@csie.org Acked-by: Ian Campbell i...@hellion.org.uk ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] nand/denali: Document CONFIG symbols
The patch nand/denali: Adding Denali NAND driver support introduced two config symbols without documenting them. Signed-off-by: Scott Wood scottw...@freescale.com Cc: Chin Liang See cl...@altera.com Cc: Masahiro Yamada yamad...@jp.panasonic.com --- doc/README.nand | 6 ++ 1 file changed, 6 insertions(+) diff --git a/doc/README.nand b/doc/README.nand index e29188f..320d752 100644 --- a/doc/README.nand +++ b/doc/README.nand @@ -215,6 +215,12 @@ Configuration Options: Platform specific options = + CONFIG_NAND_DENALI + Enables the denali.c driver. + + CONFIG_SYS_NAND_DENALI_64BIT + Indicates that the Denali NAND controller is the 64-bit variant. + CONFIG_NAND_OMAP_GPMC Enables omap_gpmc.c driver for OMAPx and AM platforms. GPMC controller is used for parallel NAND flash devices, and can -- 1.9.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2 09/10] ARM: sunxi: Add basic A31 support
On Wed, 2014-09-24 at 16:01 +0800, Chen-Yu Tsai wrote: From: Maxime Ripard maxime.rip...@free-electrons.com Add a new sun6i machine that supports UART and MMC. Signed-off-by: Maxime Ripard maxime.rip...@free-electrons.com Signed-off-by: Hans de Goede hdego...@redhat.com [w...@csie.org: use SPDX labels, adapt to Kconfig system, drop ifdef around mmc and smp code, drop MACH_TYPE] Signed-off-by: Chen-Yu Tsai w...@csie.org Acked-by: Ian Campbell i...@hellion.org.uk ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2 10/10] ARM: sun6i: Add Colombus board defconfig
On Wed, 2014-09-24 at 16:01 +0800, Chen-Yu Tsai wrote: The Colombus board is an A31 evaluation board from WITS Technology. Signed-off-by: Chen-Yu Tsai w...@csie.org --- configs/Colombus_defconfig | 4 1 file changed, 4 insertions(+) create mode 100644 configs/Colombus_defconfig diff --git a/configs/Colombus_defconfig b/configs/Colombus_defconfig new file mode 100644 index 000..16800de --- /dev/null +++ b/configs/Colombus_defconfig @@ -0,0 +1,4 @@ +CONFIG_SYS_EXTRA_OPTIONS=COLOMBUS Does this do anything other than define an unused #define? Ah, I suppose eventually it will cause the inclusion of a suitable dram file. Really ought to start moving things out of SYS_EXTRA though, but I don't think you need to shave that yakk just to get this patch in, so: Acked-by: Ian Campbell i...@hellion.org.uk ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] mtd: nand: mxs: Add ECC geometry for 2048b/112b NAND
Add ECC geometry for NAND which has 2048b pagesize and 112b OOB
size. This is for example Macronix MX30LF2G28AB chip.
Signed-off-by: Marek Vasut ma...@denx.de
---
drivers/mtd/nand/mxs_nand.c | 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/mtd/nand/mxs_nand.c b/drivers/mtd/nand/mxs_nand.c
index 036c113..7a064ab 100644
--- a/drivers/mtd/nand/mxs_nand.c
+++ b/drivers/mtd/nand/mxs_nand.c
@@ -146,8 +146,13 @@ static uint32_t mxs_nand_aux_status_offset(void)
static inline uint32_t mxs_nand_get_ecc_strength(uint32_t page_data_size,
uint32_t page_oob_size)
{
- if (page_data_size == 2048)
- return 8;
+ if (page_data_size == 2048) {
+ if (page_oob_size == 64)
+ return 8;
+
+ if (page_oob_size == 112)
+ return 14;
+ }
if (page_data_size == 4096) {
if (page_oob_size == 128)
--
2.1.0
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 2/2] arm: m53evk: Zap superfluous tab in env
Remove this tab from env, since it's useless, just use spaces.
Signed-off-by: Marek Vasut ma...@denx.de
Cc: Stefano Babic sba...@denx.de
---
include/configs/m53evk.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h
index ee4eb10..c133ba9 100644
--- a/include/configs/m53evk.h
+++ b/include/configs/m53evk.h
@@ -351,9 +351,9 @@
mmc rescan; \
if test -e mmc 0:1 ${bootscript} ; then \
if load mmc 0:1 ${kernel_addr_r} ${bootscript}; \
- then; \
- \techo Running bootscript...; \
- \tsource ${kernel_addr_r};\
+ then ;\
+ echo Running bootscript... ; \
+ source ${kernel_addr_r} ; \
fi ; \
fi\0
--
2.1.0
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/2] arm: m28evk: Zap superfluous tab in env
Remove this tab from env, since it's useless, just use spaces.
Signed-off-by: Marek Vasut ma...@denx.de
Cc: Stefano Babic sba...@denx.de
---
include/configs/m28evk.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h
index 322b45f..efe770b 100644
--- a/include/configs/m28evk.h
+++ b/include/configs/m28evk.h
@@ -282,9 +282,9 @@
mmc rescan; \
if test -e mmc 0:2 ${bootscript} ; then \
if load mmc 0:2 ${kernel_addr_r} ${bootscript}; \
- then; \
- \techo Running bootscript...; \
- \tsource ${kernel_addr_r};\
+ then ;\
+ echo Running bootscript... ; \
+ source ${kernel_addr_r} ; \
fi ; \
fi\0
--
2.1.0
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] driver/net/fm/memac_phy: set NEG bit for external MDIOs
On Wed, Aug 13, 2014 at 5:38 AM, shh@gmail.com wrote: From: Shaohui Xie shaohui@freescale.com NEG bit default is '1' for external MDIOs as per FMAN-v3 RM, but on some platforms, e.g. T2080QDS, this bit is '0', which leads to MDIO failure on XAUI PHY, so set this bit definitely to align with the RM. Signed-off-by: Shaohui Xie shaohui@freescale.com Acked-by: Joe Hershberger joe.hershber...@ni.com ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] Fman/mEMAC: mEMAC fix for 10G MAC and PHY
On Wed, Aug 13, 2014 at 5:32 AM, shh@gmail.com wrote: From: Shaohui Xie shaohui@freescale.com 1. use Payload length check disable when enable MAC; 2. add XGMII support for setting MAC interface mode; 3. only enable auto negotiation for Non-XGMII mode; 4. return 0x if clause 22 is used to read 10G phy_id; Signed-off-by: Shaohui Xie shaohui@freescale.com Signed-off-by: Roy Zang tie-fei.z...@freescale.com Acked-By: Joe Hershberger joe.hershber...@ni.com ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] patman: Check commit_match before stripping leading whitespace
True commit lines start at column zero. Anything that is indented
is part of the commit message instead. I noticed this by trying to
run buildman with commit e3a4facdfc07179ebe017a07b8de6224a935a9f3
as master, which contained a reference to a Linux commit inside
the commit message. ProcessLine saw that as a genuite commit
line, and thus buildman tried to build it, and died with an
exception because that SHA is not present in the U-Boot tree.
Signed-off-by: Scott Wood scottw...@freescale.com
---
tools/patman/patchstream.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tools/patman/patchstream.py b/tools/patman/patchstream.py
index d630157..68e98b9 100644
--- a/tools/patman/patchstream.py
+++ b/tools/patman/patchstream.py
@@ -139,6 +139,9 @@ class PatchStream:
# Initially we have no output. Prepare the input line string
out = []
line = line.rstrip('\n')
+
+commit_match = re_commit.match(line) if self.is_log else None
+
if self.is_log:
if line[:4] == '':
line = line[4:]
@@ -146,7 +149,6 @@ class PatchStream:
# Handle state transition and skipping blank lines
series_tag_match = re_series_tag.match(line)
commit_tag_match = re_commit_tag.match(line)
-commit_match = re_commit.match(line) if self.is_log else None
cover_cc_match = re_cover_cc.match(line)
signoff_match = re_signoff.match(line)
tag_match = None
--
1.9.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
