December 2014 - U-Boot

[U-Boot] [PATCH 4/4] vexpress64: support the Juno Development Platform
by Linus Walleij 29 Dec '14

29 Dec '14

The Juno Development Platform is a physical Versatile Express device with some differences from the emulated semihosting models. The main difference is that the system is split in a SoC and an FPGA where the SoC hosts the serial ports at totally different adresses. Signed-off-by: Linus Walleij <linus.walleij(a)linaro.org> --- arch/arm/Kconfig | 4 ++++ board/armltd/vexpress64/Kconfig | 13 +++++++++++++ board/armltd/vexpress64/MAINTAINERS | 5 +++++ configs/vexpress_aemv8a_juno_defconfig | 5 +++++ include/configs/vexpress_aemv8a.h | 20 +++++++++++++++++++- 5 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 configs/vexpress_aemv8a_juno_defconfig diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 9a7e36570de5..489c16f3ccd6 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -736,6 +736,10 @@ config TARGET_VEXPRESS64_BASE_FVP select ARM64 select SEMIHOSTING +config TARGET_VEXPRESS64_JUNO + bool "Support Versatile Express Juno Development Platform" + select ARM64 + config TARGET_LS2085A_EMU bool "Support ls2085a_emu" select ARM64 diff --git a/board/armltd/vexpress64/Kconfig b/board/armltd/vexpress64/Kconfig index 2343e717f121..f7de039b7f5b 100644 --- a/board/armltd/vexpress64/Kconfig +++ b/board/armltd/vexpress64/Kconfig @@ -23,3 +23,16 @@ config SYS_CONFIG_NAME default "vexpress_aemv8a" endif + +if TARGET_VEXPRESS64_JUNO + +config SYS_BOARD + default "vexpress64" + +config SYS_VENDOR + default "armltd" + +config SYS_CONFIG_NAME + default "vexpress_aemv8a" + +endif diff --git a/board/armltd/vexpress64/MAINTAINERS b/board/armltd/vexpress64/MAINTAINERS index 66c8dffa1634..0ba044d7ff87 100644 --- a/board/armltd/vexpress64/MAINTAINERS +++ b/board/armltd/vexpress64/MAINTAINERS @@ -9,3 +9,8 @@ VEXPRESS_AEMV8A_SEMI BOARD M: Linus Walleij <linus.walleij(a)linaro.org> S: Maintained F: configs/vexpress_aemv8a_semi_defconfig + +JUNO DEVELOPMENT PLATFORM BOARD +M: Linus Walleij <linus.walleij(a)linaro.org> +S: Maintained +F: configs/vexpress_aemv8a_juno_defconfig diff --git a/configs/vexpress_aemv8a_juno_defconfig b/configs/vexpress_aemv8a_juno_defconfig new file mode 100644 index 000000000000..d28a4286e5af --- /dev/null +++ b/configs/vexpress_aemv8a_juno_defconfig @@ -0,0 +1,5 @@ +# ARM Ltd. Juno Board Reference Design +CONFIG_ARM=y +CONFIG_TARGET_VEXPRESS64_JUNO=y +CONFIG_DEFAULT_DEVICE_TREE="vexpress64" +CONFIG_SHOW_BOOT_PROGRESS=y diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index 85894bedf8bd..9527b02718dd 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -21,9 +21,11 @@ #define CONFIG_REMAKE_ELF -#ifndef CONFIG_TARGET_VEXPRESS64_BASE_FVP +#if !defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP) && \ + !defined(CONFIG_TARGET_VEXPRESS64_JUNO) /* Base FVP and Juno not using GICv3 yet */ #define CONFIG_GICV3 +//#define CONFIG_GICV2 #endif /*#define CONFIG_ARMV8_SWITCH_TO_EL1*/ @@ -44,6 +46,9 @@ /* ATF loads u-boot here for BASE_FVP model */ #define CONFIG_SYS_TEXT_BASE 0x88000000 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x03f00000) +#elif CONFIG_TARGET_VEXPRESS64_JUNO +#define CONFIG_SYS_TEXT_BASE 0xe0000000 +#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x7fff0) #else #define CONFIG_SYS_TEXT_BASE 0x80000000 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x7fff0) @@ -88,10 +93,15 @@ #define V2M_KMI0 (V2M_PA_CS3 + V2M_PERIPH_OFFSET(6)) #define V2M_KMI1 (V2M_PA_CS3 + V2M_PERIPH_OFFSET(7)) +#ifdef CONFIG_TARGET_VEXPRESS64_JUNO +#define V2M_UART0 0x7ff80000 +#define V2M_UART1 0x7ff70000 +#else /* Not Juno */ #define V2M_UART0 (V2M_PA_CS3 + V2M_PERIPH_OFFSET(9)) #define V2M_UART1 (V2M_PA_CS3 + V2M_PERIPH_OFFSET(10)) #define V2M_UART2 (V2M_PA_CS3 + V2M_PERIPH_OFFSET(11)) #define V2M_UART3 (V2M_PA_CS3 + V2M_PERIPH_OFFSET(12)) +#endif #define V2M_WDT (V2M_PA_CS3 + V2M_PERIPH_OFFSET(15)) @@ -122,6 +132,9 @@ #ifdef CONFIG_TARGET_VEXPRESS64_BASE_FVP #define GICD_BASE (0x2f000000) #define GICC_BASE (0x2c000000) +#elif CONFIG_TARGET_VEXPRESS64_JUNO +#define GICD_BASE (0x2C010000) +#define GICC_BASE (0x2C02f000) #else #define GICD_BASE (0x2C001000) #define GICC_BASE (0x2C002000) @@ -140,7 +153,11 @@ /* PL011 Serial Configuration */ #define CONFIG_PL011_SERIAL +#ifdef CONFIG_TARGET_VEXPRESS64_JUNO +#define CONFIG_PL011_CLOCK 7273800 +#else #define CONFIG_PL011_CLOCK 24000000 +#endif #define CONFIG_PL01x_PORTS {(void *)CONFIG_SYS_SERIAL0, \ (void *)CONFIG_SYS_SERIAL1} #define CONFIG_CONS_INDEX 0 @@ -161,6 +178,7 @@ #define CONFIG_CMD_ENV #define CONFIG_CMD_FLASH #define CONFIG_CMD_IMI +#define CONFIG_CMD_LOADB #define CONFIG_CMD_MEMORY #define CONFIG_CMD_MII #define CONFIG_CMD_NET -- 1.9.3

