[U-Boot] [PATCH 1/2 V2] at91rm9200: rename lowlevel init value to CONFIG_SYS_

[Wolfgang Denk]

Dear Jean-Christophe PLAGNIOL-VILLARD,

In message <1229547702-20400-1-git-send-email-plagnioj at jcrosoft.com> you wrote:
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
> Cc: Sami Nurmenniemi <sanurmen at sysart.fi>
> ---
>  board/m501sk/memsetup.S                |  134 ++++++++++++++++----------------
>  cpu/arm920t/at91rm9200/lowlevel_init.S |   88 +++++++++++-----------
>  include/configs/at91rm9200dk.h         |   46 ++++++------
>  include/configs/cmc_pu2.h              |   46 ++++++------
>  include/configs/csb637.h               |   46 ++++++------
>  include/configs/mp2usb.h               |   46 ++++++------
>  6 files changed, 203 insertions(+), 203 deletions(-)
> 
> diff --git a/board/m501sk/memsetup.S b/board/m501sk/memsetup.S
> index 6aea723..1a3ca4b 100644
> --- a/board/m501sk/memsetup.S
> +++ b/board/m501sk/memsetup.S
> @@ -41,50 +41,50 @@
>  
>  /* flash */
>  #define MC_PUIA 0xFFFFFF10
> -#define MC_PUIA_VAL 0x00000000
> +#define CONFIG_SYS_MC_PUIA_VAL 0x00000000
>  #define MC_PUP 0xFFFFFF50
> -#define MC_PUP_VAL 0x00000000
> +#define CONFIG_SYS_MC_PUP_VAL 0x00000000
>  #define MC_PUER 0xFFFFFF54
> -#define MC_PUER_VAL 0x00000000
> +#define CONFIG_SYS_MC_PUER_VAL 0x00000000
>  #define MC_ASR 0xFFFFFF04
> -#define MC_ASR_VAL 0x00000000
> +#define CONFIG_SYS_MC_ASR_VAL 0x00000000
>  #define MC_AASR 0xFFFFFF08
> -#define MC_AASR_VAL 0x00000000
> +#define CONFIG_SYS_MC_AASR_VAL 0x00000000
>  #define EBI_CFGR 0xFFFFFF64
> -#define EBI_CFGR_VAL 0x00000000
> +#define CONFIG_SYS_EBI_CFGR_VAL 0x00000000
>  #define SMC_CSR0 0xFFFFFF70
> -#define SMC_CSR0_VAL 0x00003284 /* 16bit, 2 TDF, 4 WS */
> +#define CONFIG_SYS_SMC_CSR0_VAL 0x00003284 /* 16bit, 2 TDF, 4 WS */
>  
>  /* clocks */
>  #define PLLAR 0xFFFFFC28
> -#define PLLAR_VAL 0x20263E04 /* 179.712000 MHz for PCK */
> +#define CONFIG_SYS_PLLAR_VAL 0x20263E04 /* 179.712000 MHz for PCK */
>  #define PLLBR 0xFFFFFC2C
> -#define PLLBR_VAL 0x10483E0E /* 48.054857 MHz (divider by 2 for USB) */
> +#define CONFIG_SYS_PLLBR_VAL 0x10483E0E /* 48.054857 MHz (divider by 2 for USB) */
>  #define MCKR 0xFFFFFC30
>  /* PCK/3 = MCK Master Clock = 59.904000MHz from PLLA */
> -#define MCKR_VAL	0x00000202
> +#define CONFIG_SYS_MCKR_VAL	0x00000202
>  
>  /* sdram */
>  #define PIOC_ASR 0xFFFFF870
> -#define PIOC_ASR_VAL 0xFFFF0000 /* Configure PIOC as Perip (D16/D31) */
> +#define CONFIG_SYS_PIOC_ASR_VAL 0xFFFF0000 /* Configure PIOC as Perip (D16/D31) */
>  #define PIOC_BSR 0xFFFFF874
> -#define PIOC_BSR_VAL 0x00000000
> +#define CONFIG_SYS_PIOC_BSR_VAL 0x00000000
>  #define PIOC_PDR 0xFFFFF804
> -#define PIOC_PDR_VAL 0xFFFF0000
> +#define CONFIG_SYS_PIOC_PDR_VAL 0xFFFF0000
>  #define EBI_CSA 0xFFFFFF60
> -#define EBI_CSA_VAL 0x00000002 /* CS1=SDRAM */
> +#define CONFIG_SYS_EBI_CSA_VAL 0x00000002 /* CS1=CONFIG_SYS_SDRAM */
>  #define SDRC_CR 0xFFFFFF98
> -#define SDRC_CR_VAL 0x2188c155 /* set up the SDRAM */
> -#define SDRAM 0x20000000 /* address of the SDRAM */
> -#define SDRAM1 0x20000080 /* address of the SDRAM */
> -#define SDRAM_VAL 0x00000000 /* value written to SDRAM */
> +#define CONFIG_SYS_SDRC_CR_VAL 0x2188c155 /* set up the CONFIG_SYS_SDRAM */
> +#define CONFIG_SYS_SDRAM 0x20000000 /* address of the CONFIG_SYS_SDRAM */
> +#define CONFIG_SYS_SDRAM1 0x20000080 /* address of the CONFIG_SYS_SDRAM */
> +#define CONFIG_SYS_SDRAM_VAL 0x00000000 /* value written to CONFIG_SYS_SDRAM */
>  #define SDRC_MR 0xFFFFFF90
> -#define SDRC_MR_VAL 0x00000002 /* Precharge All */
> -#define SDRC_MR_VAL1 0x00000004 /* refresh */
> -#define SDRC_MR_VAL2 0x00000003 /* Load Mode Register */
> -#define SDRC_MR_VAL3 0x00000000 /* Normal Mode */
> +#define CONFIG_SYS_SDRC_MR_VAL 0x00000002 /* Precharge All */
> +#define CONFIG_SYS_SDRC_MR_VAL1 0x00000004 /* refresh */
> +#define CONFIG_SYS_SDRC_MR_VAL2 0x00000003 /* Load Mode Register */
> +#define CONFIG_SYS_SDRC_MR_VAL3 0x00000000 /* Normal Mode */
>  #define SDRC_TR 0xFFFFFF94
> -#define SDRC_TR_VAL 0x000002E0 /* Write refresh rate */
> +#define CONFIG_SYS_SDRC_TR_VAL 0x000002E0 /* Write refresh rate */

I think it is fundamentally wrong to put these #defines in the board's
memsetup.S file. The do not belong into some source file, but into the
board config file, include/configs/<name>

If we touch this part, should we not do it right, then?

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: wd at denx.de
"Athens  built  the  Acropolis.  Corinth  was  a   commercial   city,
interested  in  purely  materialistic things. Today we admire Athens,
visit it, preserve the old temples, yet we hardly ever  set  foot  in
Corinth."              - Dr. Harold Urey, Nobel Laureate in chemistry