ARM change name of defines for AT91 arm926ejs
PATCH 1/1 ARM change name of defines for AT91 arm926ejs
AT91_CPU_NAME to CONFIG_SYS_AT91_CPU_NAME
AT91_MAIN_CLOCK to CONFIG_SYS_AT91_MAIN_CLOCK
--- board/atmel/at91cap9adk/at91cap9adk.c | 2 +- board/atmel/at91sam9261ek/at91sam9261ek.c | 2 +- board/atmel/at91sam9263ek/at91sam9263ek.c | 2 +- board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c | 2 +- board/atmel/at91sam9rlek/at91sam9rlek.c | 2 +- board/esd/otc570/otc570.c | 2 +- board/ronetix/pm9261/pm9261.c | 2 +- board/ronetix/pm9263/pm9263.c | 2 +- cpu/arm926ejs/at91/clock.c | 2 +- cpu/arm926ejs/at91/cpu.c | 8 ++++---- include/asm-arm/arch-at91/at91cap9.h | 2 +- include/asm-arm/arch-at91/at91rm9200.h | 2 +- include/asm-arm/arch-at91/at91sam9260.h | 4 ++-- include/asm-arm/arch-at91/at91sam9261.h | 2 +- include/asm-arm/arch-at91/at91sam9263.h | 2 +- include/asm-arm/arch-at91/at91sam9g45.h | 2 +- include/asm-arm/arch-at91/at91sam9rl.h | 2 +- include/configs/afeb9260.h | 2 +- include/configs/at91cap9adk.h | 2 +- include/configs/at91sam9260ek.h | 2 +- include/configs/at91sam9261ek.h | 2 +- include/configs/at91sam9263ek.h | 2 +- include/configs/at91sam9m10g45ek.h | 2 +- include/configs/at91sam9rlek.h | 2 +- include/configs/cpu9260.h | 2 +- include/configs/pm9261.h | 4 ++-- include/configs/pm9263.h | 2 +- include/configs/sbc35_a9g20.h | 2 +- include/configs/tny_a9260.h | 2 +- 29 files changed, 34 insertions(+), 34 deletions(-)
board/atmel/at91cap9adk/at91cap9adk.c +1 -1
@@ -282,7 +282,7 @@ void lcd_show_board_info(void)lcd_printf ("(C) 2008 ATMEL Corp\n" );lcd_printf ("at91support at atmel.com\n" );lcd_printf ("%s CPU at %s MHz\n" , -AT91_CPU_NAME , +CONFIG_SYS_AT91_CPU_NAME ,strmhz (temp,get_cpu_clk_rate ())); dram_size =0 ;
board/atmel/at91sam9261ek/at91sam9261ek.c +1 -1
@@ -217,7 +217,7 @@ void lcd_show_board_info(void)lcd_printf ("(C) 2008 ATMEL Corp\n" );lcd_printf ("at91support at atmel.com\n" );lcd_printf ("%s CPU at %s MHz\n" , -AT91_CPU_NAME , +CONFIG_SYS_AT91_CPU_NAME ,strmhz (temp,get_cpu_clk_rate ())); dram_size =0 ;
board/atmel/at91sam9263ek/at91sam9263ek.c +1 -1
@@ -218,7 +218,7 @@ void lcd_show_board_info(void)lcd_printf ("(C) 2008 ATMEL Corp\n" );lcd_printf ("at91support at atmel.com\n" );lcd_printf ("%s CPU at %s MHz\n" , -AT91_CPU_NAME , +CONFIG_SYS_AT91_CPU_NAME ,strmhz (temp,get_cpu_clk_rate ())); dram_size =0 ;
board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c +1 -1
@@ -217,7 +217,7 @@ void lcd_show_board_info(void)lcd_printf ("(C) 2008 ATMEL Corp\n" );lcd_printf ("at91support at atmel.com\n" );lcd_printf ("%s CPU at %s MHz\n" , -AT91_CPU_NAME , +CONFIG_SYS_AT91_CPU_NAME ,strmhz (temp,get_cpu_clk_rate ())); dram_size =0 ;
board/atmel/at91sam9rlek/at91sam9rlek.c +1 -1
@@ -157,7 +157,7 @@ void lcd_show_board_info(void)lcd_printf ("(C) 2008 ATMEL Corp\n" );lcd_printf ("at91support at atmel.com\n" );lcd_printf ("%s CPU at %s MHz\n" , -AT91_CPU_NAME , +CONFIG_SYS_AT91_CPU_NAME ,strmhz (temp,get_cpu_clk_rate ())); dram_size =0 ;
board/esd/otc570/otc570.c +1 -1
@@ -219,7 +219,7 @@ void lcd_show_board_info(void) nand_size += nand_info[i].size;lcd_printf ("\n%s\n" ,U_BOOT_VERSION ); -lcd_printf ("%s CPU at %s MHz\n" ,AT91_CPU_NAME , +lcd_printf ("%s CPU at %s MHz\n" ,CONFIG_SYS_AT91_CPU_NAME ,strmhz (temp,get_cpu_clk_rate ())); lcd_printf(" %ld MB SDRAM, %ld MB NAND\n", dram_size >> 20,
board/ronetix/pm9261/pm9261.c +1 -1
@@ -189,7 +189,7 @@ void lcd_show_board_info(void)lcd_printf ("(C) 2009 Ronetix GmbH\n" );lcd_printf ("support at ronetix.at\n" );lcd_printf ("%s CPU at %s MHz" , -AT91_CPU_NAME , +CONFIG_SYS_AT91_CPU_NAME ,strmhz (temp,get_cpu_clk_rate ())); dram_size =0 ;
board/ronetix/pm9263/pm9263.c +1 -1
@@ -304,7 +304,7 @@ void lcd_show_board_info(void)lcd_printf ("(C) 2009 Ronetix GmbH\n" );lcd_printf ("support at ronetix.at\n" );lcd_printf ("%s CPU at %s MHz" , -AT91_CPU_NAME , +CONFIG_SYS_AT91_CPU_NAME ,strmhz (temp,get_cpu_clk_rate ())); dram_size =0 ;
cpu/arm926ejs/at91/clock.c +1 -1
@@ -147,7 +147,7 @@ int at91_clock_init(unsigned long main_clock) {unsigned freq, mckr;at91_pmc_t *pmc = (at91_pmc_t *)AT91_PMC_BASE ; -#ifndef AT91_MAIN_CLOCK +#ifndef CONFIG_SYS_AT91_MAIN_CLOCK unsigned tmp;/* * When the bootloader initialized the main oscillator correctly,
cpu/arm926ejs/at91/cpu.c +4 -4
@@ -31,13 +31,13 @@#include <asm/arch/clk.h> #include <asm/arch/io.h> -#ifndef AT91_MAIN_CLOCK -#define AT91_MAIN_CLOCK 0 +#ifndef CONFIG_SYS_AT91_MAIN_CLOCK +#define CONFIG_SYS_AT91_MAIN_CLOCK 0#endif int arch_cpu_init (void ) { -return at91_clock_init (AT91_MAIN_CLOCK ); +return at91_clock_init (CONFIG_SYS_AT91_MAIN_CLOCK ); }#if defined(CONFIG_DISPLAY_CPUINFO )
@@ -45,7 +45,7 @@ int print_cpuinfo(void) {char buf[32 ]; -printf ("CPU: %s\n" ,AT91_CPU_NAME ); +printf ("CPU: %s\n" ,CONFIG_SYS_AT91_CPU_NAME );printf ("Crystal frequency: %8s MHz\n" ,strmhz (buf,get_main_clk_rate ())); printf("CPU clock : %8s MHz\n",
include/asm-arm/arch-at91/at91cap9.h +1 -1
@@ -145,6 +145,6 @@/* * Cpu Name */ -#define AT91_CPU_NAME "AT91CAP9" +#define CONFIG_SYS_AT91_CPU_NAME "AT91CAP9"#endif
include/asm-arm/arch-at91/at91rm9200.h +1 -1
@@ -130,6 +130,6 @@#define AT91_PMX_CA_NCS7 0x00002000#define AT91_PMX_CA_D16_31 0xFFFF0000 -#define AT91_CPU_NAME "AT91RM9200" +#define CONFIG_SYS_AT91_CPU_NAME "AT91RM9200"#endif
include/asm-arm/arch-at91/at91sam9260.h +2 -2
@@ -139,9 +139,9 @@* Cpu Name */ #if defined(CONFIG_AT91SAM9260 ) -#define AT91_CPU_NAME "AT91SAM9260" +#define CONFIG_SYS_AT91_CPU_NAME "AT91SAM9260"#elif defined(CONFIG_AT91SAM9G20 ) -#define AT91_CPU_NAME "AT91SAM9G20" +#define CONFIG_SYS_AT91_CPU_NAME "AT91SAM9G20"#endif #endif
include/asm-arm/arch-at91/at91sam9261.h +1 -1
@@ -114,6 +114,6 @@/* * Cpu Name */ -#define AT91_CPU_NAME "AT91SAM9261" +#define CONFIG_SYS_AT91_CPU_NAME "AT91SAM9261"#endif
include/asm-arm/arch-at91/at91sam9263.h +1 -1
@@ -147,6 +147,6 @@/* * Cpu Name */ -#define AT91_CPU_NAME "AT91SAM9263" +#define CONFIG_SYS_AT91_CPU_NAME "AT91SAM9263"#endif
include/asm-arm/arch-at91/at91sam9g45.h +1 -1
@@ -147,6 +147,6 @@/* * Cpu Name */ -#define AT91_CPU_NAME "AT91SAM9G45" +#define CONFIG_SYS_AT91_CPU_NAME "AT91SAM9G45"#endif
include/asm-arm/arch-at91/at91sam9rl.h +1 -1
@@ -125,6 +125,6 @@/* * Cpu Name */ -#define AT91_CPU_NAME "AT91SAM9RL" +#define CONFIG_SYS_AT91_CPU_NAME "AT91SAM9RL"#endif
include/configs/afeb9260.h +1 -1
@@ -29,7 +29,7 @@#define CONFIG_AT91_LEGACY /* ARM asynchronous clock */ -#define AT91_MAIN_CLOCK 18429952/* from 18.432 MHz crystal */ +#define CONFIG_SYS_AT91_MAIN_CLOCK 18429952/* from 18.432 MHz crystal */ #define CONFIG_SYS_HZ 1000#define CONFIG_AT91SAM9260 1/* It's an Atmel AT91SAM9260 SoC*/
include/configs/at91cap9adk.h +1 -1
@@ -30,7 +30,7 @@#define CONFIG_AT91_LEGACY /* ARM asynchronous clock */ -#define AT91_MAIN_CLOCK 12000000/* 12 MHz crystal */ +#define CONFIG_SYS_AT91_MAIN_CLOCK 12000000/* 12 MHz crystal */ #define CONFIG_SYS_HZ 1000#define CONFIG_ARM926EJS 1/* This is an ARM926EJS Core */
include/configs/at91sam9260ek.h +1 -1
@@ -30,7 +30,7 @@#define CONFIG_AT91_LEGACY /* ARM asynchronous clock */ -#define AT91_MAIN_CLOCK 18432000/* 18.432 MHz crystal */ +#define CONFIG_SYS_AT91_MAIN_CLOCK 18432000/* 18.432 MHz crystal */ #define CONFIG_SYS_HZ 1000#define CONFIG_ARM926EJS 1/* This is an ARM926EJS Core */
include/configs/at91sam9261ek.h +1 -1
@@ -30,7 +30,7 @@#define CONFIG_AT91_LEGACY /* ARM asynchronous clock */ -#define AT91_MAIN_CLOCK 18432000/* 18.432 MHz crystal */ +#define CONFIG_SYS_AT91_MAIN_CLOCK 18432000/* 18.432 MHz crystal */ #define CONFIG_SYS_HZ 1000#define CONFIG_ARM926EJS 1/* This is an ARM926EJS Core */
include/configs/at91sam9263ek.h +1 -1
@@ -28,7 +28,7 @@#define __CONFIG_H/* ARM asynchronous clock */ -#define AT91_MAIN_CLOCK 16367660/* 16.367 MHz crystal */ +#define CONFIG_SYS_AT91_MAIN_CLOCK 16367660/* 16.367 MHz crystal */ #define CONFIG_SYS_HZ 1000#define CONFIG_ARM926EJS 1/* This is an ARM926EJS Core */
include/configs/at91sam9m10g45ek.h +1 -1
@@ -30,7 +30,7 @@#define CONFIG_AT91_LEGACY /* ARM asynchronous clock */ -#define AT91_MAIN_CLOCK 12000000/* from 12 MHz crystal */ +#define CONFIG_SYS_AT91_MAIN_CLOCK 12000000/* from 12 MHz crystal */ #define CONFIG_SYS_HZ 1000#define CONFIG_ARM926EJS 1/* This is an ARM926EJS Core */
include/configs/at91sam9rlek.h +1 -1
@@ -30,7 +30,7 @@#define CONFIG_AT91_LEGACY /* ARM asynchronous clock */ -#define AT91_MAIN_CLOCK 12000000/* 12 MHz crystal */ +#define CONFIG_SYS_AT91_MAIN_CLOCK 12000000/* 12 MHz crystal */ #define CONFIG_SYS_HZ 1000#define CONFIG_ARM926EJS 1/* This is an ARM926EJS Core */
include/configs/cpu9260.h +1 -1
@@ -35,7 +35,7 @@#define CONFIG_DISPLAY_CPUINFO 1 -#define AT91_MAIN_CLOCK 18432000 +#define CONFIG_SYS_AT91_MAIN_CLOCK 18432000#define CONFIG_SYS_HZ 1000#define CONFIG_ARM926EJS 1
include/configs/pm9261.h +2 -2
@@ -31,14 +31,14 @@#define CONFIG_AT91_LEGACY /* ARM asynchronous clock */ -#define AT91_CPU_NAME "AT91SAM9261" +#define CONFIG_SYS_AT91_CPU_NAME "AT91SAM9261"#define CONFIG_DISPLAY_BOARDINFO #define MASTER_PLL_DIV 15#define MASTER_PLL_MUL 162#define MAIN_PLL_DIV 2 -#define AT91_MAIN_CLOCK 18432000 +#define CONFIG_SYS_AT91_MAIN_CLOCK 18432000#define CONFIG_SYS_HZ 1000
include/configs/pm9263.h +1 -1
@@ -37,7 +37,7 @@#define MASTER_PLL_DIV 6#define MASTER_PLL_MUL 65#define MAIN_PLL_DIV 2/* 2 or 4 */ -#define AT91_MAIN_CLOCK 18432000 +#define CONFIG_SYS_AT91_MAIN_CLOCK 18432000#define CONFIG_SYS_HZ 1000
include/configs/sbc35_a9g20.h +1 -1
@@ -41,7 +41,7 @@#endif /* ARM asynchronous clock */ -#define AT91_MAIN_CLOCK 12000000/* 12.000 MHz crystal */ +#define CONFIG_SYS_AT91_MAIN_CLOCK 12000000/* 12.000 MHz crystal */ #define CONFIG_SYS_HZ 1000#define CONFIG_ARM926EJS 1/* This is an ARM926EJS Core */
include/configs/tny_a9260.h +1 -1
@@ -51,7 +51,7 @@#endif /* ARM asynchronous clock */ -#define AT91_MAIN_CLOCK 12000000/* 12 MHz crystal */ +#define CONFIG_SYS_AT91_MAIN_CLOCK 12000000/* 12 MHz crystal */ #define CONFIG_SYS_HZ 1000#define CONFIG_ARM926EJS 1/* This is an ARM926EJS Core */
Signature · 1 line
1.6.4.4
PATCH 1/1 ARM change name of defines for AT91 arm926ejs
Quoted 3 lines · Achim Ehrlich
AT91_CPU_NAMEtoCONFIG_SYS_AT91_CPU_NAME
AT91_MAIN_CLOCKtoCONFIG_SYS_AT91_MAIN_CLOCK
Please expand the comment to explain why this change is necessary. Tom
PATCH 1/1 ARM change name of defines for AT91 arm926ejs
Configuration defines should be preceeded with CONFIG_SYS_. Renamed some at91 specific defines to conform to this naming convention:
AT91_CPU_NAME to CONFIG_SYS_AT91_CPU_NAMEAT91_MAIN_CLOCK to CONFIG_SYS_AT91_MAIN_CLOCK
--- board/atmel/at91cap9adk/at91cap9adk.c | 2 +- board/atmel/at91sam9261ek/at91sam9261ek.c | 2 +- board/atmel/at91sam9263ek/at91sam9263ek.c | 2 +- board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c | 2 +- board/atmel/at91sam9rlek/at91sam9rlek.c | 2 +- board/esd/otc570/otc570.c | 2 +- board/ronetix/pm9261/pm9261.c | 2 +- board/ronetix/pm9263/pm9263.c | 2 +- cpu/arm926ejs/at91/clock.c | 2 +- cpu/arm926ejs/at91/cpu.c | 8 ++++---- include/asm-arm/arch-at91/at91cap9.h | 2 +- include/asm-arm/arch-at91/at91rm9200.h | 2 +- include/asm-arm/arch-at91/at91sam9260.h | 4 ++-- include/asm-arm/arch-at91/at91sam9261.h | 2 +- include/asm-arm/arch-at91/at91sam9263.h | 2 +- include/asm-arm/arch-at91/at91sam9g45.h | 2 +- include/asm-arm/arch-at91/at91sam9rl.h | 2 +- include/configs/afeb9260.h | 2 +- include/configs/at91cap9adk.h | 2 +- include/configs/at91sam9260ek.h | 2 +- include/configs/at91sam9261ek.h | 2 +- include/configs/at91sam9263ek.h | 2 +- include/configs/at91sam9m10g45ek.h | 2 +- include/configs/at91sam9rlek.h | 2 +- include/configs/cpu9260.h | 2 +- include/configs/pm9261.h | 4 ++-- include/configs/pm9263.h | 2 +- include/configs/sbc35_a9g20.h | 2 +- include/configs/tny_a9260.h | 2 +- 29 files changed, 34 insertions(+), 34 deletions(-)
board/atmel/at91cap9adk/at91cap9adk.c +1 -1
@@ -282,7 +282,7 @@ void lcd_show_board_info(void)lcd_printf ("(C) 2008 ATMEL Corp\n" );lcd_printf ("at91support at atmel.com\n" );lcd_printf ("%s CPU at %s MHz\n" , -AT91_CPU_NAME , +CONFIG_SYS_AT91_CPU_NAME ,strmhz (temp,get_cpu_clk_rate ())); dram_size =0 ;
board/atmel/at91sam9261ek/at91sam9261ek.c +1 -1
@@ -217,7 +217,7 @@ void lcd_show_board_info(void)lcd_printf ("(C) 2008 ATMEL Corp\n" );lcd_printf ("at91support at atmel.com\n" );lcd_printf ("%s CPU at %s MHz\n" , -AT91_CPU_NAME , +CONFIG_SYS_AT91_CPU_NAME ,strmhz (temp,get_cpu_clk_rate ())); dram_size =0 ;
board/atmel/at91sam9263ek/at91sam9263ek.c +1 -1
@@ -218,7 +218,7 @@ void lcd_show_board_info(void)lcd_printf ("(C) 2008 ATMEL Corp\n" );lcd_printf ("at91support at atmel.com\n" );lcd_printf ("%s CPU at %s MHz\n" , -AT91_CPU_NAME , +CONFIG_SYS_AT91_CPU_NAME ,strmhz (temp,get_cpu_clk_rate ())); dram_size =0 ;
board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c +1 -1
@@ -217,7 +217,7 @@ void lcd_show_board_info(void)lcd_printf ("(C) 2008 ATMEL Corp\n" );lcd_printf ("at91support at atmel.com\n" );lcd_printf ("%s CPU at %s MHz\n" , -AT91_CPU_NAME , +CONFIG_SYS_AT91_CPU_NAME ,strmhz (temp,get_cpu_clk_rate ())); dram_size =0 ;
board/atmel/at91sam9rlek/at91sam9rlek.c +1 -1
@@ -157,7 +157,7 @@ void lcd_show_board_info(void)lcd_printf ("(C) 2008 ATMEL Corp\n" );lcd_printf ("at91support at atmel.com\n" );lcd_printf ("%s CPU at %s MHz\n" , -AT91_CPU_NAME , +CONFIG_SYS_AT91_CPU_NAME ,strmhz (temp,get_cpu_clk_rate ())); dram_size =0 ;
board/esd/otc570/otc570.c +1 -1
@@ -219,7 +219,7 @@ void lcd_show_board_info(void) nand_size += nand_info[i].size;lcd_printf ("\n%s\n" ,U_BOOT_VERSION ); -lcd_printf ("%s CPU at %s MHz\n" ,AT91_CPU_NAME , +lcd_printf ("%s CPU at %s MHz\n" ,CONFIG_SYS_AT91_CPU_NAME ,strmhz (temp,get_cpu_clk_rate ())); lcd_printf(" %ld MB SDRAM, %ld MB NAND\n", dram_size >> 20,
board/ronetix/pm9261/pm9261.c +1 -1
@@ -189,7 +189,7 @@ void lcd_show_board_info(void)lcd_printf ("(C) 2009 Ronetix GmbH\n" );lcd_printf ("support at ronetix.at\n" );lcd_printf ("%s CPU at %s MHz" , -AT91_CPU_NAME , +CONFIG_SYS_AT91_CPU_NAME ,strmhz (temp,get_cpu_clk_rate ())); dram_size =0 ;
board/ronetix/pm9263/pm9263.c +1 -1
@@ -304,7 +304,7 @@ void lcd_show_board_info(void)lcd_printf ("(C) 2009 Ronetix GmbH\n" );lcd_printf ("support at ronetix.at\n" );lcd_printf ("%s CPU at %s MHz" , -AT91_CPU_NAME , +CONFIG_SYS_AT91_CPU_NAME ,strmhz (temp,get_cpu_clk_rate ())); dram_size =0 ;
cpu/arm926ejs/at91/clock.c +1 -1
@@ -147,7 +147,7 @@ int at91_clock_init(unsigned long main_clock) {unsigned freq, mckr;at91_pmc_t *pmc = (at91_pmc_t *)AT91_PMC_BASE ; -#ifndef AT91_MAIN_CLOCK +#ifndef CONFIG_SYS_AT91_MAIN_CLOCK unsigned tmp;/* * When the bootloader initialized the main oscillator correctly,
cpu/arm926ejs/at91/cpu.c +4 -4
@@ -31,13 +31,13 @@#include <asm/arch/clk.h> #include <asm/arch/io.h> -#ifndef AT91_MAIN_CLOCK -#define AT91_MAIN_CLOCK 0 +#ifndef CONFIG_SYS_AT91_MAIN_CLOCK +#define CONFIG_SYS_AT91_MAIN_CLOCK 0#endif int arch_cpu_init (void ) { -return at91_clock_init (AT91_MAIN_CLOCK ); +return at91_clock_init (CONFIG_SYS_AT91_MAIN_CLOCK ); }#if defined(CONFIG_DISPLAY_CPUINFO )
@@ -45,7 +45,7 @@ int print_cpuinfo(void) {char buf[32 ]; -printf ("CPU: %s\n" ,AT91_CPU_NAME ); +printf ("CPU: %s\n" ,CONFIG_SYS_AT91_CPU_NAME );printf ("Crystal frequency: %8s MHz\n" ,strmhz (buf,get_main_clk_rate ())); printf("CPU clock : %8s MHz\n",
include/asm-arm/arch-at91/at91cap9.h +1 -1
@@ -145,6 +145,6 @@/* * Cpu Name */ -#define AT91_CPU_NAME "AT91CAP9" +#define CONFIG_SYS_AT91_CPU_NAME "AT91CAP9"#endif
include/asm-arm/arch-at91/at91rm9200.h +1 -1
@@ -130,6 +130,6 @@#define AT91_PMX_CA_NCS7 0x00002000#define AT91_PMX_CA_D16_31 0xFFFF0000 -#define AT91_CPU_NAME "AT91RM9200" +#define CONFIG_SYS_AT91_CPU_NAME "AT91RM9200"#endif
include/asm-arm/arch-at91/at91sam9260.h +2 -2
@@ -139,9 +139,9 @@* Cpu Name */ #if defined(CONFIG_AT91SAM9260 ) -#define AT91_CPU_NAME "AT91SAM9260" +#define CONFIG_SYS_AT91_CPU_NAME "AT91SAM9260"#elif defined(CONFIG_AT91SAM9G20 ) -#define AT91_CPU_NAME "AT91SAM9G20" +#define CONFIG_SYS_AT91_CPU_NAME "AT91SAM9G20"#endif #endif
include/asm-arm/arch-at91/at91sam9261.h +1 -1
@@ -114,6 +114,6 @@/* * Cpu Name */ -#define AT91_CPU_NAME "AT91SAM9261" +#define CONFIG_SYS_AT91_CPU_NAME "AT91SAM9261"#endif
include/asm-arm/arch-at91/at91sam9263.h +1 -1
@@ -147,6 +147,6 @@/* * Cpu Name */ -#define AT91_CPU_NAME "AT91SAM9263" +#define CONFIG_SYS_AT91_CPU_NAME "AT91SAM9263"#endif
include/asm-arm/arch-at91/at91sam9g45.h +1 -1
@@ -147,6 +147,6 @@/* * Cpu Name */ -#define AT91_CPU_NAME "AT91SAM9G45" +#define CONFIG_SYS_AT91_CPU_NAME "AT91SAM9G45"#endif
include/asm-arm/arch-at91/at91sam9rl.h +1 -1
@@ -125,6 +125,6 @@/* * Cpu Name */ -#define AT91_CPU_NAME "AT91SAM9RL" +#define CONFIG_SYS_AT91_CPU_NAME "AT91SAM9RL"#endif
include/configs/afeb9260.h +1 -1
@@ -29,7 +29,7 @@#define CONFIG_AT91_LEGACY /* ARM asynchronous clock */ -#define AT91_MAIN_CLOCK 18429952/* from 18.432 MHz crystal */ +#define CONFIG_SYS_AT91_MAIN_CLOCK 18429952/* from 18.432 MHz crystal */ #define CONFIG_SYS_HZ 1000#define CONFIG_AT91SAM9260 1/* It's an Atmel AT91SAM9260 SoC*/
include/configs/at91cap9adk.h +1 -1
@@ -30,7 +30,7 @@#define CONFIG_AT91_LEGACY /* ARM asynchronous clock */ -#define AT91_MAIN_CLOCK 12000000/* 12 MHz crystal */ +#define CONFIG_SYS_AT91_MAIN_CLOCK 12000000/* 12 MHz crystal */ #define CONFIG_SYS_HZ 1000#define CONFIG_ARM926EJS 1/* This is an ARM926EJS Core */
include/configs/at91sam9260ek.h +1 -1
@@ -30,7 +30,7 @@#define CONFIG_AT91_LEGACY /* ARM asynchronous clock */ -#define AT91_MAIN_CLOCK 18432000/* 18.432 MHz crystal */ +#define CONFIG_SYS_AT91_MAIN_CLOCK 18432000/* 18.432 MHz crystal */ #define CONFIG_SYS_HZ 1000#define CONFIG_ARM926EJS 1/* This is an ARM926EJS Core */
include/configs/at91sam9261ek.h +1 -1
@@ -30,7 +30,7 @@#define CONFIG_AT91_LEGACY /* ARM asynchronous clock */ -#define AT91_MAIN_CLOCK 18432000/* 18.432 MHz crystal */ +#define CONFIG_SYS_AT91_MAIN_CLOCK 18432000/* 18.432 MHz crystal */ #define CONFIG_SYS_HZ 1000#define CONFIG_ARM926EJS 1/* This is an ARM926EJS Core */
include/configs/at91sam9263ek.h +1 -1
@@ -28,7 +28,7 @@#define __CONFIG_H/* ARM asynchronous clock */ -#define AT91_MAIN_CLOCK 16367660/* 16.367 MHz crystal */ +#define CONFIG_SYS_AT91_MAIN_CLOCK 16367660/* 16.367 MHz crystal */ #define CONFIG_SYS_HZ 1000#define CONFIG_ARM926EJS 1/* This is an ARM926EJS Core */
include/configs/at91sam9m10g45ek.h +1 -1
@@ -30,7 +30,7 @@#define CONFIG_AT91_LEGACY /* ARM asynchronous clock */ -#define AT91_MAIN_CLOCK 12000000/* from 12 MHz crystal */ +#define CONFIG_SYS_AT91_MAIN_CLOCK 12000000/* from 12 MHz crystal */ #define CONFIG_SYS_HZ 1000#define CONFIG_ARM926EJS 1/* This is an ARM926EJS Core */
include/configs/at91sam9rlek.h +1 -1
@@ -30,7 +30,7 @@#define CONFIG_AT91_LEGACY /* ARM asynchronous clock */ -#define AT91_MAIN_CLOCK 12000000/* 12 MHz crystal */ +#define CONFIG_SYS_AT91_MAIN_CLOCK 12000000/* 12 MHz crystal */ #define CONFIG_SYS_HZ 1000#define CONFIG_ARM926EJS 1/* This is an ARM926EJS Core */
include/configs/cpu9260.h +1 -1
@@ -35,7 +35,7 @@#define CONFIG_DISPLAY_CPUINFO 1 -#define AT91_MAIN_CLOCK 18432000 +#define CONFIG_SYS_AT91_MAIN_CLOCK 18432000#define CONFIG_SYS_HZ 1000#define CONFIG_ARM926EJS 1
include/configs/pm9261.h +2 -2
@@ -31,14 +31,14 @@#define CONFIG_AT91_LEGACY /* ARM asynchronous clock */ -#define AT91_CPU_NAME "AT91SAM9261" +#define CONFIG_SYS_AT91_CPU_NAME "AT91SAM9261"#define CONFIG_DISPLAY_BOARDINFO #define MASTER_PLL_DIV 15#define MASTER_PLL_MUL 162#define MAIN_PLL_DIV 2 -#define AT91_MAIN_CLOCK 18432000 +#define CONFIG_SYS_AT91_MAIN_CLOCK 18432000#define CONFIG_SYS_HZ 1000
include/configs/pm9263.h +1 -1
@@ -37,7 +37,7 @@#define MASTER_PLL_DIV 6#define MASTER_PLL_MUL 65#define MAIN_PLL_DIV 2/* 2 or 4 */ -#define AT91_MAIN_CLOCK 18432000 +#define CONFIG_SYS_AT91_MAIN_CLOCK 18432000#define CONFIG_SYS_HZ 1000
include/configs/sbc35_a9g20.h +1 -1
@@ -41,7 +41,7 @@#endif /* ARM asynchronous clock */ -#define AT91_MAIN_CLOCK 12000000/* 12.000 MHz crystal */ +#define CONFIG_SYS_AT91_MAIN_CLOCK 12000000/* 12.000 MHz crystal */ #define CONFIG_SYS_HZ 1000#define CONFIG_ARM926EJS 1/* This is an ARM926EJS Core */
include/configs/tny_a9260.h +1 -1
@@ -51,7 +51,7 @@#endif /* ARM asynchronous clock */ -#define AT91_MAIN_CLOCK 12000000/* 12 MHz crystal */ +#define CONFIG_SYS_AT91_MAIN_CLOCK 12000000/* 12 MHz crystal */ #define CONFIG_SYS_HZ 1000#define CONFIG_ARM926EJS 1/* This is an ARM926EJS Core */
Signature · 1 line
1.6.4.4
PATCH 1/1 ARM change name of defines for AT91 arm926ejs
Quoted 7 lines · Achim Ehrlich
Configuration defines should be preceeded with
CONFIG_SYS_. Renamed some at91 specific defines to conform to this naming convention:
AT91_CPU_NAMEtoCONFIG_SYS_AT91_CPU_NAMEAT91_MAIN_CLOCKtoCONFIG_SYS_AT91_MAIN_CLOCKSigned-off-by Achim Ehrlich <[email protected]>
Thank you.
I have pushed this to arm/master
Tom