2 1

[U-Boot] [PATCH 3/4] vexpress64: get rid of CONFIG_SYS_EXTRA_OPTIONS
by Linus Walleij 29 Dec '14

29 Dec '14

The Versatile Express ARMv8 semihosted FVP platform is still using the legacy CONFIG_SYS_EXTRA_OPTIONS method to configure some compile-time flags. Get rid of this and create a Kconfig entry for the FVP model, and a selectable bool for the semihosting library. The FVP subboard is now modeled as a target choice so we can eventually choose between different ARMv8 versatile express boards (FVP, base model, Juno...) this way. All dependent symbols are updated to reflect this. The 64bit Versatile Express board symbols are renamed VEXPRESS64 so we have some chance to see what is actually going on. Tested on the FVP fast model. Signed-off-by: Linus Walleij <linus.walleij(a)linaro.org> --- arch/arm/Kconfig | 14 +++++++++++++- board/armltd/vexpress64/Kconfig | 13 +++++++++++++ configs/vexpress_aemv8a_defconfig | 2 +- configs/vexpress_aemv8a_semi_defconfig | 4 ++-- include/configs/vexpress_aemv8a.h | 16 ++++++++-------- 5 files changed, 37 insertions(+), 12 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 2b0d2c933895..9a7e36570de5 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -51,6 +51,13 @@ config SYS_CPU default "sa1100" if CPU_SA1100 default "armv8" if ARM64 +config SEMIHOSTING + bool "support boot from semihosting" + help + In emulated environments, semihosting is a way for + the hosted environment to call out to the emulator to + retrieve files from the host machine. + choice prompt "Target select" @@ -720,10 +727,15 @@ config TEGRA select CPU_ARM720T if SPL_BUILD select CPU_V7 if !SPL_BUILD -config TARGET_VEXPRESS_AEMV8A +config TARGET_VEXPRESS64_AEMV8A bool "Support vexpress_aemv8a" select ARM64 +config TARGET_VEXPRESS64_BASE_FVP + bool "Support Versatile Express ARMv8a FVP BASE model" + select ARM64 + select SEMIHOSTING + config TARGET_LS2085A_EMU bool "Support ls2085a_emu" select ARM64 diff --git a/board/armltd/vexpress64/Kconfig b/board/armltd/vexpress64/Kconfig index 7ebea6317f70..2343e717f121 100644 --- a/board/armltd/vexpress64/Kconfig +++ b/board/armltd/vexpress64/Kconfig @@ -10,3 +10,16 @@ config SYS_CONFIG_NAME default "vexpress_aemv8a" endif + +if TARGET_VEXPRESS64_BASE_FVP + +config SYS_BOARD + default "vexpress64" + +config SYS_VENDOR + default "armltd" + +config SYS_CONFIG_NAME + default "vexpress_aemv8a" + +endif diff --git a/configs/vexpress_aemv8a_defconfig b/configs/vexpress_aemv8a_defconfig index b463a333bc6b..9f4b87655613 100644 --- a/configs/vexpress_aemv8a_defconfig +++ b/configs/vexpress_aemv8a_defconfig @@ -1,3 +1,3 @@ CONFIG_ARM=y -CONFIG_TARGET_VEXPRESS_AEMV8A=y +CONFIG_TARGET_VEXPRESS64_AEMV8A=y CONFIG_DEFAULT_DEVICE_TREE="vexpress64" diff --git a/configs/vexpress_aemv8a_semi_defconfig b/configs/vexpress_aemv8a_semi_defconfig index 0035ccdaecd4..26cf7db47f84 100644 --- a/configs/vexpress_aemv8a_semi_defconfig +++ b/configs/vexpress_aemv8a_semi_defconfig @@ -1,4 +1,4 @@ -CONFIG_SYS_EXTRA_OPTIONS="SEMIHOSTING,BASE_FVP" +# Semihosted FVP fast model CONFIG_ARM=y -CONFIG_TARGET_VEXPRESS_AEMV8A=y +CONFIG_TARGET_VEXPRESS64_BASE_FVP=y CONFIG_DEFAULT_DEVICE_TREE="vexpress64" diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index 027d78b59171..85894bedf8bd 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -11,9 +11,9 @@ /* We use generic board for v8 Versatile Express */ #define CONFIG_SYS_GENERIC_BOARD -#ifdef CONFIG_BASE_FVP +#ifdef CONFIG_TARGET_VEXPRESS64_BASE_FVP #ifndef CONFIG_SEMIHOSTING -#error CONFIG_BASE_FVP requires CONFIG_SEMIHOSTING +#error CONFIG_TARGET_VEXPRESS64_BASE_FVP requires CONFIG_SEMIHOSTING #endif #define CONFIG_BOARD_LATE_INIT #define CONFIG_ARMV8_SWITCH_TO_EL1 @@ -21,8 +21,8 @@ #define CONFIG_REMAKE_ELF -#ifndef CONFIG_BASE_FVP -/* Base FVP not using GICv3 yet */ +#ifndef CONFIG_TARGET_VEXPRESS64_BASE_FVP +/* Base FVP and Juno not using GICv3 yet */ #define CONFIG_GICV3 #endif @@ -40,7 +40,7 @@ #define CONFIG_BOOTP_VCI_STRING "U-boot.armv8.vexpress_aemv8a" /* Link Definitions */ -#ifdef CONFIG_BASE_FVP +#ifdef CONFIG_TARGET_VEXPRESS64_BASE_FVP /* ATF loads u-boot here for BASE_FVP model */ #define CONFIG_SYS_TEXT_BASE 0x88000000 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x03f00000) @@ -54,7 +54,7 @@ /* SMP Spin Table Definitions */ -#ifdef CONFIG_BASE_FVP +#ifdef CONFIG_TARGET_VEXPRESS64_BASE_FVP #define CPU_RELEASE_ADDR (CONFIG_SYS_SDRAM_BASE + 0x03f00000) #else #define CPU_RELEASE_ADDR (CONFIG_SYS_SDRAM_BASE + 0x7fff0) @@ -119,7 +119,7 @@ #define GICR_BASE (0x2f100000) #else -#ifdef CONFIG_BASE_FVP +#ifdef CONFIG_TARGET_VEXPRESS64_BASE_FVP #define GICD_BASE (0x2f000000) #define GICC_BASE (0x2c000000) #else @@ -191,7 +191,7 @@ #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 /* Initial environment variables */ -#ifdef CONFIG_BASE_FVP +#ifdef CONFIG_TARGET_VEXPRESS64_BASE_FVP #define CONFIG_EXTRA_ENV_SETTINGS \ "kernel_name=uImage\0" \ "kernel_addr_r=0x80000000\0" \ -- 1.9.3

