[U-Boot] [PATCH v2] powerpc/p1022ds: Add sdcard and spi boot support to P1022DS

[Tabi Timur-B04825]

On Thu, Apr 26, 2012 at 8:57 AM, Dirk Eibach <eibach at gdsys.de> wrote:
> Signed-off-by: Dirk Eibach <eibach at gdsys.de>
> Cc: Timur Tabi <timur at freescale.com>
> ---
> Changes in v2:
> - add Cc
> - split up original patch series
>
>  board/freescale/p1022ds/p1022ds.c |    4 ++
>  board/freescale/p1022ds/tlb.c     |   10 ++++++
>  boards.cfg                        |    4 ++
>  include/configs/P1022DS.h         |   63 ++++++++++++++++++++++++++++++++++---
>  4 files changed, 76 insertions(+), 5 deletions(-)
>
> diff --git a/board/freescale/p1022ds/p1022ds.c b/board/freescale/p1022ds/p1022ds.c
> index 456d9b0..c4bdbad 100644
> --- a/board/freescale/p1022ds/p1022ds.c
> +++ b/board/freescale/p1022ds/p1022ds.c
> @@ -37,6 +37,10 @@ int board_early_init_f(void)
>  {
>        ccsr_gur_t *gur = (void *)CONFIG_SYS_MPC85xx_GUTS_ADDR;
>
> +       /* Reset eLBC_DIU and SPI_eLBC in case we are booting from SD */
> +       clrbits_be32(&gur->pmuxcr, 0x00600000);
> +       setbits_be32(&gur->pmuxcr, 0x80000000);

Please use clrsetbits_be32().

> +
>        /* Set pmuxcr to allow both i2c1 and i2c2 */
>        setbits_be32(&gur->pmuxcr, 0x1000);
>
> diff --git a/board/freescale/p1022ds/tlb.c b/board/freescale/p1022ds/tlb.c
> index e620112..1e9969f 100644
> --- a/board/freescale/p1022ds/tlb.c
> +++ b/board/freescale/p1022ds/tlb.c
> @@ -71,6 +71,16 @@ struct fsl_e_tlb_entry tlb_table[] = {
>        SET_TLB_ENTRY(1, PIXIS_BASE, PIXIS_BASE_PHYS,
>                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
>                      0, 7, BOOKE_PAGESZ_4K, 1),
> +
> +#if defined(CONFIG_SYS_RAMBOOT)
> +       SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE,
> +                       MAS3_SX|MAS3_SW|MAS3_SR, 0,
> +                       0, 8, BOOKE_PAGESZ_1G, 1),
> +       SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE + 0x40000000,
> +                       CONFIG_SYS_DDR_SDRAM_BASE + 0x40000000,
> +                       MAS3_SX|MAS3_SW|MAS3_SR, 0,
> +                       0, 9, BOOKE_PAGESZ_1G, 1)
> +#endif
>  };
>
>  int num_tlb_entries = ARRAY_SIZE(tlb_table);
> diff --git a/boards.cfg b/boards.cfg
> index 24c5879..8de4235 100644
> --- a/boards.cfg
> +++ b/boards.cfg
> @@ -700,6 +700,10 @@ P1021RDB-PC_SDCARD           powerpc     mpc85xx     p1_p2_rdb_pc        freesca
>  P1021RDB-PC_SPIFLASH         powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1021RDB,SPIFLASH
>  P1022DS                      powerpc     mpc85xx     p1022ds             freescale
>  P1022DS_36BIT                powerpc     mpc85xx     p1022ds             freescale      -           P1022DS:36BIT
> +P1022DS_36BIT_SDCARD         powerpc     mpc85xx     p1022ds             freescale      -           P1022DS:36BIT,SDCARD
> +P1022DS_36BIT_SPIFLASH       powerpc     mpc85xx     p1022ds             freescale      -           P1022DS:36BIT,SPIFLASH
> +P1022DS_SDCARD               powerpc     mpc85xx     p1022ds             freescale      -           P1022DS:SDCARD
> +P1022DS_SPIFLASH             powerpc     mpc85xx     p1022ds             freescale      -           P1022DS:SPIFLASH
>  P1023RDS                     powerpc     mpc85xx     p1023rds            freescale      -           P1023RDS
>  P1023RDS_NAND                powerpc     mpc85xx     p1023rds            freescale      -           P1023RDS:NAND
>  P1024RDB                     powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1024RDB
> diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
> index 70d751d..73a56a6 100644
> --- a/include/configs/P1022DS.h
> +++ b/include/configs/P1022DS.h
> @@ -26,6 +26,18 @@
>  #define CONFIG_P1022DS
>  #define CONFIG_MP                      /* support multiple processors */
>
> +#ifdef CONFIG_SDCARD
> +#define CONFIG_RAMBOOT_SDCARD          1
> +#define CONFIG_SYS_TEXT_BASE           0x11000000
> +#define CONFIG_RESET_VECTOR_ADDRESS    0x1107fffc
> +#endif
> +
> +#ifdef CONFIG_SPIFLASH
> +#define CONFIG_RAMBOOT_SPIFLASH                1
> +#define CONFIG_SYS_TEXT_BASE           0x11000000
> +#define CONFIG_RESET_VECTOR_ADDRESS    0x1107fffc
> +#endif
> +
>  #ifndef CONFIG_SYS_TEXT_BASE
>  #define CONFIG_SYS_TEXT_BASE   0xeff80000
>  #endif
> @@ -52,8 +64,14 @@
>
>  #define CONFIG_FSL_LAW                 /* Use common FSL init code */
>
> +#if 0
> +#define CONFIG_SYS_CLK_FREQ    99999000  /* get_board_sys_clk() */
> +#define CONFIG_DDR_CLK_FREQ    99999000 /* get_board_ddr_clk() */
> +#else

Why add these lines?

>  #define CONFIG_SYS_CLK_FREQ    get_board_sys_clk()
>  #define CONFIG_DDR_CLK_FREQ    get_board_ddr_clk()
> +#endif
> +
>  #define CONFIG_ICS307_REFCLK_HZ        33333000  /* ICS307 clock chip ref freq */
>
>  /*
> @@ -138,6 +156,14 @@
>
>  #define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE    /* start of monitor */
>
> +#if defined(CONFIG_RAMBOOT_NAND) || defined(CONFIG_RAMBOOT_SDCARD) || \
> +       defined(CONFIG_RAMBOOT_SPIFLASH)
> +#define CONFIG_SYS_RAMBOOT
> +#define CONFIG_SYS_EXTRA_ENV_RELOC
> +#else
> +#undef CONFIG_SYS_RAMBOOT
> +#endif

Is the #undef really necessary?



-- 
Timur Tabi
Linux kernel developer at Freescale