powerpc/p1010rdb: remove unused cpld_show
PATCH 1/4 powerpc/p1010rdb: remove unused cpld_show
Function cpld_show() was for debug and not called, so clean it.
--- board/freescale/p1010rdb/p1010rdb.c | 35 ----------------------------------- 1 file changed, 35 deletions(-)
board/freescale/p1010rdb/p1010rdb.c +0 -35
@@ -52,41 +52,6 @@ struct cpld_data {u8 por2;/* POR Options */ u8 por3; /* POR Options */ }; - -void cpld_show (void ) -{ -struct cpld_data *cpld_data = (void *)(CONFIG_SYS_CPLD_BASE ); - -printf ("CPLD: V%x.%x PCBA: V%x.0\n" , -in_8 (&cpld_data->cpld_ver) &0xF0 , -in_8 (&cpld_data->cpld_ver) &0x0F , -in_8 (&cpld_data->pcba_ver) &0x0F ); - -#ifdef CONFIG_DEBUG -printf ("twindie_ddr =%x\n" , -in_8 (&cpld_data->twindie_ddr3)); -printf ("bank_sel =%x\n" , -in_8 (&cpld_data->bank_sel)); -printf ("usb2_sel =%x\n" , -in_8 (&cpld_data->usb2_sel)); -printf ("porsw_sel =%x\n" , -in_8 (&cpld_data->porsw_sel)); -printf ("tdm_can_sel =%x\n" , -in_8 (&cpld_data->tdm_can_sel)); -printf ("tdm_can_sel =%x\n" , -in_8 (&cpld_data->tdm_can_sel)); -printf ("spi_cs0_sel =%x\n" , -in_8 (&cpld_data->spi_cs0_sel)); -printf ("bcsr0 =%x\n" , -in_8 (&cpld_data->bcsr0)); -printf ("bcsr1 =%x\n" , -in_8 (&cpld_data->bcsr1)); -printf ("bcsr2 =%x\n" , -in_8 (&cpld_data->bcsr2)); -printf ("bcsr3 =%x\n" , -in_8 (&cpld_data->bcsr3)); -#endif -}#endif int board_early_init_f (void )
Signature · 1 line
1.8.0
PATCH 2/4 powerpc/eeprom: update MAX_NUM_PORTS to adapt non-256-bytes EEPROM
Some boards use System EEPROM with 128-bytes instead of 256-bytes. Since we regard 256-bytes EEPROM as standard EEPROM with default value for MAX_NUM_PORTS. For those non-256-bytes EEPROM, we can redefine MAX_NUM_PORTS in board-specific file to override the default MAX_NUM_PORTS.
This patch doesn't impact on previous existing boards.
---
Verified with 128B and 256B EEPROM, CRC works.
board/freescale/common/sys_eeprom.c | 4 ++++ 1 file changed, 4 insertions(+)
board/freescale/common/sys_eeprom.c +4 -0
@@ -18,7 +18,11 @@#endif #ifdef CONFIG_SYS_I2C_EEPROM_NXID +/* some boards with non-256-bytes EEPROM have special define */ +/* for MAX_NUM_PORTS in board-specific file */ +#ifndef MAX_NUM_PORTS #define MAX_NUM_PORTS 23 +#endif #define NXID_VERSION 1#endif
Signature · 1 line
1.8.0
PATCH 2/4 powerpc/eeprom: update MAX_NUM_PORTS to adapt non-256-bytes EEPROM
Quoted 6 lines · Shengzhou Liu
Some boards use System EEPROM with 128-bytes instead of 256-bytes. Since we regard 256-bytes EEPROM as standard EEPROM with default value for
MAX_NUM_PORTS. For those non-256-bytes EEPROM, we can redefineMAX_NUM_PORTSin board-specific file to override the defaultMAX_NUM_PORTS.
Quoted 7 lines
This patch doesn't impact on previous existing boards.
Signed-off-by Shengzhou Liu <[email protected]>---
Verified with 128B and 256B EEPROM, CRC works.
I would appreciate it if you update the version number and put a change log under the --- line, even there is no change. With a clear version number and change log, reviewers will be able to identify this is a resend and not spending much time on it.
You are also encouraged to mark previous patch as "superseded".
York
PATCH 2/4 powerpc/eeprom: update MAX_NUM_PORTS to adapt non-256-bytes EEPROM
Quoted 9 lines
-----Original Message-----
From: sun york-R58495
Sent: Friday, September 13, 2013 11:13 PM
To: Liu Shengzhou-B36685
Cc: u-boot at lists.denx.de
Subject: Re: [PATCH 2/4] powerpc/eeprom: updateMAX_NUM_PORTSto adapt non-256- bytes EEPROM
Quoted 9 lines
I would appreciate it if you update the version number and put a change log under the --- line, even there is no change. With a clear version number and change log, reviewers will be able to identify this is a resend and not spending much time on it.
You are also encouraged to mark previous patch as "superseded".
York
Sorry for missing the updated version number, will keep it later. Previous patch has been marked as "superseded".
Thanks,
Shengzhou
PATCH 3/4 board/p1010rdb: add pin mux and sdhc support in any boot
In reply to Shengzhou LiuSince pins multiplexing, SDHC shares signals with IFC, with this patch:
To enable SDHC in case of NOR/NAND/SPI boot
a) For temporary use case in runtime without reboot system run 'mux sdhc' in u-boot to validate SDHC with invalidating IFC.
b) For long-term use case
set 'esdhc' in hwconfig and save it.
To enable IFC in case of SD boot
a) For temporary use case in runtime without reboot system run 'mux ifc' in u-boot to validate IFC with invalidating SDHC.
b) For long-term use case
set 'ifc' in hwconfig and save it.
--- board/freescale/p1010rdb/law.c | 2 - board/freescale/p1010rdb/p1010rdb.c | 119 +++++++++++++++++++++++++++++++----- board/freescale/p1010rdb/tlb.c | 4 -- include/configs/P1010RDB.h | 15 +---- 4 files changed, 107 insertions(+), 33 deletions(-)
board/freescale/p1010rdb/law.c +0 -2
@@ -9,11 +9,9 @@#include <asm/mmu.h> struct law_entry law_table[] = { -#ifndef CONFIG_SDCARD SET_LAW (CONFIG_SYS_FLASH_BASE_PHYS ,LAW_SIZE_32M ,LAW_TRGT_IF_IFC ),SET_LAW (CONFIG_SYS_CPLD_BASE_PHYS ,LAW_SIZE_128K ,LAW_TRGT_IF_IFC ),SET_LAW (CONFIG_SYS_NAND_BASE_PHYS ,LAW_SIZE_1M ,LAW_TRGT_IF_IFC ), -#endif };int num_law_entries =ARRAY_SIZE (law_table);
board/freescale/p1010rdb/p1010rdb.c +105 -14
198 lines not on this page · raw message
board/freescale/p1010rdb/tlb.c +0 -4
@@ -42,7 +42,6 @@ struct fsl_e_tlb_entry tlb_table[] = { 0, 1, BOOKE_PAGESZ_1M, 1),#ifndef CONFIG_SPL_BUILD -#ifndef CONFIG_SDCARD SET_TLB_ENTRY (1 ,CONFIG_SYS_FLASH_BASE ,CONFIG_SYS_FLASH_BASE_PHYS ,MAS3_SX |MAS3_SR ,MAS2_W |MAS2_G , 0, 2, BOOKE_PAGESZ_16M, 1),
@@ -51,7 +50,6 @@ struct fsl_e_tlb_entry tlb_table[] = { CONFIG_SYS_FLASH_BASE_PHYS + 0x1000000, MAS3_SX|MAS3_SR, MAS2_W|MAS2_G, 0, 3, BOOKE_PAGESZ_16M, 1), -#endif #ifdef CONFIG_PCI /* *I*G* - PCI */
@@ -66,7 +64,6 @@ struct fsl_e_tlb_entry tlb_table[] = {#endif #endif -#ifndef CONFIG_SDCARD /* *I*G - Board CPLD */ SET_TLB_ENTRY(1, CONFIG_SYS_CPLD_BASE, CONFIG_SYS_CPLD_BASE_PHYS, MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
@@ -75,7 +72,6 @@ struct fsl_e_tlb_entry tlb_table[] = { SET_TLB_ENTRY(1, CONFIG_SYS_NAND_BASE, CONFIG_SYS_NAND_BASE_PHYS, MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, 0, 7, BOOKE_PAGESZ_1M, 1), -#endif #if defined(CONFIG_SYS_RAMBOOT ) || defined(CONFIG_SPL ) SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE,
include/configs/P1010RDB.h +2 -13
@@ -152,10 +152,7 @@#define CONFIG_DDR_CLK_FREQ 66666666/* DDRCLK on P1010 RDB */ #define CONFIG_SYS_CLK_FREQ 66666666/* SYSCLK for P1010 RDB */ -#ifndef CONFIG_SDCARD #define CONFIG_MISC_INIT_R -#endif -#define CONFIG_HWCONFIG /* * These can be toggled for performance analysis, otherwise use default.
@@ -256,10 +253,6 @@ extern unsigned long get_sdram_size(void);* 0xffe0_0000 0xffef_ffff CCSR 1M non-cacheable */ -/* In case of SD card boot, IFC interface is not available because of muxing */ -#ifdef CONFIG_SDCARD -#define CONFIG_SYS_NO_FLASH -#else /* * IFC Definitions */
@@ -410,7 +403,6 @@ extern unsigned long get_sdram_size(void); FTIM2_GPCM_TCH(0x0) | \ FTIM2_GPCM_TWP(0x1f))#define CONFIG_SYS_CS3_FTIM3 0x0 -#endif /* CONFIG_SDCARD */ #if defined(CONFIG_RAMBOOT_SDCARD ) || defined(CONFIG_RAMBOOT_SPIFLASH )#define CONFIG_SYS_RAMBOOT
@@ -482,6 +474,8 @@ extern unsigned long get_sdram_size(void);#define CONFIG_SYS_FSL_I2C2_SPEED 400000#define CONFIG_SYS_FSL_I2C2_SLAVE 0x7F#define CONFIG_SYS_FSL_I2C2_OFFSET 0x3100 +#define I2C_PCA9557_ADDR1 0x18 +#define I2C_PCA9557_BUS_NUM 0/* I2C EEPROM */ #undef CONFIG_ID_EEPROM
@@ -567,12 +561,7 @@ extern unsigned long get_sdram_size(void);#define CONFIG_LBA48 #endif /* #ifdef CONFIG_FSL_SATA */ -/* SD interface will only be available in case of SD boot */ -#ifdef CONFIG_SDCARD #define CONFIG_MMC -#define CONFIG_DEF_HWCONFIG esdhc -#endif -#ifdef CONFIG_MMC #define CONFIG_CMD_MMC #define CONFIG_DOS_PARTITION
Signature · 1 line
1.8.0
PATCH 4/4 powerpc/p1010rdb: add p1010rdb-pb support with updating p1010rdb-pa
In reply to Shengzhou Liu- Rename old P1010RDB board as P1010RDB-PA.
- Add support for new P1010RDB-PB board.
- Some optimization.
For more details, see board/freescale/p1010rdb/README.
--- board/freescale/p1010rdb/p1010rdb.c | 176 ++++++++++++++++++++++++++++++++++-- boards.cfg | 40 +++++--- include/configs/P1010RDB.h | 101 ++++++++++++++++++--- 3 files changed, 283 insertions(+), 34 deletions(-)
board/freescale/p1010rdb/p1010rdb.c +170 -6
@@ -38,12 +38,23 @@ DECLARE_GLOBAL_DATA_PTR;enum {MUX_TYPE_IFC ,MUX_TYPE_SDHC , +MUX_TYPE_SPIFLASH , +MUX_TYPE_TDM , +MUX_TYPE_CAN , +MUX_TYPE_CS0_NOR , +MUX_TYPE_CS0_NAND , +}; + +enum { +I2C_READ_BANK , +I2C_READ_PCB_VER , };static uint sd_ifc_mux;struct cpld_data {u8 cpld_ver;/* cpld revision */ +#if defined(CONFIG_P1010RDB_PA )u8 pcba_ver;/* pcb revision number */ u8 twindie_ddr3;u8 res1[6 ];
@@ -58,6 +69,9 @@ struct cpld_data {u8 por1;/* POR Options */ u8 por2;/* POR Options */ u8 por3;/* POR Options */ +#elif defined(CONFIG_P1010RDB_PB ) +u8 rom_loc; +#endif };int board_early_init_f (void )
@@ -116,6 +130,9 @@ int config_board_mux(int ctrl_type)ccsr_gur_t __iomem *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);u8 tmp; +#if defined(CONFIG_P1010RDB_PA ) +struct cpld_data *cpld_data = (void *)(CONFIG_SYS_CPLD_BASE ); +switch (ctrl_type) {case MUX_TYPE_IFC :i2c_set_bus_num (I2C_PCA9557_BUS_NUM );
@@ -136,25 +153,171 @@ int config_board_mux(int ctrl_type)clrsetbits_be32 (&gur->pmuxcr,PMUXCR1_SDHC_MASK ,PMUXCR1_SDHC_ENABLE );break ; +case MUX_TYPE_SPIFLASH : +out_8 (&cpld_data->spi_cs0_sel,MUX_CPLD_SPICS0_FLASH ); +break ; +case MUX_TYPE_TDM : +out_8 (&cpld_data->tdm_can_sel,MUX_CPLD_TDM ); +out_8 (&cpld_data->spi_cs0_sel,MUX_CPLD_SPICS0_SLIC ); +break ; +case MUX_TYPE_CAN : +out_8 (&cpld_data->tdm_can_sel,MUX_CPLD_CAN_UART ); +break ;default :break ; } +#elif defined(CONFIG_P1010RDB_PB ) +uint orig_bus =i2c_get_bus_num (); +i2c_set_bus_num (I2C_PCA9557_BUS_NUM ); +switch (ctrl_type) { +case MUX_TYPE_IFC : +i2c_read (I2C_PCA9557_ADDR2 ,0 ,1 , &tmp,1 ); +clrbits_8 (&tmp,0x04 ); +i2c_write (I2C_PCA9557_ADDR2 ,1 ,1 , &tmp,1 ); +i2c_read (I2C_PCA9557_ADDR2 ,3 ,1 , &tmp,1 ); +clrbits_8 (&tmp,0x04 ); +i2c_write (I2C_PCA9557_ADDR2 ,3 ,1 , &tmp,1 ); + sd_ifc_mux =MUX_TYPE_IFC ; +clrbits_be32 (&gur->pmuxcr,PMUXCR1_IFC_MASK ); +break ; +case MUX_TYPE_SDHC : +i2c_read (I2C_PCA9557_ADDR2 ,0 ,1 , &tmp,1 ); +setbits_8 (&tmp,0x04 ); +i2c_write (I2C_PCA9557_ADDR2 ,1 ,1 , &tmp,1 ); +i2c_read (I2C_PCA9557_ADDR2 ,3 ,1 , &tmp,1 ); +clrbits_8 (&tmp,0x04 ); +i2c_write (I2C_PCA9557_ADDR2 ,3 ,1 , &tmp,1 ); + sd_ifc_mux =MUX_TYPE_SDHC ; +clrsetbits_be32 (&gur->pmuxcr,PMUXCR1_SDHC_MASK , +PMUXCR1_SDHC_ENABLE ); +break ; +case MUX_TYPE_SPIFLASH : +i2c_read (I2C_PCA9557_ADDR2 ,0 ,1 , &tmp,1 ); +clrbits_8 (&tmp,0x80 ); +i2c_write (I2C_PCA9557_ADDR2 ,1 ,1 , &tmp,1 ); +i2c_read (I2C_PCA9557_ADDR2 ,3 ,1 , &tmp,1 ); +clrbits_8 (&tmp,0x80 ); +i2c_write (I2C_PCA9557_ADDR2 ,3 ,1 , &tmp,1 ); +break ; +case MUX_TYPE_TDM : +i2c_read (I2C_PCA9557_ADDR2 ,0 ,1 , &tmp,1 ); +setbits_8 (&tmp,0x82 ); +i2c_write (I2C_PCA9557_ADDR2 ,1 ,1 , &tmp,1 ); +i2c_read (I2C_PCA9557_ADDR2 ,3 ,1 , &tmp,1 ); +clrbits_8 (&tmp,0x82 ); +i2c_write (I2C_PCA9557_ADDR2 ,3 ,1 , &tmp,1 ); +break ; +case MUX_TYPE_CAN : +i2c_read (I2C_PCA9557_ADDR2 ,0 ,1 , &tmp,1 ); +clrbits_8 (&tmp,0x02 ); +i2c_write (I2C_PCA9557_ADDR2 ,1 ,1 , &tmp,1 ); +i2c_read (I2C_PCA9557_ADDR2 ,3 ,1 , &tmp,1 ); +clrbits_8 (&tmp,0x02 ); +i2c_write (I2C_PCA9557_ADDR2 ,3 ,1 , &tmp,1 ); +break ; +case MUX_TYPE_CS0_NOR : +i2c_read (I2C_PCA9557_ADDR2 ,0 ,1 , &tmp,1 ); +clrbits_8 (&tmp,0x08 ); +i2c_write (I2C_PCA9557_ADDR2 ,1 ,1 , &tmp,1 ); +i2c_read (I2C_PCA9557_ADDR2 ,3 ,1 , &tmp,1 ); +clrbits_8 (&tmp,0x08 ); +i2c_write (I2C_PCA9557_ADDR2 ,3 ,1 , &tmp,1 ); +break ; +case MUX_TYPE_CS0_NAND : +i2c_read (I2C_PCA9557_ADDR2 ,0 ,1 , &tmp,1 ); +setbits_8 (&tmp,0x08 ); +i2c_write (I2C_PCA9557_ADDR2 ,1 ,1 , &tmp,1 ); +i2c_read (I2C_PCA9557_ADDR2 ,3 ,1 , &tmp,1 ); +clrbits_8 (&tmp,0x08 ); +i2c_write (I2C_PCA9557_ADDR2 ,3 ,1 , &tmp,1 ); +break ; +default : +break ; + } +i2c_set_bus_num (orig_bus); +#endif return 0 ; } +#ifdef CONFIG_P1010RDB_PB +int i2c_pca9557_read (int type) +{ +u8 val; + +i2c_set_bus_num (I2C_PCA9557_BUS_NUM ); +i2c_read (I2C_PCA9557_ADDR2 ,0 ,1 , &val,1 ); + +switch (type) { +case I2C_READ_BANK : + val = (val &0x10 ) >>4 ; +break ; +case I2C_READ_PCB_VER : + val = ((val &0x60 ) >>5 ) +1 ; +break ; +default : +break ; + } + +return val; +} +#endif +int checkboard (void ) {struct cpu_type *cpu; +struct cpld_data *cpld_data = (void *)(CONFIG_SYS_CPLD_BASE ); +u8 val; cpu = gd->arch.cpu; -printf ("Board: %sRDB\n" , cpu->name); +#if defined(CONFIG_P1010RDB_PA ) +printf ("Board: %sRDB-PA, " , cpu->name); +#elif defined(CONFIG_P1010RDB_PB ) +printf ("Board: %sRDB-PB, " , cpu->name); +i2c_set_bus_num (I2C_PCA9557_BUS_NUM ); +i2c_init (CONFIG_SYS_FSL_I2C_SPEED ,CONFIG_SYS_FSL_I2C_SLAVE ); + val =0x0 ;/* no polarity inversion */ +i2c_write (I2C_PCA9557_ADDR2 ,2 ,1 , &val,1 ); +#endif #ifdef CONFIG_SDCARD /* switch to IFC to read info from CPLD */ config_board_mux (MUX_TYPE_IFC );#endif +#if defined(CONFIG_P1010RDB_PA ) + val = (in_8 (&cpld_data->pcba_ver) &0xf ); +printf ("PCB: v%x.0\n" , val); +#elif defined(CONFIG_P1010RDB_PB ) + val =in_8 (&cpld_data->cpld_ver); +printf ("CPLD: v%x.%x, " , val >>4 , val &0xf ); +printf ("PCB: v%x.0, " ,i2c_pca9557_read (I2C_READ_PCB_VER )); + val =in_8 (&cpld_data->rom_loc) &0xf ; +puts ("Boot from: " ); +switch (val) { +case 0xf : +config_board_mux (MUX_TYPE_CS0_NOR ); +printf ("NOR vBank%d\n" ,i2c_pca9557_read (I2C_READ_BANK )); +break ; +case 0xe : +puts ("SDHC\n" ); + val =0x60 ;/* set pca9557 pin input/output */ +i2c_write (I2C_PCA9557_ADDR2 ,3 ,1 , &val,1 ); +break ; +case 0x5 : +config_board_mux (MUX_TYPE_IFC ); +config_board_mux (MUX_TYPE_CS0_NAND ); +puts ("NAND\n" ); +break ; +case 0x6 : +config_board_mux (MUX_TYPE_IFC ); +puts ("SPI\n" ); +break ; +default : +puts ("unknown\n" ); +break ; + } +#endif return 0 ; }
@@ -348,7 +511,6 @@ void board_reset(void)int misc_init_r (void ) { -struct cpld_data *cpld_data = (void *)(CONFIG_SYS_CPLD_BASE );ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);if (hwconfig_subarg_cmp ("fsl_p1010mux" ,"tdm_can" ,"can" )) {
@@ -356,7 +518,7 @@ int misc_init_r(void) MPC85xx_PMUXCR_CAN1_UART | MPC85xx_PMUXCR_CAN2_TDM | MPC85xx_PMUXCR_CAN2_UART); -out_8 (&cpld_data->tdm_can_sel,MUX_CPLD_CAN_UART ); +config_board_mux (MUX_TYPE_CAN ); }else if (hwconfig_subarg_cmp ("fsl_p1010mux" ,"tdm_can" ,"tdm" )) {clrbits_be32 (&gur->pmuxcr, MPC85xx_PMUXCR_CAN2_UART | MPC85xx_PMUXCR_CAN1_UART);
@@ -364,11 +526,10 @@ int misc_init_r(void) MPC85xx_PMUXCR_CAN1_TDM);clrbits_be32 (&gur->pmuxcr2, MPC85xx_PMUXCR2_UART_GPIO);setbits_be32 (&gur->pmuxcr2, MPC85xx_PMUXCR2_UART_TDM); -out_8 (&cpld_data->tdm_can_sel,MUX_CPLD_TDM ); -out_8 (&cpld_data->spi_cs0_sel,MUX_CPLD_SPICS0_SLIC ); +config_board_mux (MUX_TYPE_TDM ); }else {/* defaultly spi_cs_sel to flash */ -out_8 (&cpld_data->spi_cs0_sel,MUX_CPLD_SPICS0_FLASH ); +config_board_mux (MUX_TYPE_SPIFLASH ); }if (hwconfig ("esdhc" ))
@@ -376,6 +537,9 @@ int misc_init_r(void)else if (hwconfig ("ifc" ))config_board_mux (MUX_TYPE_IFC ); +#ifdef CONFIG_P1010RDB_PB +setbits_be32 (&gur->pmuxcr2, MPC85xx_PMUXCR2_GPIO01_DRVVBUS); +#endif return 0 ; }
boards.cfg +26 -14
@@ -787,20 +787,32 @@ MPC8572DS_36BIT powerpc mpc85xx mpc8572ds freesca MPC8572DS_NAND powerpc mpc85xx mpc8572ds freescale - MPC8572DS:NAND C29XPCIE powerpc mpc85xx c29xpcie freescale - C29XPCIE:C29XPCIE,36BIT C29XPCIE_SPIFLASH powerpc mpc85xx c29xpcie freescale - C29XPCIE:C29XPCIE,36BIT,SPIFLASH -P1010RDB_36BIT_NAND powerpc mpc85xx p1010rdb freescale - P1010RDB:P1010RDB,36BIT,NAND -P1010RDB_36BIT_NAND_SECBOOT powerpc mpc85xx p1010rdb freescale - P1010RDB:P1010RDB,36BIT,NAND_SECBOOT,SECURE_BOOT -P1010RDB_36BIT_NOR powerpc mpc85xx p1010rdb freescale - P1010RDB:P1010RDB,36BIT -P1010RDB_36BIT_NOR_SECBOOT powerpc mpc85xx p1010rdb freescale - P1010RDB:P1010RDB,36BIT,SECURE_BOOT -P1010RDB_36BIT_SDCARD powerpc mpc85xx p1010rdb freescale - P1010RDB:P1010RDB,36BIT,SDCARD -P1010RDB_36BIT_SPIFLASH powerpc mpc85xx p1010rdb freescale - P1010RDB:P1010RDB,36BIT,SPIFLASH -P1010RDB_36BIT_SPIFLASH_SECBOOT powerpc mpc85xx p1010rdb freescale - P1010RDB:P1010RDB,36BIT,SPIFLASH,SECURE_BOOT -P1010RDB_NAND powerpc mpc85xx p1010rdb freescale - P1010RDB:P1010RDB,NAND -P1010RDB_NAND_SECBOOT powerpc mpc85xx p1010rdb freescale - P1010RDB:P1010RDB,NAND_SECBOOT,SECURE_BOOT -P1010RDB_NOR powerpc mpc85xx p1010rdb freescale - P1010RDB:P1010RDB -P1010RDB_NOR_SECBOOT powerpc mpc85xx p1010rdb freescale - P1010RDB:P1010RDB,SECURE_BOOT -P1010RDB_SDCARD powerpc mpc85xx p1010rdb freescale - P1010RDB:P1010RDB,SDCARD -P1010RDB_SPIFLASH powerpc mpc85xx p1010rdb freescale - P1010RDB:P1010RDB,SPIFLASH -P1010RDB_SPIFLASH_SECBOOT powerpc mpc85xx p1010rdb freescale - P1010RDB:P1010RDB,SPIFLASH,SECURE_BOOT +P1010RDB-PA_36BIT_NAND powerpc mpc85xx p1010rdb freescale - P1010RDB:P1010RDB_PA,36BIT,NAND +P1010RDB-PA_36BIT_NAND_SECBOOT powerpc mpc85xx p1010rdb freescale - P1010RDB:P1010RDB_PA,36BIT,NAND_SECBOOT,SECURE_BOOT +P1010RDB-PA_36BIT_NOR powerpc mpc85xx p1010rdb freescale - P1010RDB:P1010RDB_PA,36BIT +P1010RDB-PA_36BIT_NOR_SECBOOT powerpc mpc85xx p1010rdb freescale - P1010RDB:P1010RDB_PA,36BIT,SECURE_BOOT +P1010RDB-PA_36BIT_SDCARD powerpc mpc85xx p1010rdb freescale - P1010RDB:P1010RDB_PA,36BIT,SDCARD +P1010RDB-PA_36BIT_SPIFLASH powerpc mpc85xx p1010rdb freescale - P1010RDB:P1010RDB_PA,36BIT,SPIFLASH +P1010RDB-PA_36BIT_SPIFLASH_SECBOOT powerpc mpc85xx p1010rdb freescale - P1010RDB:P1010RDB_PA,36BIT,SPIFLASH,SECURE_BOOT +P1010RDB-PA_NAND powerpc mpc85xx p1010rdb freescale - P1010RDB:P1010RDB_PA,NAND +P1010RDB-PA_NOR powerpc mpc85xx p1010rdb freescale - P1010RDB:P1010RDB_PA +P1010RDB-PA_SDCARD powerpc mpc85xx p1010rdb freescale - P1010RDB:P1010RDB_PA,SDCARD +P1010RDB-PA_SPIFLASH powerpc mpc85xx p1010rdb freescale - P1010RDB:P1010RDB_PA,SPIFLASH +P1010RDB-PA_SPIFLASH_SECBOOT powerpc mpc85xx p1010rdb freescale - P1010RDB:P1010RDB_PA,SPIFLASH,SECURE_BOOT +P1010RDB-PB_NOR powerpc mpc85xx p1010rdb freescale - P1010RDB:P1010RDB_PB +P1010RDB-PB_NAND powerpc mpc85xx p1010rdb freescale - P1010RDB:P1010RDB_PB,NAND +P1010RDB-PB_SDCARD powerpc mpc85xx p1010rdb freescale - P1010RDB:P1010RDB_PB,SDCARD +P1010RDB-PB_SPIFLASH powerpc mpc85xx p1010rdb freescale - P1010RDB:P1010RDB_PB,SPIFLASH +P1010RDB-PB_NOR_SECBOOT powerpc mpc85xx p1010rdb freescale - P1010RDB:P1010RDB_PB,SECURE_BOOT +P1010RDB-PB_NAND_SECBOOT powerpc mpc85xx p1010rdb freescale - P1010RDB:P1010RDB_PB,NAND_SECBOOT,SECURE_BOOT +P1010RDB-PB_SPIFLASH_SECBOOT powerpc mpc85xx p1010rdb freescale - P1010RDB:P1010RDB_PB,SPIFLASH,SECURE_BOOT +P1010RDB-PB_36BIT_NOR powerpc mpc85xx p1010rdb freescale - P1010RDB:P1010RDB_PB,36BIT +P1010RDB-PB_36BIT_NOR_SECBOOT powerpc mpc85xx p1010rdb freescale - P1010RDB:P1010RDB_PB,36BIT,SECURE_BOOT +P1010RDB-PB_36BIT_NAND powerpc mpc85xx p1010rdb freescale - P1010RDB:P1010RDB_PB,36BIT,NAND +P1010RDB-PB_36BIT_NAND_SECBOOT powerpc mpc85xx p1010rdb freescale - P1010RDB:P1010RDB_PB,36BIT,NAND_SECBOOT,SECURE_BOOT +P1010RDB-PB_36BIT_SDCARD powerpc mpc85xx p1010rdb freescale - P1010RDB:P1010RDB_PB,36BIT,SDCARD +P1010RDB-PB_36BIT_SPIFLASH powerpc mpc85xx p1010rdb freescale - P1010RDB:P1010RDB_PB,36BIT,SPIFLASH +P1010RDB-PB_36BIT_SPIFLASH_SECBOOT powerpc mpc85xx p1010rdb freescale - P1010RDB:P1010RDB_PB,36BIT,SPIFLASH,SECURE_BOOT P1011RDB powerpc mpc85xx p1_p2_rdb freescale - P1_P2_RDB:P1011RDB P1011RDB_36BIT powerpc mpc85xx p1_p2_rdb freescale - P1_P2_RDB:P1011RDB,36BIT P1011RDB_36BIT_SDCARD powerpc mpc85xx p1_p2_rdb freescale - P1_P2_RDB:P1011RDB,36BIT,SDCARD
include/configs/P1010RDB.h +87 -14
177 lines not on this page · raw message
Signature · 1 line
1.8.0
[U-Boot] AES: Encryption of u-boot.img
Hi everyone,
I want to implement a minimal secure boot architecture into u-boot by letting the u-boot.img be decrypted during SPL execution. Thus, the u-boot.img is present on the MMC in an encrypted version. I already implemented a basic AES-128 en-/decryption algorithm into the SPL.
Everything will be implement on a PandaBoard (OMAP4460). Now my questions are:
1.) What would be the general architecture? u-boot.img is loaded into external memory (DRAM)at address 0x80100000. To decrypt it, the whole file needs to be processed by SPL, which will not be able to load the data since the SPL can not exceed a certain size (~49 kByte I guess).
-> Thus, would it be somehow possible to implement the algorithm in
the SPL but let the u-boot.img data be stored in DRAM for processing?
2.) Furthermore, where could be a good place to put the actual algorithm in? I figured that in my situation the function call flow is something like this:
... > omap_boot_device() > boot_device() > spl_mmc_load_image() > mmc_load_image_fat > file_fat_read() > do_fat_read()
Quoted 1 line
_jump_to_image_noargs()where u-boot.img is eventually called using the
image_entry() function.
Thanks a lot,
-b
[U-Boot] AES: Encryption of u-boot.img
Hi
Quoted 16 lines · On Fri, Sep 13, 2013 at 4:57 PM, bin4ry <[email protected]> wrote:
Hi everyone,
I want to implement a minimal secure boot architecture into u-boot by letting the u-boot.img be decrypted during SPL execution. Thus, the u-boot.img is present on the MMC in an encrypted version. I already implemented a basic AES-128 en-/decryption algorithm into the SPL.
Everything will be implement on a PandaBoard (OMAP4460). Now my questions are:
1.) What would be the general architecture? u-boot.img is loaded into external memory (DRAM)at address
0x80100000. To decrypt it, the whole file needs to be processed by SPL, which will not be able to load the data since the SPL can not exceed a certain size (~49 kByte I guess).-> Thus, would it be somehow possible to implement the algorithm in
Quoted 8 lines
the SPL but let the u-boot.img data be stored in DRAM for processing?
2.) Furthermore, where could be a good place to put the actual algorithm in? I figured that in my situation the function call flow is something like this:
... >
omap_boot_device()>boot_device()>spl_mmc_load_image()>mmc_load_image_fat>file_fat_read()>do_fat_read()
... > omap_boot_device() > boot_device() > spl_mmc_load_image()
Quoted 1 line
file_fat_read()>do_fat_read()
I don't understand you can decrypt it after load. Why just verify the signature?
Michael
Quoted 12 lines
Quoted 1 line
_jump_to_image_noargs()where u-boot.img is eventually called using the
image_entry()function.Thanks a lot,
-b_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] AES: Encryption of u-boot.img
Am 13.09.2013 19:28, schrieb Michael Trimarchi:
Quoted 5 lines
Hi
I don't understand you can decrypt it after load. Why just verify the signature?Michael
This is a proof-of-concept for a technique, which involves de-/encrypting the u-boot.img with a key derived from a hardware fingerprint. This is why I can not just verify the signature.
Yes, I want to decrypt it after load. However, I am not sure about the correct position in the SPL source code to this, i.e. the position after loading the u-boot.img and before executing it. I assume after do_fat_read() the u-boot.img is loaded into internal memory and jump_to_image_no_args() executes the u-boot.img. Thus, the decryption routine should be implemented between both functions?
[U-Boot] AES: Encryption of u-boot.img
In reply to bin4ryHi bin4ry,
Quoted 6 lines · On Fri, 13 Sep 2013 16:57:20 +0200, bin4ry <[email protected]> wrote:
Hi everyone,
I want to implement a minimal secure boot architecture into u-boot by letting the u-boot.img be decrypted during SPL execution. Thus, the u-boot.img is present on the MMC in an encrypted version. I already implemented a basic AES-128 en-/decryption algorithm into the SPL.
What's the point of encrypting the whole binary? Secure boot usually uses authentication, not encryption, of the payload that is to be
secured: instead of decrypting several hundreds of KBs, you hash them (which is faster) and decrypt only the few hundreds bits of the encrypted hash in order to compare both hashes (but trust chain remains the same of course).
Note: if you chose payload encryption over authentication (hash encryption) because you are worried about collision, preimage or even second preimage resistance, then you should just go with use a stronger hash function. Besides, for a small and compact payload such as a bootloader, the risks of collisions are reduced because there is less room in the input space.
Amicalement,
Signature · 1 line
Albert.
[U-Boot] AES: Encryption of u-boot.img
Hi Albert,
so if I get you right the workflow for payload authentication is the following:
Encryption process:
1. Create hash value H for u-boot.img
2. Encrypt the hash value H with secret K to get encrypted hash values H_enc
3. Store H_enc
Decryption process:
1. Read H_enc
2. Decrypt H_enc using secret K to get plain hash values H
3. Create Hash values H' of u-boot.img
4. Compare H and H'
Did I get you right?
Thanks and best regards,
-b
Am 15.09.2013 08:08, schrieb Albert ARIBAUD:
Quoted 15 lines
What's the point of encrypting the whole binary? Secure boot usually uses authentication, not encryption, of the payload that is to be
secured: instead of decrypting several hundreds of KBs, you hash them (which is faster) and decrypt only the few hundreds bits of the encrypted hash in order to compare both hashes (but trust chain remains the same of course).Note: if you chose payload encryption over authentication (hash encryption) because you are worried about collision, preimage or even second preimage resistance, then you should just go with use a stronger hash function. Besides, for a small and compact payload such as a bootloader, the risks of collisions are reduced because there is less room in the input space.
Amicalement,
[U-Boot] AES: Encryption of u-boot.img
Hi bin4ry,
Sorry for the delay in answering.
Quoted 6 lines · On Mon, 30 Sep 2013 09:51:54 +0200, bin4ry <[email protected]> wrote:
Hi Albert,
so if I get you right the workflow for payload authentication is the following:
Encryption process:
(you really should not talk about "encryption process" if your goal is authentication rather than encryption. The correct term would be somehting like "signature process" and "signature verification process")
Quoted 4 lines
1. Create hash value H for u-boot.img
2. Encrypt the hash value H with secret K to get encrypted hash valuesH_enc
3. StoreH_enc
Quoted 8 lines
Decryption process:
1. Read
H_enc
2. DecryptH_encusing secret K to get plain hash values H
3. Create Hash values H' of u-boot.img
4. Compare H and H'Did I get you right?
Almost, but not quite.
The most important problem is that you seem to assume use of symmetric encryption , since your 'K' seems to be both the encryption and decryption key. That is not good, because K is needed on the target for the verification phase, and thus, could then be used by an attacker to encrypt the hash of a malicious payload that would then pass verification. You need asymetric encryption, with a pair of public and private keys. The private key is used in the signing process, for encrypting the hash. The public key is on the device and is used in the verification process, for decrypting the encrypted hash.
But then, of course, you can't simply have the public key in Flash, because the attacker could generate a new pair of keys, then sign the malicious payload hash with the new private key and flash the new public key. Therefore, you need a way to secure the public key. One way is to have it in ROM, but this could be against silicon or manufacter budget. Fuses are usually not big enough, but you could fuse a hash of the key.
Note that, in any case, authentication only makes senses if you can trust the piece of software on the arget that will check the key and verify the payload hash... Which means you need some secure mode on the device to boot (pun intended). And that mode will probably already include a way of signing the payloads.
Quoted 1 line
Thanks and best regards,
You're welcome.
Quoted 1 line
-b
Amicalement,
Signature · 1 line
Albert.