3 2

Re: [U-Boot] [PATCH 5/9] [v3] lib/rsa: Modify rsa to use DM driver if available
by Simon Glass 29 Dec '14

29 Dec '14

Hi Ruchika, On 24 December 2014 at 03:28, Ruchika Gupta <ruchika.gupta(a)freescale.com> wrote: > Hi Simon, > >> -----Original Message----- >> From: sjg(a)google.com [mailto:sjg@google.com] On Behalf Of Simon Glass >> Sent: Wednesday, December 24, 2014 6:19 AM >> To: Gupta Ruchika-R66431 >> Cc: U-Boot Mailing List; Sun York-R58495 >> Subject: Re: [PATCH 5/9] [v3] lib/rsa: Modify rsa to use DM driver if >> available >> >> Hi Ruchika, >> >> On 23 December 2014 at 04:32, Ruchika Gupta <ruchika.gupta(a)freescale.com> >> wrote: >> > Modify rsa_verify to use the rsa driver of DM library available.The >> > tools and the configurations which don't use Driver Model, will >> > continue to use the same RSA sw library. The software implementation >> > of RSA Modular Exponentation is now compiled if RSA_MOD_EXP_SW is selected. >> > >> > Kconfig options are also added for rsa library. >> > >> > Signed-off-by: Ruchika Gupta <ruchika.gupta(a)freescale.com> >> > CC: Simon Glass <sjg(a)chromium.org> >> > --- >> > Changes in v3: >> > New patch >> > >> > include/configs/am335x_evm.h | 1 + >> > lib/Kconfig | 6 +----- >> > lib/rsa/Kconfig | 31 +++++++++++++++++++++++++++++++ >> > lib/rsa/Makefile | 3 ++- >> > lib/rsa/rsa-verify.c | 18 ++++++++++++++++++ >> > 5 files changed, 53 insertions(+), 6 deletions(-) create mode 100644 >> > lib/rsa/Kconfig >> > >> > diff --git a/include/configs/am335x_evm.h >> > b/include/configs/am335x_evm.h index cc36985..aa79841 100644 >> > --- a/include/configs/am335x_evm.h >> > +++ b/include/configs/am335x_evm.h >> > @@ -25,6 +25,7 @@ >> > # ifdef CONFIG_ENABLE_VBOOT >> > # define CONFIG_FIT_SIGNATURE >> > # define CONFIG_RSA >> > +# define CONFIG_RSA_MOD_EXP_SW >> >> This should go in am335x_boneblack_vboot_defconfig I think. > I didn’t move it in the defconfig as it was conditionally defined under CONFIG_ENABLE_VBOOT Ah OK I see. > >> >> > # endif >> > #endif >> > >> > diff --git a/lib/Kconfig b/lib/Kconfig index 602dd37..a1f30a2 100644 >> > --- a/lib/Kconfig >> > +++ b/lib/Kconfig >> > @@ -27,10 +27,6 @@ config SYS_HZ >> > get_timer() must operate in milliseconds and this option must be >> > set to 1000. >> > >> > -config RSA >> > - bool "Use RSA Library" >> > - help >> > - RSA support.This enables the RSA algorithm used for FIT image >> > - verification in U-Boot. >> > +source lib/rsa/Kconfig >> > >> > endmenu >> > diff --git a/lib/rsa/Kconfig b/lib/rsa/Kconfig new file mode 100644 >> > index 0000000..8f9aa44 >> > --- /dev/null >> > +++ b/lib/rsa/Kconfig >> > @@ -0,0 +1,31 @@ >> > +config RSA >> > + bool "Use RSA Library" >> > + select RSA_MOD_EXP_SW if !DM >> > + select DM_RSA if DM >> > + help >> > + RSA support.This enables the RSA algorithm used for FIT image >> > + verification in U-Boot. >> > + See doc/uImage.FIT/signature.txt for more details. >> > + >> > +if RSA && DM_RSA >> > + >> > +config RSA_SW >> > + bool "User driver Model for RSA Modular Exponentiation in software" >> > + depends on DM && DM_RSA && RSA >> > + select RSA_MOD_EXP_SW >> > + default y >> > + help >> > + Enables driver for modular exponentiation in software. This is a >> RSA >> > + algorithm used in FIT image verification. It required RSA Key as >> > + input. >> > + See doc/uImage.FIT/signature.txt for more details. >> > + >> > +endif >> > + >> > +config RSA_MOD_EXP_SW >> > + bool >> > + default n >> > + help >> > + Library for SW implementation of RSA Modular Exponentiation. This >> > + library is used by the mkimage tool(not selected through this >> option) >> > + as well as by the RSA driver model with SW implementation. >> > diff --git a/lib/rsa/Makefile b/lib/rsa/Makefile index >> > cc25b3c..ccc6060 100644 >> > --- a/lib/rsa/Makefile >> > +++ b/lib/rsa/Makefile >> > @@ -7,4 +7,5 @@ >> > # SPDX-License-Identifier: GPL-2.0+ >> > # >> > >> > -obj-$(CONFIG_FIT_SIGNATURE) += rsa-verify.o rsa-checksum.o >> > rsa-mod-exp.o >> > +obj-$(CONFIG_FIT_SIGNATURE) += rsa-verify.o rsa-checksum.o >> > +obj-$(CONFIG_RSA_MOD_EXP_SW) += rsa-mod-exp.o >> > diff --git a/lib/rsa/rsa-verify.c b/lib/rsa/rsa-verify.c index >> > f8bc086..27f10ef 100644 >> > --- a/lib/rsa/rsa-verify.c >> > +++ b/lib/rsa/rsa-verify.c >> > @@ -12,6 +12,7 @@ >> > #include <asm/errno.h> >> > #include <asm/types.h> >> > #include <asm/unaligned.h> >> > +#include <dm.h> >> > #else >> > #include "fdt_host.h" >> > #include "mkimage.h" >> > @@ -43,6 +44,9 @@ static int rsa_verify_key(struct key_prop *prop, const >> uint8_t *sig, >> > const uint8_t *padding; >> > int pad_len; >> > int ret; >> > +#if defined(CONFIG_DM_RSA) && !defined(USE_HOSTCC) >> > + struct udevice *rsa_dev; >> > +#endif >> > >> > if (!prop || !sig || !hash || !algo) >> > return -EIO; >> > @@ -63,11 +67,25 @@ static int rsa_verify_key(struct key_prop *prop, >> > const uint8_t *sig, >> > >> > uint8_t buf[sig_len]; >> > >> > +#if defined(CONFIG_DM_RSA) && !defined(USE_HOSTCC) >> > + ret = uclass_get_device(UCLASS_RSA, 0, &rsa_dev); >> > + if (!ret) { >> > + ret = rsa_mod_exp(rsa_dev, sig, sig_len, prop, buf); >> > + if (ret) { >> > + debug("Error in Modular exponentation\n"); >> > + return ret; >> > + } >> > + } else { >> > + printf("RSA: Can't find Mod Exp implemnetation\n"); >> > + return -EINVAL; >> > + } >> > +#else >> > ret = rsa_mod_exp_sw(sig, sig_len, prop, buf); >> > if (ret) { >> > debug("Error in Modular exponentation\n"); >> > return ret; >> > } >> > +#endif >> >> This should use the uclass regardless I think. The software implementation >> should just be a driver like the hardware implementation. > I have already added software implementation as a driver in the previous patch. I have kept it here for the tools (mkimage) and the platforms which don’t use CONFIG_DM by default. OK. [ship] Regards, Simon

1 0

Re: [U-Boot] FW: [PATCH 5/9] [v3] lib/rsa: Modify rsa to use DM driver if available
by Simon Glass 29 Dec '14

29 Dec '14

Hi Ruchika, On 24 December 2014 at 03:29, Ruchika Gupta <ruchika.gupta(a)freescale.com> wrote: > My Patches to the mailing list using outlook client are failing. So forwarding the message. > > Any pointers on how to correct the issue will be highly appreciated. I don't use Microsoft Outlook but someone on the list might know. I know that in Gmail I have it set to plain text. IMO the only sane approach is to set up 'git send-email' so that it works properly. Then patman will create, process and email your patches correctly each time. > > Regards, > Ruchika > > -----Original Message----- > From: u-boot-bounces(a)lists.denx.de [mailto:u-boot-bounces@lists.denx.de] On Behalf Of u-boot-owner(a)lists.denx.de > Sent: Wednesday, December 24, 2014 3:59 PM > To: Gupta Ruchika-R66431 > Subject: RE: [PATCH 5/9] [v3] lib/rsa: Modify rsa to use DM driver if available > > Message rejected. No base64 encoded MIME text parts allowed. > Regards, Simon

1 0

[U-Boot] [PATCH 5/9] [v3] lib/rsa: Modify rsa to use DM driver if available
by Ruchika Gupta 29 Dec '14

29 Dec '14

Resending as the message bounced from u-boot mailing list. Hi Simon, > -----Original Message----- > From: sjg(a)google.com [mailto:sjg@google.com] On Behalf Of Simon Glass > Sent: Wednesday, December 24, 2014 6:19 AM > To: Gupta Ruchika-R66431 > Cc: U-Boot Mailing List; Sun York-R58495 > Subject: Re: [PATCH 5/9] [v3] lib/rsa: Modify rsa to use DM driver if > available > > Hi Ruchika, > > On 23 December 2014 at 04:32, Ruchika Gupta > <ruchika.gupta(a)freescale.com> > wrote: > > Modify rsa_verify to use the rsa driver of DM library available.The > > tools and the configurations which don't use Driver Model, will > > continue to use the same RSA sw library. The software implementation > > of RSA Modular Exponentation is now compiled if RSA_MOD_EXP_SW is selected. > > > > Kconfig options are also added for rsa library. > > > > Signed-off-by: Ruchika Gupta <ruchika.gupta(a)freescale.com> > > CC: Simon Glass <sjg(a)chromium.org> > > --- > > Changes in v3: > > New patch > > > > include/configs/am335x_evm.h | 1 + > > lib/Kconfig | 6 +----- > > lib/rsa/Kconfig | 31 +++++++++++++++++++++++++++++++ > > lib/rsa/Makefile | 3 ++- > > lib/rsa/rsa-verify.c | 18 ++++++++++++++++++ > > 5 files changed, 53 insertions(+), 6 deletions(-) create mode > > 100644 lib/rsa/Kconfig > > > > diff --git a/include/configs/am335x_evm.h > > b/include/configs/am335x_evm.h index cc36985..aa79841 100644 > > --- a/include/configs/am335x_evm.h > > +++ b/include/configs/am335x_evm.h > > @@ -25,6 +25,7 @@ > > # ifdef CONFIG_ENABLE_VBOOT > > # define CONFIG_FIT_SIGNATURE > > # define CONFIG_RSA > > +# define CONFIG_RSA_MOD_EXP_SW > > This should go in am335x_boneblack_vboot_defconfig I think. I didn’t move it in the defconfig as it was conditionally defined under CONFIG_ENABLE_VBOOT > > > # endif > > #endif > > > > diff --git a/lib/Kconfig b/lib/Kconfig index 602dd37..a1f30a2 100644 > > --- a/lib/Kconfig > > +++ b/lib/Kconfig > > @@ -27,10 +27,6 @@ config SYS_HZ > > get_timer() must operate in milliseconds and this option must be > > set to 1000. > > > > -config RSA > > - bool "Use RSA Library" > > - help > > - RSA support.This enables the RSA algorithm used for FIT image > > - verification in U-Boot. > > +source lib/rsa/Kconfig > > > > endmenu > > diff --git a/lib/rsa/Kconfig b/lib/rsa/Kconfig new file mode 100644 > > index 0000000..8f9aa44 > > --- /dev/null > > +++ b/lib/rsa/Kconfig > > @@ -0,0 +1,31 @@ > > +config RSA > > + bool "Use RSA Library" > > + select RSA_MOD_EXP_SW if !DM > > + select DM_RSA if DM > > + help > > + RSA support.This enables the RSA algorithm used for FIT image > > + verification in U-Boot. > > + See doc/uImage.FIT/signature.txt for more details. > > + > > +if RSA && DM_RSA > > + > > +config RSA_SW > > + bool "User driver Model for RSA Modular Exponentiation in software" > > + depends on DM && DM_RSA && RSA > > + select RSA_MOD_EXP_SW > > + default y > > + help > > + Enables driver for modular exponentiation in software. > > +This is a > RSA > > + algorithm used in FIT image verification. It required RSA Key as > > + input. > > + See doc/uImage.FIT/signature.txt for more details. > > + > > +endif > > + > > +config RSA_MOD_EXP_SW > > + bool > > + default n > > + help > > + Library for SW implementation of RSA Modular Exponentiation. This > > + library is used by the mkimage tool(not selected through > > +this > option) > > + as well as by the RSA driver model with SW implementation. > > diff --git a/lib/rsa/Makefile b/lib/rsa/Makefile index > > cc25b3c..ccc6060 100644 > > --- a/lib/rsa/Makefile > > +++ b/lib/rsa/Makefile > > @@ -7,4 +7,5 @@ > > # SPDX-License-Identifier: GPL-2.0+ > > # > > > > -obj-$(CONFIG_FIT_SIGNATURE) += rsa-verify.o rsa-checksum.o > > rsa-mod-exp.o > > +obj-$(CONFIG_FIT_SIGNATURE) += rsa-verify.o rsa-checksum.o > > +obj-$(CONFIG_RSA_MOD_EXP_SW) += rsa-mod-exp.o > > diff --git a/lib/rsa/rsa-verify.c b/lib/rsa/rsa-verify.c index > > f8bc086..27f10ef 100644 > > --- a/lib/rsa/rsa-verify.c > > +++ b/lib/rsa/rsa-verify.c > > @@ -12,6 +12,7 @@ > > #include <asm/errno.h> > > #include <asm/types.h> > > #include <asm/unaligned.h> > > +#include <dm.h> > > #else > > #include "fdt_host.h" > > #include "mkimage.h" > > @@ -43,6 +44,9 @@ static int rsa_verify_key(struct key_prop *prop, > > const > uint8_t *sig, > > const uint8_t *padding; > > int pad_len; > > int ret; > > +#if defined(CONFIG_DM_RSA) && !defined(USE_HOSTCC) > > + struct udevice *rsa_dev; > > +#endif > > > > if (!prop || !sig || !hash || !algo) > > return -EIO; > > @@ -63,11 +67,25 @@ static int rsa_verify_key(struct key_prop *prop, > > const uint8_t *sig, > > > > uint8_t buf[sig_len]; > > > > +#if defined(CONFIG_DM_RSA) && !defined(USE_HOSTCC) > > + ret = uclass_get_device(UCLASS_RSA, 0, &rsa_dev); > > + if (!ret) { > > + ret = rsa_mod_exp(rsa_dev, sig, sig_len, prop, buf); > > + if (ret) { > > + debug("Error in Modular exponentation\n"); > > + return ret; > > + } > > + } else { > > + printf("RSA: Can't find Mod Exp implemnetation\n"); > > + return -EINVAL; > > + } > > +#else > > ret = rsa_mod_exp_sw(sig, sig_len, prop, buf); > > if (ret) { > > debug("Error in Modular exponentation\n"); > > return ret; > > } > > +#endif > > This should use the uclass regardless I think. The software > implementation should just be a driver like the hardware implementation. I have already added software implementation as a driver in the previous patch. I have kept it here for the tools (mkimage) and the platforms which don’t use CONFIG_DM by default. > > > > > padding = algo->rsa_padding; > > pad_len = algo->pad_len - algo->checksum_len; > > -- > > 1.8.1.4 > > > > Regards, > Simon Regards, Ruchika

2 1

[U-Boot] [PATCH 3/9] [v3] DM: crypto/rsa: Add rsa Modular Exponentiation DM driver
by Ruchika Gupta 29 Dec '14

29 Dec '14

Re-sending as delivery to uboot mailing list failed last time... Hi Simon, Thanks for the review comments. > -----Original Message----- > From: sjg(a)google.com [mailto:sjg@google.com] On Behalf Of Simon Glass > Sent: Wednesday, December 24, 2014 6:19 AM > To: Gupta Ruchika-R66431 > Cc: U-Boot Mailing List; Sun York-R58495 > Subject: Re: [PATCH 3/9] [v3] DM: crypto/rsa: Add rsa Modular > Exponentiation DM driver > > Hi Ruchika, > > On 23 December 2014 at 04:32, Ruchika Gupta > <ruchika.gupta(a)freescale.com> > wrote: > > Add a new rsa uclass for performing modular exponentiation and > > implement the software driver basing on this uclass. > > > > Signed-off-by: Ruchika Gupta <ruchika.gupta(a)freescale.com> > > CC: Simon Glass <sjg(a)chromium.org> > > --- > > Changes in v3: > > New patch with driver model for RSA UCLASS > > > > drivers/crypto/Kconfig | 1 + > > drivers/crypto/Makefile | 1 + > > drivers/crypto/rsa/Kconfig | 5 +++++ > > drivers/crypto/rsa/Makefile | 8 ++++++++ > > drivers/crypto/rsa/rsa_sw.c | 39 > +++++++++++++++++++++++++++++++++++++++ > > drivers/crypto/rsa/rsa_uclass.c | 31 +++++++++++++++++++++++++++++++ > > include/dm/uclass-id.h | 1 + > > include/u-boot/rsa-mod-exp.h | 40 > ++++++++++++++++++++++++++++++++++++++++ > > 8 files changed, 126 insertions(+) > > create mode 100644 drivers/crypto/rsa/Kconfig create mode 100644 > > drivers/crypto/rsa/Makefile create mode 100644 > > drivers/crypto/rsa/rsa_sw.c create mode 100644 > > drivers/crypto/rsa/rsa_uclass.c > > > > diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index > > e69de29..75f3479 100644 > > --- a/drivers/crypto/Kconfig > > +++ b/drivers/crypto/Kconfig > > @@ -0,0 +1 @@ > > +source drivers/crypto/rsa/Kconfig > > diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile index > > 7b79237..a2f30fc 100644 > > --- a/drivers/crypto/Makefile > > +++ b/drivers/crypto/Makefile > > @@ -6,4 +6,5 @@ > > # > > > > obj-$(CONFIG_EXYNOS_ACE_SHA) += ace_sha.o > > +obj-y += rsa/ > > obj-y += fsl/ > > diff --git a/drivers/crypto/rsa/Kconfig b/drivers/crypto/rsa/Kconfig > > new file mode 100644 index 0000000..7eb90a1 > > --- /dev/null > > +++ b/drivers/crypto/rsa/Kconfig > > @@ -0,0 +1,5 @@ > > +config DM_RSA > > + bool "Enable Driver Model for RSA " > > + depends on DM > > + help > > + If you want to use driver model for RSA Modular > > +Exponentiation, > say Y. > > Can you send a new patch (later if you prefer) which removes this > option altogether? It should be the default. In other words, RSA > should always use driver model. If we make it mandatory for RSA to use driver model, all platforms would need to use DM by default in their defconfig. Would that be acceptable ? Secondly if I force select DM and DM_RSA when CONFIG_RSA is selected, this may result in duplication of CONFIG_DM with platforms having it defined already. Please suggest. > > > diff --git a/drivers/crypto/rsa/Makefile > > b/drivers/crypto/rsa/Makefile new file mode 100644 index > > 0000000..fae4f8c > > --- /dev/null > > +++ b/drivers/crypto/rsa/Makefile > > @@ -0,0 +1,8 @@ > > +# > > +# (C) Copyright 2014 Freescale Semiconductor, Inc. > > +# > > +# SPDX-License-Identifier: GPL-2.0+ > > +# > > + > > +obj-$(CONFIG_DM_RSA) += rsa_uclass.o > > +obj-$(CONFIG_RSA_SW) += rsa_sw.o > > diff --git a/drivers/crypto/rsa/rsa_sw.c > > b/drivers/crypto/rsa/rsa_sw.c new file mode 100644 index > > 0000000..5d94754 > > --- /dev/null > > +++ b/drivers/crypto/rsa/rsa_sw.c > > @@ -0,0 +1,39 @@ > > +/* > > + * (C) Copyright 2014 Freescale Semiconductor, Inc. > > + * Author: Ruchika Gupta <ruchika.gupta(a)freescale.com> > > + * > > + * SPDX-License-Identifier: GPL-2.0+ > > + */ > > + > > +#include <config.h> > > +#include <common.h> > > +#include <dm.h> > > +#include <u-boot/rsa-mod-exp.h> > > + > > +int mod_exp_sw(struct udevice *dev, const uint8_t *sig, uint32_t sig_len, > > + struct key_prop *prop, uint8_t *out) { > > + int ret = 0; > > + > > + ret = rsa_mod_exp_sw(sig, sig_len, prop, out); > > + > > + if (ret) { > > + debug("%s: RSA failed to verify: %d\n", __func__, ret); > > + return ret; > > + } > > + return 0; > > +} > > + > > +static const struct rsa_ops rsa_ops_sw = { > > + .get_mod_exp = mod_exp_sw, > > +}; > > + > > +U_BOOT_DRIVER(fsl_rsa) = { > > + .name = "rsa_sw", > > + .id = UCLASS_RSA, > > + .ops = &rsa_ops_sw, > > +}; > > + > > +U_BOOT_DEVICE(rsa_sw) = { > > + .name = "rsa_sw", > > +}; > > diff --git a/drivers/crypto/rsa/rsa_uclass.c > > b/drivers/crypto/rsa/rsa_uclass.c new file mode 100644 index > > 0000000..f4f4f39 > > --- /dev/null > > +++ b/drivers/crypto/rsa/rsa_uclass.c > > @@ -0,0 +1,31 @@ > > +/* > > + * (C) Copyright 2014 Freescale Semiconductor, Inc > > + * Author: Ruchika Gupta <ruchika.gupta(a)freescale.com> > > + * > > + * SPDX-License-Identifier: GPL-2.0+ > > + */ > > + > > +#include <common.h> > > +#include <dm.h> > > +#include <u-boot/rsa-mod-exp.h> > > +#include <errno.h> > > +#include <fdtdec.h> > > +#include <malloc.h> > > +#include <asm/io.h> > > +#include <linux/list.h> > > + > > +int rsa_mod_exp(struct udevice *dev, const uint8_t *sig, uint32_t sig_len, > > + struct key_prop *node, uint8_t *out) { > > + const struct rsa_ops *ops = device_get_ops(dev); > > + > > + if (!ops->get_mod_exp) > > + return -ENOSYS; > > + > > + return ops->get_mod_exp(dev, sig, sig_len, node, out); } > > + > > +UCLASS_DRIVER(rsa) = { > > + .id = UCLASS_RSA, > > + .name = "rsa", > > +}; > > diff --git a/include/dm/uclass-id.h b/include/dm/uclass-id.h index > > f17c3c2..659369e 100644 > > --- a/include/dm/uclass-id.h > > +++ b/include/dm/uclass-id.h > > @@ -33,6 +33,7 @@ enum uclass_id { > > UCLASS_I2C, /* I2C bus */ > > UCLASS_I2C_GENERIC, /* Generic I2C device */ > > UCLASS_I2C_EEPROM, /* I2C EEPROM device */ > > + UCLASS_RSA , /* RSA Mod Exp device */ > > Funny spacing here. Sorry, I will correct that. > > > > > UCLASS_COUNT, > > UCLASS_INVALID = -1, > > diff --git a/include/u-boot/rsa-mod-exp.h > > b/include/u-boot/rsa-mod-exp.h index 59cd9ea..7f7e196 100644 > > --- a/include/u-boot/rsa-mod-exp.h > > +++ b/include/u-boot/rsa-mod-exp.h > > @@ -40,4 +40,44 @@ struct key_prop { int rsa_mod_exp_sw(const > > uint8_t *sig, uint32_t sig_len, > > struct key_prop *node, uint8_t *out); > > > > +/** > > + * rsa_mod_exp - Perform RSA Modular Exponentiation > > + * > > + * Operation: out[] = sig ^ exponent % modulus > > + * > > + * @udev: RSA Device > > + * @sig: RSA PKCS1.5 signature > > + * @sig_len: Length of signature in number of bytes > > + * @node: Node with RSA key elements like modulus, exponent, R^2, > n0inv > > + * @out: Result in form of byte array > > How big is this array? Thanks for pointing out. In next set of patch, I will change it to uint8_t **out and introduce a uin32_t *out_len also. Ideally the implemntor of this function should allocate out as per length required and return back the pointer and the allocated length. This will also require change in patch 1 of this series. I will change and float next version. > > > + */ > > +int rsa_mod_exp(struct udevice *dev, const uint8_t *sig, uint32_t sig_len, > > + struct key_prop *node, uint8_t *out); > > + > > +/** > > + * struct struct rsa_ops - Driver model for RSA operations > > + * > > + * The uclass interface is implemented by all crypto devices which > > +use > > + * driver model. > > + */ > > +struct rsa_ops { > > + /** > > + * Perform Modular Exponentiation > > + * > > + * Operation: out[] = sig ^ exponent % modulus > > + * > > + * @dev: RSA Device > > + * @sig: RSA PKCS1.5 signature > > + * @sig_len: Length of signature in number of bytes > > + * @node: Node with RSA key elements like modulus, exponent, > > + * R^2, n0inv > > + * @out: Result in form of byte array > > How big is this array? Same as above, I will change it to **outp and add a pointer for length > > > + * Returns: 0 if exponentiation is succesful, or a negative > > + value > > successful Ok > > > + * if it wasn't. > > + */ > > + int (*get_mod_exp)(struct udevice *dev, const uint8_t *sig, > > mod_exp() is better I think, since it matches your function above. Ok. I will change it. > > > + uint32_t sig_len, struct key_prop *node, > > + uint8_t *out); }; > > + > > #endif > > -- > > 1.8.1.4 > > > > Regards, > Simon Regards, Ruchika

2 1

Re: [U-Boot] [PATCH v4 18/23] ARM: Implement non-cached memory support
by Albert ARIBAUD 29 Dec '14

29 Dec '14

Hello Tom, On Thu, 18 Dec 2014 21:33:09 +0000, Tom Warren <TWarren(a)nvidia.com> wrote: > Albert, > > Please pull u-boot-tegra.git/master into ARM master. ./MAKEALL -s tegra is clean. I assume this is actually for Tom Rini, as non-core ARM trees now merge directly into mainline.1 Amicalement, -- Albert.

2 1

[U-Boot] [PATCH 0/4] sunxi: video: native vga support
by Hans de Goede 29 Dec '14

29 Dec '14

Hi Ian, Here is my last sunxi-video patch series, this time adding support for the native vga out found on the A10 / A20 SoCs, and used e.g. on the Cubietruck. With this patch series by default (can be overridden through video-mode env.) the display will fallback to 1024x768 over VGA when no HDMI cable is plugged in on boards with a VGA connector. This way people using VGA can at least see something, which makes it a lot easier to set the env. when not using a serial console. Regards, Hans

2 8

[U-Boot] L2 cache and LCD on sunxi
by Simon Glass 29 Dec '14

29 Dec '14

Hi, I ran up a banana PI and noticed that HDMI works in U-Boot. Great! Scrolling seems very slow though - is the L2 cache disabled perhaps? Also are there instructions for getting an LCD running in U-Boot? I have an Olimex A20-OLinuxion-MICRO (what a mouthful!) with a 7 inch display if that matters. I can't find any useful information so far. Regards, Simon

2 7

[U-Boot] [PATCH v2] sunxi: video: Fallback from HDMI to VGA on boards with VGA
by Hans de Goede 29 Dec '14

29 Dec '14

If a board has no LCD, but does have VGA fallback to VGA when no HDMI cable is connected (unless hpd=0). Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- Changes in v2: -Fix missing "break;" in v1 which caused hdmi output to no longer work --- doc/README.video | 3 +-- drivers/video/sunxi_display.c | 51 ++++++++++++++++++++++++------------------- 2 files changed, 30 insertions(+), 24 deletions(-) diff --git a/doc/README.video b/doc/README.video index cfe6318..2c55d6a 100644 --- a/doc/README.video +++ b/doc/README.video @@ -50,8 +50,7 @@ The sunxi u-boot driver supports the following video-mode options: - hpd=[0|1] - Enable use of the hdmi HotPlug Detect feature 0: Disabled. Configure dvi/hdmi output even if no cable is detected - 1: Enabled. If a LCD has been configured fallback to the LCD when no cable is - detected, if no LCD is configured, disable video ouput. + 1: Enabled. Fallback to the lcd / vga / none in that order (if available) Defaults to hpd=1. - edid=[0|1] - Enable use of DDC + EDID to get monitor info diff --git a/drivers/video/sunxi_display.c b/drivers/video/sunxi_display.c index 0dd5aa1..929ec17 100644 --- a/drivers/video/sunxi_display.c +++ b/drivers/video/sunxi_display.c @@ -837,36 +837,43 @@ void *video_hw_init(void) printf("Unknown monitor: '%s', falling back to '%s'\n", mon, mon_desc[sunxi_display.monitor]); +#ifdef CONFIG_VIDEO_HDMI + /* If HDMI/DVI is selected do HPD & EDID, and handle fallback */ + if (sunxi_display.monitor == sunxi_monitor_dvi || + sunxi_display.monitor == sunxi_monitor_hdmi) { + /* Always call hdp_detect, as it also enables clocks, etc. */ + ret = sunxi_hdmi_hpd_detect(); + if (ret) { + printf("HDMI connected: "); + if (edid && sunxi_hdmi_edid_get_mode(&custom) == 0) + mode = &custom; + } else if (hpd) { + sunxi_hdmi_shutdown(); + /* Fallback to lcd / vga / none */ + if (lcd_mode[0]) { + sunxi_display.monitor = sunxi_monitor_lcd; + } else { +#ifdef CONFIG_VIDEO_VGA_VIA_LCD + sunxi_display.monitor = sunxi_monitor_vga; +#else + sunxi_display.monitor = sunxi_monitor_none; +#endif + } + } /* else continue with hdmi/dvi without a cable connected */ + } +#endif + switch (sunxi_display.monitor) { case sunxi_monitor_none: return NULL; case sunxi_monitor_dvi: case sunxi_monitor_hdmi: -#ifndef CONFIG_VIDEO_HDMI +#ifdef CONFIG_VIDEO_HDMI + break; +#else printf("HDMI/DVI not supported on this board\n"); sunxi_display.monitor = sunxi_monitor_none; return NULL; -#else - /* Always call hdp_detect, as it also enables clocks, etc. */ - ret = sunxi_hdmi_hpd_detect(); - if (ret) { - printf("HDMI connected: "); - if (edid && sunxi_hdmi_edid_get_mode(&custom) == 0) - mode = &custom; - break; - } - if (!hpd) - break; /* User has requested to ignore hpd */ - - sunxi_hdmi_shutdown(); - - if (lcd_mode[0] == 0) { - sunxi_display.monitor = sunxi_monitor_none; - return NULL; /* No LCD, bail */ - } - - /* Fall back / through to LCD */ - sunxi_display.monitor = sunxi_monitor_lcd; #endif case sunxi_monitor_lcd: if (lcd_mode[0]) { -- 2.1.0

2 1