From c0c316569f70055eb7c70864aaa6d48666782600 Mon Sep 17 00:00:00 2001 From: Matthias Weisser Date: Tue, 12 Jan 2010 12:06:31 +0100 Subject: [PATCH 001/164] video: Fix console display when splashscreen is used If a splashscreen is used the console scrolling used the scroll size as needed when a logo was displayed. This patch sets the scroll size to the whole screen if a splashscreen is shown. Signed-off-by: Matthias Weisser --- drivers/video/cfb_console.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c index c07a26e3c..49f0a2e04 100644 --- a/drivers/video/cfb_console.c +++ b/drivers/video/cfb_console.c @@ -260,7 +260,7 @@ void console_cursor (int state); #define CURSOR_ON #define CURSOR_OFF #define CURSOR_SET video_set_hw_cursor(console_col * VIDEO_FONT_WIDTH, \ - (console_row * VIDEO_FONT_HEIGHT) + VIDEO_LOGO_HEIGHT); + (console_row * VIDEO_FONT_HEIGHT) + video_logo_height); #endif /* CONFIG_VIDEO_HW_CURSOR */ #ifdef CONFIG_VIDEO_LOGO @@ -298,7 +298,7 @@ void console_cursor (int state); #define VIDEO_BURST_LEN (VIDEO_COLS/8) #ifdef CONFIG_VIDEO_LOGO -#define CONSOLE_ROWS ((VIDEO_ROWS - VIDEO_LOGO_HEIGHT) / VIDEO_FONT_HEIGHT) +#define CONSOLE_ROWS ((VIDEO_ROWS - video_logo_height) / VIDEO_FONT_HEIGHT) #else #define CONSOLE_ROWS (VIDEO_ROWS / VIDEO_FONT_HEIGHT) #endif @@ -349,6 +349,8 @@ static GraphicDevice *pGD; /* Pointer to Graphic array */ static void *video_fb_address; /* frame buffer address */ static void *video_console_address; /* console buffer start address */ +static int video_logo_height = VIDEO_LOGO_HEIGHT; + static int console_col = 0; /* cursor col */ static int console_row = 0; /* cursor row */ @@ -527,7 +529,7 @@ static inline void video_drawstring (int xx, int yy, unsigned char *s) static void video_putchar (int xx, int yy, unsigned char c) { - video_drawchars (xx, yy + VIDEO_LOGO_HEIGHT, &c, 1); + video_drawchars (xx, yy + video_logo_height, &c, 1); } /*****************************************************************************/ @@ -620,11 +622,11 @@ static void console_scrollup (void) #ifdef VIDEO_HW_BITBLT video_hw_bitblt (VIDEO_PIXEL_SIZE, /* bytes per pixel */ 0, /* source pos x */ - VIDEO_LOGO_HEIGHT + VIDEO_FONT_HEIGHT, /* source pos y */ + video_logo_height + VIDEO_FONT_HEIGHT, /* source pos y */ 0, /* dest pos x */ - VIDEO_LOGO_HEIGHT, /* dest pos y */ + video_logo_height, /* dest pos y */ VIDEO_VISIBLE_COLS, /* frame width */ - VIDEO_VISIBLE_ROWS - VIDEO_LOGO_HEIGHT - VIDEO_FONT_HEIGHT /* frame height */ + VIDEO_VISIBLE_ROWS - video_logo_height - VIDEO_FONT_HEIGHT /* frame height */ ); #else memcpyl (CONSOLE_ROW_FIRST, CONSOLE_ROW_SECOND, @@ -1101,7 +1103,7 @@ void logo_plot (void *screen, int width, int x, int y) int xcount, i; int skip = (width - VIDEO_LOGO_WIDTH) * VIDEO_PIXEL_SIZE; - int ycount = VIDEO_LOGO_HEIGHT; + int ycount = video_logo_height; unsigned char r, g, b, *logo_red, *logo_blue, *logo_green; unsigned char *source; unsigned char *dest = (unsigned char *)screen + @@ -1225,6 +1227,7 @@ static void *video_logo (void) #endif /* CONFIG_SPLASH_SCREEN_ALIGN */ if (video_display_bitmap (addr, x, y) == 0) { + video_logo_height = 0; return ((void *) (video_fb_address)); } } @@ -1249,7 +1252,7 @@ static void *video_logo (void) #ifdef CONFIG_CONSOLE_EXTRA_INFO { - int i, n = ((VIDEO_LOGO_HEIGHT - VIDEO_FONT_HEIGHT) / VIDEO_FONT_HEIGHT); + int i, n = ((video_logo_height - VIDEO_FONT_HEIGHT) / VIDEO_FONT_HEIGHT); for (i = 1; i < n; i++) { video_get_info_str (i, info); @@ -1278,7 +1281,7 @@ static void *video_logo (void) } #endif - return (video_fb_address + VIDEO_LOGO_HEIGHT * VIDEO_LINE_LEN); + return (video_fb_address + video_logo_height * VIDEO_LINE_LEN); } #endif From fd428c05c863aefb575b12b2a1916b02d5bfa759 Mon Sep 17 00:00:00 2001 From: Detlev Zundel Date: Fri, 12 Mar 2010 10:01:12 +0100 Subject: [PATCH 002/164] mpc5xxx: Remove all references to MGT5100 We do not support a processor that never reached a real customer. Signed-off-by: Detlev Zundel --- MAINTAINERS | 1 - MAKEALL | 2 - Makefile | 24 +- board/bc3450/bc3450.c | 56 --- board/bc3450/mt48lc16m16a2-75.h | 13 - board/canmb/canmb.c | 52 --- board/canmb/mt48lc16m32s2-75.h | 13 - board/esd/cpci5200/mt46v16m16-75.h | 5 - board/esd/mecp5200/mt46v16m16-75.h | 5 - board/esd/pf5200/mt46v16m16-75.h | 5 - board/icecube/icecube.c | 60 +-- board/icecube/mt46v16m16-75.h | 5 - board/icecube/mt46v32m16.h | 5 - board/icecube/mt48lc16m16a2-75.h | 13 - board/jupiter/jupiter.c | 6 - board/mcc200/mt46v16m16-75.h | 5 - board/mcc200/mt48lc16m16a2-75.h | 13 - board/mcc200/mt48lc16m32s2-75.h | 13 - board/munices/mt48lc16m16a2-75.h | 13 - board/pm520/mt46v16m16-75.h | 5 - board/pm520/mt48lc16m16a2-75.h | 13 - board/pm520/pm520.c | 60 --- board/total5200/mt48lc16m16a2-75.h | 13 - board/total5200/mt48lc32m16a2-75.h | 5 - board/total5200/sdram.c | 52 --- board/total5200/sdram.h | 5 - board/total5200/total5200.c | 27 +- board/tqc/tqm5200/mt48lc16m16a2-75.h | 13 - cpu/mpc5xxx/Makefile | 2 +- cpu/mpc5xxx/cpu.c | 7 - cpu/mpc5xxx/cpu_init.c | 35 +- cpu/mpc5xxx/firmware_sc_task.impl.S | 364 ------------------- cpu/mpc5xxx/firmware_sc_task_bestcomm.impl.S | 4 - cpu/mpc5xxx/pci_mpc5200.c | 4 +- cpu/mpc5xxx/serial.c | 17 - cpu/mpc5xxx/start.S | 8 - cpu/mpc5xxx/usb_ohci.c | 7 - cpu/mpc5xxx/usb_ohci.h | 5 - drivers/input/ps2ser.c | 11 - drivers/net/mpc5xxx_fec.c | 10 +- include/configs/BC3450.h | 9 +- include/configs/IceCube.h | 13 +- include/configs/PM520.h | 11 - include/configs/TB5200.h | 5 - include/configs/TQM5200.h | 5 - include/configs/Total5200.h | 23 +- include/configs/aev.h | 5 - include/configs/cpci5200.h | 11 - include/configs/hmi1001.h | 5 - include/configs/inka4x0.h | 5 - include/configs/ipek01.h | 5 - include/configs/manroland/mpc5200-common.h | 5 - include/configs/mecp5200.h | 14 - include/configs/o2dnt.h | 7 - include/configs/pf5200.h | 11 - include/configs/smmaco4.h | 5 - include/configs/spieval.h | 5 - include/configs/v38b.h | 2 - include/mpc5xxx.h | 69 +--- 59 files changed, 22 insertions(+), 1169 deletions(-) delete mode 100644 cpu/mpc5xxx/firmware_sc_task.impl.S diff --git a/MAINTAINERS b/MAINTAINERS index 80057ce1e..0abeb26dc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -80,7 +80,6 @@ Torsten Demke Wolfgang Denk - IceCube_5100 MGT5100 IceCube_5200 MPC5200 ARIA MPC5121e diff --git a/MAKEALL b/MAKEALL index beacb5f51..2eb8bb6b8 100755 --- a/MAKEALL +++ b/MAKEALL @@ -61,7 +61,6 @@ LIST_5xxx=" \ EVAL5200 \ fo300 \ galaxy5200 \ - icecube_5100 \ icecube_5200 \ inka4x0 \ ipek01 \ @@ -76,7 +75,6 @@ LIST_5xxx=" \ pf5200 \ PM520 \ TB5200 \ - Total5100 \ Total5200 \ Total5200_Rev2 \ TQM5200 \ diff --git a/Makefile b/Makefile index d801e2597..5147df7e4 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # -# (C) Copyright 2000-2009 +# (C) Copyright 2000-2010 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. # # See file CREDITS for list of people who contributed to this @@ -548,8 +548,7 @@ icecube_5200_LOWBOOT_config \ icecube_5200_LOWBOOT08_config \ icecube_5200_DDR_config \ icecube_5200_DDR_LOWBOOT_config \ -icecube_5200_DDR_LOWBOOT08_config \ -icecube_5100_config: unconfig +icecube_5200_DDR_LOWBOOT08_config: unconfig @mkdir -p $(obj)include @mkdir -p $(obj)board/icecube @[ -z "$(findstring LOWBOOT_,$@)" ] || \ @@ -568,14 +567,6 @@ icecube_5100_config: unconfig { echo "#define CONFIG_MPC5200_DDR" >>$(obj)include/config.h ; \ $(XECHO) "... DDR memory revision" ; \ } - @[ -z "$(findstring 5200,$@)" ] || \ - { echo "#define CONFIG_MPC5200" >>$(obj)include/config.h ; \ - $(XECHO) "... with MPC5200 processor" ; \ - } - @[ -z "$(findstring 5100,$@)" ] || \ - { echo "#define CONFIG_MGT5100" >>$(obj)include/config.h ; \ - $(XECHO) "... with MGT5100 processor" ; \ - } @$(MKCONFIG) -a IceCube ppc mpc5xxx icecube jupiter_config: unconfig @@ -594,7 +585,6 @@ lite5200b_LOWBOOT_config: unconfig @mkdir -p $(obj)board/icecube @ echo "#define CONFIG_MPC5200_DDR" >>$(obj)include/config.h @ $(XECHO) "... DDR memory revision" - @ echo "#define CONFIG_MPC5200" >>$(obj)include/config.h @ echo "#define CONFIG_LITE5200B" >>$(obj)include/config.h @[ -z "$(findstring _PM_,$@)" ] || \ { echo "#define CONFIG_LITE5200B_PM" >>$(obj)include/config.h ; \ @@ -604,7 +594,6 @@ lite5200b_LOWBOOT_config: unconfig { echo "TEXT_BASE = 0xFF000000" >$(obj)board/icecube/config.tmp ; \ $(XECHO) "... with LOWBOOT configuration" ; \ } - @ $(XECHO) "... with MPC5200B processor" @$(MKCONFIG) -a IceCube ppc mpc5xxx icecube mcc200_config \ @@ -728,21 +717,12 @@ TOP5200_config: unconfig @ echo "#define CONFIG_$(@:_config=) 1" >$(obj)include/config.h @$(MKCONFIG) -n $@ -a TOP5200 ppc mpc5xxx top5200 emk -Total5100_config \ Total5200_config \ Total5200_lowboot_config \ Total5200_Rev2_config \ Total5200_Rev2_lowboot_config: unconfig @mkdir -p $(obj)include @mkdir -p $(obj)board/total5200 - @[ -z "$(findstring 5100,$@)" ] || \ - { echo "#define CONFIG_MGT5100" >>$(obj)include/config.h ; \ - $(XECHO) "... with MGT5100 processor" ; \ - } - @[ -z "$(findstring 5200,$@)" ] || \ - { echo "#define CONFIG_MPC5200" >>$(obj)include/config.h ; \ - $(XECHO) "... with MPC5200 processor" ; \ - } @[ -n "$(findstring Rev,$@)" ] || \ { echo "#define CONFIG_TOTAL5200_REV 1" >>$(obj)include/config.h ; \ $(XECHO) "... revision 1 board" ; \ diff --git a/board/bc3450/bc3450.c b/board/bc3450/bc3450.c index 6fb0096be..3117b5fbf 100644 --- a/board/bc3450/bc3450.c +++ b/board/bc3450/bc3450.c @@ -104,7 +104,6 @@ static void sdram_start (int hi_addr) * is something else than 0x00000000. */ -#if defined(CONFIG_MPC5200) phys_size_t initdram (int board_type) { ulong dramsize = 0; @@ -204,57 +203,6 @@ phys_size_t initdram (int board_type) return dramsize; } -#elif defined(CONFIG_MGT5100) - -phys_size_t initdram (int board_type) -{ - ulong dramsize = 0; -#ifndef CONFIG_SYS_RAMBOOT - ulong test1, test2; - - /* setup and enable SDRAM chip selects */ - *(vu_long *)MPC5XXX_SDRAM_START = 0x00000000; - *(vu_long *)MPC5XXX_SDRAM_STOP = 0x0000ffff; /* 2G */ - *(vu_long *)MPC5XXX_ADDECR |= (1 << 22); /* Enable SDRAM */ - __asm__ volatile ("sync"); - - /* setup config registers */ - *(vu_long *)MPC5XXX_SDRAM_CONFIG1 = SDRAM_CONFIG1; - *(vu_long *)MPC5XXX_SDRAM_CONFIG2 = SDRAM_CONFIG2; - - /* address select register */ - *(vu_long *)MPC5XXX_SDRAM_XLBSEL = SDRAM_ADDRSEL; - __asm__ volatile ("sync"); - - /* find RAM size */ - sdram_start(0); - test1 = get_ram_size((ulong *)CONFIG_SYS_SDRAM_BASE, 0x80000000); - sdram_start(1); - test2 = get_ram_size((ulong *)CONFIG_SYS_SDRAM_BASE, 0x80000000); - if (test1 > test2) { - sdram_start(0); - dramsize = test1; - } else { - dramsize = test2; - } - - /* set SDRAM end address according to size */ - *(vu_long *)MPC5XXX_SDRAM_STOP = ((dramsize - 1) >> 15); - -#else /* CONFIG_SYS_RAMBOOT */ - - /* Retrieve amount of SDRAM available */ - dramsize = ((*(vu_long *)MPC5XXX_SDRAM_STOP + 1) << 15); - -#endif /* CONFIG_SYS_RAMBOOT */ - - return dramsize; -} - -#else -#error Neither CONFIG_MPC5200 or CONFIG_MGT5100 defined -#endif - int checkboard (void) { #if defined (CONFIG_TQM5200) @@ -276,10 +224,6 @@ void flash_preinit(void) * Note that CS_BOOT cannot be cleared when * executing in flash. */ -#if defined(CONFIG_MGT5100) - *(vu_long *)MPC5XXX_ADDECR &= ~(1 << 25); /* disable CS_BOOT */ - *(vu_long *)MPC5XXX_ADDECR |= (1 << 16); /* enable CS0 */ -#endif *(vu_long *)MPC5XXX_BOOTCS_CFG &= ~0x1; /* clear RO */ } diff --git a/board/bc3450/mt48lc16m16a2-75.h b/board/bc3450/mt48lc16m16a2-75.h index 3f1e1691b..48b43213d 100644 --- a/board/bc3450/mt48lc16m16a2-75.h +++ b/board/bc3450/mt48lc16m16a2-75.h @@ -23,7 +23,6 @@ #define SDRAM_DDR 0 /* is SDR */ -#if defined(CONFIG_MPC5200) /* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x00CD0000 /* #define SDRAM_MODE 0x008D0000 */ /* CAS latency 2 */ @@ -33,15 +32,3 @@ /*#define SDRAM_CONFIG1 0xD7322800 */ /* SDRAM controller bug workaround */ #define SDRAM_CONFIG2 0x8AD70000 /*#define SDRAM_CONFIG2 0xDDD70000 */ /* SDRAM controller bug workaround */ - -#elif defined(CONFIG_MGT5100) -/* Settings for XLB = 66 MHz */ -#define SDRAM_MODE 0x008D0000 -#define SDRAM_CONTROL 0x504F0000 -#define SDRAM_CONFIG1 0xC2222600 -#define SDRAM_CONFIG2 0x88B70004 -#define SDRAM_ADDRSEL 0x02000000 - -#else -#error Neither CONFIG_MPC5200 or CONFIG_MGT5100 defined -#endif diff --git a/board/canmb/canmb.c b/board/canmb/canmb.c index dce07bf78..6ddc858ea 100644 --- a/board/canmb/canmb.c +++ b/board/canmb/canmb.c @@ -81,7 +81,6 @@ static void sdram_start (int hi_addr) * is something else than 0x00000000. */ -#if defined(CONFIG_MPC5200) phys_size_t initdram (int board_type) { ulong dramsize = 0; @@ -183,57 +182,6 @@ phys_size_t initdram (int board_type) return dramsize + dramsize2; } -#elif defined(CONFIG_MGT5100) - -phys_size_t initdram (int board_type) -{ - ulong dramsize = 0; -#ifndef CONFIG_SYS_RAMBOOT - ulong test1, test2; - - /* setup and enable SDRAM chip selects */ - *(vu_long *)MPC5XXX_SDRAM_START = 0x00000000; - *(vu_long *)MPC5XXX_SDRAM_STOP = 0x0000ffff;/* 2G */ - *(vu_long *)MPC5XXX_ADDECR |= (1 << 22); /* Enable SDRAM */ - __asm__ volatile ("sync"); - - /* setup config registers */ - *(vu_long *)MPC5XXX_SDRAM_CONFIG1 = SDRAM_CONFIG1; - *(vu_long *)MPC5XXX_SDRAM_CONFIG2 = SDRAM_CONFIG2; - - /* address select register */ - *(vu_long *)MPC5XXX_SDRAM_XLBSEL = SDRAM_ADDRSEL; - __asm__ volatile ("sync"); - - /* find RAM size */ - sdram_start(0); - test1 = get_ram_size((ulong *)CONFIG_SYS_SDRAM_BASE, 0x80000000); - sdram_start(1); - test2 = get_ram_size((ulong *)CONFIG_SYS_SDRAM_BASE, 0x80000000); - if (test1 > test2) { - sdram_start(0); - dramsize = test1; - } else { - dramsize = test2; - } - - /* set SDRAM end address according to size */ - *(vu_long *)MPC5XXX_SDRAM_STOP = ((dramsize - 1) >> 15); - -#else /* CONFIG_SYS_RAMBOOT */ - - /* Retrieve amount of SDRAM available */ - dramsize = ((*(vu_long *)MPC5XXX_SDRAM_STOP + 1) << 15); - -#endif /* CONFIG_SYS_RAMBOOT */ - - return dramsize; -} - -#else -#error Neither CONFIG_MPC5200 or CONFIG_MGT5100 defined -#endif - int checkboard (void) { puts ("Board: CANMB\n"); diff --git a/board/canmb/mt48lc16m32s2-75.h b/board/canmb/mt48lc16m32s2-75.h index ffdf0396a..15477259c 100644 --- a/board/canmb/mt48lc16m32s2-75.h +++ b/board/canmb/mt48lc16m32s2-75.h @@ -23,21 +23,8 @@ #define SDRAM_DDR 0 /* is SDR */ -#if defined(CONFIG_MPC5200) /* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x00CD0000 #define SDRAM_CONTROL 0x504F0000 #define SDRAM_CONFIG1 0xD2322800 #define SDRAM_CONFIG2 0x8AD70000 - -#elif defined(CONFIG_MGT5100) -/* Settings for XLB = 66 MHz */ -#define SDRAM_MODE 0x008D0000 -#define SDRAM_CONTROL 0x504F0000 -#define SDRAM_CONFIG1 0xC2222600 -#define SDRAM_CONFIG2 0x88B70004 -#define SDRAM_ADDRSEL 0x02000000 - -#else -#error Neither CONFIG_MPC5200 or CONFIG_MGT5100 defined -#endif diff --git a/board/esd/cpci5200/mt46v16m16-75.h b/board/esd/cpci5200/mt46v16m16-75.h index 22d0a5544..cf63806a5 100644 --- a/board/esd/cpci5200/mt46v16m16-75.h +++ b/board/esd/cpci5200/mt46v16m16-75.h @@ -23,7 +23,6 @@ #define SDRAM_DDR 1 /* is DDR */ -#if defined(CONFIG_MPC5200) /* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x018D0000 #define SDRAM_EMODE 0x40090000 @@ -31,7 +30,3 @@ #define SDRAM_CONFIG1 0x73722930 #define SDRAM_CONFIG2 0x47770000 #define SDRAM_TAPDELAY 0x10000000 - -#else -#error CONFIG_MPC5200 not defined -#endif diff --git a/board/esd/mecp5200/mt46v16m16-75.h b/board/esd/mecp5200/mt46v16m16-75.h index 22d0a5544..cf63806a5 100644 --- a/board/esd/mecp5200/mt46v16m16-75.h +++ b/board/esd/mecp5200/mt46v16m16-75.h @@ -23,7 +23,6 @@ #define SDRAM_DDR 1 /* is DDR */ -#if defined(CONFIG_MPC5200) /* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x018D0000 #define SDRAM_EMODE 0x40090000 @@ -31,7 +30,3 @@ #define SDRAM_CONFIG1 0x73722930 #define SDRAM_CONFIG2 0x47770000 #define SDRAM_TAPDELAY 0x10000000 - -#else -#error CONFIG_MPC5200 not defined -#endif diff --git a/board/esd/pf5200/mt46v16m16-75.h b/board/esd/pf5200/mt46v16m16-75.h index 22d0a5544..cf63806a5 100644 --- a/board/esd/pf5200/mt46v16m16-75.h +++ b/board/esd/pf5200/mt46v16m16-75.h @@ -23,7 +23,6 @@ #define SDRAM_DDR 1 /* is DDR */ -#if defined(CONFIG_MPC5200) /* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x018D0000 #define SDRAM_EMODE 0x40090000 @@ -31,7 +30,3 @@ #define SDRAM_CONFIG1 0x73722930 #define SDRAM_CONFIG2 0x47770000 #define SDRAM_TAPDELAY 0x10000000 - -#else -#error CONFIG_MPC5200 not defined -#endif diff --git a/board/icecube/icecube.c b/board/icecube/icecube.c index 75244610c..47b219555 100644 --- a/board/icecube/icecube.c +++ b/board/icecube/icecube.c @@ -134,7 +134,6 @@ static void sdram_start (int hi_addr) * is something else than 0x00000000. */ -#if defined(CONFIG_MPC5200) phys_size_t initdram (int board_type) { ulong dramsize = 0; @@ -258,65 +257,12 @@ phys_size_t initdram (int board_type) return dramsize + dramsize2; } -#elif defined(CONFIG_MGT5100) - -phys_size_t initdram (int board_type) -{ - ulong dramsize = 0; -#ifndef CONFIG_SYS_RAMBOOT - ulong test1, test2; - - /* setup and enable SDRAM chip selects */ - *(vu_long *)MPC5XXX_SDRAM_START = 0x00000000; - *(vu_long *)MPC5XXX_SDRAM_STOP = 0x0000ffff;/* 2G */ - *(vu_long *)MPC5XXX_ADDECR |= (1 << 22); /* Enable SDRAM */ - __asm__ volatile ("sync"); - - /* setup config registers */ - *(vu_long *)MPC5XXX_SDRAM_CONFIG1 = SDRAM_CONFIG1; - *(vu_long *)MPC5XXX_SDRAM_CONFIG2 = SDRAM_CONFIG2; - - /* address select register */ - *(vu_long *)MPC5XXX_SDRAM_XLBSEL = SDRAM_ADDRSEL; - __asm__ volatile ("sync"); - - /* find RAM size */ - sdram_start(0); - test1 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x80000000); - sdram_start(1); - test2 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x80000000); - if (test1 > test2) { - sdram_start(0); - dramsize = test1; - } else { - dramsize = test2; - } - - /* set SDRAM end address according to size */ - *(vu_long *)MPC5XXX_SDRAM_STOP = ((dramsize - 1) >> 15); - -#else /* CONFIG_SYS_RAMBOOT */ - - /* Retrieve amount of SDRAM available */ - dramsize = ((*(vu_long *)MPC5XXX_SDRAM_STOP + 1) << 15); - -#endif /* CONFIG_SYS_RAMBOOT */ - - return dramsize; -} - -#else -#error Neither CONFIG_MPC5200 or CONFIG_MGT5100 defined -#endif - int checkboard (void) { #if defined (CONFIG_LITE5200B) puts ("Board: Freescale Lite5200B\n"); -#elif defined(CONFIG_MPC5200) +#else puts ("Board: Motorola MPC5200 (IceCube)\n"); -#elif defined(CONFIG_MGT5100) - puts ("Board: Motorola MGT5100 (IceCube)\n"); #endif return 0; } @@ -329,10 +275,6 @@ void flash_preinit(void) * Note that CS_BOOT cannot be cleared when * executing in flash. */ -#if defined(CONFIG_MGT5100) - *(vu_long *)MPC5XXX_ADDECR &= ~(1 << 25); /* disable CS_BOOT */ - *(vu_long *)MPC5XXX_ADDECR |= (1 << 16); /* enable CS0 */ -#endif *(vu_long *)MPC5XXX_BOOTCS_CFG &= ~0x1; /* clear RO */ } diff --git a/board/icecube/mt46v16m16-75.h b/board/icecube/mt46v16m16-75.h index 4c0f9a740..eb857404f 100644 --- a/board/icecube/mt46v16m16-75.h +++ b/board/icecube/mt46v16m16-75.h @@ -23,7 +23,6 @@ #define SDRAM_DDR 1 /* is DDR */ -#if defined(CONFIG_MPC5200) /* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x018D0000 #define SDRAM_EMODE 0x40090000 @@ -31,7 +30,3 @@ #define SDRAM_CONFIG1 0x73722930 #define SDRAM_CONFIG2 0x47770000 #define SDRAM_TAPDELAY 0x10000000 - -#else -#error CONFIG_MPC5200 not defined -#endif diff --git a/board/icecube/mt46v32m16.h b/board/icecube/mt46v32m16.h index de2b48bc6..519bf6d0f 100644 --- a/board/icecube/mt46v32m16.h +++ b/board/icecube/mt46v32m16.h @@ -23,7 +23,6 @@ #define SDRAM_DDR 1 /* is DDR */ -#if defined(CONFIG_MPC5200) /* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x018D0000 #define SDRAM_EMODE 0x40090000 @@ -31,7 +30,3 @@ #define SDRAM_CONFIG1 0x73722930 #define SDRAM_CONFIG2 0x47770000 #define SDRAM_TAPDELAY 0x10000000 - -#else -#error CONFIG_MPC5200 not defined -#endif diff --git a/board/icecube/mt48lc16m16a2-75.h b/board/icecube/mt48lc16m16a2-75.h index ffdf0396a..15477259c 100644 --- a/board/icecube/mt48lc16m16a2-75.h +++ b/board/icecube/mt48lc16m16a2-75.h @@ -23,21 +23,8 @@ #define SDRAM_DDR 0 /* is SDR */ -#if defined(CONFIG_MPC5200) /* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x00CD0000 #define SDRAM_CONTROL 0x504F0000 #define SDRAM_CONFIG1 0xD2322800 #define SDRAM_CONFIG2 0x8AD70000 - -#elif defined(CONFIG_MGT5100) -/* Settings for XLB = 66 MHz */ -#define SDRAM_MODE 0x008D0000 -#define SDRAM_CONTROL 0x504F0000 -#define SDRAM_CONFIG1 0xC2222600 -#define SDRAM_CONFIG2 0x88B70004 -#define SDRAM_ADDRSEL 0x02000000 - -#else -#error Neither CONFIG_MPC5200 or CONFIG_MGT5100 defined -#endif diff --git a/board/jupiter/jupiter.c b/board/jupiter/jupiter.c index 6e752c655..967aabdcf 100644 --- a/board/jupiter/jupiter.c +++ b/board/jupiter/jupiter.c @@ -227,10 +227,6 @@ void flash_preinit(void) * Note that CS_BOOT cannot be cleared when * executing in flash. */ -#if defined(CONFIG_MGT5100) - *(vu_long *)MPC5XXX_ADDECR &= ~(1 << 25); /* disable CS_BOOT */ - *(vu_long *)MPC5XXX_ADDECR |= (1 << 16); /* enable CS0 */ -#endif *(vu_long *)MPC5XXX_BOOTCS_CFG &= ~0x1; /* clear RO */ } @@ -248,10 +244,8 @@ void flash_afterinit(ulong size) *(vu_long *)MPC5XXX_BOOTCS_STOP = *(vu_long *)MPC5XXX_CS0_STOP = STOP_REG(CONFIG_SYS_BOOTCS_START | size, size); } -#if defined(CONFIG_MPC5200) *(vu_long *)MPC5XXX_ADDECR &= ~(1 << 25); /* disable CS_BOOT */ *(vu_long *)MPC5XXX_ADDECR |= (1 << 16); /* enable CS0 */ -#endif } int update_flash_size (int flash_size) diff --git a/board/mcc200/mt46v16m16-75.h b/board/mcc200/mt46v16m16-75.h index f650faaa1..423febe20 100644 --- a/board/mcc200/mt46v16m16-75.h +++ b/board/mcc200/mt46v16m16-75.h @@ -23,7 +23,6 @@ #define SDRAM_DDR 1 /* is DDR */ -#if defined(CONFIG_MPC5200) /* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x018D0000 #define SDRAM_EMODE 0x40090000 @@ -31,7 +30,3 @@ #define SDRAM_CONFIG1 0x73722930 #define SDRAM_CONFIG2 0x47770000 #define SDRAM_TAPDELAY 0x10000000 - -#else -#error CONFIG_MPC5200 not defined -#endif diff --git a/board/mcc200/mt48lc16m16a2-75.h b/board/mcc200/mt48lc16m16a2-75.h index ffdf0396a..15477259c 100644 --- a/board/mcc200/mt48lc16m16a2-75.h +++ b/board/mcc200/mt48lc16m16a2-75.h @@ -23,21 +23,8 @@ #define SDRAM_DDR 0 /* is SDR */ -#if defined(CONFIG_MPC5200) /* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x00CD0000 #define SDRAM_CONTROL 0x504F0000 #define SDRAM_CONFIG1 0xD2322800 #define SDRAM_CONFIG2 0x8AD70000 - -#elif defined(CONFIG_MGT5100) -/* Settings for XLB = 66 MHz */ -#define SDRAM_MODE 0x008D0000 -#define SDRAM_CONTROL 0x504F0000 -#define SDRAM_CONFIG1 0xC2222600 -#define SDRAM_CONFIG2 0x88B70004 -#define SDRAM_ADDRSEL 0x02000000 - -#else -#error Neither CONFIG_MPC5200 or CONFIG_MGT5100 defined -#endif diff --git a/board/mcc200/mt48lc16m32s2-75.h b/board/mcc200/mt48lc16m32s2-75.h index ffdf0396a..15477259c 100644 --- a/board/mcc200/mt48lc16m32s2-75.h +++ b/board/mcc200/mt48lc16m32s2-75.h @@ -23,21 +23,8 @@ #define SDRAM_DDR 0 /* is SDR */ -#if defined(CONFIG_MPC5200) /* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x00CD0000 #define SDRAM_CONTROL 0x504F0000 #define SDRAM_CONFIG1 0xD2322800 #define SDRAM_CONFIG2 0x8AD70000 - -#elif defined(CONFIG_MGT5100) -/* Settings for XLB = 66 MHz */ -#define SDRAM_MODE 0x008D0000 -#define SDRAM_CONTROL 0x504F0000 -#define SDRAM_CONFIG1 0xC2222600 -#define SDRAM_CONFIG2 0x88B70004 -#define SDRAM_ADDRSEL 0x02000000 - -#else -#error Neither CONFIG_MPC5200 or CONFIG_MGT5100 defined -#endif diff --git a/board/munices/mt48lc16m16a2-75.h b/board/munices/mt48lc16m16a2-75.h index ffdf0396a..15477259c 100644 --- a/board/munices/mt48lc16m16a2-75.h +++ b/board/munices/mt48lc16m16a2-75.h @@ -23,21 +23,8 @@ #define SDRAM_DDR 0 /* is SDR */ -#if defined(CONFIG_MPC5200) /* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x00CD0000 #define SDRAM_CONTROL 0x504F0000 #define SDRAM_CONFIG1 0xD2322800 #define SDRAM_CONFIG2 0x8AD70000 - -#elif defined(CONFIG_MGT5100) -/* Settings for XLB = 66 MHz */ -#define SDRAM_MODE 0x008D0000 -#define SDRAM_CONTROL 0x504F0000 -#define SDRAM_CONFIG1 0xC2222600 -#define SDRAM_CONFIG2 0x88B70004 -#define SDRAM_ADDRSEL 0x02000000 - -#else -#error Neither CONFIG_MPC5200 or CONFIG_MGT5100 defined -#endif diff --git a/board/pm520/mt46v16m16-75.h b/board/pm520/mt46v16m16-75.h index f650faaa1..423febe20 100644 --- a/board/pm520/mt46v16m16-75.h +++ b/board/pm520/mt46v16m16-75.h @@ -23,7 +23,6 @@ #define SDRAM_DDR 1 /* is DDR */ -#if defined(CONFIG_MPC5200) /* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x018D0000 #define SDRAM_EMODE 0x40090000 @@ -31,7 +30,3 @@ #define SDRAM_CONFIG1 0x73722930 #define SDRAM_CONFIG2 0x47770000 #define SDRAM_TAPDELAY 0x10000000 - -#else -#error CONFIG_MPC5200 not defined -#endif diff --git a/board/pm520/mt48lc16m16a2-75.h b/board/pm520/mt48lc16m16a2-75.h index ffdf0396a..15477259c 100644 --- a/board/pm520/mt48lc16m16a2-75.h +++ b/board/pm520/mt48lc16m16a2-75.h @@ -23,21 +23,8 @@ #define SDRAM_DDR 0 /* is SDR */ -#if defined(CONFIG_MPC5200) /* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x00CD0000 #define SDRAM_CONTROL 0x504F0000 #define SDRAM_CONFIG1 0xD2322800 #define SDRAM_CONFIG2 0x8AD70000 - -#elif defined(CONFIG_MGT5100) -/* Settings for XLB = 66 MHz */ -#define SDRAM_MODE 0x008D0000 -#define SDRAM_CONTROL 0x504F0000 -#define SDRAM_CONFIG1 0xC2222600 -#define SDRAM_CONFIG2 0x88B70004 -#define SDRAM_ADDRSEL 0x02000000 - -#else -#error Neither CONFIG_MPC5200 or CONFIG_MGT5100 defined -#endif diff --git a/board/pm520/pm520.c b/board/pm520/pm520.c index 9da104173..d6914343f 100644 --- a/board/pm520/pm520.c +++ b/board/pm520/pm520.c @@ -84,7 +84,6 @@ static void sdram_start (int hi_addr) * is something else than 0x00000000. */ -#if defined(CONFIG_MPC5200) phys_size_t initdram (int board_type) { ulong dramsize = 0; @@ -186,64 +185,9 @@ phys_size_t initdram (int board_type) return dramsize + dramsize2; } -#elif defined(CONFIG_MGT5100) - -phys_size_t initdram (int board_type) -{ - ulong dramsize = 0; -#ifndef CONFIG_SYS_RAMBOOT - ulong test1, test2; - - /* setup and enable SDRAM chip selects */ - *(vu_long *)MPC5XXX_SDRAM_START = 0x00000000; - *(vu_long *)MPC5XXX_SDRAM_STOP = 0x0000ffff;/* 2G */ - *(vu_long *)MPC5XXX_ADDECR |= (1 << 22); /* Enable SDRAM */ - __asm__ volatile ("sync"); - - /* setup config registers */ - *(vu_long *)MPC5XXX_SDRAM_CONFIG1 = SDRAM_CONFIG1; - *(vu_long *)MPC5XXX_SDRAM_CONFIG2 = SDRAM_CONFIG2; - - /* address select register */ - *(vu_long *)MPC5XXX_SDRAM_XLBSEL = SDRAM_ADDRSEL; - __asm__ volatile ("sync"); - - /* find RAM size */ - sdram_start(0); - test1 = get_ram_size((ulong *)CONFIG_SYS_SDRAM_BASE, 0x80000000); - sdram_start(1); - test2 = get_ram_size((ulong *)CONFIG_SYS_SDRAM_BASE, 0x80000000); - if (test1 > test2) { - sdram_start(0); - dramsize = test1; - } else { - dramsize = test2; - } - - /* set SDRAM end address according to size */ - *(vu_long *)MPC5XXX_SDRAM_STOP = ((dramsize - 1) >> 15); - -#else /* CONFIG_SYS_RAMBOOT */ - - /* Retrieve amount of SDRAM available */ - dramsize = ((*(vu_long *)MPC5XXX_SDRAM_STOP + 1) << 15); - -#endif /* CONFIG_SYS_RAMBOOT */ - - return dramsize; -} - -#else -#error Neither CONFIG_MPC5200 or CONFIG_MGT5100 defined -#endif - int checkboard (void) { -#if defined(CONFIG_MPC5200) puts ("Board: MicroSys PM520 \n"); -#elif defined(CONFIG_MGT5100) - puts ("Board: MicroSys PM510 \n"); -#endif return 0; } @@ -255,10 +199,6 @@ void flash_preinit(void) * Note that CS_BOOT cannot be cleared when * executing in flash. */ -#if defined(CONFIG_MGT5100) - *(vu_long *)MPC5XXX_ADDECR &= ~(1 << 25); /* disable CS_BOOT */ - *(vu_long *)MPC5XXX_ADDECR |= (1 << 16); /* enable CS0 */ -#endif *(vu_long *)MPC5XXX_BOOTCS_CFG &= ~0x1; /* clear RO */ } diff --git a/board/total5200/mt48lc16m16a2-75.h b/board/total5200/mt48lc16m16a2-75.h index 5b0923e3e..ae237c6ca 100644 --- a/board/total5200/mt48lc16m16a2-75.h +++ b/board/total5200/mt48lc16m16a2-75.h @@ -23,21 +23,8 @@ #define SDRAM_DDR 0 /* is SDR */ -#if defined(CONFIG_MPC5200) /* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x00CD0000 #define SDRAM_CONTROL 0x504F0000 #define SDRAM_CONFIG1 0xD2322800 #define SDRAM_CONFIG2 0x8AD70000 - -#elif defined(CONFIG_MGT5100) -/* Settings for XLB = 66 MHz */ -#define SDRAM_MODE 0x008D0000 -#define SDRAM_CONTROL 0x504F0000 -#define SDRAM_CONFIG1 0xC2222600 -#define SDRAM_CONFIG2 0x88B70004 -#define SDRAM_ADDRSEL 0x02000000 - -#else -#error Neither CONFIG_MPC5200 or CONFIG_MGT5100 defined -#endif diff --git a/board/total5200/mt48lc32m16a2-75.h b/board/total5200/mt48lc32m16a2-75.h index 4b5ac80b3..cb4b43d63 100644 --- a/board/total5200/mt48lc32m16a2-75.h +++ b/board/total5200/mt48lc32m16a2-75.h @@ -28,13 +28,8 @@ #define SDRAM_DDR 0 /* is SDR */ -#if defined(CONFIG_MPC5200) /* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x00CD0000 #define SDRAM_CONTROL 0x514F0000 #define SDRAM_CONFIG1 0xD2322800 #define SDRAM_CONFIG2 0x8AD70000 - -#else -#error CONFIG_MPC5200 is not defined -#endif diff --git a/board/total5200/sdram.c b/board/total5200/sdram.c index dc4c6f18c..d883eb656 100644 --- a/board/total5200/sdram.c +++ b/board/total5200/sdram.c @@ -76,7 +76,6 @@ static void mpc5xxx_sdram_start (sdram_conf_t *sdram_conf, int hi_addr) * is something else than 0x00000000. */ -#if defined(CONFIG_MPC5200) long int mpc5xxx_sdram_init (sdram_conf_t *sdram_conf) { ulong dramsize = 0; @@ -174,54 +173,3 @@ long int mpc5xxx_sdram_init (sdram_conf_t *sdram_conf) return dramsize + dramsize2; } - -#elif defined(CONFIG_MGT5100) - -long int mpc5xxx_sdram_init (sdram_conf_t *sdram_conf) -{ - ulong dramsize = 0; -#ifndef CONFIG_SYS_RAMBOOT - ulong test1, test2; - - /* setup and enable SDRAM chip selects */ - *(vu_long *)MPC5XXX_SDRAM_START = 0x00000000; - *(vu_long *)MPC5XXX_SDRAM_STOP = 0x0000ffff;/* 2G */ - *(vu_long *)MPC5XXX_ADDECR |= (1 << 22); /* Enable SDRAM */ - __asm__ volatile ("sync"); - - /* setup config registers */ - *(vu_long *)MPC5XXX_SDRAM_CONFIG1 = sdram_conf->config1; - *(vu_long *)MPC5XXX_SDRAM_CONFIG2 = sdram_conf->config2; - - /* address select register */ - *(vu_long *)MPC5XXX_SDRAM_XLBSEL = sdram_conf->addrsel; - __asm__ volatile ("sync"); - - /* find RAM size */ - mpc5xxx_sdram_start(sdram_conf, 0); - test1 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x80000000); - mpc5xxx_sdram_start(sdram_conf, 1); - test2 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x80000000); - if (test1 > test2) { - mpc5xxx_sdram_start(sdram_conf, 0); - dramsize = test1; - } else { - dramsize = test2; - } - - /* set SDRAM end address according to size */ - *(vu_long *)MPC5XXX_SDRAM_STOP = ((dramsize - 1) >> 15); - -#else /* CONFIG_SYS_RAMBOOT */ - - /* Retrieve amount of SDRAM available */ - dramsize = ((*(vu_long *)MPC5XXX_SDRAM_STOP + 1) << 15); - -#endif /* CONFIG_SYS_RAMBOOT */ - - return dramsize; -} - -#else -#error Neither CONFIG_MPC5200 or CONFIG_MGT5100 defined -#endif diff --git a/board/total5200/sdram.h b/board/total5200/sdram.h index bc21e1d30..396a19014 100644 --- a/board/total5200/sdram.h +++ b/board/total5200/sdram.h @@ -28,12 +28,7 @@ typedef struct { ulong control; ulong config1; ulong config2; -#if defined(CONFIG_MPC5200) ulong tapdelay; -#endif -#if defined(CONFIG_MGT5100) - ulong addrsel; -#endif } sdram_conf_t; long int mpc5xxx_sdram_init (sdram_conf_t *sdram_conf); diff --git a/board/total5200/total5200.c b/board/total5200/total5200.c index c524d63f9..61b5b807a 100644 --- a/board/total5200/total5200.c +++ b/board/total5200/total5200.c @@ -47,26 +47,17 @@ phys_size_t initdram (int board_type) sdram_conf.control = SDRAM_CONTROL; sdram_conf.config1 = SDRAM_CONFIG1; sdram_conf.config2 = SDRAM_CONFIG2; -#if defined(CONFIG_MPC5200) sdram_conf.tapdelay = 0; -#endif -#if defined(CONFIG_MGT5100) - sdram_conf.addrsel = SDRAM_ADDRSEL; -#endif return mpc5xxx_sdram_init (&sdram_conf); } int checkboard (void) { -#if defined(CONFIG_MPC5200) #if CONFIG_TOTAL5200_REV==2 puts ("Board: Total5200 Rev.2 "); #else puts ("Board: Total5200 "); #endif -#elif defined(CONFIG_MGT5100) - puts ("Board: Total5100 "); -#endif /* * Retrieve FPGA Revision. @@ -85,20 +76,6 @@ int checkboard (void) return 0; } -#if defined(CONFIG_MGT5100) -int board_early_init_r(void) -{ - /* - * Now, when we are in RAM, enable CS0 - * because CS_BOOT cannot be written. - */ - *(vu_long *)MPC5XXX_ADDECR &= ~(1 << 25); /* disable CS_BOOT */ - *(vu_long *)MPC5XXX_ADDECR |= (1 << 16); /* enable CS0 */ - - return 0; -} -#endif - #ifdef CONFIG_PCI static struct pci_controller hose; @@ -266,9 +243,7 @@ static const S1D_REGS init_regs [] = void video_get_info_str (int line_number, char *info) { if (line_number == 1) { -#ifdef CONFIG_MGT5100 - strcpy (info, " Total5100"); -#elif CONFIG_TOTAL5200_REV==1 +#if CONFIG_TOTAL5200_REV==1 strcpy (info, " Total5200"); #elif CONFIG_TOTAL5200_REV==2 strcpy (info, " Total5200 Rev.2"); diff --git a/board/tqc/tqm5200/mt48lc16m16a2-75.h b/board/tqc/tqm5200/mt48lc16m16a2-75.h index 3f1e1691b..48b43213d 100644 --- a/board/tqc/tqm5200/mt48lc16m16a2-75.h +++ b/board/tqc/tqm5200/mt48lc16m16a2-75.h @@ -23,7 +23,6 @@ #define SDRAM_DDR 0 /* is SDR */ -#if defined(CONFIG_MPC5200) /* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x00CD0000 /* #define SDRAM_MODE 0x008D0000 */ /* CAS latency 2 */ @@ -33,15 +32,3 @@ /*#define SDRAM_CONFIG1 0xD7322800 */ /* SDRAM controller bug workaround */ #define SDRAM_CONFIG2 0x8AD70000 /*#define SDRAM_CONFIG2 0xDDD70000 */ /* SDRAM controller bug workaround */ - -#elif defined(CONFIG_MGT5100) -/* Settings for XLB = 66 MHz */ -#define SDRAM_MODE 0x008D0000 -#define SDRAM_CONTROL 0x504F0000 -#define SDRAM_CONFIG1 0xC2222600 -#define SDRAM_CONFIG2 0x88B70004 -#define SDRAM_ADDRSEL 0x02000000 - -#else -#error Neither CONFIG_MPC5200 or CONFIG_MGT5100 defined -#endif diff --git a/cpu/mpc5xxx/Makefile b/cpu/mpc5xxx/Makefile index 06fdbcfb7..0ee061155 100644 --- a/cpu/mpc5xxx/Makefile +++ b/cpu/mpc5xxx/Makefile @@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(CPU).a START = start.o -SOBJS = io.o firmware_sc_task_bestcomm.impl.o firmware_sc_task.impl.o +SOBJS = io.o firmware_sc_task_bestcomm.impl.o COBJS = i2c.o traps.o cpu.o cpu_init.o ide.o interrupts.o \ loadtask.o pci_mpc5200.o serial.o speed.o usb_ohci.o usb.o diff --git a/cpu/mpc5xxx/cpu.c b/cpu/mpc5xxx/cpu.c index edfb8282b..b20234d32 100644 --- a/cpu/mpc5xxx/cpu.c +++ b/cpu/mpc5xxx/cpu.c @@ -50,16 +50,10 @@ int checkcpu (void) { ulong clock = gd->cpu_clk; char buf[32]; -#ifndef CONFIG_MGT5100 uint svr, pvr; -#endif puts ("CPU: "); -#ifdef CONFIG_MGT5100 - puts (CPU_ID_STR); - printf (" (JTAG ID %08lx)", *(vu_long *)MPC5XXX_CDM_JTAGID); -#else svr = get_svr(); pvr = get_pvr(); @@ -77,7 +71,6 @@ int checkcpu (void) printf (" v%d.%d, Core v%d.%d", SVR_MJREV (svr), SVR_MNREV (svr), PVR_MAJ(pvr), PVR_MIN(pvr)); -#endif printf (" at %s MHz\n", strmhz (buf, clock)); return 0; } diff --git a/cpu/mpc5xxx/cpu_init.c b/cpu/mpc5xxx/cpu_init.c index 560c9b311..9daf3755a 100644 --- a/cpu/mpc5xxx/cpu_init.c +++ b/cpu/mpc5xxx/cpu_init.c @@ -53,10 +53,6 @@ void cpu_init_f (void) (struct mpc5xxx_gpt *) MPC5XXX_GPT; #endif /* CONFIG_WATCHDOG */ unsigned long addecr = (1 << 25); /* Boot_CS */ - -#if defined(CONFIG_SYS_RAMBOOT) && defined(CONFIG_MGT5100) - addecr |= (1 << 22); /* SDRAM enable */ -#endif /* Pointer is writable since we allocated a register for it */ gd = (gd_t *) (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_GBL_DATA_OFFSET); @@ -136,7 +132,6 @@ void cpu_init_f (void) out_be32(&lpb->cs5_cfg, CONFIG_SYS_CS5_CFG); #endif -#if defined(CONFIG_MPC5200) addecr |= 1; #if defined(CONFIG_SYS_CS6_START) && defined(CONFIG_SYS_CS6_SIZE) out_be32(&mm->cs6_start, START_REG(CONFIG_SYS_CS6_START)); @@ -164,14 +159,9 @@ void cpu_init_f (void) #if defined(CONFIG_SYS_CS_DEADCYCLE) out_be32(&lpb->cs_deadcycle, CONFIG_SYS_CS_DEADCYCLE); #endif -#endif /* CONFIG_MPC5200 */ /* Enable chip selects */ -#if defined(CONFIG_MGT5100) - out_be32(&mm->addecr, addecr); -#elif defined(CONFIG_MPC5200) out_be32(&mm->ipbi_ws_ctrl, addecr); -#endif out_be32(&lpb->cs_ctrl, (1 << 24)); /* Setup pin multiplexing */ @@ -179,7 +169,6 @@ void cpu_init_f (void) out_be32(&gpio->port_config, CONFIG_SYS_GPS_PORT_CONFIG); #endif -#if defined(CONFIG_MPC5200) /* enable timebase */ setbits_be32(&xlb->config, (1 << 13)); @@ -187,33 +176,29 @@ void cpu_init_f (void) setbits_be32(&xlb->config, (1 << 15)); out_be32(&xlb->snoop_window, CONFIG_SYS_SDRAM_BASE | 0x1d); -# if defined(CONFIG_SYS_IPBCLK_EQUALS_XLBCLK) +#if defined(CONFIG_SYS_IPBCLK_EQUALS_XLBCLK) /* Motorola reports IPB should better run at 133 MHz. */ -# if defined(CONFIG_MGT5100) - setbits_be32(&mm->addecr, 1); -# elif defined(CONFIG_MPC5200) setbits_be32(&mm->ipbi_ws_ctrl, 1); -# endif /* pci_clk_sel = 0x02, ipb_clk_sel = 0x00; */ addecr = in_be32(&cdm->cfg); addecr &= ~0x103; -# if defined(CONFIG_SYS_PCICLK_EQUALS_IPBCLK_DIV2) +# if defined(CONFIG_SYS_PCICLK_EQUALS_IPBCLK_DIV2) /* pci_clk_sel = 0x01 -> IPB_CLK/2 */ addecr |= 0x01; -# else +# else /* pci_clk_sel = 0x02 -> XLB_CLK/4 = IPB_CLK/4 */ addecr |= 0x02; -# endif /* CONFIG_SYS_PCICLK_EQUALS_IPBCLK_DIV2 */ +# endif /* CONFIG_SYS_PCICLK_EQUALS_IPBCLK_DIV2 */ out_be32(&cdm->cfg, addecr); -# endif /* CONFIG_SYS_IPBCLK_EQUALS_XLBCLK */ +#endif /* CONFIG_SYS_IPBCLK_EQUALS_XLBCLK */ /* Configure the XLB Arbiter */ out_be32(&xlb->master_pri_enable, 0xff); out_be32(&xlb->master_priority, 0x11111111); -# if defined(CONFIG_SYS_XLB_PIPELINING) +#if defined(CONFIG_SYS_XLB_PIPELINING) /* Enable piplining */ clrbits_be32(&xlb->config, (1 << 31)); -# endif +#endif #if defined(CONFIG_WATCHDOG) /* Charge the watchdog timer - prescaler = 64k, count = 64k*/ @@ -222,8 +207,6 @@ void cpu_init_f (void) reset_5xxx_watchdog(); #endif /* CONFIG_WATCHDOG */ - -#endif /* CONFIG_MPC5200 */ } /* @@ -235,11 +218,7 @@ int cpu_init_r (void) (struct mpc5xxx_intr *) MPC5XXX_ICTL; /* mask all interrupts */ -#if defined(CONFIG_MGT5100) - out_be32(&intr->per_mask, 0xfffffc00); -#elif defined(CONFIG_MPC5200) out_be32(&intr->per_mask, 0xffffff00); -#endif setbits_be32(&intr->main_mask, 0x0001ffff); clrbits_be32(&intr->ctrl, 0x00000f00); /* route critical ints to normal ints */ diff --git a/cpu/mpc5xxx/firmware_sc_task.impl.S b/cpu/mpc5xxx/firmware_sc_task.impl.S deleted file mode 100644 index b668ee5cf..000000000 --- a/cpu/mpc5xxx/firmware_sc_task.impl.S +++ /dev/null @@ -1,364 +0,0 @@ -/* - * Copyright (C) 2001, Software Center, Motorola China. - * - * This file contains microcode for the FEC controller of the MGT5100 CPU. - */ - -#include - -#if defined(CONFIG_MGT5100) - -/* sas/sccg, gas target */ -.section smartdmaInitData,"aw",@progbits /* Initialized data for task variables */ -.section smartdmaTaskTable,"aw",@progbits /* Task tables */ -.globl taskTable -taskTable: -.globl scEthernetRecv_Entry -scEthernetRecv_Entry: /* Task 0 */ -.long scEthernetRecv_TDT - taskTable /* Task 0 Descriptor Table */ -.long scEthernetRecv_TDT - taskTable + 0x000000a4 -.long scEthernetRecv_VarTab - taskTable /* Task 0 Variable Table */ -.long scEthernetRecv_FDT - taskTable + 0x03 /* Task 0 Function Descriptor Table & Flags */ -.long 0x00000000 -.long 0x00000000 -.long scEthernetRecv_CSave - taskTable /* Task 0 context save space */ -.long 0xf0000000 -.globl scEthernetXmit_Entry -scEthernetXmit_Entry: /* Task 1 */ -.long scEthernetXmit_TDT - taskTable /* Task 1 Descriptor Table */ -.long scEthernetXmit_TDT - taskTable + 0x000000d0 -.long scEthernetXmit_VarTab - taskTable /* Task 1 Variable Table */ -.long scEthernetXmit_FDT - taskTable + 0x03 /* Task 1 Function Descriptor Table & Flags */ -.long 0x00000000 -.long 0x00000000 -.long scEthernetXmit_CSave - taskTable /* Task 1 context save space */ -.long 0xf0000000 - - -.globl scEthernetRecv_TDT -scEthernetRecv_TDT: /* Task 0 Descriptor Table */ -.long 0xc4c50000 /* 0000: LCDEXT: idx0 = var9 + var10; idx0 once var0; idx0 += inc0 */ -.long 0x84c5e000 /* 0004: LCD: idx1 = var9 + var11; ; idx1 += inc0 */ -.long 0x10001f08 /* 0008: DRD1A: var7 = idx1; FN=0 MORE init=0 WS=0 RS=0 */ -.long 0x10000380 /* 000C: DRD1A: var0 = *idx0; FN=0 MORE init=0 WS=0 RS=0 */ -.long 0x00000f88 /* 0010: DRD1A: var3 = *idx1; FN=0 init=0 WS=0 RS=0 */ -.long 0x81980000 /* 0014: LCD: idx0 = var3; idx0 once var0; idx0 += inc0 */ -.long 0x10000780 /* 0018: DRD1A: var1 = *idx0; FN=0 MORE init=0 WS=0 RS=0 */ -.long 0x60000000 /* 001C: DRD2A: EU0=0 EU1=0 EU2=0 EU3=0 EXT init=0 WS=0 RS=0 */ -.long 0x010c504c /* 0020: DRD2B1: var4 = EU1(); EU1(var1,var12) */ -.long 0x82180349 /* 0024: LCD: idx0 = var4; idx0 != var13; idx0 += inc1 */ -.long 0x81c68004 /* 0028: LCD: idx1 = var3 + var13 + 4; idx1 once var0; idx1 += inc0 */ -.long 0x70000000 /* 002C: DRD2A: EU0=0 EU1=0 EU2=0 EU3=0 EXT MORE init=0 WS=0 RS=0 */ -.long 0x018c504e /* 0030: DRD2B1: var6 = EU1(); EU1(var1,var14) */ -.long 0x70000000 /* 0034: DRD2A: EU0=0 EU1=0 EU2=0 EU3=0 EXT MORE init=0 WS=0 RS=0 */ -.long 0x020c504f /* 0038: DRD2B1: var8 = EU1(); EU1(var1,var15) */ -.long 0x00000b88 /* 003C: DRD1A: var2 = *idx1; FN=0 init=0 WS=0 RS=0 */ -.long 0x8000d184 /* 0040: LCDEXT: idx1 = 0xf0003184; ; */ -.long 0xc6990452 /* 0044: LCDEXT: idx2 = var13; idx2 < var17; idx2 += inc2 */ -.long 0x81486010 /* 0048: LCD: idx3 = var2 + var16; ; idx3 += inc2 */ -.long 0x006acf88 /* 004C: DRD1A: *idx3 = *idx1; FN=0 init=3 WS=1 RS=1 */ -.long 0x8000d184 /* 0050: LCDEXT: idx1 = 0xf0003184; ; */ -.long 0x86810492 /* 0054: LCD: idx2 = var13, idx3 = var2; idx2 < var18; idx2 += inc2, idx3 += inc2 */ -.long 0x006acf88 /* 0058: DRD1A: *idx3 = *idx1; FN=0 init=3 WS=1 RS=1 */ -.long 0x8000d184 /* 005C: LCDEXT: idx1 = 0xf0003184; ; */ -.long 0x868184d2 /* 0060: LCD: idx2 = var13, idx3 = var3; idx2 < var19; idx2 += inc2, idx3 += inc2 */ -.long 0x000acf88 /* 0064: DRD1A: *idx3 = *idx1; FN=0 init=0 WS=1 RS=1 */ -.long 0xc318839b /* 0068: LCDEXT: idx1 = var6; idx1 == var14; idx1 += inc3 */ -.long 0x80190000 /* 006C: LCD: idx2 = var0; idx2 once var0; idx2 += inc0 */ -.long 0x04008468 /* 0070: DRD1A: idx1 = var13; FN=0 INT init=0 WS=0 RS=0 */ -.long 0xc4038358 /* 0074: LCDEXT: idx1 = var8, idx2 = var7; idx1 == var13; idx1 += inc3, idx2 += inc0 */ -.long 0x81c50000 /* 0078: LCD: idx3 = var3 + var10; idx3 once var0; idx3 += inc0 */ -.long 0x1000cb18 /* 007C: DRD1A: *idx2 = idx3; FN=0 MORE init=0 WS=0 RS=0 */ -.long 0x00000f18 /* 0080: DRD1A: var3 = idx3; FN=0 init=0 WS=0 RS=0 */ -.long 0xc4188364 /* 0084: LCDEXT: idx1 = var8; idx1 > var13; idx1 += inc4 */ -.long 0x83990000 /* 0088: LCD: idx2 = var7; idx2 once var0; idx2 += inc0 */ -.long 0x10000c00 /* 008C: DRD1A: var3 = var0; FN=0 MORE init=0 WS=0 RS=0 */ -.long 0x0000c800 /* 0090: DRD1A: *idx2 = var0; FN=0 init=0 WS=0 RS=0 */ -.long 0x81988000 /* 0094: LCD: idx1 = var3; idx1 once var0; idx1 += inc0 */ -.long 0x10000788 /* 0098: DRD1A: var1 = *idx1; FN=0 MORE init=0 WS=0 RS=0 */ -.long 0x60000000 /* 009C: DRD2A: EU0=0 EU1=0 EU2=0 EU3=0 EXT init=0 WS=0 RS=0 */ -.long 0x080c504c /* 00A0: DRD2B1: idx0 = EU1(); EU1(var1,var12) */ -.long 0x000001f8 /* 00A4(:0): NOP */ - - -.globl scEthernetXmit_TDT -scEthernetXmit_TDT: /* Task 1 Descriptor Table */ -.long 0x80014800 /* 0000: LCDEXT: idx0 = 0xf0004800; ; */ -.long 0x85c60004 /* 0004: LCD: idx1 = var11 + var12 + 4; idx1 once var0; idx1 += inc0 */ -.long 0x10002308 /* 0008: DRD1A: var8 = idx1; FN=0 MORE init=0 WS=0 RS=0 */ -.long 0x10000f88 /* 000C: DRD1A: var3 = *idx1; FN=0 MORE init=0 WS=0 RS=0 */ -.long 0x00000380 /* 0010: DRD1A: var0 = *idx0; FN=0 init=0 WS=0 RS=0 */ -.long 0x81980000 /* 0014: LCD: idx0 = var3; idx0 once var0; idx0 += inc0 */ -.long 0x10000780 /* 0018: DRD1A: var1 = *idx0; FN=0 MORE init=0 WS=0 RS=0 */ -.long 0x60000000 /* 001C: DRD2A: EU0=0 EU1=0 EU2=0 EU3=0 EXT init=0 WS=0 RS=0 */ -.long 0x024c504d /* 0020: DRD2B1: var9 = EU1(); EU1(var1,var13) */ -.long 0x84980309 /* 0024: LCD: idx0 = var9; idx0 != var12; idx0 += inc1 */ -.long 0xc0004003 /* 0028: LCDEXT: idx1 = 0x00000003; ; */ -.long 0x81c60004 /* 002C: LCD: idx2 = var3 + var12 + 4; idx2 once var0; idx2 += inc0 */ -.long 0x70000000 /* 0030: DRD2A: EU0=0 EU1=0 EU2=0 EU3=0 EXT MORE init=0 WS=0 RS=0 */ -.long 0x010c504e /* 0034: DRD2B1: var4 = EU1(); EU1(var1,var14) */ -.long 0x70000000 /* 0038: DRD2A: EU0=0 EU1=0 EU2=0 EU3=0 EXT MORE init=0 WS=0 RS=0 */ -.long 0x014c504f /* 003C: DRD2B1: var5 = EU1(); EU1(var1,var15) */ -.long 0x70000000 /* 0040: DRD2A: EU0=0 EU1=0 EU2=0 EU3=0 EXT MORE init=0 WS=0 RS=0 */ -.long 0x028c5050 /* 0044: DRD2B1: var10 = EU1(); EU1(var1,var16) */ -.long 0x70000000 /* 0048: DRD2A: EU0=0 EU1=0 EU2=0 EU3=0 EXT MORE init=0 WS=0 RS=0 */ -.long 0x018c5051 /* 004C: DRD2B1: var6 = EU1(); EU1(var1,var17) */ -.long 0x10000b90 /* 0050: DRD1A: var2 = *idx2; FN=0 MORE init=0 WS=0 RS=0 */ -.long 0x60000000 /* 0054: DRD2A: EU0=0 EU1=0 EU2=0 EU3=0 EXT init=0 WS=0 RS=0 */ -.long 0x01cc50a1 /* 0058: DRD2B1: var7 = EU1(); EU1(var2,idx1) */ -.long 0xc2988312 /* 005C: LCDEXT: idx1 = var5; idx1 > var12; idx1 += inc2 */ -.long 0x83490000 /* 0060: LCD: idx2 = var6 + var18; idx2 once var0; idx2 += inc0 */ -.long 0x00001b10 /* 0064: DRD1A: var6 = idx2; FN=0 init=0 WS=0 RS=0 */ -.long 0x8000d1a4 /* 0068: LCDEXT: idx1 = 0xf00031a4; ; */ -.long 0x8301031c /* 006C: LCD: idx2 = var6, idx3 = var2; idx2 > var12; idx2 += inc3, idx3 += inc4 */ -.long 0x008ac798 /* 0070: DRD1A: *idx1 = *idx3; FN=0 init=4 WS=1 RS=1 */ -.long 0x8000d1a4 /* 0074: LCDEXT: idx1 = 0xf00031a4; ; */ -.long 0xc1430000 /* 0078: LCDEXT: idx2 = var2 + var6; idx2 once var0; idx2 += inc0 */ -.long 0x82998312 /* 007C: LCD: idx3 = var5; idx3 > var12; idx3 += inc2 */ -.long 0x088ac790 /* 0080: DRD1A: *idx1 = *idx2; FN=0 TFD init=4 WS=1 RS=1 */ -.long 0x81988000 /* 0084: LCD: idx1 = var3; idx1 once var0; idx1 += inc0 */ -.long 0x60000100 /* 0088: DRD2A: EU0=0 EU1=1 EU2=0 EU3=0 EXT init=0 WS=0 RS=0 */ -.long 0x0c4c5c4d /* 008C: DRD2B1: *idx1 = EU1(); EU1(*idx1,var13) */ -.long 0xc21883ad /* 0090: LCDEXT: idx1 = var4; idx1 == var14; idx1 += inc5 */ -.long 0x80190000 /* 0094: LCD: idx2 = var0; idx2 once var0; idx2 += inc0 */ -.long 0x04008460 /* 0098: DRD1A: idx1 = var12; FN=0 INT init=0 WS=0 RS=0 */ -.long 0xc4052305 /* 009C: LCDEXT: idx1 = var8, idx2 = var10; idx2 == var12; idx1 += inc0, idx2 += inc5 */ -.long 0x81c98000 /* 00A0: LCD: idx3 = var3 + var19; idx3 once var0; idx3 += inc0 */ -.long 0x1000c718 /* 00A4: DRD1A: *idx1 = idx3; FN=0 MORE init=0 WS=0 RS=0 */ -.long 0x00000f18 /* 00A8: DRD1A: var3 = idx3; FN=0 init=0 WS=0 RS=0 */ -.long 0xc4188000 /* 00AC: LCDEXT: idx1 = var8; idx1 once var0; idx1 += inc0 */ -.long 0x85190312 /* 00B0: LCD: idx2 = var10; idx2 > var12; idx2 += inc2 */ -.long 0x10000c00 /* 00B4: DRD1A: var3 = var0; FN=0 MORE init=0 WS=0 RS=0 */ -.long 0x1000c400 /* 00B8: DRD1A: *idx1 = var0; FN=0 MORE init=0 WS=0 RS=0 */ -.long 0x00008860 /* 00BC: DRD1A: idx2 = var12; FN=0 init=0 WS=0 RS=0 */ -.long 0x81988000 /* 00C0: LCD: idx1 = var3; idx1 once var0; idx1 += inc0 */ -.long 0x10000788 /* 00C4: DRD1A: var1 = *idx1; FN=0 MORE init=0 WS=0 RS=0 */ -.long 0x60000000 /* 00C8: DRD2A: EU0=0 EU1=0 EU2=0 EU3=0 EXT init=0 WS=0 RS=0 */ -.long 0x080c504d /* 00CC: DRD2B1: idx0 = EU1(); EU1(var1,var13) */ -.long 0x000001f8 /* 00D0(:0): NOP */ - -.align 8 - -.globl scEthernetRecv_VarTab -scEthernetRecv_VarTab: /* Task 0 Variable Table */ -.long 0x00000000 /* var[0] */ -.long 0x00000000 /* var[1] */ -.long 0x00000000 /* var[2] */ -.long 0x00000000 /* var[3] */ -.long 0x00000000 /* var[4] */ -.long 0x00000000 /* var[5] */ -.long 0x00000000 /* var[6] */ -.long 0x00000000 /* var[7] */ -.long 0x00000000 /* var[8] */ -.long 0xf0004800 /* var[9] */ -.long 0x00000008 /* var[10] */ -.long 0x0000000c /* var[11] */ -.long 0x80000000 /* var[12] */ -.long 0x00000000 /* var[13] */ -.long 0x10000000 /* var[14] */ -.long 0x20000000 /* var[15] */ -.long 0x000005e4 /* var[16] */ -.long 0x0000000e /* var[17] */ -.long 0x000005e0 /* var[18] */ -.long 0x00000004 /* var[19] */ -.long 0x00000000 /* var[20] */ -.long 0x00000000 /* var[21] */ -.long 0x00000000 /* var[22] */ -.long 0x00000000 /* var[23] */ -.long 0x00000000 /* inc[0] */ -.long 0x60000000 /* inc[1] */ -.long 0x20000001 /* inc[2] */ -.long 0x80000000 /* inc[3] */ -.long 0x40000000 /* inc[4] */ -.long 0x00000000 /* inc[5] */ -.long 0x00000000 /* inc[6] */ -.long 0x00000000 /* inc[7] */ - -.align 8 - -.globl scEthernetXmit_VarTab -scEthernetXmit_VarTab: /* Task 1 Variable Table */ -.long 0x00000000 /* var[0] */ -.long 0x00000000 /* var[1] */ -.long 0x00000000 /* var[2] */ -.long 0x00000000 /* var[3] */ -.long 0x00000000 /* var[4] */ -.long 0x00000000 /* var[5] */ -.long 0x00000000 /* var[6] */ -.long 0x00000000 /* var[7] */ -.long 0x00000000 /* var[8] */ -.long 0x00000000 /* var[9] */ -.long 0x00000000 /* var[10] */ -.long 0xf0004800 /* var[11] */ -.long 0x00000000 /* var[12] */ -.long 0x80000000 /* var[13] */ -.long 0x10000000 /* var[14] */ -.long 0x08000000 /* var[15] */ -.long 0x20000000 /* var[16] */ -.long 0x0000ffff /* var[17] */ -.long 0xffffffff /* var[18] */ -.long 0x00000008 /* var[19] */ -.long 0x00000000 /* var[20] */ -.long 0x00000000 /* var[21] */ -.long 0x00000000 /* var[22] */ -.long 0x00000000 /* var[23] */ -.long 0x00000000 /* inc[0] */ -.long 0x60000000 /* inc[1] */ -.long 0x40000000 /* inc[2] */ -.long 0x4000ffff /* inc[3] */ -.long 0xe0000001 /* inc[4] */ -.long 0x80000000 /* inc[5] */ -.long 0x00000000 /* inc[6] */ -.long 0x00000000 /* inc[7] */ - -.align 8 - -.globl scEthernetRecv_FDT -scEthernetRecv_FDT: /* Task 0 Function Descriptor Table */ -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x05800000 /* and(), EU# 1 */ -.long 0x05400000 /* andn(), EU# 1 */ -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 - -.align 8 - -.globl scEthernetXmit_FDT -scEthernetXmit_FDT: /* Task 1 Function Descriptor Table */ -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x05800000 /* and(), EU# 1 */ -.long 0x05400000 /* andn(), EU# 1 */ -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 -.long 0x00000000 - - -.align 8 -.globl scEthernetRecv_CSave -scEthernetRecv_CSave: /* Task 0 context save space */ -.space 256, 0x0 - - -.align 8 -.globl scEthernetXmit_CSave -scEthernetXmit_CSave: /* Task 1 context save space */ -.space 256, 0x0 - -#endif /* CONFIG_MGT5100 */ diff --git a/cpu/mpc5xxx/firmware_sc_task_bestcomm.impl.S b/cpu/mpc5xxx/firmware_sc_task_bestcomm.impl.S index d140c7e98..00c23121a 100644 --- a/cpu/mpc5xxx/firmware_sc_task_bestcomm.impl.S +++ b/cpu/mpc5xxx/firmware_sc_task_bestcomm.impl.S @@ -6,8 +6,6 @@ #include -#if defined(CONFIG_MPC5200) - /* sas/sccg, gas target */ .section smartdmaInitData,"aw",@progbits /* Initialized data for task variables */ .section smartdmaTaskTable,"aw",@progbits /* Task tables */ @@ -359,5 +357,3 @@ scEthernetRecv_CSave: /* Task 0 context save space */ .globl scEthernetXmit_CSave scEthernetXmit_CSave: /* Task 1 context save space */ .space 128, 0x0 - -#endif /* CONFIG_MPC5200 */ diff --git a/cpu/mpc5xxx/pci_mpc5200.c b/cpu/mpc5xxx/pci_mpc5200.c index 225738a07..8268f8afe 100644 --- a/cpu/mpc5xxx/pci_mpc5200.c +++ b/cpu/mpc5xxx/pci_mpc5200.c @@ -23,7 +23,7 @@ #include -#if defined(CONFIG_PCI) && defined(CONFIG_MPC5200) +#if defined(CONFIG_PCI) #include #include @@ -184,4 +184,4 @@ void pci_mpc5xxx_init (struct pci_controller *hose) hose->last_busno = pci_hose_scan(hose); } -#endif /* CONFIG_PCI && CONFIG_MPC5200 */ +#endif /* CONFIG_PCI */ diff --git a/cpu/mpc5xxx/serial.c b/cpu/mpc5xxx/serial.c index a8a384aa5..66759887c 100644 --- a/cpu/mpc5xxx/serial.c +++ b/cpu/mpc5xxx/serial.c @@ -50,8 +50,6 @@ DECLARE_GLOBAL_DATA_PTR; #define PSC_BASE MPC5XXX_PSC2 #elif CONFIG_PSC_CONSOLE == 3 #define PSC_BASE MPC5XXX_PSC3 -#elif defined(CONFIG_MGT5100) -#error CONFIG_PSC_CONSOLE must be in 1, 2 or 3 #elif CONFIG_PSC_CONSOLE == 4 #define PSC_BASE MPC5XXX_PSC4 #elif CONFIG_PSC_CONSOLE == 5 @@ -73,8 +71,6 @@ DECLARE_GLOBAL_DATA_PTR; #define PSC_BASE2 MPC5XXX_PSC2 #elif CONFIG_PSC_CONSOLE2 == 3 #define PSC_BASE2 MPC5XXX_PSC3 -#elif defined(CONFIG_MGT5100) -#error CONFIG_PSC_CONSOLE2 must be in 1, 2 or 3 #elif CONFIG_PSC_CONSOLE2 == 4 #define PSC_BASE2 MPC5XXX_PSC4 #elif CONFIG_PSC_CONSOLE2 == 5 @@ -104,23 +100,14 @@ int serial_init (void) psc->command = PSC_SEL_MODE_REG_1; /* select clock sources */ -#if defined(CONFIG_MGT5100) - psc->psc_clock_select = 0xdd00; - baseclk = (CONFIG_SYS_MPC5XXX_CLKIN + 16) / 32; -#elif defined(CONFIG_MPC5200) psc->psc_clock_select = 0; baseclk = (gd->ipb_clk + 16) / 32; -#endif /* switch to UART mode */ psc->sicr = 0; /* configure parity, bit length and so on */ -#if defined(CONFIG_MGT5100) - psc->mode = PSC_MODE_ERR | PSC_MODE_8_BITS | PSC_MODE_PARNONE; -#elif defined(CONFIG_MPC5200) psc->mode = PSC_MODE_8_BITS | PSC_MODE_PARNONE; -#endif psc->mode = PSC_MODE_ONE_STOP; /* set up UART divisor */ @@ -246,11 +233,7 @@ void serial_setbrg(void) #endif unsigned long baseclk, div; -#if defined(CONFIG_MGT5100) - baseclk = (CONFIG_SYS_MPC5XXX_CLKIN + 16) / 32; -#elif defined(CONFIG_MPC5200) baseclk = (gd->ipb_clk + 16) / 32; -#endif /* set up UART divisor */ div = (baseclk + (gd->baudrate/2)) / gd->baudrate; diff --git a/cpu/mpc5xxx/start.S b/cpu/mpc5xxx/start.S index d499da503..ba4994421 100644 --- a/cpu/mpc5xxx/start.S +++ b/cpu/mpc5xxx/start.S @@ -111,9 +111,6 @@ boot_warm: # if defined(CONFIG_SYS_RAMBOOT) # error CONFIG_SYS_LOWBOOT is incompatible with CONFIG_SYS_RAMBOOT # endif /* CONFIG_SYS_RAMBOOT */ -# if defined(CONFIG_MGT5100) -# error CONFIG_SYS_LOWBOOT is incompatible with MGT5100 -# endif /* CONFIG_MGT5100 */ lis r4, CONFIG_SYS_DEFAULT_MBAR@h lis r3, START_REG(CONFIG_SYS_BOOTCS_START)@h ori r3, r3, START_REG(CONFIG_SYS_BOOTCS_START)@l @@ -145,14 +142,9 @@ lowboot_reentry: #if defined(CONFIG_SYS_DEFAULT_MBAR) && !defined(CONFIG_SYS_RAMBOOT) lis r3, CONFIG_SYS_MBAR@h ori r3, r3, CONFIG_SYS_MBAR@l -#if defined(CONFIG_MPC5200) /* MBAR is mirrored into the MBAR SPR */ mtspr MBAR,r3 rlwinm r3, r3, 16, 16, 31 -#endif -#if defined(CONFIG_MGT5100) - rlwinm r3, r3, 17, 15, 31 -#endif lis r4, CONFIG_SYS_DEFAULT_MBAR@h stw r3, 0(r4) #endif /* CONFIG_SYS_DEFAULT_MBAR */ diff --git a/cpu/mpc5xxx/usb_ohci.c b/cpu/mpc5xxx/usb_ohci.c index 66a4af8d8..7976e4df7 100644 --- a/cpu/mpc5xxx/usb_ohci.c +++ b/cpu/mpc5xxx/usb_ohci.c @@ -76,13 +76,8 @@ #define m16_swap(x) swap_16(x) #define m32_swap(x) swap_32(x) -#ifdef CONFIG_MPC5200 #define ohci_cpu_to_le16(x) (x) #define ohci_cpu_to_le32(x) (x) -#else -#define ohci_cpu_to_le16(x) swap_16(x) -#define ohci_cpu_to_le32(x) swap_32(x) -#endif /* global ohci_t */ static ohci_t gohci; @@ -803,9 +798,7 @@ static td_t * dl_reverse_done_list (ohci_t *ohci) } else td_list->ed->hwHeadP &= ohci_cpu_to_le32 (0xfffffff2); } -#ifdef CONFIG_MPC5200 td_list->hwNextTD = 0; -#endif } td_list->next_dl_td = td_rev; diff --git a/cpu/mpc5xxx/usb_ohci.h b/cpu/mpc5xxx/usb_ohci.h index 6eedbdd1d..629b529a6 100644 --- a/cpu/mpc5xxx/usb_ohci.h +++ b/cpu/mpc5xxx/usb_ohci.h @@ -127,13 +127,8 @@ typedef struct td td_t; #define NUM_INTS 32 /* part of the OHCI standard */ struct ohci_hcca { __u32 int_table[NUM_INTS]; /* Interrupt ED table */ -#if defined(CONFIG_MPC5200) __u16 pad1; /* set to 0 on each frame_no change */ __u16 frame_no; /* current frame number */ -#else - __u16 frame_no; /* current frame number */ - __u16 pad1; /* set to 0 on each frame_no change */ -#endif __u32 done_head; /* info returned for an interrupt */ u8 reserved_for_hc[116]; } __attribute__((aligned(256))); diff --git a/drivers/input/ps2ser.c b/drivers/input/ps2ser.c index 1b20a76c4..8d0b6d604 100644 --- a/drivers/input/ps2ser.c +++ b/drivers/input/ps2ser.c @@ -36,8 +36,6 @@ DECLARE_GLOBAL_DATA_PTR; #define PSC_BASE MPC5XXX_PSC2 #elif CONFIG_PS2SERIAL == 3 #define PSC_BASE MPC5XXX_PSC3 -#elif defined(CONFIG_MGT5100) -#error CONFIG_PS2SERIAL must be in 1, 2 or 3 #elif CONFIG_PS2SERIAL == 4 #define PSC_BASE MPC5XXX_PSC4 #elif CONFIG_PS2SERIAL == 5 @@ -87,23 +85,14 @@ int ps2ser_init(void) psc->command = PSC_SEL_MODE_REG_1; /* select clock sources */ -#if defined(CONFIG_MGT5100) - psc->psc_clock_select = 0xdd00; - baseclk = (CONFIG_SYS_MPC5XXX_CLKIN + 16) / 32; -#elif defined(CONFIG_MPC5200) psc->psc_clock_select = 0; baseclk = (gd->ipb_clk + 16) / 32; -#endif /* switch to UART mode */ psc->sicr = 0; /* configure parity, bit length and so on */ -#if defined(CONFIG_MGT5100) - psc->mode = PSC_MODE_ERR | PSC_MODE_8_BITS | PSC_MODE_PARNONE; -#elif defined(CONFIG_MPC5200) psc->mode = PSC_MODE_8_BITS | PSC_MODE_PARNONE; -#endif psc->mode = PSC_MODE_ONE_STOP; /* set up UART divisor */ diff --git a/drivers/net/mpc5xxx_fec.c b/drivers/net/mpc5xxx_fec.c index 1876b7684..c2b1bbdc7 100644 --- a/drivers/net/mpc5xxx_fec.c +++ b/drivers/net/mpc5xxx_fec.c @@ -336,13 +336,11 @@ static int mpc5xxx_fec_init(struct eth_device *dev, bd_t * bis) */ fec->eth->xmit_fsm = 0x03000000; -#if defined(CONFIG_MPC5200) /* - * Turn off COMM bus prefetch in the MGT5200 BestComm. It doesn't + * Turn off COMM bus prefetch in the MPC5200 BestComm. It doesn't * work w/ the current receive task. */ sdma->PtdCntrl |= 0x00000001; -#endif /* * Set priority of different initiators @@ -579,9 +577,7 @@ static int mpc5xxx_fec_init_phy(struct eth_device *dev, bd_t * bis) /********************************************************************/ static void mpc5xxx_fec_halt(struct eth_device *dev) { -#if defined(CONFIG_MPC5200) struct mpc5xxx_sdma *sdma = (struct mpc5xxx_sdma *)MPC5XXX_SDMA; -#endif mpc5xxx_fec_priv *fec = (mpc5xxx_fec_priv *)dev->priv; int counter = 0xffff; @@ -611,13 +607,11 @@ static void mpc5xxx_fec_halt(struct eth_device *dev) SDMA_TASK_DISABLE (FEC_XMIT_TASK_NO); SDMA_TASK_DISABLE (FEC_RECV_TASK_NO); -#if defined(CONFIG_MPC5200) /* - * Turn on COMM bus prefetch in the MGT5200 BestComm after we're + * Turn on COMM bus prefetch in the MPC5200 BestComm after we're * done. It doesn't work w/ the current receive task. */ sdma->PtdCntrl &= ~0x00000001; -#endif /* * Disable the Ethernet Controller diff --git a/include/configs/BC3450.h b/include/configs/BC3450.h index 8c5a74229..44befe9ed 100644 --- a/include/configs/BC3450.h +++ b/include/configs/BC3450.h @@ -471,13 +471,8 @@ /* * Various low-level settings */ -#if defined(CONFIG_MPC5200) -# define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI -# define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -# define CONFIG_SYS_HID0_INIT 0 -# define CONFIG_SYS_HID0_FINAL 0 -#endif +#define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI +#define CONFIG_SYS_HID0_FINAL HID0_ICE #define CONFIG_SYS_BOOTCS_START CONFIG_SYS_FLASH_BASE #define CONFIG_SYS_BOOTCS_SIZE CONFIG_SYS_FLASH_SIZE diff --git a/include/configs/IceCube.h b/include/configs/IceCube.h index 5ef0b7798..5d3a744ff 100644 --- a/include/configs/IceCube.h +++ b/include/configs/IceCube.h @@ -30,6 +30,7 @@ */ #define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */ +#define CONFIG_MPC5200 1 /* (more precisely a MPC5200 CPU) */ #define CONFIG_ICECUBE 1 /* ... on IceCube board */ #define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */ @@ -47,7 +48,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } -#ifdef CONFIG_MPC5200 /* MPC5100 PCI is not supported yet. */ /* * PCI Mapping: * 0x40000000 - 0x4fffffff - PCI Memory @@ -77,10 +77,6 @@ #define CONFIG_SYS_RX_ETH_BUFFER 8 /* use 8 rx buffer on eepro100 */ #define CONFIG_NS8382X 1 -#else -#define CONFIG_MII 1 -#endif - /* Partitions */ #define CONFIG_MAC_PARTITION #define CONFIG_DOS_PARTITION @@ -169,7 +165,6 @@ #define CONFIG_BOOTCOMMAND "run flash_self" -#if defined(CONFIG_MPC5200) /* * IPB Bus clocking configuration. */ @@ -178,7 +173,6 @@ #else #undef CONFIG_SYS_IPBCLK_EQUALS_XLBCLK /* define for 133MHz speed */ #endif -#endif /* CONFIG_MPC5200 */ /* pass open firmware flat tree */ #define CONFIG_OF_LIBFDT 1 @@ -338,13 +332,8 @@ /* * Various low-level settings */ -#if defined(CONFIG_MPC5200) #define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI #define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -#define CONFIG_SYS_HID0_INIT 0 -#define CONFIG_SYS_HID0_FINAL 0 -#endif #if defined(CONFIG_LITE5200B) #define CONFIG_SYS_CS1_START CONFIG_SYS_FLASH_BASE diff --git a/include/configs/PM520.h b/include/configs/PM520.h index f9687d274..22de2075f 100644 --- a/include/configs/PM520.h +++ b/include/configs/PM520.h @@ -50,7 +50,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } -#ifdef CONFIG_MPC5200 /* MPC5100 PCI is not supported yet. */ /* * PCI Mapping: * 0x40000000 - 0x4fffffff - PCI Memory @@ -75,7 +74,6 @@ #define CONFIG_SYS_RX_ETH_BUFFER 8 /* use 8 rx buffer on eepro100 */ #undef CONFIG_NS8382X -#endif /* Partitions */ #define CONFIG_DOS_PARTITION @@ -111,9 +109,7 @@ #define CONFIG_CMD_SNTP #define CONFIG_CMD_USB -#if defined(CONFIG_MPC5200) #define CONFIG_CMD_PCI -#endif /* @@ -147,12 +143,10 @@ #define CONFIG_BOOTCOMMAND "run flash_self" -#if defined(CONFIG_MPC5200) /* * IPB Bus clocking configuration. */ #undef CONFIG_SYS_IPBCLK_EQUALS_XLBCLK /* define for 133MHz speed */ -#endif /* * I2C configuration */ @@ -301,13 +295,8 @@ /* * Various low-level settings */ -#if defined(CONFIG_MPC5200) #define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI #define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -#define CONFIG_SYS_HID0_INIT 0 -#define CONFIG_SYS_HID0_FINAL 0 -#endif #if defined(CONFIG_BOOT_ROM) #define CONFIG_SYS_BOOTCS_START CONFIG_SYS_BOOTROM_BASE diff --git a/include/configs/TB5200.h b/include/configs/TB5200.h index 3438abaea..6da18ebca 100644 --- a/include/configs/TB5200.h +++ b/include/configs/TB5200.h @@ -430,13 +430,8 @@ /* * Various low-level settings */ -#if defined(CONFIG_MPC5200) #define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI #define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -#define CONFIG_SYS_HID0_INIT 0 -#define CONFIG_SYS_HID0_FINAL 0 -#endif #define CONFIG_SYS_BOOTCS_START CONFIG_SYS_FLASH_BASE #define CONFIG_SYS_BOOTCS_SIZE CONFIG_SYS_FLASH_SIZE diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h index 2154c7870..107bff19f 100644 --- a/include/configs/TQM5200.h +++ b/include/configs/TQM5200.h @@ -633,13 +633,8 @@ /* * Various low-level settings */ -#if defined(CONFIG_MPC5200) #define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI #define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -#define CONFIG_SYS_HID0_INIT 0 -#define CONFIG_SYS_HID0_FINAL 0 -#endif #define CONFIG_SYS_BOOTCS_START CONFIG_SYS_FLASH_BASE #define CONFIG_SYS_BOOTCS_SIZE CONFIG_SYS_FLASH_SIZE diff --git a/include/configs/Total5200.h b/include/configs/Total5200.h index 1daa5746e..7510ab10e 100644 --- a/include/configs/Total5200.h +++ b/include/configs/Total5200.h @@ -41,6 +41,7 @@ */ #define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */ +#define CONFIG_MPC5200 1 /* (more precisely a MPC5200 CPU) */ #define CONFIG_TOTAL5200 1 /* ... on Total5200 board */ #define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */ @@ -73,7 +74,6 @@ #define CONFIG_SPLASH_SCREEN -#ifdef CONFIG_MPC5200 /* MGT5100 PCI is not supported yet. */ /* * PCI Mapping: * 0x40000000 - 0x4fffffff - PCI Memory @@ -98,12 +98,6 @@ #define CONFIG_SYS_RX_ETH_BUFFER 8 /* use 8 rx buffer on eepro100 */ #define CONFIG_NS8382X 1 -#else /* MGT5100 */ - -#define CONFIG_MII 1 - -#endif - /* Partitions */ #define CONFIG_MAC_PARTITION #define CONFIG_DOS_PARTITION @@ -127,9 +121,7 @@ */ #include -#if defined(CONFIG_MPC5200) - #define CONFIG_CMD_PCI -#endif +#define CONFIG_CMD_PCI #define CONFIG_CMD_BMP #define CONFIG_CMD_EEPROM @@ -176,12 +168,10 @@ #define CONFIG_BOOTCOMMAND "run flash_self" -#if defined(CONFIG_MPC5200) /* * IPB Bus clocking configuration. */ #undef CONFIG_SYS_IPBCLK_EQUALS_XLBCLK /* define for 133MHz speed */ -#endif /* * I2C configuration @@ -326,17 +316,8 @@ /* * Various low-level settings */ -#if defined(CONFIG_MPC5200) #define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI #define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -#define CONFIG_SYS_HID0_INIT 0 -#define CONFIG_SYS_HID0_FINAL 0 -#endif - -#if defined (CONFIG_MGT5100) -# define CONFIG_BOARD_EARLY_INIT_R /* switch from CS_BOOT to CS0 */ -#endif #if CONFIG_TOTAL5200_REV==1 # define CONFIG_SYS_BOOTCS_START CONFIG_SYS_FLASH_BASE diff --git a/include/configs/aev.h b/include/configs/aev.h index 2b4826d90..98958a623 100644 --- a/include/configs/aev.h +++ b/include/configs/aev.h @@ -362,13 +362,8 @@ /* * Various low-level settings */ -#if defined(CONFIG_MPC5200) #define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI #define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -#define CONFIG_SYS_HID0_INIT 0 -#define CONFIG_SYS_HID0_FINAL 0 -#endif #define CONFIG_SYS_BOOTCS_START CONFIG_SYS_FLASH_BASE #define CONFIG_SYS_BOOTCS_SIZE CONFIG_SYS_FLASH_SIZE diff --git a/include/configs/cpci5200.h b/include/configs/cpci5200.h index 52df16af1..f7290d6eb 100644 --- a/include/configs/cpci5200.h +++ b/include/configs/cpci5200.h @@ -59,7 +59,6 @@ #define CONFIG_BAUDRATE 9600 /* ... at 115200 bps */ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } -#ifdef CONFIG_MPC5200 /* MPC5100 PCI is not supported yet. */ /* * PCI Mapping: * 0x40000000 - 0x4fffffff - PCI Memory @@ -90,8 +89,6 @@ #define CONFIG_NS8382X 1 #endif -#endif - /* Partitions */ #define CONFIG_MAC_PARTITION #define CONFIG_DOS_PARTITION @@ -169,8 +166,6 @@ #define CONFIG_BOOTCOMMAND "run flash_vxworks0" -#if defined(CONFIG_MPC5200) - #define CONFIG_RTC_M48T35A 1 /* ST Electronics M48 timekeeper */ #define CONFIG_SYS_NVRAM_BASE_ADDR 0xfd010000 #define CONFIG_SYS_NVRAM_SIZE 32*1024 @@ -179,7 +174,6 @@ * IPB Bus clocking configuration. */ #undef CONFIG_SYS_IPBCLK_EQUALS_XLBCLK /* define for 133MHz speed */ -#endif /* * I2C configuration */ @@ -303,13 +297,8 @@ /* * Various low-level settings */ -#if defined(CONFIG_MPC5200) #define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI #define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -#define CONFIG_SYS_HID0_INIT 0 -#define CONFIG_SYS_HID0_FINAL 0 -#endif #define CONFIG_SYS_BOOTCS_START CONFIG_SYS_FLASH_BASE #define CONFIG_SYS_BOOTCS_SIZE CONFIG_SYS_FLASH_SIZE diff --git a/include/configs/hmi1001.h b/include/configs/hmi1001.h index a81527ebe..f9cdcbc3c 100644 --- a/include/configs/hmi1001.h +++ b/include/configs/hmi1001.h @@ -261,13 +261,8 @@ /* * Various low-level settings */ -#if defined(CONFIG_MPC5200) #define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI #define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -#define CONFIG_SYS_HID0_INIT 0 -#define CONFIG_SYS_HID0_FINAL 0 -#endif #define CONFIG_SYS_BOOTCS_START CONFIG_SYS_FLASH_BASE #define CONFIG_SYS_BOOTCS_SIZE CONFIG_SYS_FLASH_SIZE diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h index 14f782670..c5b1565e3 100644 --- a/include/configs/inka4x0.h +++ b/include/configs/inka4x0.h @@ -366,13 +366,8 @@ static inline void tws_data_config_output(unsigned output) /* * Various low-level settings */ -#if defined(CONFIG_MPC5200) #define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI #define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -#define CONFIG_SYS_HID0_INIT 0 -#define CONFIG_SYS_HID0_FINAL 0 -#endif #define CONFIG_SYS_BOOTCS_START CONFIG_SYS_FLASH_BASE #define CONFIG_SYS_BOOTCS_SIZE CONFIG_SYS_FLASH_SIZE diff --git a/include/configs/ipek01.h b/include/configs/ipek01.h index d0cb1e1d6..6903b3614 100644 --- a/include/configs/ipek01.h +++ b/include/configs/ipek01.h @@ -324,13 +324,8 @@ /* * Various low-level settings */ -#if defined(CONFIG_MPC5200) #define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI #define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -#define CONFIG_SYS_HID0_INIT 0 -#define CONFIG_SYS_HID0_FINAL 0 -#endif #define CONFIG_SYS_BOOTCS_START CONFIG_SYS_FLASH_BASE #define CONFIG_SYS_BOOTCS_SIZE CONFIG_SYS_FLASH_SIZE diff --git a/include/configs/manroland/mpc5200-common.h b/include/configs/manroland/mpc5200-common.h index b29ef9b65..d25e093ac 100644 --- a/include/configs/manroland/mpc5200-common.h +++ b/include/configs/manroland/mpc5200-common.h @@ -170,13 +170,8 @@ /* * Various low-level settings */ -#if defined(CONFIG_MPC5200) #define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI #define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -#define CONFIG_SYS_HID0_INIT 0 -#define CONFIG_SYS_HID0_FINAL 0 -#endif #define CONFIG_SYS_BOOTCS_START CONFIG_SYS_FLASH_BASE #define CONFIG_SYS_BOOTCS_SIZE CONFIG_SYS_FLASH_SIZE diff --git a/include/configs/mecp5200.h b/include/configs/mecp5200.h index 4a93b5888..73405eabb 100644 --- a/include/configs/mecp5200.h +++ b/include/configs/mecp5200.h @@ -63,9 +63,6 @@ #endif #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } - -#ifdef CONFIG_MPC5200 /* MPC5100 PCI is not supported yet. */ - #define CONFIG_MII #if 0 /* test-only !!! */ #define CONFIG_NET_MULTI 1 @@ -74,10 +71,6 @@ #define CONFIG_NS8382X 1 #endif -#else /* MPC5100 */ - -#endif - /* Partitions */ #define CONFIG_MAC_PARTITION #define CONFIG_DOS_PARTITION @@ -152,12 +145,10 @@ #define CONFIG_BOOTCOMMAND "run flash_vxworks0" -#if defined(CONFIG_MPC5200) /* * IPB Bus clocking configuration. */ #undef CONFIG_SYS_IPBSPEED_133 /* define for 133MHz speed */ -#endif /* * I2C configuration */ @@ -288,13 +279,8 @@ /* * Various low-level settings */ -#if defined(CONFIG_MPC5200) #define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI #define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -#define CONFIG_SYS_HID0_INIT 0 -#define CONFIG_SYS_HID0_FINAL 0 -#endif #define CONFIG_SYS_BOOTCS_START CONFIG_SYS_FLASH_BASE #define CONFIG_SYS_BOOTCS_SIZE CONFIG_SYS_FLASH_SIZE diff --git a/include/configs/o2dnt.h b/include/configs/o2dnt.h index 18e7cc2a9..bdc0f7944 100644 --- a/include/configs/o2dnt.h +++ b/include/configs/o2dnt.h @@ -138,7 +138,6 @@ #define CONFIG_BOOTCOMMAND "run flash_self" -#if defined(CONFIG_MPC5200) /* * IPB Bus clocking configuration. */ @@ -154,7 +153,6 @@ */ #define CONFIG_SYS_PCICLK_EQUALS_IPBCLK_DIV2 /* define for 66MHz speed */ #endif -#endif /* * I2C configuration @@ -276,13 +274,8 @@ /* * Various low-level settings */ -#if defined(CONFIG_MPC5200) #define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI #define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -#define CONFIG_SYS_HID0_INIT 0 -#define CONFIG_SYS_HID0_FINAL 0 -#endif #define CONFIG_SYS_BOOTCS_START CONFIG_SYS_FLASH_BASE #define CONFIG_SYS_BOOTCS_SIZE CONFIG_SYS_FLASH_SIZE diff --git a/include/configs/pf5200.h b/include/configs/pf5200.h index 8ca55d78e..80a0bc609 100644 --- a/include/configs/pf5200.h +++ b/include/configs/pf5200.h @@ -61,7 +61,6 @@ #endif #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } -#ifdef CONFIG_MPC5200 /* MPC5100 PCI is not supported yet. */ /* * PCI Mapping: * 0x40000000 - 0x4fffffff - PCI Memory @@ -87,7 +86,6 @@ #define CONFIG_SYS_RX_ETH_BUFFER 8 /* use 8 rx buffer on eepro100 */ #define CONFIG_NS8382X 1 #endif -#endif /* Partitions */ #define CONFIG_MAC_PARTITION @@ -121,9 +119,7 @@ #define CONFIG_CMD_I2C #define CONFIG_CMD_IDE -#ifdef CONFIG_MPC5200 #define CONFIG_CMD_PCI -#endif #if (TEXT_BASE == 0xFF000000) /* Boot low with 16 MB Flash */ @@ -166,12 +162,10 @@ #define CONFIG_BOOTCOMMAND "run flash_vxworks0" -#if defined(CONFIG_MPC5200) /* * IPB Bus clocking configuration. */ #undef CONFIG_SYS_IPBCLK_EQUALS_XLBCLK /* define for 133MHz speed */ -#endif /* * I2C configuration */ @@ -289,13 +283,8 @@ /* * Various low-level settings */ -#if defined(CONFIG_MPC5200) #define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI #define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -#define CONFIG_SYS_HID0_INIT 0 -#define CONFIG_SYS_HID0_FINAL 0 -#endif #define CONFIG_SYS_BOOTCS_START CONFIG_SYS_FLASH_BASE #define CONFIG_SYS_BOOTCS_SIZE CONFIG_SYS_FLASH_SIZE diff --git a/include/configs/smmaco4.h b/include/configs/smmaco4.h index 5a2ef3aa8..060026bb6 100644 --- a/include/configs/smmaco4.h +++ b/include/configs/smmaco4.h @@ -358,13 +358,8 @@ /* * Various low-level settings */ -#if defined(CONFIG_MPC5200) #define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI #define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -#define CONFIG_SYS_HID0_INIT 0 -#define CONFIG_SYS_HID0_FINAL 0 -#endif #define CONFIG_SYS_BOOTCS_START CONFIG_SYS_FLASH_BASE #define CONFIG_SYS_BOOTCS_SIZE CONFIG_SYS_FLASH_SIZE diff --git a/include/configs/spieval.h b/include/configs/spieval.h index 27dda253f..d377e199d 100644 --- a/include/configs/spieval.h +++ b/include/configs/spieval.h @@ -438,13 +438,8 @@ /* * Various low-level settings */ -#if defined(CONFIG_MPC5200) #define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI #define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -#define CONFIG_SYS_HID0_INIT 0 -#define CONFIG_SYS_HID0_FINAL 0 -#endif #define CONFIG_SYS_BOOTCS_START CONFIG_SYS_FLASH_BASE #define CONFIG_SYS_BOOTCS_SIZE CONFIG_SYS_FLASH_SIZE diff --git a/include/configs/v38b.h b/include/configs/v38b.h index 92bcdb33f..d462ed0f1 100644 --- a/include/configs/v38b.h +++ b/include/configs/v38b.h @@ -170,12 +170,10 @@ #define CONFIG_BOOTCOMMAND "run net_nfs" -#if defined(CONFIG_MPC5200) /* * IPB Bus clocking configuration. */ #undef CONFIG_SYS_IPBCLK_EQUALS_XLBCLK /* define for 133MHz speed */ -#endif /* * I2C configuration diff --git a/include/mpc5xxx.h b/include/mpc5xxx.h index 4dcf90c03..2d343c7b0 100644 --- a/include/mpc5xxx.h +++ b/include/mpc5xxx.h @@ -1,7 +1,7 @@ /* * include/asm-ppc/mpc5xxx.h * - * Prototypes, etc. for the Motorola MGT5xxx/MPC5xxx + * Prototypes, etc. for the Motorola MPC5xxx * embedded cpu chips * * 2003 (c) MontaVista, Software, Inc. @@ -33,24 +33,15 @@ #include /* Processor name */ -#if defined(CONFIG_MPC5200) #define CPU_ID_STR "MPC5200" -#elif defined(CONFIG_MGT5100) -#define CPU_ID_STR "MGT5100" -#endif /* Exception offsets (PowerPC standard) */ #define EXC_OFF_SYS_RESET 0x0100 #define _START_OFFSET EXC_OFF_SYS_RESET /* useful macros for manipulating CSx_START/STOP */ -#if defined(CONFIG_MGT5100) -#define START_REG(start) ((start) >> 15) -#define STOP_REG(start, size) (((start) + (size) - 1) >> 15) -#elif defined(CONFIG_MPC5200) #define START_REG(start) ((start) >> 16) #define STOP_REG(start, size) (((start) + (size) - 1) >> 16) -#endif /* Internal memory map */ @@ -70,21 +61,12 @@ #define MPC5XXX_BOOTCS_STOP (CONFIG_SYS_MBAR + 0x0050) #define MPC5XXX_ADDECR (CONFIG_SYS_MBAR + 0x0054) -#if defined(CONFIG_MGT5100) -#define MPC5XXX_SDRAM_START (CONFIG_SYS_MBAR + 0x0034) -#define MPC5XXX_SDRAM_STOP (CONFIG_SYS_MBAR + 0x0038) -#define MPC5XXX_PCI1_START (CONFIG_SYS_MBAR + 0x003c) -#define MPC5XXX_PCI1_STOP (CONFIG_SYS_MBAR + 0x0040) -#define MPC5XXX_PCI2_START (CONFIG_SYS_MBAR + 0x0044) -#define MPC5XXX_PCI2_STOP (CONFIG_SYS_MBAR + 0x0048) -#elif defined(CONFIG_MPC5200) #define MPC5XXX_CS6_START (CONFIG_SYS_MBAR + 0x0058) #define MPC5XXX_CS6_STOP (CONFIG_SYS_MBAR + 0x005c) #define MPC5XXX_CS7_START (CONFIG_SYS_MBAR + 0x0060) #define MPC5XXX_CS7_STOP (CONFIG_SYS_MBAR + 0x0064) #define MPC5XXX_SDRAM_CS0CFG (CONFIG_SYS_MBAR + 0x0034) #define MPC5XXX_SDRAM_CS1CFG (CONFIG_SYS_MBAR + 0x0038) -#endif #define MPC5XXX_SDRAM (CONFIG_SYS_MBAR + 0x0100) #define MPC5XXX_CDM (CONFIG_SYS_MBAR + 0x0200) @@ -99,18 +81,12 @@ #define MPC5XXX_SDMA (CONFIG_SYS_MBAR + 0x1200) #define MPC5XXX_XLBARB (CONFIG_SYS_MBAR + 0x1f00) -#if defined(CONFIG_MGT5100) -#define MPC5XXX_PSC1 (CONFIG_SYS_MBAR + 0x2000) -#define MPC5XXX_PSC2 (CONFIG_SYS_MBAR + 0x2400) -#define MPC5XXX_PSC3 (CONFIG_SYS_MBAR + 0x2800) -#elif defined(CONFIG_MPC5200) #define MPC5XXX_PSC1 (CONFIG_SYS_MBAR + 0x2000) #define MPC5XXX_PSC2 (CONFIG_SYS_MBAR + 0x2200) #define MPC5XXX_PSC3 (CONFIG_SYS_MBAR + 0x2400) #define MPC5XXX_PSC4 (CONFIG_SYS_MBAR + 0x2600) #define MPC5XXX_PSC5 (CONFIG_SYS_MBAR + 0x2800) #define MPC5XXX_PSC6 (CONFIG_SYS_MBAR + 0x2c00) -#endif #define MPC5XXX_FEC (CONFIG_SYS_MBAR + 0x3000) #define MPC5XXX_ATA (CONFIG_SYS_MBAR + 0x3A00) @@ -118,22 +94,14 @@ #define MPC5XXX_I2C1 (CONFIG_SYS_MBAR + 0x3D00) #define MPC5XXX_I2C2 (CONFIG_SYS_MBAR + 0x3D40) -#if defined(CONFIG_MGT5100) -#define MPC5XXX_SRAM (CONFIG_SYS_MBAR + 0x4000) -#define MPC5XXX_SRAM_SIZE (8*1024) -#elif defined(CONFIG_MPC5200) #define MPC5XXX_SRAM (CONFIG_SYS_MBAR + 0x8000) #define MPC5XXX_SRAM_SIZE (16*1024) -#endif /* SDRAM Controller */ #define MPC5XXX_SDRAM_MODE (MPC5XXX_SDRAM + 0x0000) #define MPC5XXX_SDRAM_CTRL (MPC5XXX_SDRAM + 0x0004) #define MPC5XXX_SDRAM_CONFIG1 (MPC5XXX_SDRAM + 0x0008) #define MPC5XXX_SDRAM_CONFIG2 (MPC5XXX_SDRAM + 0x000c) -#if defined(CONFIG_MGT5100) -#define MPC5XXX_SDRAM_XLBSEL (MPC5XXX_SDRAM + 0x0010) -#endif #define MPC5XXX_SDRAM_SDELAY (MPC5XXX_SDRAM + 0x0090) /* Clock Distribution Module */ @@ -155,19 +123,15 @@ #define MPC5XXX_BOOTCS_CFG MPC5XXX_CS0_CFG #define MPC5XXX_CS_CTRL (MPC5XXX_LPB + 0x0018) #define MPC5XXX_CS_STATUS (MPC5XXX_LPB + 0x001c) -#if defined(CONFIG_MPC5200) #define MPC5XXX_CS6_CFG (MPC5XXX_LPB + 0x0020) #define MPC5XXX_CS7_CFG (MPC5XXX_LPB + 0x0024) #define MPC5XXX_CS_BURST (MPC5XXX_LPB + 0x0028) #define MPC5XXX_CS_DEADCYCLE (MPC5XXX_LPB + 0x002c) -#endif -#if defined(CONFIG_MPC5200) /* XLB Arbiter registers */ #define MPC5XXX_XLBARB_CFG (MPC5XXX_XLBARB + 0x40) #define MPC5XXX_XLBARB_MPRIEN (MPC5XXX_XLBARB + 0x64) #define MPC5XXX_XLBARB_MPRIVAL (MPC5XXX_XLBARB + 0x68) -#endif /* GPIO registers */ #define MPC5XXX_GPS_PORT_CONFIG (MPC5XXX_GPIO + 0x0000) @@ -242,14 +206,6 @@ #define MPC5XXX_PCI_CFG (MPC5XXX_PCI + 0x0c) #define MPC5XXX_PCI_BAR0 (MPC5XXX_PCI + 0x10) #define MPC5XXX_PCI_BAR1 (MPC5XXX_PCI + 0x14) -#if defined(CONFIG_MGT5100) -#define MPC5XXX_PCI_CTRL (MPC5XXX_PCI + 0x68) -#define MPC5XXX_PCI_VALMSKR (MPC5XXX_PCI + 0x6c) -#define MPC5XXX_PCI_VALMSKW (MPC5XXX_PCI + 0x70) -#define MPC5XXX_PCI_SUBW1 (MPC5XXX_PCI + 0x74) -#define MPC5XXX_PCI_SUBW2 (MPC5XXX_PCI + 0x78) -#define MPC5XXX_PCI_WINCOMMAND (MPC5XXX_PCI + 0x7c) -#elif defined(CONFIG_MPC5200) #define MPC5XXX_PCI_GSCR (MPC5XXX_PCI + 0x60) #define MPC5XXX_PCI_TBATR0 (MPC5XXX_PCI + 0x64) #define MPC5XXX_PCI_TBATR1 (MPC5XXX_PCI + 0x68) @@ -262,7 +218,6 @@ #define MPC5XXX_PCI_ISR (MPC5XXX_PCI + 0x88) #define MPC5XXX_PCI_ARB (MPC5XXX_PCI + 0x8c) #define MPC5XXX_PCI_CAR (MPC5XXX_PCI + 0xf8) -#endif /* Interrupt Controller registers */ #define MPC5XXX_ICTL_PER_MASK (MPC5XXX_ICTL + 0x0000) @@ -495,31 +450,16 @@ struct mpc5xxx_mmap_ctl { volatile u32 cs4_stop; volatile u32 cs5_start; /* 0x002c */ volatile u32 cs5_stop; -#if defined(CONFIG_MGT5100) - volatile u32 sdram_start; /* 0x0034 */ - volatile u32 sdram_stop; /* 0x0038 */ - volatile u32 pci1_start; /* 0x003c */ - volatile u32 pci1_stop; /* 0x0040 */ - volatile u32 pci2_start; /* 0x0044 */ - volatile u32 pci2_stop; /* 0x0048 */ -#elif defined(CONFIG_MPC5200) volatile u32 sdram0; /* 0x0034 */ volatile u32 sdram1; /* 0x0038 */ volatile u32 dummy1[4]; /* 0x003c */ -#endif volatile u32 boot_start; /* 0x004c */ volatile u32 boot_stop; -#if defined(CONFIG_MGT5100) - volatile u32 addecr; /* 0x0054 */ -#elif defined(CONFIG_MPC5200) volatile u32 ipbi_ws_ctrl; /* 0x0054 */ -#endif -#if defined(CONFIG_MPC5200) volatile u32 cs6_start; /* 0x0058 */ volatile u32 cs6_stop; volatile u32 cs7_start; /* 0x0060 */ volatile u32 cs7_stop; -#endif }; /* Clock distribution module */ @@ -546,12 +486,7 @@ struct mpc5xxx_sdram { volatile u32 ctrl; volatile u32 config1; volatile u32 config2; -#if defined(CONFIG_MGT5100) - volatile u32 xlbsel; - volatile u32 dummy[31]; -#else volatile u32 dummy[32]; -#endif volatile u32 sdelay; }; @@ -564,12 +499,10 @@ struct mpc5xxx_lpb { volatile u32 cs5_cfg; volatile u32 cs_ctrl; volatile u32 cs_status; -#if defined(CONFIG_MPC5200) volatile u32 cs6_cfg; volatile u32 cs7_cfg; volatile u32 cs_burst; volatile u32 cs_deadcycle; -#endif }; From 352745ad487f72e839986ddbb020e1fe86c1d482 Mon Sep 17 00:00:00 2001 From: Thomas Chou Date: Tue, 16 Mar 2010 12:12:48 -0400 Subject: [PATCH 003/164] nios2: use generic unaligned.h Signed-off-by: Scott McNutt --- include/asm-nios2/unaligned.h | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 include/asm-nios2/unaligned.h diff --git a/include/asm-nios2/unaligned.h b/include/asm-nios2/unaligned.h new file mode 100644 index 000000000..779117c4b --- /dev/null +++ b/include/asm-nios2/unaligned.h @@ -0,0 +1,6 @@ +#ifndef _ASM_NIOS2_UNALIGNED_H +#define _ASM_NIOS2_UNALIGNED_H + +#include + +#endif /* _ASM_NIOS2_UNALIGNED_H */ From a6a04967bc2957d20799f4bb2a6b3dd0353c1cfd Mon Sep 17 00:00:00 2001 From: Renato Andreola Date: Tue, 16 Mar 2010 16:01:29 -0400 Subject: [PATCH 004/164] nios2: Added support to YANU UART Signed-off-by: Scott McNutt --- cpu/nios2/serial.c | 168 ++++++++++++++++++++++++++++++++++++++++++- include/nios2-yanu.h | 115 +++++++++++++++++++++++++++++ 2 files changed, 282 insertions(+), 1 deletion(-) create mode 100644 include/nios2-yanu.h diff --git a/cpu/nios2/serial.c b/cpu/nios2/serial.c index 8bbb803a6..6c835af4b 100644 --- a/cpu/nios2/serial.c +++ b/cpu/nios2/serial.c @@ -2,6 +2,9 @@ * (C) Copyright 2004, Psyent Corporation * Scott McNutt * + * YANU Support: + * Copyright 2010, Renato Andreola + * * See file CREDITS for list of people who contributed to this * project. * @@ -26,6 +29,7 @@ #include #include #include +#include DECLARE_GLOBAL_DATA_PTR; @@ -74,10 +78,172 @@ int serial_getc (void) return (c); } +#elif defined(CONFIG_CONSOLE_YANU) +/*-----------------------------------------------------------------*/ +/* YANU Imagos serial port */ +/*-----------------------------------------------------------------*/ + +static yanu_uart_t *uart = (yanu_uart_t *)CONFIG_SYS_NIOS_CONSOLE; + +#if defined(CONFIG_SYS_NIOS_FIXEDBAUD) + +/* Everything's already setup for fixed-baud PTF assignment*/ + +void serial_setbrg (void) +{ + int n, k; + const unsigned max_uns = 0xFFFFFFFF; + unsigned best_n, best_m, baud; + + /* compute best N and M couple */ + best_n = YANU_MAX_PRESCALER_N; + for (n = YANU_MAX_PRESCALER_N; n >= 0; n--) { + if ((unsigned)CONFIG_SYS_CLK_FREQ / (1 << (n + 4)) >= + (unsigned)CONFIG_BAUDRATE) { + best_n = n; + break; + } + } + for (k = 0;; k++) { + if ((unsigned)CONFIG_BAUDRATE <= (max_uns >> (15+n-k))) + break; + } + best_m = + ((unsigned)CONFIG_BAUDRATE * (1 << (15 + n - k))) / + ((unsigned)CONFIG_SYS_CLK_FREQ >> k); + + baud = best_m + best_n * YANU_BAUDE; + writel(&uart->baud, baud); + + return; +} + +#else + +void serial_setbrg (void) +{ + int n, k; + const unsigned max_uns = 0xFFFFFFFF; + unsigned best_n, best_m, baud; + + /* compute best N and M couple */ + best_n = YANU_MAX_PRESCALER_N; + for (n = YANU_MAX_PRESCALER_N; n >= 0; n--) { + if ((unsigned)CONFIG_SYS_CLK_FREQ / (1 << (n + 4)) >= + gd->baudrate) { + best_n = n; + break; + } + } + for (k = 0;; k++) { + if (gd->baudrate <= (max_uns >> (15+n-k))) + break; + } + best_m = + (gd->baudrate * (1 << (15 + n - k))) / + ((unsigned)CONFIG_SYS_CLK_FREQ >> k); + + baud = best_m + best_n * YANU_BAUDE; + writel(&uart->baud, baud); + + return; +} + + +#endif /* CONFIG_SYS_NIOS_FIXEDBAUD */ + +int serial_init (void) +{ + unsigned action,control; + + /* status register cleanup */ + action = YANU_ACTION_RRRDY | + YANU_ACTION_RTRDY | + YANU_ACTION_ROE | + YANU_ACTION_RBRK | + YANU_ACTION_RFE | + YANU_ACTION_RPE | + YANU_ACTION_RFE | YANU_ACTION_RFIFO_CLEAR | YANU_ACTION_TFIFO_CLEAR; + + writel(&uart->action, action); + + /* control register cleanup */ + /* no interrupts enabled */ + /* one stop bit */ + /* hardware flow control disabled */ + /* 8 bits */ + control = (0x7 << YANU_CONTROL_BITS_POS); + /* enven parity just to be clean */ + control |= YANU_CONTROL_PAREVEN; + /* we set threshold for fifo */ + control |= YANU_CONTROL_RDYDLY * YANU_RXFIFO_DLY; + control |= YANU_CONTROL_TXTHR * YANU_TXFIFO_THR; + + writel(&uart->control, control); + + /* to set baud rate */ + serial_setbrg(); + + return (0); +} + + +/*----------------------------------------------------------------------- + * YANU CONSOLE + *---------------------------------------------------------------------*/ +void serial_putc (char c) +{ + int tx_chars; + unsigned status; + + if (c == '\n') + serial_putc ('\r'); + + while (1) { + status = readl(&uart->status); + tx_chars = (status>>YANU_TFIFO_CHARS_POS) + & ((1<data, (unsigned char)c); +} + +void serial_puts (const char *s) +{ + while (*s != 0) { + serial_putc (*s++); + } +} + + +int serial_tstc(void) +{ + unsigned status ; + + status = readl(&uart->status); + return (((status >> YANU_RFIFO_CHARS_POS) & + ((1 << YANU_RFIFO_CHARS_N) - 1)) > 0); +} + +int serial_getc (void) +{ + while (serial_tstc() == 0) + WATCHDOG_RESET (); + + /* first we pull the char */ + writel(&uart->action, YANU_ACTION_RFIFO_PULL); + + return(readl(&uart->data) & YANU_DATA_CHAR_MASK); +} + +#else /*CONFIG_CONSOLE_YANU*/ + /*------------------------------------------------------------------ * UART the serial port *-----------------------------------------------------------------*/ -#else static nios_uart_t *uart = (nios_uart_t *) CONFIG_SYS_NIOS_CONSOLE; diff --git a/include/nios2-yanu.h b/include/nios2-yanu.h new file mode 100644 index 000000000..1c9a96793 --- /dev/null +++ b/include/nios2-yanu.h @@ -0,0 +1,115 @@ +/* + * (C) Copyright 2006, Imagos S.a.s + * Renato Andreola + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +/************************************************************************* + * Altera NiosII YANU serial interface by Imagos + * please see http://www.opencores.org/project,yanu for + * information/downloads + ************************************************************************/ + +#ifndef __NIOS2_YANU_H__ +#define __NIOS2_YANU_H__ + +#define YANU_MAX_PRESCALER_N ((1 << 4) - 1) /* 15 */ +#define YANU_MAX_PRESCALER_M ((1 << 11) -1) /* 2047 */ +#define YANU_FIFO_SIZE (16) +#define YANU_RXFIFO_SIZE (YANU_FIFO_SIZE) +#define YANU_TXFIFO_SIZE (YANU_FIFO_SIZE) + +#define YANU_RXFIFO_DLY (10*11) +#define YANU_TXFIFO_THR (10) +#define YANU_DATA_CHAR_MASK (0xFF) + +/* data register */ +#define YANU_DATA_OFFSET (0) /* data register offset */ + +#define YANU_CONTROL_OFFSET (4) /* control register offset */ +/* interrupt enable */ +#define YANU_CONTROL_IE_RRDY (1<<0) /* ie on received character ready */ +#define YANU_CONTROL_IE_OE (1<<1) /* ie on rx overrun */ +#define YANU_CONTROL_IE_BRK (1<<2) /* ie on break detect */ +#define YANU_CONTROL_IE_FE (1<<3) /* ie on framing error */ +#define YANU_CONTROL_IE_PE (1<<4) /* ie on parity error */ +#define YANU_CONTROL_IE_TRDY (1<<5) /* ie interrupt on tranmitter ready */ +/* control bits */ +#define YANU_CONTROL_BITS_POS (6) /* bits number pos */ +#define YANU_CONTROL_BITS (1< Date: Thu, 25 Feb 2010 10:12:12 +0100 Subject: [PATCH 005/164] cmd_i2c.c: reduced subaddress length to 3 bytes according to some of the comments the subaddress length is 1 or 2, but we are being prepared for the case it becomes 3. However the code also accepted 4. This repairs this by changing the constand 4 to 3. Signed-off-by: Frans Meulenbroeks --- common/cmd_i2c.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/common/cmd_i2c.c b/common/cmd_i2c.c index 62cbd335e..7531702bf 100644 --- a/common/cmd_i2c.c +++ b/common/cmd_i2c.c @@ -193,7 +193,7 @@ int do_i2c_md ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) for (j = 0; j < 8; j++) { if (argv[2][j] == '.') { alen = argv[2][j+1] - '0'; - if (alen > 4) { + if (alen > 3) { cmd_usage(cmdtp); return 1; } @@ -287,7 +287,7 @@ int do_i2c_mw ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) for (j = 0; j < 8; j++) { if (argv[2][j] == '.') { alen = argv[2][j+1] - '0'; - if (alen > 4) { + if (alen > 3) { cmd_usage(cmdtp); return 1; } @@ -361,7 +361,7 @@ int do_i2c_crc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) for (j = 0; j < 8; j++) { if (argv[2][j] == '.') { alen = argv[2][j+1] - '0'; - if (alen > 4) { + if (alen > 3) { cmd_usage(cmdtp); return 1; } @@ -451,7 +451,7 @@ mod_i2c_mem(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char *argv[]) for (j = 0; j < 8; j++) { if (argv[2][j] == '.') { alen = argv[2][j+1] - '0'; - if (alen > 4) { + if (alen > 3) { cmd_usage(cmdtp); return 1; } @@ -607,7 +607,7 @@ int do_i2c_loop(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) for (j = 0; j < 8; j++) { if (argv[2][j] == '.') { alen = argv[2][j+1] - '0'; - if (alen > 4) { + if (alen > 3) { cmd_usage(cmdtp); return 1; } From f74d9bd2a248efa229f0f3478fe331e2a319588c Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Thu, 25 Feb 2010 10:12:13 +0100 Subject: [PATCH 006/164] cmd_bootm.c: made subcommand array static Signed-off-by: Frans Meulenbroeks --- common/cmd_bootm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 23ab0c4aa..827d542f9 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -462,7 +462,7 @@ static int bootm_start_standalone(ulong iflag, int argc, char *argv[]) /* we overload the cmd field with our state machine info instead of a * function pointer */ -cmd_tbl_t cmd_bootm_sub[] = { +static cmd_tbl_t cmd_bootm_sub[] = { U_BOOT_CMD_MKENT(start, 0, 1, (void *)BOOTM_STATE_START, "", ""), U_BOOT_CMD_MKENT(loados, 0, 1, (void *)BOOTM_STATE_LOADOS, "", ""), #if defined(CONFIG_PPC) || defined(CONFIG_M68K) || defined(CONFIG_SPARC) From bfc3b77ebe68435b46e988e3a440bc4857bc7cf4 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Thu, 25 Feb 2010 10:12:14 +0100 Subject: [PATCH 007/164] cmd_i2c.c: reworked subcommand handling Signed-off-by: Frans Meulenbroeks --- common/cmd_i2c.c | 79 ++++++++++++++++++++++++++++-------------------- 1 file changed, 46 insertions(+), 33 deletions(-) diff --git a/common/cmd_i2c.c b/common/cmd_i2c.c index 7531702bf..11ed511bb 100644 --- a/common/cmd_i2c.c +++ b/common/cmd_i2c.c @@ -1242,46 +1242,59 @@ int do_i2c_bus_speed(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) return ret; } +int do_i2c_mm(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) +{ + return mod_i2c_mem (cmdtp, 1, flag, argc, argv); +} + +int do_i2c_nm(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) +{ + return mod_i2c_mem (cmdtp, 0, flag, argc, argv); +} + +int do_i2c_reset(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) +{ + i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE); + return 0; +} + +static cmd_tbl_t cmd_i2c_sub[] = { +#if defined(CONFIG_I2C_MUX) + U_BOOT_CMD_MKENT(bus, 1, 1, do_i2c_add_bus, "", ""), +#endif /* CONFIG_I2C_MUX */ + U_BOOT_CMD_MKENT(crc32, 3, 1, do_i2c_crc, "", ""), +#if defined(CONFIG_I2C_MULTI_BUS) + U_BOOT_CMD_MKENT(dev, 1, 1, do_i2c_bus_num, "", ""), +#endif /* CONFIG_I2C_MULTI_BUS */ + U_BOOT_CMD_MKENT(loop, 3, 1, do_i2c_loop, "", ""), + U_BOOT_CMD_MKENT(md, 3, 1, do_i2c_md, "", ""), + U_BOOT_CMD_MKENT(mm, 2, 1, do_i2c_mm, "", ""), + U_BOOT_CMD_MKENT(mw, 3, 1, do_i2c_mw, "", ""), + U_BOOT_CMD_MKENT(nm, 2, 1, do_i2c_nm, "", ""), + U_BOOT_CMD_MKENT(probe, 0, 1, do_i2c_probe, "", ""), + U_BOOT_CMD_MKENT(reset, 0, 1, do_i2c_reset, "", ""), +#if defined(CONFIG_CMD_SDRAM) + U_BOOT_CMD_MKENT(sdram, 1, 1, do_sdram, "", ""), +#endif + U_BOOT_CMD_MKENT(speed, 1, 1, do_i2c_bus_speed, "", ""), +}; + int do_i2c(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) { + cmd_tbl_t *c; + /* Strip off leading 'i2c' command argument */ argc--; argv++; -#if defined(CONFIG_I2C_MUX) - if (!strncmp(argv[0], "bu", 2)) - return do_i2c_add_bus(cmdtp, flag, argc, argv); -#endif /* CONFIG_I2C_MUX */ - if (!strncmp(argv[0], "sp", 2)) - return do_i2c_bus_speed(cmdtp, flag, argc, argv); -#if defined(CONFIG_I2C_MULTI_BUS) - if (!strncmp(argv[0], "de", 2)) - return do_i2c_bus_num(cmdtp, flag, argc, argv); -#endif /* CONFIG_I2C_MULTI_BUS */ - if (!strncmp(argv[0], "md", 2)) - return do_i2c_md(cmdtp, flag, argc, argv); - if (!strncmp(argv[0], "mm", 2)) - return mod_i2c_mem (cmdtp, 1, flag, argc, argv); - if (!strncmp(argv[0], "mw", 2)) - return do_i2c_mw(cmdtp, flag, argc, argv); - if (!strncmp(argv[0], "nm", 2)) - return mod_i2c_mem (cmdtp, 0, flag, argc, argv); - if (!strncmp(argv[0], "cr", 2)) - return do_i2c_crc(cmdtp, flag, argc, argv); - if (!strncmp(argv[0], "pr", 2)) - return do_i2c_probe(cmdtp, flag, argc, argv); - if (!strncmp(argv[0], "re", 2)) { - i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE); - return 0; + c = find_cmd_tbl(argv[0], &cmd_i2c_sub[0], ARRAY_SIZE(cmd_i2c_sub)); + + if (c) { + return c->cmd(cmdtp, flag, argc, argv); + } else { + cmd_usage(cmdtp); + return 1; } - if (!strncmp(argv[0], "lo", 2)) - return do_i2c_loop(cmdtp, flag, argc, argv); -#if defined(CONFIG_CMD_SDRAM) - if (!strncmp(argv[0], "sd", 2)) - return do_sdram(cmdtp, flag, argc, argv); -#endif - cmd_usage(cmdtp); - return 0; } /***************************************************/ From fb0070e9101a1f288d7054f7e80b3d808fd7ead2 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Thu, 25 Feb 2010 10:12:15 +0100 Subject: [PATCH 008/164] cmd_i2c.c: sorted commands alphabetically Signed-off-by: Frans Meulenbroeks --- common/cmd_i2c.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/common/cmd_i2c.c b/common/cmd_i2c.c index 11ed511bb..b51d0c91c 100644 --- a/common/cmd_i2c.c +++ b/common/cmd_i2c.c @@ -1302,25 +1302,24 @@ int do_i2c(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD( i2c, 6, 1, do_i2c, "I2C sub-system", - "speed [speed] - show or set I2C bus speed\n" #if defined(CONFIG_I2C_MUX) - "i2c bus [muxtype:muxaddr:muxchannel] - add a new bus reached over muxes\n" + "bus [muxtype:muxaddr:muxchannel] - add a new bus reached over muxes\ni2c " #endif /* CONFIG_I2C_MUX */ + "crc32 chip address[.0, .1, .2] count - compute CRC32 checksum\n" #if defined(CONFIG_I2C_MULTI_BUS) "i2c dev [dev] - show or set current I2C bus\n" #endif /* CONFIG_I2C_MULTI_BUS */ + "i2c loop chip address[.0, .1, .2] [# of objects] - looping read of device\n" "i2c md chip address[.0, .1, .2] [# of objects] - read from I2C device\n" "i2c mm chip address[.0, .1, .2] - write to I2C device (auto-incrementing)\n" "i2c mw chip address[.0, .1, .2] value [count] - write to I2C device (fill)\n" "i2c nm chip address[.0, .1, .2] - write to I2C device (constant address)\n" - "i2c crc32 chip address[.0, .1, .2] count - compute CRC32 checksum\n" "i2c probe - show devices on the I2C bus\n" "i2c reset - re-init the I2C Controller\n" - "i2c loop chip address[.0, .1, .2] [# of objects] - looping read of device" #if defined(CONFIG_CMD_SDRAM) - "\n" - "i2c sdram chip - print SDRAM configuration information" + "i2c sdram chip - print SDRAM configuration information\n" #endif + "i2c speed [speed] - show or set I2C bus speed" ); #if defined(CONFIG_I2C_MUX) From 652e53546b23c25f80756287eaf607b713afdc87 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Thu, 25 Feb 2010 10:12:16 +0100 Subject: [PATCH 009/164] cmd_i2c.c: added i2c read to memory function Signed-off-by: Frans Meulenbroeks --- common/cmd_i2c.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) diff --git a/common/cmd_i2c.c b/common/cmd_i2c.c index b51d0c91c..ee9577cb6 100644 --- a/common/cmd_i2c.c +++ b/common/cmd_i2c.c @@ -154,6 +154,63 @@ int i2c_set_bus_speed(unsigned int) */ #define DISP_LINE_LEN 16 +/* + * Syntax: + * i2c read {i2c_chip} {devaddr}{.0, .1, .2} {len} {memaddr} + */ + +int do_i2c_read ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +{ + u_char chip; + uint devaddr, alen, length; + u_char *memaddr; + int j; + + if (argc != 5) { + cmd_usage(cmdtp); + return 1; + } + + /* + * I2C chip address + */ + chip = simple_strtoul(argv[1], NULL, 16); + + /* + * I2C data address within the chip. This can be 1 or + * 2 bytes long. Some day it might be 3 bytes long :-). + */ + devaddr = simple_strtoul(argv[2], NULL, 16); + alen = 1; + for (j = 0; j < 8; j++) { + if (argv[2][j] == '.') { + alen = argv[2][j+1] - '0'; + if (alen > 3) { + cmd_usage(cmdtp); + return 1; + } + break; + } else if (argv[2][j] == '\0') + break; + } + + /* + * Length is the number of objects, not number of bytes. + */ + length = simple_strtoul(argv[3], NULL, 16); + + /* + * memaddr is the address where to store things in memory + */ + memaddr = (u_char *)simple_strtoul(argv[4], NULL, 16); + + if (i2c_read(chip, devaddr, alen, memaddr, length) != 0) { + puts ("Error reading the chip.\n"); + return 1; + } + return 0; +} + int do_i2c_md ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { u_char chip; @@ -1272,6 +1329,7 @@ static cmd_tbl_t cmd_i2c_sub[] = { U_BOOT_CMD_MKENT(mw, 3, 1, do_i2c_mw, "", ""), U_BOOT_CMD_MKENT(nm, 2, 1, do_i2c_nm, "", ""), U_BOOT_CMD_MKENT(probe, 0, 1, do_i2c_probe, "", ""), + U_BOOT_CMD_MKENT(read, 5, 1, do_i2c_read, "", ""), U_BOOT_CMD_MKENT(reset, 0, 1, do_i2c_reset, "", ""), #if defined(CONFIG_CMD_SDRAM) U_BOOT_CMD_MKENT(sdram, 1, 1, do_sdram, "", ""), @@ -1315,6 +1373,7 @@ U_BOOT_CMD( "i2c mw chip address[.0, .1, .2] value [count] - write to I2C device (fill)\n" "i2c nm chip address[.0, .1, .2] - write to I2C device (constant address)\n" "i2c probe - show devices on the I2C bus\n" + "i2c read chip address[.0, .1, .2] length memaddress - read to memory \n" "i2c reset - re-init the I2C Controller\n" #if defined(CONFIG_CMD_SDRAM) "i2c sdram chip - print SDRAM configuration information\n" @@ -1323,7 +1382,6 @@ U_BOOT_CMD( ); #if defined(CONFIG_I2C_MUX) - int i2c_mux_add_device(I2C_MUX_DEVICE *dev) { I2C_MUX_DEVICE *devtmp = i2c_mux_devices; From 47ab5ad14575531798431f0d1e8f83ee9bb0a87e Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Fri, 26 Feb 2010 14:00:19 +0100 Subject: [PATCH 010/164] cmd_setexpr: allow memory addresses in expressions This patch add functionality to use memory addresses in expressions. This increases the power of expressions substantially It adheres to the standard convemtions: memory addresses can be given in the format *address (e.g. *1000) Rationale for this change is that it allows masking off bits from a byte that is obtained by reading data from e.g. i2c. Signed-off-by: Frans Meulenbroeks Fix warning: control reaches end of non-void function Signed-off-by: Wolfgang Denk --- common/cmd_setexpr.c | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/common/cmd_setexpr.c b/common/cmd_setexpr.c index f8b5d4dcf..2d3719755 100644 --- a/common/cmd_setexpr.c +++ b/common/cmd_setexpr.c @@ -28,10 +28,33 @@ #include #include +static ulong get_arg(char *s, int w) +{ + ulong *p; + + /* + * if the parameter starts with a '*' then assume + * it is a pointer to the value we want + */ + + if (s[0] == '*') { + p = (ulong *)simple_strtoul(&s[1], NULL, 16); + switch (w) { + case 1: return((ulong)(*(uchar *)p)); + case 2: return((ulong)(*(ushort *)p)); + case 4: + default: return(*p); + } + } else { + return simple_strtoul(s, NULL, 16); + } +} + int do_setexpr(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { ulong a, b; char buf[16]; + int w; /* Validate arguments */ if ((argc != 5) || (strlen(argv[3]) != 1)) { @@ -39,8 +62,10 @@ int do_setexpr(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) return 1; } - a = simple_strtoul(argv[2], NULL, 16); - b = simple_strtoul(argv[4], NULL, 16); + w = cmd_get_data_size(argv[0], 4); + + a = get_arg(argv[2], w); + b = get_arg(argv[4], w); switch (argv[3][0]) { case '|': sprintf(buf, "%lx", (a | b)); break; @@ -64,7 +89,8 @@ int do_setexpr(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD( setexpr, 5, 0, do_setexpr, "set environment variable as the result of eval expression", - "name value1 value2\n" + "[.b, .w, .l] name value1 value2\n" " - set environment variable 'name' to the result of the evaluated\n" - " express specified by . can be &, |, ^, +, -, *, /, %" + " express specified by . can be &, |, ^, +, -, *, /, %\n" + " size argument is only meaningful if value1 and/or value2 are memory addresses" ); From e070a56c777f1fd05950e1bc63483c19decd6f78 Mon Sep 17 00:00:00 2001 From: Michael Zaidman Date: Mon, 1 Mar 2010 11:47:36 +0200 Subject: [PATCH 011/164] POST: add progress API Add POST progress API implemented as weak calls before and after each call to the POST test callback in the post_run_single routine of the post.c file. Signed-off-by: Michael Zaidman Acked-by: Detlev Zundel --- include/post.h | 5 +++++ post/post.c | 17 +++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/include/post.h b/include/post.h index 9fcd3cec2..ff83bce6b 100644 --- a/include/post.h +++ b/include/post.h @@ -53,6 +53,11 @@ #define POST_FAIL_SAVE 0x80 +#define POST_BEFORE 1 +#define POST_AFTER 0 +#define POST_PASSED 1 +#define POST_FAILED 0 + #ifndef __ASSEMBLY__ struct post_test { diff --git a/post/post.c b/post/post.c index b29eb87fc..00e835325 100644 --- a/post/post.c +++ b/post/post.c @@ -231,6 +231,12 @@ static void post_get_flags (int *test_flags) } } +void __show_post_progress (unsigned int test_num, int before, int result) +{ +} +void show_post_progress (unsigned int, int, int) + __attribute__((weak, alias("__show_post_progress"))); + static int post_run_single (struct post_test *test, int test_flags, int flags, unsigned int i) { @@ -248,13 +254,18 @@ static int post_run_single (struct post_test *test, if (test_flags & POST_PREREL) post_log_mark_start ( test->testid ); else - post_log ("POST %s ", test->cmd); + post_log ("POST %s ", test->cmd); } + show_post_progress(i, POST_BEFORE, POST_FAILED); + if (test_flags & POST_PREREL) { - if ((*test->test) (flags) == 0) + if ((*test->test) (flags) == 0) { post_log_mark_succ ( test->testid ); + show_post_progress(i, POST_AFTER, POST_PASSED); + } else { + show_post_progress(i, POST_AFTER, POST_FAILED); if (test_flags & POST_CRITICAL) gd->flags |= GD_FLG_POSTFAIL; if (test_flags & POST_STOP) @@ -264,6 +275,7 @@ static int post_run_single (struct post_test *test, if ((*test->test) (flags) != 0) { post_log ("FAILED\n"); show_boot_progress (-32); + show_post_progress(i, POST_AFTER, POST_FAILED); if (test_flags & POST_CRITICAL) gd->flags |= GD_FLG_POSTFAIL; if (test_flags & POST_STOP) @@ -271,6 +283,7 @@ static int post_run_single (struct post_test *test, } else post_log ("PASSED\n"); + show_post_progress(i, POST_AFTER, POST_PASSED); } if ((test_flags & POST_REBOOT) && !(flags & POST_MANUAL)) { From 6475b9f91bd33bfd38418469cabdcfc0fefbd848 Mon Sep 17 00:00:00 2001 From: John Schmoller Date: Fri, 12 Mar 2010 09:49:23 -0600 Subject: [PATCH 012/164] console: Fix console buffer overrun When CONFIG_SYS_CBSIZE equals MAX_CMDBUF_SIZE, a command string of maximum length will overwrite part of the history buffer, causing the board to die. Expand the console_buffer and hist_lines buffer by one character each to hold the missing NULL char. Signed-off-by: John Schmoller --- common/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/main.c b/common/main.c index c860b0b0e..6fec20097 100644 --- a/common/main.c +++ b/common/main.c @@ -68,7 +68,7 @@ static int abortboot(int); #undef DEBUG_PARSER -char console_buffer[CONFIG_SYS_CBSIZE]; /* console I/O buffer */ +char console_buffer[CONFIG_SYS_CBSIZE + 1]; /* console I/O buffer */ static char * delete_char (char *buffer, char *p, int *colp, int *np, int plen); static char erase_seq[] = "\b \b"; /* erase sequence */ @@ -546,7 +546,7 @@ static int hist_cur = -1; unsigned hist_num = 0; char* hist_list[HIST_MAX]; -char hist_lines[HIST_MAX][HIST_SIZE]; +char hist_lines[HIST_MAX][HIST_SIZE + 1]; /* Save room for NULL */ #define add_idx_minus_one() ((hist_add_idx == 0) ? hist_max : hist_add_idx-1) From d611295032c30e6c533cb356005fa82ab7992824 Mon Sep 17 00:00:00 2001 From: John Schmoller Date: Fri, 12 Mar 2010 09:49:24 -0600 Subject: [PATCH 013/164] cmd history: Match history buffer size to console buffer Match history buffer size to console buffer size. History buffer size was hard coded to 256, artificially limiting the command buffer size. The history buffer now tracks CONFIG_SYS_CBSIZE. Signed-off-by: John Schmoller --- common/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/main.c b/common/main.c index 6fec20097..3949a5bb2 100644 --- a/common/main.c +++ b/common/main.c @@ -526,7 +526,7 @@ void reset_cmd_timeout(void) #define CTL_CH(c) ((c) - 'a' + 1) -#define MAX_CMDBUF_SIZE 256 +#define MAX_CMDBUF_SIZE CONFIG_SYS_CBSIZE #define CTL_BACKSPACE ('\b') #define DEL ((char)255) From 3c950e2ebfde083084cc926b020e3a22a536bf85 Mon Sep 17 00:00:00 2001 From: Anatolij Gustschin Date: Tue, 16 Mar 2010 17:10:05 +0100 Subject: [PATCH 014/164] fdt_support: add partitions fixup in mtd node Allow overwriting defined partitions in the device tree blob using partition info defined in the 'mtdparts' environment variable. Signed-off-by: Anatolij Gustschin Cc: Gerald Van Baren --- common/cmd_mtdparts.c | 2 +- common/fdt_support.c | 219 ++++++++++++++++++++++++++++++++++++ include/fdt_support.h | 2 + include/jffs2/load_kernel.h | 1 + include/mtd_node.h | 11 ++ 5 files changed, 234 insertions(+), 1 deletion(-) create mode 100644 include/mtd_node.h diff --git a/common/cmd_mtdparts.c b/common/cmd_mtdparts.c index 20fed2aad..0b5f74714 100644 --- a/common/cmd_mtdparts.c +++ b/common/cmd_mtdparts.c @@ -776,7 +776,7 @@ static int device_del(struct mtd_device *dev) * @param num device number * @return NULL if requested device does not exist */ -static struct mtd_device* device_find(u8 type, u8 num) +struct mtd_device *device_find(u8 type, u8 num) { struct list_head *entry; struct mtd_device *dev_tmp; diff --git a/common/fdt_support.c b/common/fdt_support.c index f89a3eef6..b7d4fe506 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -757,3 +757,222 @@ int fdt_fixup_nor_flash_size(void *blob, int cs, u32 size) return -1; } #endif + +#ifdef CONFIG_FDT_FIXUP_PARTITIONS +#include +#include + +struct reg_cell { + unsigned int r0; + unsigned int r1; +}; + +int fdt_del_subnodes(const void *blob, int parent_offset) +{ + int off, ndepth; + int ret; + + for (ndepth = 0, off = fdt_next_node(blob, parent_offset, &ndepth); + (off >= 0) && (ndepth > 0); + off = fdt_next_node(blob, off, &ndepth)) { + if (ndepth == 1) { + debug("delete %s: offset: %x\n", + fdt_get_name(blob, off, 0), off); + ret = fdt_del_node((void *)blob, off); + if (ret < 0) { + printf("Can't delete node: %s\n", + fdt_strerror(ret)); + return ret; + } else { + ndepth = 0; + off = parent_offset; + } + } + } + return 0; +} + +int fdt_increase_size(void *fdt, int add_len) +{ + int newlen; + + newlen = fdt_totalsize(fdt) + add_len; + + /* Open in place with a new len */ + return fdt_open_into(fdt, fdt, newlen); +} + +int fdt_del_partitions(void *blob, int parent_offset) +{ + const void *prop; + int ndepth = 0; + int off; + int ret; + + off = fdt_next_node(blob, parent_offset, &ndepth); + if (off > 0 && ndepth == 1) { + prop = fdt_getprop(blob, off, "label", NULL); + if (prop == NULL) { + /* + * Could not find label property, nand {}; node? + * Check subnode, delete partitions there if any. + */ + return fdt_del_partitions(blob, off); + } else { + ret = fdt_del_subnodes(blob, parent_offset); + if (ret < 0) { + printf("Can't remove subnodes: %s\n", + fdt_strerror(ret)); + return ret; + } + } + } + return 0; +} + +int fdt_node_set_part_info(void *blob, int parent_offset, + struct mtd_device *dev) +{ + struct list_head *pentry; + struct part_info *part; + struct reg_cell cell; + int off, ndepth = 0; + int part_num, ret; + char buf[64]; + + ret = fdt_del_partitions(blob, parent_offset); + if (ret < 0) + return ret; + + /* + * Check if it is nand {}; subnode, adjust + * the offset in this case + */ + off = fdt_next_node(blob, parent_offset, &ndepth); + if (off > 0 && ndepth == 1) + parent_offset = off; + + part_num = 0; + list_for_each_prev(pentry, &dev->parts) { + int newoff; + + part = list_entry(pentry, struct part_info, link); + + debug("%2d: %-20s0x%08x\t0x%08x\t%d\n", + part_num, part->name, part->size, + part->offset, part->mask_flags); + + sprintf(buf, "partition@%x", part->offset); +add_sub: + ret = fdt_add_subnode(blob, parent_offset, buf); + if (ret == -FDT_ERR_NOSPACE) { + ret = fdt_increase_size(blob, 512); + if (!ret) + goto add_sub; + else + goto err_size; + } else if (ret < 0) { + printf("Can't add partition node: %s\n", + fdt_strerror(ret)); + return ret; + } + newoff = ret; + + /* Check MTD_WRITEABLE_CMD flag */ + if (part->mask_flags & 1) { +add_ro: + ret = fdt_setprop(blob, newoff, "read_only", NULL, 0); + if (ret == -FDT_ERR_NOSPACE) { + ret = fdt_increase_size(blob, 512); + if (!ret) + goto add_ro; + else + goto err_size; + } else if (ret < 0) + goto err_prop; + } + + cell.r0 = cpu_to_fdt32(part->offset); + cell.r1 = cpu_to_fdt32(part->size); +add_reg: + ret = fdt_setprop(blob, newoff, "reg", &cell, sizeof(cell)); + if (ret == -FDT_ERR_NOSPACE) { + ret = fdt_increase_size(blob, 512); + if (!ret) + goto add_reg; + else + goto err_size; + } else if (ret < 0) + goto err_prop; + +add_label: + ret = fdt_setprop_string(blob, newoff, "label", part->name); + if (ret == -FDT_ERR_NOSPACE) { + ret = fdt_increase_size(blob, 512); + if (!ret) + goto add_label; + else + goto err_size; + } else if (ret < 0) + goto err_prop; + + part_num++; + } + return 0; +err_size: + printf("Can't increase blob size: %s\n", fdt_strerror(ret)); + return ret; +err_prop: + printf("Can't add property: %s\n", fdt_strerror(ret)); + return ret; +} + +/* + * Update partitions in nor/nand nodes using info from + * mtdparts environment variable. The nodes to update are + * specified by node_info structure which contains mtd device + * type and compatible string: E. g. the board code in + * ft_board_setup() could use: + * + * struct node_info nodes[] = { + * { "fsl,mpc5121-nfc", MTD_DEV_TYPE_NAND, }, + * { "cfi-flash", MTD_DEV_TYPE_NOR, }, + * }; + * + * fdt_fixup_mtdparts(blob, nodes, ARRAY_SIZE(nodes)); + */ +void fdt_fixup_mtdparts(void *blob, void *node_info, int node_info_size) +{ + struct node_info *ni = node_info; + struct mtd_device *dev; + char *parts; + int i, idx; + int noff; + + parts = getenv("mtdparts"); + if (!parts) + return; + + if (mtdparts_init() != 0) + return; + + for (i = 0; i < node_info_size; i++) { + idx = 0; + noff = fdt_node_offset_by_compatible(blob, -1, ni[i].compat); + while (noff != -FDT_ERR_NOTFOUND) { + debug("%s: %s, mtd dev type %d\n", + fdt_get_name(blob, noff, 0), + ni[i].compat, ni[i].type); + dev = device_find(ni[i].type, idx++); + if (dev) { + if (fdt_node_set_part_info(blob, noff, dev)) + return; /* return on error */ + } + + /* Jump to next flash node */ + noff = fdt_node_offset_by_compatible(blob, noff, + ni[i].compat); + } + } +} +#endif diff --git a/include/fdt_support.h b/include/fdt_support.h index 0a9dd0dd8..a3d5f8cbf 100644 --- a/include/fdt_support.h +++ b/include/fdt_support.h @@ -81,5 +81,7 @@ int fdt_resize(void *blob); int fdt_fixup_nor_flash_size(void *blob, int cs, u32 size); +void fdt_fixup_mtdparts(void *fdt, void *node_info, int node_info_size); + #endif /* ifdef CONFIG_OF_LIBFDT */ #endif /* ifndef __FDT_SUPPORT_H */ diff --git a/include/jffs2/load_kernel.h b/include/jffs2/load_kernel.h index 8b2720e95..906eb3d3c 100644 --- a/include/jffs2/load_kernel.h +++ b/include/jffs2/load_kernel.h @@ -78,5 +78,6 @@ struct mtdids { extern int mtdparts_init(void); extern int find_dev_and_part(const char *id, struct mtd_device **dev, u8 *part_num, struct part_info **part); +extern struct mtd_device *device_find(u8 type, u8 num); #endif /* load_kernel_h */ diff --git a/include/mtd_node.h b/include/mtd_node.h new file mode 100644 index 000000000..5aae0859d --- /dev/null +++ b/include/mtd_node.h @@ -0,0 +1,11 @@ +#ifndef _NODE_INFO +#define _NODE_INFO + +/* + * Info we use to search for a flash node in DTB. + */ +struct node_info { + const char *compat; /* compatible string */ + int type; /* mtd flash type */ +}; +#endif From 152dda3d94e97ede7af3f9560a59a659384d4585 Mon Sep 17 00:00:00 2001 From: Wolfgang Denk Date: Mon, 22 Mar 2010 23:25:00 +0100 Subject: [PATCH 015/164] Prepare v2010.03-rc2 Update CHANGELOG Signed-off-by: Wolfgang Denk --- CHANGELOG | 205 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ Makefile | 2 +- 2 files changed, 206 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 9f8c7cd47..2dd7fe4e1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,208 @@ +commit d650da2dd4af99967aabc43cccbd8f160eb4cea6 +Author: Matthias Kaehlcke +Date: Tue Mar 9 22:13:33 2010 +0100 + + ep93xx timer: Fix resolution of get_ticks() + + ep93xx timer: Make get_ticks() return a value in CONFIG_SYS_HZ resolution, + as announced by get_tbclk() + + Signed-off-by: Matthias Kaehlcke + +commit 7e67fb5bf27a07d3b8d6b97c76f7195f7d68af58 +Author: Matthias Kaehlcke +Date: Tue Mar 9 22:13:20 2010 +0100 + + ep93xx timer: Fix possible overflow in usecs_to_ticks() + + ep93xx timer: Use 64-bit values in usecs_to_ticks() in order to avoid + overflows in intermediate values + + Signed-off-by: Matthias Kaehlcke + +commit daa989b47297c9f73426783599c286ef3a1f3f49 +Author: Asen Dimov +Date: Thu Mar 18 13:41:47 2010 +0200 + + correct a syntax typo in at91_matrix.h + + Signed-off-by: Asen Dimov + +commit 322ff395c9aec7b87a2211fe4333fdf44377c564 +Author: Jeff Angielski +Date: Wed Mar 17 15:09:26 2010 -0400 + + env: fix endian ordering in crc table + + The crc table was being built as little endian for big endian + targets. This would cause fw_printenv to always fail with + "Warning: Bad CRC, using default environment" messages. + + Signed-off-by: Jeff Angielski + Acked-by: Joakim Tjernlund + +commit 51c2ac9bb574c1420b993615268392b0c1f829f6 +Author: Anatolij Gustschin +Date: Tue Mar 16 17:10:08 2010 +0100 + + mpc5121: cpu/mpc512x/diu.c: fix warnings + + Fix warnings while compiling with CONFIG_VIDEO enabled: + + diu.c: In function 'video_hw_init': + diu.c:158: warning: 'return' with no value, in function returning non-void + diu.c:162: warning: format '%ld' expects type 'long int', but argument 6 has type 'int' + diu.c:162: warning: format '%ld' expects type 'long int', but argument 7 has type 'int' + + Signed-off-by: Anatolij Gustschin + +commit a74908161a1b37d780d3a826a86807bbc50a3857 +Author: Anatolij Gustschin +Date: Tue Mar 16 15:29:33 2010 +0100 + + console.c: fix problem with splashimage + + If a board uses cfb_console driver and splash image + and also defines CONFIG_SILENT_CONSOLE, the user is + locked out even if "silent" is not set. It is not + possible to get any output, neither on vga console + device nor on serial console after redirecting the + output to the serial console, since the GD_FLG_SILENT + flag remains set. + + Fix the problem by redirecting the output from frame + buffer to serial console if splashimage is used. + Only suppress the output if "silent" environment + variable was set and don't set the GD_FLG_SILENT + flag arbitrarily. + + Signed-off-by: Anatolij Gustschin + +commit 5647f78d04174b0b99857d2a7cbf25141bd14a45 +Author: Thomas Weber +Date: Sat Mar 13 23:14:45 2010 +0100 + + mod change 755 => 644 for multiple files + + I executed 'find . -name "*.[chS]" -perm 755 -exec chmod 644 {} \;' + + Signed-off-by: Thomas Weber + Add some more: neither Makefile nor config.mk need execute permissions. + Signed-off-by: Wolfgang Denk + +commit 99c006a320ceb9ea19135ac1512e4a81e8bebb72 +Author: Stefano Babic +Date: Sat Mar 13 21:09:00 2010 +0100 + + mxcmmc: fix warnings due to access 32 bit registers with 16 bit accessors + + Some registers of the mxcmmc driver were accessed using + 16 bit accessor functions, because only the LSB is + significant. This is not needed and generates + warnings. + + Signed-off-by: Stefano Babic + +commit c96f86eefc215b67dd222694ce2b6f60e6a42b0b +Author: Wolfgang Denk +Date: Sun Jan 17 23:55:53 2010 +0100 + + TFTP: allow for adjustable retransmission timout + + So far, TFTP negotiated a fixed retransmission timeout of 5 seconds. + In some cases (busy networks, slow TFTP servers) this caused very + slow transfers. A new environment variable "tftptimeout" allows to + set this timeout. Lowering this value may make downloads succeed + faster in networks with high packet loss rates or with unreliable + TFTP servers. + + Signed-off-by: Wolfgang Denk + Cc: Ben Warren + Signed-off-by: Ben Warren + +commit 252b404d954f91499a4477a3e1064eb237ce5a1c +Author: Wolfgang Denk +Date: Tue Mar 9 14:27:25 2010 +0100 + + Fix PCI_BASE_ADDRESS_5 handling in pci_hose_config_device() + + Signed-off-by: FUJITA Kazutoshi + Signed-off-by: + Acked-by: Stefan Roese + +commit 9d90a93d367272ee65550c0c9f82615cec967c70 +Author: Frans Meulenbroeks +Date: Thu Feb 25 14:03:08 2010 +0100 + + cmd_mmc remove \n + + This patch removes the \n after the help message for mmcinfo. + This resulted in an empty line being displayed after the mmcinfo line + when the help command was given. + + Signed-off-by: Frans Meulenbroeks + +commit 67c7189dd35cb368ef665126fd17816581bd2e92 +Author: Renato Andreola +Date: Tue Mar 16 16:01:29 2010 -0400 + + nios2: Added support to YANU UART + + Signed-off-by: Scott McNutt + +commit 1e67fb32fbdae7949bb423c9e20b3f77c0a61663 +Author: Thomas Chou +Date: Tue Mar 16 12:12:48 2010 -0400 + + nios2: use generic unaligned.h + + Signed-off-by: Scott McNutt + +commit 05022629a2ca6c385dc390d32c20aa27cf5d915a +Author: Mike Frysinger +Date: Thu Jan 21 05:01:15 2010 -0500 + + asm-blackfin/unaligned.h: add for zlib code + + The new zlib code wants asm/unaligned.h, so have the Blackfin version pull + in the asm-generic/unaligned.h. + + Signed-off-by: Mike Frysinger + +commit 3adc1fda38a6aacd4aaf3c2c9cc62a1e69e6de17 +Author: Mike Frysinger +Date: Thu Jan 21 05:01:14 2010 -0500 + + asm-generic/unaligned.h: dynamic default unaligned accesses + + This is based on the asm-arm/unaligned.h, but made generic so all arches + that cannot do unaligned accesses can utilize it. + + Signed-off-by: Mike Frysinger + +commit be129aa71882421ad0b50cd3762915d10ace27ad +Author: Matthias Weisser +Date: Tue Jan 12 12:06:31 2010 +0100 + + video: Fix console display when splashscreen is used + + If a splashscreen is used the console scrolling used the + scroll size as needed when a logo was displayed. This + patch sets the scroll size to the whole screen if + a splashscreen is shown. + + Signed-off-by: Matthias Weisser + +commit 93910edb595a88d394da3eb2cf5148096155dfe9 +Author: Wolfgang Denk +Date: Fri Mar 12 23:06:04 2010 +0100 + + Prepare v2010.03-rc1 + + Coding style cleanup, update CHANGELOG. + + Signed-off-by: Wolfgang Denk + commit 4e72fb15c9073129e05820cc9c54f54bc4985835 Author: Wolfgang Denk Date: Fri Mar 12 22:11:00 2010 +0100 diff --git a/Makefile b/Makefile index d801e2597..c37f8682a 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ VERSION = 2010 PATCHLEVEL = 03 SUBLEVEL = -EXTRAVERSION = -rc1 +EXTRAVERSION = -rc2 ifneq "$(SUBLEVEL)" "" U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) else From cc41a59a74ca9095d518d6d69655c6735dd00809 Mon Sep 17 00:00:00 2001 From: Cyril Chemparathy Date: Wed, 17 Mar 2010 10:03:10 -0400 Subject: [PATCH 016/164] TI: Davinci: NAND Driver Cleanup Modified to use IO accessor routines consistently. Eliminated volatile usage to keep checkpatch.pl happy. Signed-off-by: Cyril Chemparathy --- board/davinci/da830evm/da830evm.c | 2 +- drivers/mtd/nand/davinci_nand.c | 128 ++++++++++++----------- include/asm-arm/arch-davinci/emif_defs.h | 77 +++++++------- 3 files changed, 106 insertions(+), 101 deletions(-) diff --git a/board/davinci/da830evm/da830evm.c b/board/davinci/da830evm/da830evm.c index ed668afcc..638544366 100644 --- a/board/davinci/da830evm/da830evm.c +++ b/board/davinci/da830evm/da830evm.c @@ -150,7 +150,7 @@ int board_init(void) DAVINCI_ABCR_RHOLD(0) | DAVINCI_ABCR_TA(2) | DAVINCI_ABCR_ASIZE_8BIT), - &davinci_emif_regs->AB2CR); + &davinci_emif_regs->ab2cr); #endif /* arch number of the board */ diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c index bfc2acf59..4ca738e45 100644 --- a/drivers/mtd/nand/davinci_nand.c +++ b/drivers/mtd/nand/davinci_nand.c @@ -57,8 +57,6 @@ #define ECC_STATE_ERR_CORR_COMP_P 0x2 #define ECC_STATE_ERR_CORR_COMP_N 0x3 -static emif_registers *const emif_regs = (void *) DAVINCI_ASYNC_EMIF_CNTRL_BASE; - /* * Exploit the little endianness of the ARM to do multi-byte transfers * per device read. This can perform over twice as quickly as individual @@ -93,7 +91,7 @@ static void nand_davinci_read_buf(struct mtd_info *mtd, uint8_t *buf, int len) /* copy aligned data */ while (len >= 4) { - *(u32 *)buf = readl(nand); + *(u32 *)buf = __raw_readl(nand); buf += 4; len -= 4; } @@ -138,7 +136,7 @@ static void nand_davinci_write_buf(struct mtd_info *mtd, const uint8_t *buf, /* copy aligned data */ while (len >= 4) { - writel(*(u32 *)buf, nand); + __raw_writel(*(u32 *)buf, nand); buf += 4; len -= 4; } @@ -156,7 +154,8 @@ static void nand_davinci_write_buf(struct mtd_info *mtd, const uint8_t *buf, } } -static void nand_davinci_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int ctrl) +static void nand_davinci_hwcontrol(struct mtd_info *mtd, int cmd, + unsigned int ctrl) { struct nand_chip *this = mtd->priv; u_int32_t IO_ADDR_W = (u_int32_t)this->IO_ADDR_W; @@ -164,9 +163,9 @@ static void nand_davinci_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int c if (ctrl & NAND_CTRL_CHANGE) { IO_ADDR_W &= ~(MASK_ALE|MASK_CLE); - if ( ctrl & NAND_CLE ) + if (ctrl & NAND_CLE) IO_ADDR_W |= MASK_CLE; - if ( ctrl & NAND_ALE ) + if (ctrl & NAND_ALE) IO_ADDR_W |= MASK_ALE; this->IO_ADDR_W = (void __iomem *) IO_ADDR_W; } @@ -181,24 +180,26 @@ static void nand_davinci_enable_hwecc(struct mtd_info *mtd, int mode) { u_int32_t val; - (void)readl(&(emif_regs->NANDFECC[CONFIG_SYS_NAND_CS - 2])); + (void)__raw_readl(&(davinci_emif_regs->nandfecc[ + CONFIG_SYS_NAND_CS - 2])); - val = readl(&emif_regs->NANDFCR); + val = __raw_readl(&davinci_emif_regs->nandfcr); val |= DAVINCI_NANDFCR_NAND_ENABLE(CONFIG_SYS_NAND_CS); val |= DAVINCI_NANDFCR_1BIT_ECC_START(CONFIG_SYS_NAND_CS); - writel(val, &emif_regs->NANDFCR); + __raw_writel(val, &davinci_emif_regs->nandfcr); } static u_int32_t nand_davinci_readecc(struct mtd_info *mtd, u_int32_t region) { u_int32_t ecc = 0; - ecc = readl(&(emif_regs->NANDFECC[region - 1])); + ecc = __raw_readl(&(davinci_emif_regs->nandfecc[region - 1])); - return(ecc); + return ecc; } -static int nand_davinci_calculate_ecc(struct mtd_info *mtd, const u_char *dat, u_char *ecc_code) +static int nand_davinci_calculate_ecc(struct mtd_info *mtd, const u_char *dat, + u_char *ecc_code) { u_int32_t tmp; const int region = 1; @@ -232,7 +233,8 @@ static int nand_davinci_calculate_ecc(struct mtd_info *mtd, const u_char *dat, u return 0; } -static int nand_davinci_correct_data(struct mtd_info *mtd, u_char *dat, u_char *read_ecc, u_char *calc_ecc) +static int nand_davinci_correct_data(struct mtd_info *mtd, u_char *dat, + u_char *read_ecc, u_char *calc_ecc) { struct nand_chip *this = mtd->priv; u_int32_t ecc_nand = read_ecc[0] | (read_ecc[1] << 8) | @@ -268,7 +270,7 @@ static int nand_davinci_correct_data(struct mtd_info *mtd, u_char *dat, u_char * return -1; } } - return(0); + return 0; } #endif /* CONFIG_SYS_NAND_HW_ECC */ @@ -315,15 +317,15 @@ static void nand_davinci_4bit_enable_hwecc(struct mtd_info *mtd, int mode) * Start a new ECC calculation for reading or writing 512 bytes * of data. */ - val = readl(&emif_regs->NANDFCR); + val = __raw_readl(&davinci_emif_regs->nandfcr); val &= ~DAVINCI_NANDFCR_4BIT_ECC_SEL_MASK; val |= DAVINCI_NANDFCR_NAND_ENABLE(CONFIG_SYS_NAND_CS); val |= DAVINCI_NANDFCR_4BIT_ECC_SEL(CONFIG_SYS_NAND_CS); val |= DAVINCI_NANDFCR_4BIT_ECC_START; - writel(val, &emif_regs->NANDFCR); + __raw_writel(val, &davinci_emif_regs->nandfcr); break; case NAND_ECC_READSYN: - val = emif_regs->NAND4BITECC1; + val = __raw_readl(&davinci_emif_regs->nand4bitecc[0]); break; default: break; @@ -332,10 +334,12 @@ static void nand_davinci_4bit_enable_hwecc(struct mtd_info *mtd, int mode) static u32 nand_davinci_4bit_readecc(struct mtd_info *mtd, unsigned int ecc[4]) { - ecc[0] = emif_regs->NAND4BITECC1 & NAND_4BITECC_MASK; - ecc[1] = emif_regs->NAND4BITECC2 & NAND_4BITECC_MASK; - ecc[2] = emif_regs->NAND4BITECC3 & NAND_4BITECC_MASK; - ecc[3] = emif_regs->NAND4BITECC4 & NAND_4BITECC_MASK; + int i; + + for (i = 0; i < 4; i++) { + ecc[i] = __raw_readl(&davinci_emif_regs->nand4bitecc[i]) & + NAND_4BITECC_MASK; + } return 0; } @@ -418,32 +422,36 @@ static int nand_davinci_4bit_correct_data(struct mtd_info *mtd, uint8_t *dat, */ /*Take 2 bits from 8th byte and 8 bits from 9th byte */ - writel(((ecc16[4]) >> 6) & 0x3FF, &emif_regs->NAND4BITECCLOAD); + __raw_writel(((ecc16[4]) >> 6) & 0x3FF, + &davinci_emif_regs->nand4biteccload); /* Take 4 bits from 7th byte and 6 bits from 8th byte */ - writel((((ecc16[3]) >> 12) & 0xF) | ((((ecc16[4])) << 4) & 0x3F0), - &emif_regs->NAND4BITECCLOAD); + __raw_writel((((ecc16[3]) >> 12) & 0xF) | ((((ecc16[4])) << 4) & 0x3F0), + &davinci_emif_regs->nand4biteccload); /* Take 6 bits from 6th byte and 4 bits from 7th byte */ - writel((ecc16[3] >> 2) & 0x3FF, &emif_regs->NAND4BITECCLOAD); + __raw_writel((ecc16[3] >> 2) & 0x3FF, + &davinci_emif_regs->nand4biteccload); /* Take 8 bits from 5th byte and 2 bits from 6th byte */ - writel(((ecc16[2]) >> 8) | ((((ecc16[3])) << 8) & 0x300), - &emif_regs->NAND4BITECCLOAD); + __raw_writel(((ecc16[2]) >> 8) | ((((ecc16[3])) << 8) & 0x300), + &davinci_emif_regs->nand4biteccload); /*Take 2 bits from 3rd byte and 8 bits from 4th byte */ - writel((((ecc16[1]) >> 14) & 0x3) | ((((ecc16[2])) << 2) & 0x3FC), - &emif_regs->NAND4BITECCLOAD); + __raw_writel((((ecc16[1]) >> 14) & 0x3) | ((((ecc16[2])) << 2) & 0x3FC), + &davinci_emif_regs->nand4biteccload); /* Take 4 bits form 2nd bytes and 6 bits from 3rd bytes */ - writel(((ecc16[1]) >> 4) & 0x3FF, &emif_regs->NAND4BITECCLOAD); + __raw_writel(((ecc16[1]) >> 4) & 0x3FF, + &davinci_emif_regs->nand4biteccload); /* Take 6 bits from 1st byte and 4 bits from 2nd byte */ - writel((((ecc16[0]) >> 10) & 0x3F) | (((ecc16[1]) << 6) & 0x3C0), - &emif_regs->NAND4BITECCLOAD); + __raw_writel((((ecc16[0]) >> 10) & 0x3F) | (((ecc16[1]) << 6) & 0x3C0), + &davinci_emif_regs->nand4biteccload); /* Take 10 bits from 0th and 1st bytes */ - writel((ecc16[0]) & 0x3FF, &emif_regs->NAND4BITECCLOAD); + __raw_writel((ecc16[0]) & 0x3FF, + &davinci_emif_regs->nand4biteccload); /* * Perform a dummy read to the EMIF Revision Code and Status register. @@ -451,7 +459,7 @@ static int nand_davinci_4bit_correct_data(struct mtd_info *mtd, uint8_t *dat, * writing the ECC values in previous step. */ - val = emif_regs->NANDFSR; + val = __raw_readl(&davinci_emif_regs->nandfsr); /* * Read the syndrome from the NAND Flash 4-Bit ECC 1-4 registers. @@ -467,13 +475,13 @@ static int nand_davinci_4bit_correct_data(struct mtd_info *mtd, uint8_t *dat, * Clear any previous address calculation by doing a dummy read of an * error address register. */ - val = emif_regs->NANDERRADD1; + val = __raw_readl(&davinci_emif_regs->nanderradd1); /* * Set the addr_calc_st bit(bit no 13) in the NAND Flash Control * register to 1. */ - emif_regs->NANDFCR |= 1 << 13; + __raw_writel(1 << 13, &davinci_emif_regs->nandfcr); /* * Wait for the corr_state field (bits 8 to 11)in the @@ -481,12 +489,12 @@ static int nand_davinci_4bit_correct_data(struct mtd_info *mtd, uint8_t *dat, */ i = NAND_TIMEOUT; do { - val = emif_regs->NANDFSR; + val = __raw_readl(&davinci_emif_regs->nandfsr); val &= 0xc00; i--; } while ((i > 0) && val); - iserror = emif_regs->NANDFSR; + iserror = __raw_readl(&davinci_emif_regs->nandfsr); iserror &= EMIF_NANDFSR_ECC_STATE_MASK; iserror = iserror >> 8; @@ -501,32 +509,33 @@ static int nand_davinci_4bit_correct_data(struct mtd_info *mtd, uint8_t *dat, */ if (iserror == ECC_STATE_NO_ERR) { - val = emif_regs->NANDERRVAL1; + val = __raw_readl(&davinci_emif_regs->nanderrval1); return 0; } else if (iserror == ECC_STATE_TOO_MANY_ERRS) { - val = emif_regs->NANDERRVAL1; + val = __raw_readl(&davinci_emif_regs->nanderrval1); return -1; } - numerrors = ((emif_regs->NANDFSR >> 16) & 0x3) + 1; + numerrors = ((__raw_readl(&davinci_emif_regs->nandfsr) >> 16) + & 0x3) + 1; /* Read the error address, error value and correct */ for (i = 0; i < numerrors; i++) { if (i > 1) { erroraddress = - ((emif_regs->NANDERRADD2 >> + ((__raw_readl(&davinci_emif_regs->nanderradd2) >> (16 * (i & 1))) & 0x3FF); erroraddress = ((512 + 7) - erroraddress); errorvalue = - ((emif_regs->NANDERRVAL2 >> + ((__raw_readl(&davinci_emif_regs->nanderrval2) >> (16 * (i & 1))) & 0xFF); } else { erroraddress = - ((emif_regs->NANDERRADD1 >> + ((__raw_readl(&davinci_emif_regs->nanderradd1) >> (16 * (i & 1))) & 0x3FF); erroraddress = ((512 + 7) - erroraddress); errorvalue = - ((emif_regs->NANDERRVAL1 >> + ((__raw_readl(&davinci_emif_regs->nanderrval1) >> (16 * (i & 1))) & 0xFF); } /* xor the corrupt data with error value */ @@ -540,7 +549,7 @@ static int nand_davinci_4bit_correct_data(struct mtd_info *mtd, uint8_t *dat, static int nand_davinci_dev_ready(struct mtd_info *mtd) { - return emif_regs->NANDFSR & 0x1; + return __raw_readl(&davinci_emif_regs->nandfsr) & 0x1; } static void nand_flash_init(void) @@ -561,21 +570,22 @@ static void nand_flash_init(void) * * *------------------------------------------------------------------*/ acfg1 = 0 - | (0 << 31 ) /* selectStrobe */ - | (0 << 30 ) /* extWait */ - | (1 << 26 ) /* writeSetup 10 ns */ - | (3 << 20 ) /* writeStrobe 40 ns */ - | (1 << 17 ) /* writeHold 10 ns */ - | (1 << 13 ) /* readSetup 10 ns */ - | (5 << 7 ) /* readStrobe 60 ns */ - | (1 << 4 ) /* readHold 10 ns */ - | (3 << 2 ) /* turnAround ?? ns */ - | (0 << 0 ) /* asyncSize 8-bit bus */ + | (0 << 31) /* selectStrobe */ + | (0 << 30) /* extWait */ + | (1 << 26) /* writeSetup 10 ns */ + | (3 << 20) /* writeStrobe 40 ns */ + | (1 << 17) /* writeHold 10 ns */ + | (1 << 13) /* readSetup 10 ns */ + | (5 << 7) /* readStrobe 60 ns */ + | (1 << 4) /* readHold 10 ns */ + | (3 << 2) /* turnAround ?? ns */ + | (0 << 0) /* asyncSize 8-bit bus */ ; - emif_regs->AB1CR = acfg1; /* CS2 */ + __raw_writel(acfg1, &davinci_emif_regs->ab1cr); /* CS2 */ - emif_regs->NANDFCR = 0x00000101; /* NAND flash on CS2 */ + /* NAND flash on CS2 */ + __raw_writel(0x00000101, &davinci_emif_regs->nandfcr); #endif } diff --git a/include/asm-arm/arch-davinci/emif_defs.h b/include/asm-arm/arch-davinci/emif_defs.h index aa57703c6..b48ec17e9 100644 --- a/include/asm-arm/arch-davinci/emif_defs.h +++ b/include/asm-arm/arch-davinci/emif_defs.h @@ -24,47 +24,42 @@ #include -typedef struct davinci_emif_regs { - dv_reg ERCSR; - dv_reg AWCCR; - dv_reg SDBCR; - dv_reg SDRCR; - dv_reg AB1CR; - dv_reg AB2CR; - dv_reg AB3CR; - dv_reg AB4CR; - dv_reg SDTIMR; - dv_reg DDRSR; - dv_reg DDRPHYCR; - dv_reg DDRPHYSR; - dv_reg TOTAR; - dv_reg TOTACTR; - dv_reg DDRPHYID_REV; - dv_reg SDSRETR; - dv_reg EIRR; - dv_reg EIMR; - dv_reg EIMSR; - dv_reg EIMCR; - dv_reg IOCTRLR; - dv_reg IOSTATR; - u_int8_t RSVD0[8]; - dv_reg NANDFCR; - dv_reg NANDFSR; - u_int8_t RSVD1[8]; - dv_reg NANDFECC[4]; - u_int8_t RSVD2[60]; - dv_reg NAND4BITECCLOAD; - dv_reg NAND4BITECC1; - dv_reg NAND4BITECC2; - dv_reg NAND4BITECC3; - dv_reg NAND4BITECC4; - dv_reg NANDERRADD1; - dv_reg NANDERRADD2; - dv_reg NANDERRVAL1; - dv_reg NANDERRVAL2; -} emif_registers; - -typedef emif_registers *emifregs; +struct davinci_emif_regs { + u_int32_t ercsr; + u_int32_t awccr; + u_int32_t sdbcr; + u_int32_t sdrcr; + u_int32_t ab1cr; + u_int32_t ab2cr; + u_int32_t ab3cr; + u_int32_t ab4cr; + u_int32_t sdtimr; + u_int32_t ddrsr; + u_int32_t ddrphycr; + u_int32_t ddrphysr; + u_int32_t totar; + u_int32_t totactr; + u_int32_t ddrphyid_rev; + u_int32_t sdsretr; + u_int32_t eirr; + u_int32_t eimr; + u_int32_t eimsr; + u_int32_t eimcr; + u_int32_t ioctrlr; + u_int32_t iostatr; + u_int8_t rsvd0[8]; + u_int32_t nandfcr; + u_int32_t nandfsr; + u_int8_t rsvd1[8]; + u_int32_t nandfecc[4]; + u_int8_t rsvd2[60]; + u_int32_t nand4biteccload; + u_int32_t nand4bitecc[4]; + u_int32_t nanderradd1; + u_int32_t nanderradd2; + u_int32_t nanderrval1; + u_int32_t nanderrval2; +}; #define davinci_emif_regs \ ((struct davinci_emif_regs *)DAVINCI_ASYNC_EMIF_CNTRL_BASE) From 7c27b7b1eac43cdcda735bad6231cdfc1f602284 Mon Sep 17 00:00:00 2001 From: Nikolay Petukhov Date: Fri, 19 Mar 2010 10:49:27 +0500 Subject: [PATCH 017/164] at91: add hwecc method for nand This is a patch to use the hardware ECC controller of the AT91SAM9260 for the AT91 nand. Taken from the kernel 2.6.33. Signed-off-by: Nikolay Petukhov --- drivers/mtd/nand/atmel_nand.c | 265 ++++++++++++++++++++++++++++++ drivers/mtd/nand/atmel_nand_ecc.h | 36 ++++ 2 files changed, 301 insertions(+) create mode 100644 drivers/mtd/nand/atmel_nand_ecc.h diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c index 40002be41..d5eb54ad8 100644 --- a/drivers/mtd/nand/atmel_nand.c +++ b/drivers/mtd/nand/atmel_nand.c @@ -31,6 +31,209 @@ #include +#ifdef CONFIG_ATMEL_NAND_HWECC + +/* Register access macros */ +#define ecc_readl(add, reg) \ + readl(AT91_BASE_SYS + add + ATMEL_ECC_##reg) +#define ecc_writel(add, reg, value) \ + writel((value), AT91_BASE_SYS + add + ATMEL_ECC_##reg) + +#include "atmel_nand_ecc.h" /* Hardware ECC registers */ + +/* oob layout for large page size + * bad block info is on bytes 0 and 1 + * the bytes have to be consecutives to avoid + * several NAND_CMD_RNDOUT during read + */ +static struct nand_ecclayout atmel_oobinfo_large = { + .eccbytes = 4, + .eccpos = {60, 61, 62, 63}, + .oobfree = { + {2, 58} + }, +}; + +/* oob layout for small page size + * bad block info is on bytes 4 and 5 + * the bytes have to be consecutives to avoid + * several NAND_CMD_RNDOUT during read + */ +static struct nand_ecclayout atmel_oobinfo_small = { + .eccbytes = 4, + .eccpos = {0, 1, 2, 3}, + .oobfree = { + {6, 10} + }, +}; + +/* + * Calculate HW ECC + * + * function called after a write + * + * mtd: MTD block structure + * dat: raw data (unused) + * ecc_code: buffer for ECC + */ +static int atmel_nand_calculate(struct mtd_info *mtd, + const u_char *dat, unsigned char *ecc_code) +{ + struct nand_chip *nand_chip = mtd->priv; + unsigned int ecc_value; + + /* get the first 2 ECC bytes */ + ecc_value = ecc_readl(CONFIG_SYS_NAND_ECC_BASE, PR); + + ecc_code[0] = ecc_value & 0xFF; + ecc_code[1] = (ecc_value >> 8) & 0xFF; + + /* get the last 2 ECC bytes */ + ecc_value = ecc_readl(CONFIG_SYS_NAND_ECC_BASE, NPR) & ATMEL_ECC_NPARITY; + + ecc_code[2] = ecc_value & 0xFF; + ecc_code[3] = (ecc_value >> 8) & 0xFF; + + return 0; +} + +/* + * HW ECC read page function + * + * mtd: mtd info structure + * chip: nand chip info structure + * buf: buffer to store read data + */ +static int atmel_nand_read_page(struct mtd_info *mtd, + struct nand_chip *chip, uint8_t *buf, int page) +{ + int eccsize = chip->ecc.size; + int eccbytes = chip->ecc.bytes; + uint32_t *eccpos = chip->ecc.layout->eccpos; + uint8_t *p = buf; + uint8_t *oob = chip->oob_poi; + uint8_t *ecc_pos; + int stat; + + /* read the page */ + chip->read_buf(mtd, p, eccsize); + + /* move to ECC position if needed */ + if (eccpos[0] != 0) { + /* This only works on large pages + * because the ECC controller waits for + * NAND_CMD_RNDOUTSTART after the + * NAND_CMD_RNDOUT. + * anyway, for small pages, the eccpos[0] == 0 + */ + chip->cmdfunc(mtd, NAND_CMD_RNDOUT, + mtd->writesize + eccpos[0], -1); + } + + /* the ECC controller needs to read the ECC just after the data */ + ecc_pos = oob + eccpos[0]; + chip->read_buf(mtd, ecc_pos, eccbytes); + + /* check if there's an error */ + stat = chip->ecc.correct(mtd, p, oob, NULL); + + if (stat < 0) + mtd->ecc_stats.failed++; + else + mtd->ecc_stats.corrected += stat; + + /* get back to oob start (end of page) */ + chip->cmdfunc(mtd, NAND_CMD_RNDOUT, mtd->writesize, -1); + + /* read the oob */ + chip->read_buf(mtd, oob, mtd->oobsize); + + return 0; +} + +/* + * HW ECC Correction + * + * function called after a read + * + * mtd: MTD block structure + * dat: raw data read from the chip + * read_ecc: ECC from the chip (unused) + * isnull: unused + * + * Detect and correct a 1 bit error for a page + */ +static int atmel_nand_correct(struct mtd_info *mtd, u_char *dat, + u_char *read_ecc, u_char *isnull) +{ + struct nand_chip *nand_chip = mtd->priv; + unsigned int ecc_status, ecc_parity, ecc_mode; + unsigned int ecc_word, ecc_bit; + + /* get the status from the Status Register */ + ecc_status = ecc_readl(CONFIG_SYS_NAND_ECC_BASE, SR); + + /* if there's no error */ + if (likely(!(ecc_status & ATMEL_ECC_RECERR))) + return 0; + + /* get error bit offset (4 bits) */ + ecc_bit = ecc_readl(CONFIG_SYS_NAND_ECC_BASE, PR) & ATMEL_ECC_BITADDR; + /* get word address (12 bits) */ + ecc_word = ecc_readl(CONFIG_SYS_NAND_ECC_BASE, PR) & ATMEL_ECC_WORDADDR; + ecc_word >>= 4; + + /* if there are multiple errors */ + if (ecc_status & ATMEL_ECC_MULERR) { + /* check if it is a freshly erased block + * (filled with 0xff) */ + if ((ecc_bit == ATMEL_ECC_BITADDR) + && (ecc_word == (ATMEL_ECC_WORDADDR >> 4))) { + /* the block has just been erased, return OK */ + return 0; + } + /* it doesn't seems to be a freshly + * erased block. + * We can't correct so many errors */ + printk(KERN_WARNING "atmel_nand : multiple errors detected." + " Unable to correct.\n"); + return -EIO; + } + + /* if there's a single bit error : we can correct it */ + if (ecc_status & ATMEL_ECC_ECCERR) { + /* there's nothing much to do here. + * the bit error is on the ECC itself. + */ + printk(KERN_WARNING "atmel_nand : one bit error on ECC code." + " Nothing to correct\n"); + return 0; + } + + printk(KERN_WARNING "atmel_nand : one bit error on data." + " (word offset in the page :" + " 0x%x bit offset : 0x%x)\n", + ecc_word, ecc_bit); + /* correct the error */ + if (nand_chip->options & NAND_BUSWIDTH_16) { + /* 16 bits words */ + ((unsigned short *) dat)[ecc_word] ^= (1 << ecc_bit); + } else { + /* 8 bits words */ + dat[ecc_word] ^= (1 << ecc_bit); + } + printk(KERN_WARNING "atmel_nand : error corrected\n"); + return 1; +} + +/* + * Enable HW ECC : unused on most chips + */ +static void atmel_nand_hwctl(struct mtd_info *mtd, int mode) +{ +} +#endif + static void at91_nand_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int ctrl) { @@ -64,6 +267,11 @@ static int at91_nand_ready(struct mtd_info *mtd) int board_nand_init(struct nand_chip *nand) { +#ifdef CONFIG_ATMEL_NAND_HWECC + static int chip_nr = 0; + struct mtd_info *mtd; +#endif + nand->ecc.mode = NAND_ECC_SOFT; #ifdef CONFIG_SYS_NAND_DBW_16 nand->options = NAND_BUSWIDTH_16; @@ -74,5 +282,62 @@ int board_nand_init(struct nand_chip *nand) #endif nand->chip_delay = 20; +#ifdef CONFIG_ATMEL_NAND_HWECC + nand->ecc.mode = NAND_ECC_HW; + nand->ecc.calculate = atmel_nand_calculate; + nand->ecc.correct = atmel_nand_correct; + nand->ecc.hwctl = atmel_nand_hwctl; + nand->ecc.read_page = atmel_nand_read_page; + nand->ecc.bytes = 4; +#endif + +#ifdef CONFIG_ATMEL_NAND_HWECC + mtd = &nand_info[chip_nr++]; + mtd->priv = nand; + + /* Detect NAND chips */ + if (nand_scan_ident(mtd, 1)) { + printk(KERN_WARNING "NAND Flash not found !\n"); + return -ENXIO; + } + + if (nand->ecc.mode == NAND_ECC_HW) { + /* ECC is calculated for the whole page (1 step) */ + nand->ecc.size = mtd->writesize; + + /* set ECC page size and oob layout */ + switch (mtd->writesize) { + case 512: + nand->ecc.layout = &atmel_oobinfo_small; + ecc_writel(CONFIG_SYS_NAND_ECC_BASE, MR, ATMEL_ECC_PAGESIZE_528); + break; + case 1024: + nand->ecc.layout = &atmel_oobinfo_large; + ecc_writel(CONFIG_SYS_NAND_ECC_BASE, MR, ATMEL_ECC_PAGESIZE_1056); + break; + case 2048: + nand->ecc.layout = &atmel_oobinfo_large; + ecc_writel(CONFIG_SYS_NAND_ECC_BASE, MR, ATMEL_ECC_PAGESIZE_2112); + break; + case 4096: + nand->ecc.layout = &atmel_oobinfo_large; + ecc_writel(CONFIG_SYS_NAND_ECC_BASE, MR, ATMEL_ECC_PAGESIZE_4224); + break; + default: + /* page size not handled by HW ECC */ + /* switching back to soft ECC */ + nand->ecc.mode = NAND_ECC_SOFT; + nand->ecc.calculate = NULL; + nand->ecc.correct = NULL; + nand->ecc.hwctl = NULL; + nand->ecc.read_page = NULL; + nand->ecc.postpad = 0; + nand->ecc.prepad = 0; + nand->ecc.bytes = 0; + break; + } + } +#endif + return 0; } diff --git a/drivers/mtd/nand/atmel_nand_ecc.h b/drivers/mtd/nand/atmel_nand_ecc.h new file mode 100644 index 000000000..1ee7f993d --- /dev/null +++ b/drivers/mtd/nand/atmel_nand_ecc.h @@ -0,0 +1,36 @@ +/* + * Error Corrected Code Controller (ECC) - System peripherals regsters. + * Based on AT91SAM9260 datasheet revision B. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + */ + +#ifndef ATMEL_NAND_ECC_H +#define ATMEL_NAND_ECC_H + +#define ATMEL_ECC_CR 0x00 /* Control register */ +#define ATMEL_ECC_RST (1 << 0) /* Reset parity */ + +#define ATMEL_ECC_MR 0x04 /* Mode register */ +#define ATMEL_ECC_PAGESIZE (3 << 0) /* Page Size */ +#define ATMEL_ECC_PAGESIZE_528 (0) +#define ATMEL_ECC_PAGESIZE_1056 (1) +#define ATMEL_ECC_PAGESIZE_2112 (2) +#define ATMEL_ECC_PAGESIZE_4224 (3) + +#define ATMEL_ECC_SR 0x08 /* Status register */ +#define ATMEL_ECC_RECERR (1 << 0) /* Recoverable Error */ +#define ATMEL_ECC_ECCERR (1 << 1) /* ECC Single Bit Error */ +#define ATMEL_ECC_MULERR (1 << 2) /* Multiple Errors */ + +#define ATMEL_ECC_PR 0x0c /* Parity register */ +#define ATMEL_ECC_BITADDR (0xf << 0) /* Bit Error Address */ +#define ATMEL_ECC_WORDADDR (0xfff << 4) /* Word Error Address */ + +#define ATMEL_ECC_NPR 0x10 /* NParity register */ +#define ATMEL_ECC_NPARITY (0xffff << 0) /* NParity */ + +#endif From 6b94b4962211c16ee2197048faa887e1f92f3757 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Sat, 20 Mar 2010 19:02:58 +0100 Subject: [PATCH 018/164] cmd_nand: show nand scrub confirmation character When issuing a nand scrub command, the entered character is not displayed this may be confusing. This patch makes the input character being displayed if it is a 'y' so that an user knows he is about to scrub his nand. Signed-off-by: Florian Fainelli --- common/cmd_nand.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/common/cmd_nand.c b/common/cmd_nand.c index 075a8afb6..9b0c93053 100644 --- a/common/cmd_nand.c +++ b/common/cmd_nand.c @@ -327,8 +327,14 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) "are sure of what you are doing!\n" "\nReally scrub this NAND flash? \n"); - if (getc() == 'y' && getc() == '\r') { - opts.scrub = 1; + if (getc() == 'y') { + puts("y"); + if (getc() == '\r') + opts.scrub = 1; + else { + puts("scrub aborted\n"); + return -1; + } } else { puts("scrub aborted\n"); return -1; From acb13868936a28502782a16e1edaec378e494a29 Mon Sep 17 00:00:00 2001 From: Alessandro Rubini Date: Sat, 13 Mar 2010 17:44:08 +0100 Subject: [PATCH 019/164] lcd: make 16bpp work Support for 16bpp was supposed to be in the code but was not working. This makes it work and has been tested in the nhk8815 board. Signed-off-by: Alessandro Rubini Acked-by: Andrea Gallo Signed-off-by: Anatolij Gustschin --- common/lcd.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/common/lcd.c b/common/lcd.c index db799db6b..64fb1c640 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -63,7 +63,7 @@ /************************************************************************/ #ifdef CONFIG_LCD_LOGO # include /* Get logo data, width and height */ -# if (CONSOLE_COLOR_WHITE >= BMP_LOGO_OFFSET) +# if (CONSOLE_COLOR_WHITE >= BMP_LOGO_OFFSET) && (LCD_BPP != LCD_COLOR16) # error Default Color Map overlaps with Logo Color Map # endif #endif @@ -218,8 +218,12 @@ static void lcd_drawchars (ushort x, ushort y, uchar *str, int count) for (row=0; row < VIDEO_FONT_HEIGHT; ++row, dest += lcd_line_length) { uchar *s = str; - uchar *d = dest; int i; +#if LCD_BPP == LCD_COLOR16 + ushort *d = (ushort *)dest; +#else + uchar *d = dest; +#endif #if LCD_BPP == LCD_MONOCHROME uchar rest = *d & -(1 << (8-off)); @@ -244,7 +248,7 @@ static void lcd_drawchars (ushort x, ushort y, uchar *str, int count) bits <<= 1; } #elif LCD_BPP == LCD_COLOR16 - for (c=0; c<16; ++c) { + for (c=0; c<8; ++c) { *d++ = (bits & 0x80) ? lcd_color_fg : lcd_color_bg; bits <<= 1; @@ -521,6 +525,13 @@ void bitmap_plot (int x, int y) cmap = (ushort *)&(cp->lcd_cmap[BMP_LOGO_OFFSET*sizeof(ushort)]); #elif defined(CONFIG_ATMEL_LCD) cmap = (uint *) (panel_info.mmio + ATMEL_LCDC_LUT(0)); +#else + /* + * default case: generic system with no cmap (most likely 16bpp) + * We set cmap to the source palette, so no change is done. + * This avoids even more ifdef in the next stanza + */ + cmap = bmp_logo_palette; #endif WATCHDOG_RESET(); @@ -559,10 +570,15 @@ void bitmap_plot (int x, int y) } } else { /* true color mode */ + u16 col16; fb16 = (ushort *)(lcd_base + y * lcd_line_length + x); for (i=0; i Date: Wed, 24 Mar 2010 10:16:20 +0100 Subject: [PATCH 020/164] at91: Get rid of some warnings when building for otc570 The soft-i2c code for AT91 defines I2C_SOFT_DECLARATIONS for direct access by dereferencing a pio pointer. The OTC570 platform uses the AT91 gpio API so it does not need the pio variable. Signed-off-by: Matthias Fuchs --- include/configs/otc570.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/configs/otc570.h b/include/configs/otc570.h index 8e27ebae9..4fde012c8 100644 --- a/include/configs/otc570.h +++ b/include/configs/otc570.h @@ -102,6 +102,7 @@ at91_set_pio_output(AT91_PIO_PORTB, 4, 0); \ at91_set_pio_output(AT91_PIO_PORTB, 5, 0); \ } +#define I2C_SOFT_DECLARATIONS /* Configure data pin as output */ #define I2C_ACTIVE at91_set_pio_output(AT91_PIO_PORTB, 4, 0) /* Configure data pin as input */ From c550afada5fcad426aa6a219a329feb9eedae8b2 Mon Sep 17 00:00:00 2001 From: Rupjyoti Sarmah Date: Wed, 24 Mar 2010 16:52:02 +0530 Subject: [PATCH 021/164] ppc4xx fix unstable 440EPx bootstrap options 440EPx fixed bootstrap options A, B, D, and E sets PLL FWDVA to a value = 1. This results in the PLLOUTB being greater than the CPU clock frequency resulting unstable 440EPx operation resulting in various software hang conditions. This patch reprograms the FWDVA satisfying the requirement of setting FWDVB to a value greater than 1 while using one of the four deafult bootstrap options. Signed-off-by: Rupjyoti Sarmah Acked-by : Victor Gallardo Signed-off-by: Stefan Roese --- cpu/ppc4xx/cpu_init.c | 65 +++++++++++++++++++++++++++++++++++++++---- include/ppc440.h | 6 ++++ 2 files changed, 66 insertions(+), 5 deletions(-) diff --git a/cpu/ppc4xx/cpu_init.c b/cpu/ppc4xx/cpu_init.c index ccd999367..8a6e545c1 100644 --- a/cpu/ppc4xx/cpu_init.c +++ b/cpu/ppc4xx/cpu_init.c @@ -111,17 +111,72 @@ void reconfigure_pll(u32 new_cpu_freq) mtcpr(CPR0_SPCID, reg); reset_needed = 1; } + } - /* Set reload inhibit so configuration will persist across - * processor resets */ + /* Get current value of FWDVA.*/ + mfcpr(CPR0_PLLD, reg); + temp = (reg & PLLD_FWDVA_MASK) >> 16; + + /* + * Check to see if FWDVA has been set to value of 1. if it has we must + * modify it. + */ + if (temp == 1) { + mfcpr(CPR0_PLLD, reg); + /* Get current value of fbdv. */ + temp = (reg & PLLD_FBDV_MASK) >> 24; + fbdv = temp ? temp : 32; + /* Get current value of lfbdv. */ + temp = (reg & PLLD_LFBDV_MASK); + lfbdv = temp ? temp : 64; + /* + * Load register that contains current boot strapping option. + */ + mfcpr(CPR0_ICFG, reg); + /* Shift strapping option into low 3 bits.*/ + reg = (reg >> 28); + + if ((reg == BOOT_STRAP_OPTION_A) || (reg == BOOT_STRAP_OPTION_B) || + (reg == BOOT_STRAP_OPTION_D) || (reg == BOOT_STRAP_OPTION_E)) { + /* + * Get current value of FWDVA. Assign current FWDVA to + * new FWDVB. + */ + mfcpr(CPR0_PLLD, reg); + target_fwdvb = (reg & PLLD_FWDVA_MASK) >> 16; + fwdvb = target_fwdvb ? target_fwdvb : 8; + /* + * Get current value of FWDVB. Assign current FWDVB to + * new FWDVA. + */ + target_fwdva = (reg & PLLD_FWDVB_MASK) >> 8; + fwdva = target_fwdva ? target_fwdva : 16; + /* + * Update CPR0_PLLD with switched FWDVA and FWDVB. + */ + reg &= ~(PLLD_FWDVA_MASK | PLLD_FWDVB_MASK | + PLLD_FBDV_MASK | PLLD_LFBDV_MASK); + reg |= ((fwdva == 16 ? 0 : fwdva) << 16) | + ((fwdvb == 8 ? 0 : fwdvb) << 8) | + ((fbdv == 32 ? 0 : fbdv) << 24) | + (lfbdv == 64 ? 0 : lfbdv); + mtcpr(CPR0_PLLD, reg); + /* Acknowledge that a reset is required. */ + reset_needed = 1; + } + } + + if (reset_needed) { + /* + * Set reload inhibit so configuration will persist across + * processor resets + */ mfcpr(CPR0_ICFG, reg); reg &= ~CPR0_ICFG_RLI_MASK; reg |= 1 << 31; mtcpr(CPR0_ICFG, reg); - } - /* Reset processor if configuration changed */ - if (reset_needed) { + /* Reset processor if configuration changed */ __asm__ __volatile__ ("sync; isync"); mtspr(SPRN_DBCR0, 0x20000000); } diff --git a/include/ppc440.h b/include/ppc440.h index e60fa1390..5f87d2c60 100644 --- a/include/ppc440.h +++ b/include/ppc440.h @@ -68,6 +68,12 @@ #define CPR0_SPCID 0x0120 #define CPR0_ICFG 0x0140 +/* 440EPX boot strap options */ +#define BOOT_STRAP_OPTION_A 0x00000000 +#define BOOT_STRAP_OPTION_B 0x00000001 +#define BOOT_STRAP_OPTION_D 0x00000003 +#define BOOT_STRAP_OPTION_E 0x00000004 + /* 440gx sdr register definations */ #define SDR0_SDSTP0 0x0020 /* */ #define SDR0_SDSTP1 0x0021 /* */ From 9d79e5758c3a6776be9a86856823d28e7154a481 Mon Sep 17 00:00:00 2001 From: Wolfgang Wegner Date: Mon, 25 Jan 2010 11:27:44 +0100 Subject: [PATCH 022/164] add ASTRO MCF5373L board This patch adds support for ASTRO board(s) based on MCF5373L. Signed-off-by: Wolfgang Wegner --- MAINTAINERS | 4 + MAKEALL | 1 + Makefile | 4 + board/astro/mcf5373l/Makefile | 44 ++++ board/astro/mcf5373l/astro.h | 44 ++++ board/astro/mcf5373l/config.mk | 27 ++ board/astro/mcf5373l/fpga.c | 425 +++++++++++++++++++++++++++++++ board/astro/mcf5373l/mcf5373l.c | 211 +++++++++++++++ board/astro/mcf5373l/u-boot.lds | 142 +++++++++++ include/configs/astro_mcf5373l.h | 389 ++++++++++++++++++++++++++++ 10 files changed, 1291 insertions(+) create mode 100644 board/astro/mcf5373l/Makefile create mode 100644 board/astro/mcf5373l/astro.h create mode 100644 board/astro/mcf5373l/config.mk create mode 100644 board/astro/mcf5373l/fpga.c create mode 100644 board/astro/mcf5373l/mcf5373l.c create mode 100644 board/astro/mcf5373l/u-boot.lds create mode 100644 include/configs/astro_mcf5373l.h diff --git a/MAINTAINERS b/MAINTAINERS index 0abeb26dc..bb03f1778 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -889,6 +889,10 @@ TsiChung Liew M5475EVB mcf547x_8x M5485EVB mcf547x_8x +Wolfgang Wegner + + astro_mcf5373l MCF5373L + ######################################################################### # AVR32 Systems: # # # diff --git a/MAKEALL b/MAKEALL index 2eb8bb6b8..eec02a358 100755 --- a/MAKEALL +++ b/MAKEALL @@ -839,6 +839,7 @@ LIST_microblaze=" \ ######################################################################### LIST_coldfire=" \ + astro_mcf5373l \ cobra5272 \ EB+MCF-EV123 \ EB+MCF-EV123_internal \ diff --git a/Makefile b/Makefile index 398e94de8..e004303a8 100644 --- a/Makefile +++ b/Makefile @@ -1976,6 +1976,10 @@ ZPC1900_config: unconfig ## Coldfire ######################################################################### +astro_mcf5373l_config \ +astro_mcf5373l_RAM_config : unconfig + @$(MKCONFIG) -t $(@:_config=) astro_mcf5373l m68k mcf532x mcf5373l astro + M5208EVBE_config : unconfig @$(MKCONFIG) $(@:_config=) m68k mcf52x2 m5208evbe freescale diff --git a/board/astro/mcf5373l/Makefile b/board/astro/mcf5373l/Makefile new file mode 100644 index 000000000..c7a1d0551 --- /dev/null +++ b/board/astro/mcf5373l/Makefile @@ -0,0 +1,44 @@ +# +# (C) Copyright 2000-2006 +# Wolfgang Denk, DENX Software Engineering, wd@denx.de. +# +# See file CREDITS for list of people who contributed to this +# project. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +# + +include $(TOPDIR)/config.mk + +LIB = $(obj)lib$(BOARD).a + +COBJS = $(BOARD).o fpga.o + +SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) +SOBJS := $(addprefix $(obj),$(SOBJS)) + +$(LIB): $(obj).depend $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) + +######################################################################### + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +######################################################################### diff --git a/board/astro/mcf5373l/astro.h b/board/astro/mcf5373l/astro.h new file mode 100644 index 000000000..b55a6f785 --- /dev/null +++ b/board/astro/mcf5373l/astro.h @@ -0,0 +1,44 @@ +#ifndef __ASTRO_H__ +#define __ASTRO_H__ + +/* in mcf5373l.c */ +int rs_serial_init(int port, int baud); +void astro_put_char(char ch); +int astro_is_char(void); +int astro_get_char(void); + +/* in fpga.c */ +int astro5373l_altera_load(void); +int astro5373l_xilinx_load(void); + +/* data structures used for communication (update.c) */ +typedef struct card_id { + char card_type; + char hardware_version; + char software_version; + char software_subversion; /* " ","a".."z" */ + char fpga_version_altera; + char fpga_version_xilinx; +} card_id_t; + +typedef struct { + unsigned char mode; + unsigned char deviation; + unsigned short freq; +} __attribute__ ((packed)) output_params_t; + +typedef struct { + unsigned short satfreq; + unsigned char satdatallg; + unsigned short symbolrate; + unsigned char viterbirate; + unsigned char symbolrate_l; + output_params_t output_params; + unsigned char reserve; + unsigned char card_error; + unsigned short dummy_ts_id; + unsigned char dummy_pat_ver; + unsigned char dummy_sdt_ver; +} __attribute__ ((packed)) parameters_t; + +#endif /* __ASTRO_H__ */ diff --git a/board/astro/mcf5373l/config.mk b/board/astro/mcf5373l/config.mk new file mode 100644 index 000000000..6316a3029 --- /dev/null +++ b/board/astro/mcf5373l/config.mk @@ -0,0 +1,27 @@ +# +# (C) Copyright 2000-2003 +# Wolfgang Denk, DENX Software Engineering, wd@denx.de. +# Coldfire contribution by Bernhard Kuhn +# +# See file CREDITS for list of people who contributed to this +# project. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +# + +TEXT_BASE = $(CONFIG_TEXT_BASE) + +PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) diff --git a/board/astro/mcf5373l/fpga.c b/board/astro/mcf5373l/fpga.c new file mode 100644 index 000000000..467461b8e --- /dev/null +++ b/board/astro/mcf5373l/fpga.c @@ -0,0 +1,425 @@ +/* + * (C) Copyright 2006 + * Wolfgang Wegner, ASTRO Strobel Kommunikationssysteme GmbH, + * w.wegner@astro-kom.de + * + * based on the files by + * Heiko Schocher, DENX Software Engineering, hs@denx.de + * and + * Rich Ireland, Enterasys Networks, rireland@enterasys.com. + * Keith Outwater, keith_outwater@mvis.com. + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + */ + +/* Altera/Xilinx FPGA configuration support for the ASTRO "URMEL" board */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include "fpga.h" + +DECLARE_GLOBAL_DATA_PTR; + +int altera_pre_fn(int cookie) +{ + gpio_t *gpiop = (gpio_t *)MMAP_GPIO; + unsigned char tmp_char; + unsigned short tmp_short; + + /* first, set the required pins to GPIO function */ + /* PAR_T0IN -> GPIO */ + tmp_char = readb(&gpiop->par_timer); + tmp_char &= 0xfc; + writeb(tmp_char, &gpiop->par_timer); + /* all QSPI pins -> GPIO */ + writew(0x0000, &gpiop->par_qspi); + /* U0RTS, U0CTS -> GPIO */ + tmp_short = __raw_readw(&gpiop->par_uart); + tmp_short &= 0xfff3; + __raw_writew(tmp_short, &gpiop->par_uart); + /* all PWM pins -> GPIO */ + writeb(0x00, &gpiop->par_pwm); + /* next, set data direction registers */ + writeb(0x01, &gpiop->pddr_timer); + writeb(0x25, &gpiop->pddr_qspi); + writeb(0x0c, &gpiop->pddr_uart); + writeb(0x04, &gpiop->pddr_pwm); + + /* ensure other SPI peripherals are deselected */ + writeb(0x08, &gpiop->ppd_uart); + writeb(0x38, &gpiop->ppd_qspi); + + /* CONFIG = 0 STATUS = 0 -> FPGA in reset state */ + writeb(0xFB, &gpiop->pclrr_uart); + /* enable Altera configuration by clearing QSPI_CS2 and DT0IN */ + writeb(0xFE, &gpiop->pclrr_timer); + writeb(0xDF, &gpiop->pclrr_qspi); + return FPGA_SUCCESS; +} + +/* Set the state of CONFIG Pin */ +int altera_config_fn(int assert_config, int flush, int cookie) +{ + gpio_t *gpiop = (gpio_t *)MMAP_GPIO; + + if (assert_config) + writeb(0x04, &gpiop->ppd_uart); + else + writeb(0xFB, &gpiop->pclrr_uart); + return FPGA_SUCCESS; +} + +/* Returns the state of STATUS Pin */ +int altera_status_fn(int cookie) +{ + gpio_t *gpiop = (gpio_t *)MMAP_GPIO; + + if (readb(&gpiop->ppd_pwm) & 0x08) + return FPGA_FAIL; + return FPGA_SUCCESS; +} + +/* Returns the state of CONF_DONE Pin */ +int altera_done_fn(int cookie) +{ + gpio_t *gpiop = (gpio_t *)MMAP_GPIO; + + if (readb(&gpiop->ppd_pwm) & 0x20) + return FPGA_FAIL; + return FPGA_SUCCESS; +} + +/* + * writes the complete buffer to the FPGA + * writing the complete buffer in one function is much faster, + * then calling it for every bit + */ +int altera_write_fn(void *buf, size_t len, int flush, int cookie) +{ + size_t bytecount = 0; + gpio_t *gpiop = (gpio_t *)MMAP_GPIO; + unsigned char *data = (unsigned char *)buf; + unsigned char val = 0; + int i; + int len_40 = len / 40; + + while (bytecount < len) { + val = data[bytecount++]; + i = 8; + do { + writeb(0xFB, &gpiop->pclrr_qspi); + if (val & 0x01) + writeb(0x01, &gpiop->ppd_qspi); + else + writeb(0xFE, &gpiop->pclrr_qspi); + writeb(0x04, &gpiop->ppd_qspi); + val >>= 1; + i--; + } while (i > 0); + + if (bytecount % len_40 == 0) { +#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG) + WATCHDOG_RESET(); +#endif +#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK + putc('.'); /* let them know we are alive */ +#endif +#ifdef CONFIG_SYS_FPGA_CHECK_CTRLC + if (ctrlc()) + return FPGA_FAIL; +#endif + } + } + return FPGA_SUCCESS; +} + +/* called, when programming is aborted */ +int altera_abort_fn(int cookie) +{ + gpio_t *gpiop = (gpio_t *)MMAP_GPIO; + + writeb(0x20, &gpiop->ppd_qspi); + writeb(0x08, &gpiop->ppd_uart); + return FPGA_SUCCESS; +} + +/* called, when programming was succesful */ +int altera_post_fn(int cookie) +{ + return altera_abort_fn(cookie); +} + +/* + * Note that these are pointers to code that is in Flash. They will be + * relocated at runtime. + * FIXME: relocation not yet working for coldfire, see below! + */ +Altera_CYC2_Passive_Serial_fns altera_fns = { + altera_pre_fn, + altera_config_fn, + altera_status_fn, + altera_done_fn, + altera_write_fn, + altera_abort_fn, + altera_post_fn +}; + +Altera_desc altera_fpga[CONFIG_FPGA_COUNT] = { + {Altera_CYC2, + passive_serial, + 85903, + (void *)&altera_fns, + NULL, + 0} +}; + +/* Initialize the fpga. Return 1 on success, 0 on failure. */ +int astro5373l_altera_load(void) +{ + int i; + + for (i = 0; i < CONFIG_FPGA_COUNT; i++) { + /* + * I did not yet manage to get relocation work properly, + * so set stuff here instead of static initialisation: + */ + altera_fns.pre = altera_pre_fn; + altera_fns.config = altera_config_fn; + altera_fns.status = altera_status_fn; + altera_fns.done = altera_done_fn; + altera_fns.write = altera_write_fn; + altera_fns.abort = altera_abort_fn; + altera_fns.post = altera_post_fn; + altera_fpga[i].iface_fns = (void *)&altera_fns; + fpga_add(fpga_altera, &altera_fpga[i]); + } + return 1; +} + +/* Set the FPGA's PROG_B line to the specified level */ +int xilinx_pgm_fn(int assert, int flush, int cookie) +{ + gpio_t *gpiop = (gpio_t *)MMAP_GPIO; + + if (assert) + writeb(0xFB, &gpiop->pclrr_uart); + else + writeb(0x04, &gpiop->ppd_uart); + return assert; +} + +/* + * Test the state of the active-low FPGA INIT line. Return 1 on INIT + * asserted (low). + */ +int xilinx_init_fn(int cookie) +{ + gpio_t *gpiop = (gpio_t *)MMAP_GPIO; + + return (readb(&gpiop->ppd_pwm) & 0x08) == 0; +} + +/* Test the state of the active-high FPGA DONE pin */ +int xilinx_done_fn(int cookie) +{ + gpio_t *gpiop = (gpio_t *)MMAP_GPIO; + + return (readb(&gpiop->ppd_pwm) & 0x20) >> 5; +} + +/* Abort an FPGA operation */ +int xilinx_abort_fn(int cookie) +{ + gpio_t *gpiop = (gpio_t *)MMAP_GPIO; + /* ensure all SPI peripherals and FPGAs are deselected */ + writeb(0x08, &gpiop->ppd_uart); + writeb(0x01, &gpiop->ppd_timer); + writeb(0x38, &gpiop->ppd_qspi); + return FPGA_FAIL; +} + +/* + * FPGA pre-configuration function. Just make sure that + * FPGA reset is asserted to keep the FPGA from starting up after + * configuration. + */ +int xilinx_pre_config_fn(int cookie) +{ + gpio_t *gpiop = (gpio_t *)MMAP_GPIO; + unsigned char tmp_char; + unsigned short tmp_short; + + /* first, set the required pins to GPIO function */ + /* PAR_T0IN -> GPIO */ + tmp_char = readb(&gpiop->par_timer); + tmp_char &= 0xfc; + writeb(tmp_char, &gpiop->par_timer); + /* all QSPI pins -> GPIO */ + writew(0x0000, &gpiop->par_qspi); + /* U0RTS, U0CTS -> GPIO */ + tmp_short = __raw_readw(&gpiop->par_uart); + tmp_short &= 0xfff3; + __raw_writew(tmp_short, &gpiop->par_uart); + /* all PWM pins -> GPIO */ + writeb(0x00, &gpiop->par_pwm); + /* next, set data direction registers */ + writeb(0x01, &gpiop->pddr_timer); + writeb(0x25, &gpiop->pddr_qspi); + writeb(0x0c, &gpiop->pddr_uart); + writeb(0x04, &gpiop->pddr_pwm); + + /* ensure other SPI peripherals are deselected */ + writeb(0x08, &gpiop->ppd_uart); + writeb(0x38, &gpiop->ppd_qspi); + writeb(0x01, &gpiop->ppd_timer); + + /* CONFIG = 0, STATUS = 0 -> FPGA in reset state */ + writeb(0xFB, &gpiop->pclrr_uart); + /* enable Xilinx configuration by clearing QSPI_CS2 and U0CTS */ + writeb(0xF7, &gpiop->pclrr_uart); + writeb(0xDF, &gpiop->pclrr_qspi); + return 0; +} + +/* + * FPGA post configuration function. Should perform a test if FPGA is running. + */ +int xilinx_post_config_fn(int cookie) +{ + int rc = 0; + + /* + * no test yet + */ + return rc; +} + +int xilinx_clk_fn(int assert_clk, int flush, int cookie) +{ + gpio_t *gpiop = (gpio_t *)MMAP_GPIO; + + if (assert_clk) + writeb(0x04, &gpiop->ppd_qspi); + else + writeb(0xFB, &gpiop->pclrr_qspi); + return assert_clk; +} + +int xilinx_wr_fn(int assert_write, int flush, int cookie) +{ + gpio_t *gpiop = (gpio_t *)MMAP_GPIO; + + if (assert_write) + writeb(0x01, &gpiop->ppd_qspi); + else + writeb(0xFE, &gpiop->pclrr_qspi); + return assert_write; +} + +int xilinx_fastwr_fn(void *buf, size_t len, int flush, int cookie) +{ + size_t bytecount = 0; + gpio_t *gpiop = (gpio_t *)MMAP_GPIO; + unsigned char *data = (unsigned char *)buf; + unsigned char val = 0; + int i; + int len_40 = len / 40; + + for (bytecount = 0; bytecount < len; bytecount++) { + val = *(data++); + for (i = 8; i > 0; i--) { + writeb(0xFB, &gpiop->pclrr_qspi); + if (val & 0x80) + writeb(0x01, &gpiop->ppd_qspi); + else + writeb(0xFE, &gpiop->pclrr_qspi); + writeb(0x04, &gpiop->ppd_qspi); + val <<= 1; + } + if (bytecount % len_40 == 0) { +#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG) + WATCHDOG_RESET(); +#endif +#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK + putc('.'); /* let them know we are alive */ +#endif +#ifdef CONFIG_SYS_FPGA_CHECK_CTRLC + if (ctrlc()) + return FPGA_FAIL; +#endif + } + } + return FPGA_SUCCESS; +} + +/* + * Note that these are pointers to code that is in Flash. They will be + * relocated at runtime. + * FIXME: relocation not yet working for coldfire, see below! + */ +Xilinx_Spartan3_Slave_Serial_fns xilinx_fns = { + xilinx_pre_config_fn, + xilinx_pgm_fn, + xilinx_clk_fn, + xilinx_init_fn, + xilinx_done_fn, + xilinx_wr_fn, + 0, + xilinx_fastwr_fn +}; + +Xilinx_desc xilinx_fpga[CONFIG_FPGA_COUNT] = { + {Xilinx_Spartan3, + slave_serial, + XILINX_XC3S4000_SIZE, + (void *)&xilinx_fns, + 0} +}; + +/* Initialize the fpga. Return 1 on success, 0 on failure. */ +int astro5373l_xilinx_load(void) +{ + int i; + + fpga_init(); + + for (i = 0; i < CONFIG_FPGA_COUNT; i++) { + /* + * I did not yet manage to get relocation work properly, + * so set stuff here instead of static initialisation: + */ + xilinx_fns.pre = xilinx_pre_config_fn; + xilinx_fns.pgm = xilinx_pgm_fn; + xilinx_fns.clk = xilinx_clk_fn; + xilinx_fns.init = xilinx_init_fn; + xilinx_fns.done = xilinx_done_fn; + xilinx_fns.wr = xilinx_wr_fn; + xilinx_fns.bwr = xilinx_fastwr_fn; + xilinx_fpga[i].iface_fns = (void *)&xilinx_fns; + fpga_add(fpga_xilinx, &xilinx_fpga[i]); + } + return 1; +} diff --git a/board/astro/mcf5373l/mcf5373l.c b/board/astro/mcf5373l/mcf5373l.c new file mode 100644 index 000000000..3c09a21ee --- /dev/null +++ b/board/astro/mcf5373l/mcf5373l.c @@ -0,0 +1,211 @@ +/* + * (C) Copyright 2000-2003 + * Wolfgang Denk, DENX Software Engineering, wd@denx.de. + * modified by Wolfgang Wegner for ASTRO 5373l + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#include +#include +#include +#include +#include +#include + +/* needed for astro bus: */ +#include +#include "astro.h" + +DECLARE_GLOBAL_DATA_PTR; +extern void uart_port_conf(void); + +int checkboard(void) +{ + puts("Board: "); + puts("ASTRO MCF5373L (Urmel) Board\n"); + return 0; +} + +phys_size_t initdram(int board_type) +{ +#if !defined(CONFIG_MONITOR_IS_IN_RAM) + sdram_t *sdp = (sdram_t *)(MMAP_SDRAM); + + /* + * GPIO configuration for bus should be set correctly from reset, + * so we do not care! First, set up address space: at this point, + * we should be running from internal SRAM; + * so use CONFIG_SYS_SDRAM_BASE as the base address for SDRAM, + * and do not care where it is + */ + __raw_writel((CONFIG_SYS_SDRAM_BASE & 0xFFF00000) | 0x00000018, + &sdp->cs0); + __raw_writel((CONFIG_SYS_SDRAM_BASE & 0xFFF00000) | 0x00000000, + &sdp->cs1); + /* + * I am not sure from the data sheet, but it seems burst length + * has to be 8 for the 16 bit data bus we use; + * so these values are for BL = 8 + */ + __raw_writel(0x33211530, &sdp->cfg1); + __raw_writel(0x56570000, &sdp->cfg2); + /* send PrechargeALL, REF and IREF remain cleared! */ + __raw_writel(0xE1462C02, &sdp->ctrl); + udelay(1); + /* refresh SDRAM twice */ + __raw_writel(0xE1462C04, &sdp->ctrl); + udelay(1); + __raw_writel(0xE1462C04, &sdp->ctrl); + /* init MR */ + __raw_writel(0x008D0000, &sdp->mode); + /* initialize EMR */ + __raw_writel(0x80010000, &sdp->mode); + /* wait until DLL is locked */ + udelay(1); + /* + * enable automatic refresh, lock mode register, + * clear iref and ipall + */ + __raw_writel(0x71462C00, &sdp->ctrl); + /* Dummy write to start SDRAM */ + writel(0, CONFIG_SYS_SDRAM_BASE); +#endif + + /* + * for get_ram_size() to work, both CS areas have to be + * configured, i.e. CS1 has to be explicitely disabled, else + * probing for memory will cause the SDRAM bus to hang! + * (Do not rely on the SDCS register(s) being set to 0x00000000 + * during reset as stated in the data sheet.) + */ + return get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE, + 0x80000000 - CONFIG_SYS_SDRAM_BASE); +} + +#define UART_BASE MMAP_UART0 +int rs_serial_init(int port, int baud) +{ + uart_t *uart; + u32 counter; + + switch (port) { + case 0: + uart = (uart_t *)(MMAP_UART0); + break; + case 1: + uart = (uart_t *)(MMAP_UART1); + break; + case 2: + uart = (uart_t *)(MMAP_UART2); + break; + default: + uart = (uart_t *)(MMAP_UART0); + } + + uart_port_conf(); + + /* write to SICR: SIM2 = uart mode,dcd does not affect rx */ + writeb(UART_UCR_RESET_RX, &uart->ucr); + writeb(UART_UCR_RESET_TX, &uart->ucr); + writeb(UART_UCR_RESET_ERROR, &uart->ucr); + writeb(UART_UCR_RESET_MR, &uart->ucr); + __asm__ ("nop"); + + writeb(0, &uart->uimr); + + /* write to CSR: RX/TX baud rate from timers */ + writeb(UART_UCSR_RCS_SYS_CLK | UART_UCSR_TCS_SYS_CLK, &uart->ucsr); + + writeb(UART_UMR_BC_8 | UART_UMR_PM_NONE, &uart->umr); + writeb(UART_UMR_SB_STOP_BITS_1, &uart->umr); + + /* Setting up BaudRate */ + counter = (u32) (gd->bus_clk / (baud)); + counter >>= 5; + + /* write to CTUR: divide counter upper byte */ + writeb((u8) ((counter & 0xff00) >> 8), &uart->ubg1); + /* write to CTLR: divide counter lower byte */ + writeb((u8) (counter & 0x00ff), &uart->ubg2); + + writeb(UART_UCR_RX_ENABLED | UART_UCR_TX_ENABLED, &uart->ucr); + + return 0; +} + +void astro_put_char(char ch) +{ + uart_t *uart; + unsigned long timer; + + uart = (uart_t *)(MMAP_UART0); + /* + * Wait for last character to go. Timeout of 6ms should + * be enough for our lowest baud rate of 2400. + */ + timer = get_timer(0); + while (get_timer(timer) < 6) { + if (readb(&uart->usr) & UART_USR_TXRDY) + break; + } + writeb(ch, &uart->utb); + + return; +} + +int astro_is_char(void) +{ + uart_t *uart; + + uart = (uart_t *)(MMAP_UART0); + return readb(&uart->usr) & UART_USR_RXRDY; +} + +int astro_get_char(void) +{ + uart_t *uart; + + uart = (uart_t *)(MMAP_UART0); + while (!(readb(&uart->usr) & UART_USR_RXRDY)) ; + return readb(&uart->urb); +} + +int misc_init_r(void) +{ + int retval = 0; + + puts("Configure Xilinx FPGA..."); + retval = astro5373l_xilinx_load(); + if (!retval) { + puts("failed!\n"); + return retval; + } + puts("done\n"); + + puts("Configure Altera FPGA..."); + retval = astro5373l_altera_load(); + if (!retval) { + puts("failed!\n"); + return retval; + } + puts("done\n"); + + return retval; +} diff --git a/board/astro/mcf5373l/u-boot.lds b/board/astro/mcf5373l/u-boot.lds new file mode 100644 index 000000000..a9a4e0a23 --- /dev/null +++ b/board/astro/mcf5373l/u-boot.lds @@ -0,0 +1,142 @@ +/* + * (C) Copyright 2000 + * Wolfgang Denk, DENX Software Engineering, wd@denx.de. + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +OUTPUT_ARCH(m68k) +/* Do we need any of these for elf? + __DYNAMIC = 0; */ +SECTIONS +{ + /* Read-only sections, merged into text segment: */ + . = + SIZEOF_HEADERS; + .interp : { *(.interp) } + .hash : { *(.hash) } + .dynsym : { *(.dynsym) } + .dynstr : { *(.dynstr) } + .rel.text : { *(.rel.text) } + .rela.text : { *(.rela.text) } + .rel.data : { *(.rel.data) } + .rela.data : { *(.rela.data) } + .rel.rodata : { *(.rel.rodata) } + .rela.rodata : { *(.rela.rodata) } + .rel.got : { *(.rel.got) } + .rela.got : { *(.rela.got) } + .rel.ctors : { *(.rel.ctors) } + .rela.ctors : { *(.rela.ctors) } + .rel.dtors : { *(.rel.dtors) } + .rela.dtors : { *(.rela.dtors) } + .rel.bss : { *(.rel.bss) } + .rela.bss : { *(.rela.bss) } + .rel.plt : { *(.rel.plt) } + .rela.plt : { *(.rela.plt) } + .init : { *(.init) } + .plt : { *(.plt) } + .text : + { + /* WARNING - the following is hand-optimized to fit within */ + /* the sector layout of our flash chips! XXX FIXME XXX */ + + cpu/mcf532x/start.o (.text) + lib_m68k/traps.o (.text) + lib_m68k/interrupts.o (.text) + common/dlmalloc.o (.text) + lib_generic/zlib.o (.text) + + . = DEFINED(env_offset) ? env_offset : .; + common/env_embedded.o (.text) + + *(.text) +/* *(.fixup)*/ + *(.got1) + } + _etext = .; + PROVIDE (etext = .); + .rodata : + { + *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) + } + .fini : { *(.fini) } =0 + .ctors : { *(.ctors) } + .dtors : { *(.dtors) } + + /* Read-write section, merged into data segment: */ + . = (. + 0x00FF) & 0xFFFFFF00; + _erotext = .; + PROVIDE (erotext = .); + + .reloc : + { + __got_start = .; + *(.got) + __got_end = .; + _GOT2_TABLE_ = .; + *(.got2) + _FIXUP_TABLE_ = .; + *(.fixup) + } + __got2_entries = (_FIXUP_TABLE_ - _GOT2_TABLE_) >>2; + __fixup_entries = (. - _FIXUP_TABLE_)>>2; + + .data : + { + *(.data) + *(.data1) + *(.sdata) + *(.sdata2) + *(.dynamic) + CONSTRUCTORS + } + _edata = .; + PROVIDE (edata = .); + + . = .; + __u_boot_cmd_start = .; + .u_boot_cmd : { *(.u_boot_cmd) } + __u_boot_cmd_end = .; + + + . = .; + __start___ex_table = .; + __ex_table : { *(__ex_table) } + __stop___ex_table = .; + + . = ALIGN(256); + __init_begin = .; + .text.init : { *(.text.init) } + .data.init : { *(.data.init) } + . = ALIGN(256); + __init_end = .; + + __bss_start = .; + .bss : + { + _sbss = .; + *(.sbss) *(.scommon) + *(.dynbss) + *(.bss) + *(COMMON) + . = ALIGN(4); + _ebss = .; + } + _end = . ; + PROVIDE (end = .); +} diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h new file mode 100644 index 000000000..1fe42f682 --- /dev/null +++ b/include/configs/astro_mcf5373l.h @@ -0,0 +1,389 @@ +/* + * Configuration settings for the Sentec Cobra Board. + * + * (C) Copyright 2003 Josef Baumgartner + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +/* + * configuration for ASTRO "Urmel" board. + * Originating from Cobra5272 configuration, messed up by + * Wolfgang Wegner + * Please do not bother the original author with bug reports + * concerning this file. + */ + +#ifndef _CONFIG_ASTRO_MCF5373L_H +#define _CONFIG_ASTRO_MCF5373L_H + +/* + * set the card type to actually compile for; either of + * the possibilities listed below has to be used! + */ +#define CONFIG_ASTRO_V532 1 + +#if CONFIG_ASTRO_V532 +#define ASTRO_ID 0xF8 +#elif CONFIG_ASTRO_V512 +#define ASTRO_ID 0xFA +#elif CONFIG_ASTRO_TWIN7S2 +#define ASTRO_ID 0xF9 +#elif CONFIG_ASTRO_V912 +#define ASTRO_ID 0xFC +#elif CONFIG_ASTRO_COFDMDUOS2 +#define ASTRO_ID 0xFB +#else +#error No card type defined! +#endif + +/* + * Define processor + * possible values for Urmel board: only Coldfire M5373 processor supported + * (please do not change) + */ + +/* it seems not clear yet which processor defines we should use */ +#define CONFIG_MCF537x /* define processor family */ +#define CONFIG_MCF532x /* define processor family */ +#define CONFIG_M5373 /* define processor type */ +#define CONFIG_ASTRO5373L /* define board type */ + +/* Command line configuration */ +#include + +/* + * CONFIG_MK_RAM defines if u-boot is loaded via BDM (or started from + * a different bootloader that has already performed RAM setup) or + * started directly from flash, which is the regular case for production + * boards. + */ +#ifdef CONFIG_MK_RAM +#define CONFIG_MONITOR_IS_IN_RAM +#define CONFIG_TEXT_BASE 0x40020000 +#define ENABLE_JFFS 0 +#else +#define CONFIG_TEXT_BASE 0x00000000 +#define ENABLE_JFFS 1 +#endif + +/* Define which commmands should be available at u-boot command prompt */ + +#define CONFIG_CMD_CACHE +#define CONFIG_CMD_DATE +#define CONFIG_CMD_ELF +#define CONFIG_CMD_FLASH +#define CONFIG_CMD_I2C +#define CONFIG_CMD_MEMORY +#define CONFIG_CMD_MISC +#define CONFIG_CMD_XIMG +#undef CONFIG_CMD_NET +#undef CONFIG_CMD_NFS +#if ENABLE_JFFS +#define CONFIG_CMD_JFFS2 +#endif +#define CONFIG_CMD_REGINFO +#define CONFIG_CMD_LOADS +#define CONFIG_CMD_LOADB +#define CONFIG_CMD_FPGA +#define CONFIG_CMDLINE_EDITING + +#define CONFIG_SYS_HUSH_PARSER +#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " + +#define CONFIG_MCFRTC +#undef RTC_DEBUG + +/* Timer */ +#define CONFIG_MCFTMR +#undef CONFIG_MCFPIT + +/* I2C */ +#define CONFIG_FSL_I2C +#define CONFIG_HARD_I2C /* I2C with hw support */ +#undef CONFIG_SOFT_I2C /* I2C bit-banged */ +#define CONFIG_SYS_I2C_SPEED 80000 +#define CONFIG_SYS_I2C_SLAVE 0x7F +#define CONFIG_SYS_I2C_OFFSET 0x58000 +#define CONFIG_SYS_IMMR CONFIG_SYS_MBAR + +/* + * Defines processor clock - important for correct timings concerning serial + * interface etc. + * CONFIG_SYS_HZ gives unit: 1000 -> 1 Hz ^= 1000 ms + */ + +#define CONFIG_SYS_HZ 1000 +#define CONFIG_SYS_CLK 80000000 +#define CONFIG_SYS_CPU_CLK (CONFIG_SYS_CLK * 3) +#define CONFIG_SYS_SDRAM_SIZE 32 /* SDRAM size in MB */ + +#define CONFIG_SYS_CORE_SRAM_SIZE 0x8000 +#define CONFIG_SYS_CORE_SRAM 0x80000000 + +#define CONFIG_SYS_UNIFY_CACHE + +/* + * Define baudrate for UART1 (console output, tftp, ...) + * default value of CONFIG_BAUDRATE for Sentec board: 19200 baud + * CONFIG_SYS_BAUDRATE_TABLE defines values that can be selected + * in u-boot command interface + */ + +#define CONFIG_BAUDRATE 115200 +#define CONFIG_SYS_BAUDRATE_TABLE { 9600 , 19200 , 38400 , 57600, 115200 } + +#define CONFIG_MCFUART +#define CONFIG_SYS_UART_PORT (2) +#define CONFIG_SYS_UART2_ALT3_GPIO + +/* + * Watchdog configuration; Watchdog is disabled for running from RAM + * and set to highest possible value else. Beware there is no check + * in the watchdog code to validate the timeout value set here! + */ + +#ifndef CONFIG_MONITOR_IS_IN_RAM +#define CONFIG_WATCHDOG +#define CONFIG_WATCHDOG_TIMEOUT 3355 /* timeout in milliseconds */ +#endif + +/* + * Configuration for environment + * Environment is located in the last sector of the flash + */ + +#ifndef CONFIG_MONITOR_IS_IN_RAM +#define CONFIG_ENV_OFFSET 0x1FF8000 +#define CONFIG_ENV_SECT_SIZE 0x8000 +#define CONFIG_ENV_IS_IN_FLASH 1 +#else +/* + * environment in RAM - This is used to use a single PC-based application + * to load an image, load U-Boot, load an environment and then start U-Boot + * to execute the commands from the environment. Feedback is done via setting + * and reading memory locations. + */ +#define CONFIG_ENV_ADDR 0x40060000 +#define CONFIG_ENV_SECT_SIZE 0x8000 +#define CONFIG_ENV_IS_IN_FLASH 1 +#endif + +/* here we put our FPGA configuration... */ +#define CONFIG_MISC_INIT_R 1 + +/* Define user parameters that have to be customized most likely */ + +/* AUTOBOOT settings - booting images automatically by u-boot after power on */ + +/* + * used for autoboot, delay in seconds u-boot will wait before starting + * defined (auto-)boot command, setting to -1 disables delay, setting to + * 0 will too prevent access to u-boot command interface: u-boot then has + * to be reflashed + * beware - watchdog is not serviced during autoboot delay time! + */ +#ifdef CONFIG_MONITOR_IS_IN_RAM +#define CONFIG_BOOTDELAY 1 +#else +#define CONFIG_BOOTDELAY 1 +#endif + +/* + * The following settings will be contained in the environment block ; if you + * want to use a neutral environment all those settings can be manually set in + * u-boot: 'set' command + */ + +#define _QUOTEME(x) #x +#define QUOTEME(x) _QUOTEME(x) + +#define CONFIG_EXTRA_ENV_SETTINGS \ + "loaderversion=11\0" \ + "card_id="QUOTEME(ASTRO_ID)"\0" \ + "alterafile=0\0" \ + "xilinxfile=0\0" \ + "xilinxload=imxtract 0x540000 $xilinxfile 0x41000000&&"\ + "fpga load 0 0x41000000 $filesize\0" \ + "alteraload=imxtract 0x6c0000 $alterafile 0x41000000&&"\ + "fpga load 1 0x41000000 $filesize\0" \ + "env_default=1\0" \ + "env_check=if test $env_default -eq 1;"\ + " then setenv env_default 0;saveenv;fi\0" + +/* + * "update" is a non-standard command that has to be supplied + * by external update.c; This is not included in mainline because + * it needs non-blocking CFI routines. + */ +#ifdef CONFIG_MONITOR_IS_IN_RAM +#define CONFIG_BOOTCOMMAND "" /* no autoboot in this case */ +#else +#if CONFIG_ASTRO_V532 +#define CONFIG_BOOTCOMMAND "protect off 0x80000 0x1ffffff;run env_check;"\ + "run xilinxload&&run alteraload&&bootm 0x80000;"\ + "update;reset" +#else +#define CONFIG_BOOTCOMMAND "protect off 0x80000 0x1ffffff;run env_check;"\ + "run xilinxload&&bootm 0x80000;update;reset" +#endif +#endif + +/* default bootargs that are considered during boot */ +#define CONFIG_BOOTARGS " console=ttyS2,115200 rootfstype=romfs"\ + " loaderversion=$loaderversion" + +#define CONFIG_SYS_PROMPT "URMEL > " + +/* default RAM address for user programs */ +#define CONFIG_SYS_LOAD_ADDR 0x20000 + +#define CONFIG_SYS_LONGHELP + +#if (CONFIG_COMMANDS & CONFIG_CMD_KGDB) +#define CONFIG_SYS_CBSIZE 1024 +#else +#define CONFIG_SYS_CBSIZE 256 +#endif +#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) +#define CONFIG_SYS_MAXARGS 16 +#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE + +#define CONFIG_FPGA_COUNT 1 +#define CONFIG_FPGA +#define CONFIG_FPGA_XILINX +#define CONFIG_FPGA_SPARTAN3 +#define CONFIG_FPGA_ALTERA +#define CONFIG_FPGA_CYCLON2 +#define CONFIG_SYS_FPGA_PROG_FEEDBACK +#define CONFIG_SYS_FPGA_WAIT 1000 + +/* End of user parameters to be customized */ + +/* Defines memory range for test */ + +#define CONFIG_SYS_MEMTEST_START 0x40020000 +#define CONFIG_SYS_MEMTEST_END 0x41ffffff + +/* + * Low Level Configuration Settings + * (address mappings, register initial values, etc.) + * You should know what you are doing if you make changes here. + */ + +/* Base register address */ + +#define CONFIG_SYS_MBAR 0xFC000000 /* Register Base Addrs */ + +/* System Conf. Reg. & System Protection Reg. */ + +#define CONFIG_SYS_SCR 0x0003; +#define CONFIG_SYS_SPR 0xffff; + +/* + * Definitions for initial stack pointer and data area (in internal SRAM) + */ +#define CONFIG_SYS_INIT_RAM_ADDR 0x80000000 +#define CONFIG_SYS_INIT_RAM_END 0x8000 +#define CONFIG_SYS_INIT_RAM_CTRL 0x221 +#define CONFIG_SYS_GBL_DATA_SIZE 128 +#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - \ + CONFIG_SYS_GBL_DATA_SIZE) +#define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET + +/* + * Start addresses for the final memory configuration + * (Set up by the startup code) + * for MCF5373, the allowable range is 0x40000000 to 0x7FF00000 + */ +#define CONFIG_SYS_SDRAM_BASE 0x40000000 + +/* + * Chipselect bank definitions + * + * CS0 - Flash 32MB (first 16MB) + * CS1 - Flash 32MB (second half) + * CS2 - FPGA + * CS3 - FPGA + * CS4 - unused + * CS5 - unused + */ +#define CONFIG_SYS_CS0_BASE 0 +#define CONFIG_SYS_CS0_MASK 0x00ff0001 +#define CONFIG_SYS_CS0_CTRL 0x00001fc0 + +#define CONFIG_SYS_CS1_BASE 0x01000000 +#define CONFIG_SYS_CS1_MASK 0x00ff0001 +#define CONFIG_SYS_CS1_CTRL 0x00001fc0 + +#define CONFIG_SYS_CS2_BASE 0x20000000 +#define CONFIG_SYS_CS2_MASK 0x00ff0001 +#define CONFIG_SYS_CS2_CTRL 0x0000fec0 + +#define CONFIG_SYS_CS3_BASE 0x21000000 +#define CONFIG_SYS_CS3_MASK 0x00ff0001 +#define CONFIG_SYS_CS3_CTRL 0x0000fec0 + +#define CONFIG_SYS_FLASH_BASE 0x00000000 + +#ifdef CONFIG_MONITOR_IS_IN_RAM +#define CONFIG_SYS_MONITOR_BASE CONFIG_TEXT_BASE +#else +/* This is mainly used during relocation in start.S */ +#define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_FLASH_BASE + 0x400) +#endif +/* Reserve 256 kB for Monitor */ +#define CONFIG_SYS_MONITOR_LEN (256 << 10) + +#define CONFIG_SYS_BOOTPARAMS_LEN (64 * 1024) +/* Reserve 128 kB for malloc() */ +#define CONFIG_SYS_MALLOC_LEN (128 << 10) + +/* + * For booting Linux, the board info and command line data + * have to be in the first 8 MB of memory, since this is + * the maximum mapped by the Linux kernel during initialization ?? + */ +#define CONFIG_SYS_BOOTMAPSZ (CONFIG_SYS_SDRAM_BASE + \ + (CONFIG_SYS_SDRAM_SIZE << 20)) + +/* FLASH organization */ +#define CONFIG_SYS_MAX_FLASH_BANKS 1 +#define CONFIG_SYS_MAX_FLASH_SECT 259 +#define CONFIG_SYS_FLASH_ERASE_TOUT 1000 + +#define CONFIG_SYS_FLASH_CFI 1 +#define CONFIG_FLASH_CFI_DRIVER 1 +#define CONFIG_SYS_FLASH_SIZE 0x2000000 +#define CONFIG_SYS_FLASH_PROTECTION 1 +#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE 1 +#define CONFIG_SYS_FLASH_CFI_NONBLOCK 1 + +#if ENABLE_JFFS +/* JFFS Partition offset set */ +#define CONFIG_SYS_JFFS2_FIRST_BANK 0 +#define CONFIG_SYS_JFFS2_NUM_BANKS 1 +/* 512k reserved for u-boot */ +#define CONFIG_SYS_JFFS2_FIRST_SECTOR 0x40 +#endif + +/* Cache Configuration */ +#define CONFIG_SYS_CACHELINE_SIZE 16 + +#endif /* _CONFIG_ASTRO_MCF5373L_H */ From 89083346d0627a5e6e271e61bd34ab5121f9462b Mon Sep 17 00:00:00 2001 From: Wolfgang Wegner Date: Fri, 30 Oct 2009 16:55:02 +0100 Subject: [PATCH 023/164] add block write function to spartan3 slave serial load Using seperate function calls for each bit-bang of slave serial load can be painfully slow. This patch adds the possibility to supply a block write function that loads the complete block of data in one call (like it can already be done with Altera FPGAs). On an MCF5373L (240 MHz) loading an XC3S4000 this reduces the load time from around 15 seconds to around 3 seconds Signed-off-by: Wolfgang Wegner --- drivers/fpga/spartan3.c | 52 ++++++++++++++++++++++------------------- include/spartan3.h | 1 + include/xilinx.h | 1 + 3 files changed, 30 insertions(+), 24 deletions(-) diff --git a/drivers/fpga/spartan3.c b/drivers/fpga/spartan3.c index 0fe30410a..7a89b5692 100644 --- a/drivers/fpga/spartan3.c +++ b/drivers/fpga/spartan3.c @@ -385,34 +385,38 @@ static int Spartan3_ss_load (Xilinx_desc * desc, void *buf, size_t bsize) } while ((*fn->init) (cookie)); /* Load the data */ - while (bytecount < bsize) { + if(*fn->bwr) + (*fn->bwr) (data, bsize, TRUE, cookie); + else { + while (bytecount < bsize) { - /* Xilinx detects an error if INIT goes low (active) - while DONE is low (inactive) */ - if ((*fn->done) (cookie) == 0 && (*fn->init) (cookie)) { - puts ("** CRC error during FPGA load.\n"); - return (FPGA_FAIL); - } - val = data [bytecount ++]; - i = 8; - do { - /* Deassert the clock */ - (*fn->clk) (FALSE, TRUE, cookie); - CONFIG_FPGA_DELAY (); - /* Write data */ - (*fn->wr) ((val & 0x80), TRUE, cookie); - CONFIG_FPGA_DELAY (); - /* Assert the clock */ - (*fn->clk) (TRUE, TRUE, cookie); - CONFIG_FPGA_DELAY (); - val <<= 1; - i --; - } while (i > 0); + /* Xilinx detects an error if INIT goes low (active) + while DONE is low (inactive) */ + if ((*fn->done) (cookie) == 0 && (*fn->init) (cookie)) { + puts ("** CRC error during FPGA load.\n"); + return (FPGA_FAIL); + } + val = data [bytecount ++]; + i = 8; + do { + /* Deassert the clock */ + (*fn->clk) (FALSE, TRUE, cookie); + CONFIG_FPGA_DELAY (); + /* Write data */ + (*fn->wr) ((val & 0x80), TRUE, cookie); + CONFIG_FPGA_DELAY (); + /* Assert the clock */ + (*fn->clk) (TRUE, TRUE, cookie); + CONFIG_FPGA_DELAY (); + val <<= 1; + i --; + } while (i > 0); #ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK - if (bytecount % (bsize / 40) == 0) - putc ('.'); /* let them know we are alive */ + if (bytecount % (bsize / 40) == 0) + putc ('.'); /* let them know we are alive */ #endif + } } CONFIG_FPGA_DELAY (); diff --git a/include/spartan3.h b/include/spartan3.h index 30b1c2d62..d5a589d09 100644 --- a/include/spartan3.h +++ b/include/spartan3.h @@ -57,6 +57,7 @@ typedef struct { Xilinx_done_fn done; Xilinx_wr_fn wr; Xilinx_post_fn post; + Xilinx_bwr_fn bwr; /* block write function */ } Xilinx_Spartan3_Slave_Serial_fns; /* Device Image Sizes diff --git a/include/xilinx.h b/include/xilinx.h index d0799bc57..2cb2e5b6a 100644 --- a/include/xilinx.h +++ b/include/xilinx.h @@ -100,5 +100,6 @@ typedef int (*Xilinx_busy_fn)( int cookie ); typedef int (*Xilinx_abort_fn)( int cookie ); typedef int (*Xilinx_pre_fn)( int cookie ); typedef int (*Xilinx_post_fn)( int cookie ); +typedef int (*Xilinx_bwr_fn)( void *buf, size_t len, int flush, int cookie ); #endif /* _XILINX_H_ */ From dfc2b7697dc07862da804c1be084f96301884bc7 Mon Sep 17 00:00:00 2001 From: Michael Durrant Date: Wed, 20 Jan 2010 19:33:02 -0600 Subject: [PATCH 024/164] Adding EP2500 MCF5282 board [PATCH] Mercury-EP2500.patch - added Mercury's EP2500 board uses the mcf5282 processor CREDITS.patch Signed-off-by: David Wu Signed-off-by: Michael Durrant --- CREDITS | 5 +++++ Makefile | 3 +++ cpu/mcf52x2/cpu_init.c | 11 +++++++++++ 3 files changed, 19 insertions(+) diff --git a/CREDITS b/CREDITS index 2471029fc..043ba6e13 100644 --- a/CREDITS +++ b/CREDITS @@ -511,6 +511,11 @@ N: Martin Winistoerfer E: martinwinistoerfer@gmx.ch D: Port to MPC555/556 microcontrollers and support for cmi board +N: David Wu +E: support@arcturusnetworks.com +D: Mercury Security EP2500 +W: http://www.arcturusnetworks.com + N: Ming-Len Wu E: minglen_wu@techware.com.tw D: Motorola MX1ADS board support diff --git a/Makefile b/Makefile index e004303a8..804430234 100644 --- a/Makefile +++ b/Makefile @@ -2048,6 +2048,9 @@ EB+MCF-EV123_internal_config : unconfig @echo "TEXT_BASE = 0xF0000000"|tee $(obj)board/BuS/EB+MCF-EV123/textbase.mk @$(MKCONFIG) EB+MCF-EV123 m68k mcf52x2 EB+MCF-EV123 BuS +EP2500_config: unconfig + @$(MKCONFIG) $(@:_config=) m68k mcf52x2 ep2500 Mercury + idmr_config : unconfig @$(MKCONFIG) $(@:_config=) m68k mcf52x2 idmr diff --git a/cpu/mcf52x2/cpu_init.c b/cpu/mcf52x2/cpu_init.c index 7cea6558f..5b06930df 100644 --- a/cpu/mcf52x2/cpu_init.c +++ b/cpu/mcf52x2/cpu_init.c @@ -5,6 +5,8 @@ * MCF5282 additionals * (C) Copyright 2005 * BuS Elektronik GmbH & Co. KG + * (c) Copyright 2010 + * Arcturus Networks Inc. * * Copyright (C) 2004-2007 Freescale Semiconductor, Inc. * TsiChung Liew (Tsi-Chung.Liew@freescale.com) @@ -582,6 +584,12 @@ void cpu_init_f(void) #ifdef CONFIG_SYS_PTCPAR MCFGPIO_PTCPAR = CONFIG_SYS_PTCPAR; #endif +#if defined(CONFIG_SYS_PORTTC) + MCFGPIO_PORTTC = CONFIG_SYS_PORTTC; +#endif +#if defined(CONFIG_SYS_DDRTC) + MCFGPIO_DDRTC = CONFIG_SYS_DDRTC; +#endif #ifdef CONFIG_SYS_PTDPAR MCFGPIO_PTDPAR = CONFIG_SYS_PTDPAR; #endif @@ -589,6 +597,9 @@ void cpu_init_f(void) MCFGPIO_PUAPAR = CONFIG_SYS_PUAPAR; #endif +#if defined(CONFIG_SYS_DDRD) + MCFGPIO_DDRD = CONFIG_SYS_DDRD; +#endif #ifdef CONFIG_SYS_DDRUA MCFGPIO_DDRUA = CONFIG_SYS_DDRUA; #endif From 116095eb1f0f7017ea8062aa8a8ba8ceecb430b5 Mon Sep 17 00:00:00 2001 From: Philippe De Muyter Date: Mon, 21 Sep 2009 22:20:29 -0600 Subject: [PATCH 025/164] fix cmd_bdinfo.c:354: warning: 'print_eth' defined but not used This fixes the following warnings when running MAKEALL for coldfire : cmd_bdinfo.c:354: warning: 'print_eth' defined but not used Signed-off-by: Philippe De Muyter --- common/cmd_bdinfo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/cmd_bdinfo.c b/common/cmd_bdinfo.c index f8400bcc0..d22eb6634 100644 --- a/common/cmd_bdinfo.c +++ b/common/cmd_bdinfo.c @@ -31,7 +31,7 @@ DECLARE_GLOBAL_DATA_PTR; static void print_num(const char *, ulong); -#if !defined(CONFIG_ARM) || defined(CONFIG_CMD_NET) +#if !(defined(CONFIG_ARM) || defined(CONFIG_M68K)) || defined(CONFIG_CMD_NET) static void print_eth(int idx); #endif @@ -350,7 +350,7 @@ static void print_num(const char *name, ulong value) printf ("%-12s= 0x%08lX\n", name, value); } -#if !defined(CONFIG_ARM) || defined(CONFIG_CMD_NET) +#if !(defined(CONFIG_ARM) || defined(CONFIG_M68K)) || defined(CONFIG_CMD_NET) static void print_eth(int idx) { char name[10], *val; From d04c1efae3d834db6e21e9976e338bf1e588e987 Mon Sep 17 00:00:00 2001 From: TsiChung Liew Date: Tue, 9 Mar 2010 18:32:16 -0600 Subject: [PATCH 026/164] ColdFire: Correct bit definition Use correct definition for _MASK and _UNMASK. It was combined in the previous used and causes confusion. Signed-off-by: TsiChung Liew --- board/freescale/m54455evb/m54455evb.c | 2 +- cpu/mcf5227x/cpu_init.c | 12 +-- cpu/mcf52x2/cpu_init.c | 14 ++-- cpu/mcf532x/cpu_init.c | 12 +-- cpu/mcf532x/speed.c | 2 +- cpu/mcf5445x/cpu_init.c | 4 +- include/asm-m68k/m520x.h | 89 ++++++++++---------- include/asm-m68k/m5227x.h | 108 ++++++++++++------------- include/asm-m68k/m5235.h | 4 +- include/asm-m68k/m5301x.h | 112 +++++++++++++------------- include/asm-m68k/m5445x.h | 56 ++++++------- 11 files changed, 206 insertions(+), 209 deletions(-) diff --git a/board/freescale/m54455evb/m54455evb.c b/board/freescale/m54455evb/m54455evb.c index 293b5b0e4..866694fb0 100644 --- a/board/freescale/m54455evb/m54455evb.c +++ b/board/freescale/m54455evb/m54455evb.c @@ -107,7 +107,7 @@ int ide_preinit(void) { volatile gpio_t *gpio = (gpio_t *) MMAP_GPIO; - gpio->par_fec |= (gpio->par_fec & GPIO_PAR_FEC_FEC1_MASK) | 0x10; + gpio->par_fec |= (gpio->par_fec & GPIO_PAR_FEC_FEC1_UNMASK) | 0x10; gpio->par_feci2c |= (gpio->par_feci2c & 0xF0FF) | (GPIO_PAR_FECI2C_MDC1_ATA_DIOR | GPIO_PAR_FECI2C_MDIO1_ATA_DIOW); diff --git a/cpu/mcf5227x/cpu_init.c b/cpu/mcf5227x/cpu_init.c index e160ee1af..d336857ed 100644 --- a/cpu/mcf5227x/cpu_init.c +++ b/cpu/mcf5227x/cpu_init.c @@ -133,19 +133,19 @@ void uart_port_conf(void) switch (CONFIG_SYS_UART_PORT) { case 0: gpio->par_uart &= - (GPIO_PAR_UART_U0TXD_MASK & GPIO_PAR_UART_U0RXD_MASK); + (GPIO_PAR_UART_U0TXD_UNMASK & GPIO_PAR_UART_U0RXD_UNMASK); gpio->par_uart |= (GPIO_PAR_UART_U0TXD_U0TXD | GPIO_PAR_UART_U0RXD_U0RXD); break; case 1: gpio->par_uart &= - (GPIO_PAR_UART_U1TXD_MASK & GPIO_PAR_UART_U1RXD_MASK); + (GPIO_PAR_UART_U1TXD_UNMASK & GPIO_PAR_UART_U1RXD_UNMASK); gpio->par_uart |= (GPIO_PAR_UART_U1TXD_U1TXD | GPIO_PAR_UART_U1RXD_U1RXD); break; case 2: gpio->par_dspi &= - (GPIO_PAR_DSPI_SIN_MASK & GPIO_PAR_DSPI_SOUT_MASK); + (GPIO_PAR_DSPI_SIN_UNMASK & GPIO_PAR_DSPI_SOUT_UNMASK); gpio->par_dspi = (GPIO_PAR_DSPI_SIN_U2RXD | GPIO_PAR_DSPI_SOUT_U2TXD); break; @@ -175,11 +175,11 @@ int cfspi_claim_bus(uint bus, uint cs) switch (cs) { case 0: - gpio->par_dspi &= ~GPIO_PAR_DSPI_PCS0_MASK; + gpio->par_dspi &= ~GPIO_PAR_DSPI_PCS0_UNMASK; gpio->par_dspi |= GPIO_PAR_DSPI_PCS0_PCS0; break; case 2: - gpio->par_timer &= GPIO_PAR_TIMER_T2IN_MASK; + gpio->par_timer &= GPIO_PAR_TIMER_T2IN_UNMASK; gpio->par_timer |= GPIO_PAR_TIMER_T2IN_DSPIPCS2; break; } @@ -199,7 +199,7 @@ void cfspi_release_bus(uint bus, uint cs) gpio->par_dspi &= ~GPIO_PAR_DSPI_PCS0_PCS0; break; case 2: - gpio->par_timer &= GPIO_PAR_TIMER_T2IN_MASK; + gpio->par_timer &= GPIO_PAR_TIMER_T2IN_UNMASK; break; } } diff --git a/cpu/mcf52x2/cpu_init.c b/cpu/mcf52x2/cpu_init.c index 5b06930df..747c1cf90 100644 --- a/cpu/mcf52x2/cpu_init.c +++ b/cpu/mcf52x2/cpu_init.c @@ -142,29 +142,29 @@ void uart_port_conf(void) /* Setup Ports: */ switch (CONFIG_SYS_UART_PORT) { case 0: - gpio->par_uart &= GPIO_PAR_UART0_MASK; + gpio->par_uart &= GPIO_PAR_UART0_UNMASK; gpio->par_uart |= (GPIO_PAR_UART_U0TXD | GPIO_PAR_UART_U0RXD); break; case 1: - gpio->par_uart &= GPIO_PAR_UART0_MASK; + gpio->par_uart &= GPIO_PAR_UART0_UNMASK; gpio->par_uart |= (GPIO_PAR_UART_U1TXD | GPIO_PAR_UART_U1RXD); break; case 2: #ifdef CONFIG_SYS_UART2_PRI_GPIO gpio->par_timer &= - (GPIO_PAR_TMR_TIN0_MASK | GPIO_PAR_TMR_TIN1_MASK); + (GPIO_PAR_TMR_TIN0_UNMASK | GPIO_PAR_TMR_TIN1_UNMASK); gpio->par_timer |= (GPIO_PAR_TMR_TIN0_U2TXD | GPIO_PAR_TMR_TIN1_U2RXD); #endif #ifdef CONFIG_SYS_UART2_ALT1_GPIO gpio->par_feci2c &= - (GPIO_PAR_FECI2C_MDC_MASK | GPIO_PAR_FECI2C_MDIO_MASK); + (GPIO_PAR_FECI2C_MDC_UNMASK | GPIO_PAR_FECI2C_MDIO_UNMASK); gpio->par_feci2c |= (GPIO_PAR_FECI2C_MDC_U2TXD | GPIO_PAR_FECI2C_MDIO_U2RXD); #endif #ifdef CONFIG_SYS_UART2_ALT1_GPIO gpio->par_feci2c &= - (GPIO_PAR_FECI2C_SDA_MASK | GPIO_PAR_FECI2C_SCL_MASK); + (GPIO_PAR_FECI2C_SDA_UNMASK | GPIO_PAR_FECI2C_SCL_UNMASK); gpio->par_feci2c |= (GPIO_PAR_FECI2C_SDA_U2TXD | GPIO_PAR_FECI2C_SCL_U2RXD); #endif @@ -184,8 +184,8 @@ int fecpin_setclear(struct eth_device *dev, int setclear) GPIO_PAR_FECI2C_MDC_MDC | GPIO_PAR_FECI2C_MDIO_MDIO; } else { gpio->par_fec &= - (GPIO_PAR_FEC_7W_MASK & GPIO_PAR_FEC_MII_MASK); - gpio->par_feci2c &= GPIO_PAR_FECI2C_RMII_MASK; + (GPIO_PAR_FEC_7W_UNMASK & GPIO_PAR_FEC_MII_UNMASK); + gpio->par_feci2c &= GPIO_PAR_FECI2C_RMII_UNMASK; } return 0; } diff --git a/cpu/mcf532x/cpu_init.c b/cpu/mcf532x/cpu_init.c index 4f1695cef..04160a829 100644 --- a/cpu/mcf532x/cpu_init.c +++ b/cpu/mcf532x/cpu_init.c @@ -145,12 +145,12 @@ void uart_port_conf(void) case 1: #ifdef CONFIG_SYS_UART1_ALT1_GPIO gpio->par_simp1h &= - ~(GPIO_PAR_SIMP1H_DATA1_MASK | GPIO_PAR_SIMP1H_VEN1_MASK); + ~(GPIO_PAR_SIMP1H_DATA1_UNMASK | GPIO_PAR_SIMP1H_VEN1_UNMASK); gpio->par_simp1h |= (GPIO_PAR_SIMP1H_DATA1_U1TXD | GPIO_PAR_SIMP1H_VEN1_U1RXD); #elif defined(CONFIG_SYS_UART1_ALT2_GPIO) gpio->par_ssih &= - ~(GPIO_PAR_SSIH_RXD_MASK | GPIO_PAR_SSIH_TXD_MASK); + ~(GPIO_PAR_SSIH_RXD_UNMASK | GPIO_PAR_SSIH_TXD_UNMASK); gpio->par_ssih |= (GPIO_PAR_SSIH_RXD_U1RXD | GPIO_PAR_SSIH_TXD_U1TXD); #endif @@ -160,12 +160,12 @@ void uart_port_conf(void) gpio->par_uart |= (GPIO_PAR_UART_U2TXD | GPIO_PAR_UART_U2RXD); #elif defined(CONFIG_SYS_UART2_ALT1_GPIO) gpio->par_dspih &= - ~(GPIO_PAR_DSPIH_SIN_MASK | GPIO_PAR_DSPIH_SOUT_MASK); + ~(GPIO_PAR_DSPIH_SIN_UNMASK | GPIO_PAR_DSPIH_SOUT_UNMASK); gpio->par_dspih |= (GPIO_PAR_DSPIH_SIN_U2RXD | GPIO_PAR_DSPIH_SOUT_U2TXD); #elif defined(CONFIG_SYS_UART2_ALT2_GPIO) gpio->par_feci2c &= - ~(GPIO_PAR_FECI2C_SDA_MASK | GPIO_PAR_FECI2C_SCL_MASK); + ~(GPIO_PAR_FECI2C_SDA_UNMASK | GPIO_PAR_FECI2C_SCL_UNMASK); gpio->par_feci2c |= (GPIO_PAR_FECI2C_SDA_U2TXD | GPIO_PAR_FECI2C_SCL_U2RXD); #endif @@ -195,11 +195,11 @@ int fecpin_setclear(struct eth_device *dev, int setclear) if (info->iobase == CONFIG_SYS_FEC0_IOBASE) { gpio->par_fec &= ~(GPIO_PAR_FEC0_7W_FEC | GPIO_PAR_FEC0_RMII_FEC); - gpio->par_feci2c &= GPIO_PAR_FECI2C_RMII0_MASK; + gpio->par_feci2c &= GPIO_PAR_FECI2C_RMII0_UNMASK; } else { gpio->par_fec &= ~(GPIO_PAR_FEC1_7W_FEC | GPIO_PAR_FEC1_RMII_FEC); - gpio->par_feci2c &= GPIO_PAR_FECI2C_RMII1_MASK; + gpio->par_feci2c &= GPIO_PAR_FECI2C_RMII1_UNMASK; } } return 0; diff --git a/cpu/mcf532x/speed.c b/cpu/mcf532x/speed.c index 67f08c760..5a29e2567 100644 --- a/cpu/mcf532x/speed.c +++ b/cpu/mcf532x/speed.c @@ -229,7 +229,7 @@ int clock_pll(int fsys, int flags) PLL_PDR_OUTDIV3((BUSDIV / 2) - 1) | PLL_PDR_OUTDIV4(USBDIV - 1); - pll->pcr &= PLL_PCR_FBDIV_MASK; + pll->pcr &= PLL_PCR_FBDIV_UNMASK; pll->pcr |= PLL_PCR_FBDIV(mfd - 1); #endif #ifdef CONFIG_MCF532x diff --git a/cpu/mcf5445x/cpu_init.c b/cpu/mcf5445x/cpu_init.c index 48b37dfe7..00b7910cc 100644 --- a/cpu/mcf5445x/cpu_init.c +++ b/cpu/mcf5445x/cpu_init.c @@ -164,9 +164,9 @@ int fecpin_setclear(struct eth_device *dev, int setclear) ~(GPIO_PAR_FECI2C_MDC0_MDC0 | GPIO_PAR_FECI2C_MDIO0_MDIO0); if (info->iobase == CONFIG_SYS_FEC0_IOBASE) - gpio->par_fec &= GPIO_PAR_FEC_FEC0_MASK; + gpio->par_fec &= GPIO_PAR_FEC_FEC0_UNMASK; else - gpio->par_fec &= GPIO_PAR_FEC_FEC1_MASK; + gpio->par_fec &= GPIO_PAR_FEC_FEC1_UNMASK; } return 0; } diff --git a/include/asm-m68k/m520x.h b/include/asm-m68k/m520x.h index 267bfd994..71f147e75 100644 --- a/include/asm-m68k/m520x.h +++ b/include/asm-m68k/m520x.h @@ -70,7 +70,6 @@ #define PACR_TP 1 #define SCM_BMT_BME (0x00000008) -#define SCM_BMT_BMT_MASK (0x07) #define SCM_BMT_BMT(x) ((x) & 0x07) #define SCM_BMT_BMT1024 (0x0000) #define SCM_BMT_BMT512 (0x0001) @@ -179,7 +178,7 @@ #define CCM_CCR_PLL_MODE (0x0002) #define CCM_CCR_RESERVED (0x0001) -#define CCM_CIR_PIN(x) (((x) & 0x03FF) << 6) +#define CCM_CIR_PIN(x) (((x) & 0xFFC0) >> 6) #define CCM_CIR_PRN(x) ((x) & 0x003F) /* *** General Purpose I/O (GPIO) *** */ @@ -196,7 +195,7 @@ #define GPIO_PAR_FBCTL_OE (0x10) #define GPIO_PAR_FBCTL_TA (0x08) #define GPIO_PAR_FBCTL_RWB (0x04) -#define GPIO_PAR_FBCTL_TS_MASK (0xFC) +#define GPIO_PAR_FBCTL_TS_UNMASK (0xFC) #define GPIO_PAR_FBCTL_TS_TS (0x03) #define GPIO_PAR_FBCTL_TS_DMA (0x02) @@ -207,39 +206,39 @@ #define GPIO_PAR_CS3 (0x08) #define GPIO_PAR_CS2 (0x04) -#define GPIO_PAR_CS1_MASK (0xFC) +#define GPIO_PAR_CS1_UNMASK (0xFC) #define GPIO_PAR_CS1_CS1 (0x03) #define GPIO_PAR_CS1_SDCS1 (0x02) -#define GPIO_PAR_FECI2C_RMII_MASK (0x0F) -#define GPIO_PAR_FECI2C_MDC_MASK (0x3F) +#define GPIO_PAR_FECI2C_RMII_UNMASK (0x0F) +#define GPIO_PAR_FECI2C_MDC_UNMASK (0x3F) #define GPIO_PAR_FECI2C_MDC_MDC (0xC0) #define GPIO_PAR_FECI2C_MDC_SCL (0x80) #define GPIO_PAR_FECI2C_MDC_U2TXD (0x40) -#define GPIO_PAR_FECI2C_MDIO_MASK (0xCF) +#define GPIO_PAR_FECI2C_MDIO_UNMASK (0xCF) #define GPIO_PAR_FECI2C_MDIO_MDIO (0x30) #define GPIO_PAR_FECI2C_MDIO_SDA (0x20) #define GPIO_PAR_FECI2C_MDIO_U2RXD (0x10) -#define GPIO_PAR_FECI2C_I2C_MASK (0xF0) -#define GPIO_PAR_FECI2C_SCL_MASK (0xF3) +#define GPIO_PAR_FECI2C_I2C_UNMASK (0xF0) +#define GPIO_PAR_FECI2C_SCL_UNMASK (0xF3) #define GPIO_PAR_FECI2C_SCL_SCL (0x0C) #define GPIO_PAR_FECI2C_SCL_U2RXD (0x04) -#define GPIO_PAR_FECI2C_SDA_MASK (0xFC) +#define GPIO_PAR_FECI2C_SDA_UNMASK (0xFC) #define GPIO_PAR_FECI2C_SDA_SDA (0x03) #define GPIO_PAR_FECI2C_SDA_U2TXD (0x01) -#define GPIO_PAR_QSPI_PCS2_MASK (0x3F) +#define GPIO_PAR_QSPI_PCS2_UNMASK (0x3F) #define GPIO_PAR_QSPI_PCS2_PCS2 (0xC0) #define GPIO_PAR_QSPI_PCS2_DACK0 (0x80) #define GPIO_PAR_QSPI_PCS2_U2RTS (0x40) -#define GPIO_PAR_QSPI_DIN_MASK (0xCF) +#define GPIO_PAR_QSPI_DIN_UNMASK (0xCF) #define GPIO_PAR_QSPI_DIN_DIN (0x30) #define GPIO_PAR_QSPI_DIN_DREQ0 (0x20) #define GPIO_PAR_QSPI_DIN_U2CTS (0x10) -#define GPIO_PAR_QSPI_DOUT_MASK (0xF3) +#define GPIO_PAR_QSPI_DOUT_UNMASK (0xF3) #define GPIO_PAR_QSPI_DOUT_DOUT (0x0C) #define GPIO_PAR_QSPI_DOUT_SDA (0x08) -#define GPIO_PAR_QSPI_SCK_MASK (0xFC) +#define GPIO_PAR_QSPI_SCK_UNMASK (0xFC) #define GPIO_PAR_QSPI_SCK_SCK (0x03) #define GPIO_PAR_QSPI_SCK_SCL (0x02) @@ -247,50 +246,50 @@ #define GPIO_PAR_TMR_TIN2(x) (((x) & 0x03) << 4) #define GPIO_PAR_TMR_TIN1(x) (((x) & 0x03) << 2) #define GPIO_PAR_TMR_TIN0(x) ((x) & 0x03) -#define GPIO_PAR_TMR_TIN3_MASK (0x3F) +#define GPIO_PAR_TMR_TIN3_UNMASK (0x3F) #define GPIO_PAR_TMR_TIN3_TIN3 (0xC0) #define GPIO_PAR_TMR_TIN3_TOUT3 (0x80) #define GPIO_PAR_TMR_TIN3_U2CTS (0x40) -#define GPIO_PAR_TMR_TIN2_MASK (0xCF) +#define GPIO_PAR_TMR_TIN2_UNMASK (0xCF) #define GPIO_PAR_TMR_TIN2_TIN2 (0x30) #define GPIO_PAR_TMR_TIN2_TOUT2 (0x20) #define GPIO_PAR_TMR_TIN2_U2RTS (0x10) -#define GPIO_PAR_TMR_TIN1_MASK (0xF3) +#define GPIO_PAR_TMR_TIN1_UNMASK (0xF3) #define GPIO_PAR_TMR_TIN1_TIN1 (0x0C) #define GPIO_PAR_TMR_TIN1_TOUT1 (0x08) #define GPIO_PAR_TMR_TIN1_U2RXD (0x04) -#define GPIO_PAR_TMR_TIN0_MASK (0xFC) +#define GPIO_PAR_TMR_TIN0_UNMASK (0xFC) #define GPIO_PAR_TMR_TIN0_TIN0 (0x03) #define GPIO_PAR_TMR_TIN0_TOUT0 (0x02) #define GPIO_PAR_TMR_TIN0_U2TXD (0x01) -#define GPIO_PAR_UART1_MASK (0xF03F) -#define GPIO_PAR_UART0_MASK (0xFFC0) -#define GPIO_PAR_UART_U1CTS_MASK (0xF3FF) +#define GPIO_PAR_UART1_UNMASK (0xF03F) +#define GPIO_PAR_UART0_UNMASK (0xFFC0) +#define GPIO_PAR_UART_U1CTS_UNMASK (0xF3FF) #define GPIO_PAR_UART_U1CTS_U1CTS (0x0C00) #define GPIO_PAR_UART_U1CTS_TIN1 (0x0800) #define GPIO_PAR_UART_U1CTS_PCS1 (0x0400) -#define GPIO_PAR_UART_U1RTS_MASK (0xFCFF) +#define GPIO_PAR_UART_U1RTS_UNMASK (0xFCFF) #define GPIO_PAR_UART_U1RTS_U1RTS (0x0300) #define GPIO_PAR_UART_U1RTS_TOUT1 (0x0200) #define GPIO_PAR_UART_U1RTS_PCS1 (0x0100) #define GPIO_PAR_UART_U1TXD (0x0080) #define GPIO_PAR_UART_U1RXD (0x0040) -#define GPIO_PAR_UART_U0CTS_MASK (0xFFCF) +#define GPIO_PAR_UART_U0CTS_UNMASK (0xFFCF) #define GPIO_PAR_UART_U0CTS_U0CTS (0x0030) #define GPIO_PAR_UART_U0CTS_TIN0 (0x0020) #define GPIO_PAR_UART_U0CTS_PCS0 (0x0010) -#define GPIO_PAR_UART_U0RTS_MASK (0xFFF3) +#define GPIO_PAR_UART_U0RTS_UNMASK (0xFFF3) #define GPIO_PAR_UART_U0RTS_U0RTS (0x000C) #define GPIO_PAR_UART_U0RTS_TOUT0 (0x0008) #define GPIO_PAR_UART_U0RTS_PCS0 (0x0004) #define GPIO_PAR_UART_U0TXD (0x0002) #define GPIO_PAR_UART_U0RXD (0x0001) -#define GPIO_PAR_FEC_7W_MASK (0xF3) +#define GPIO_PAR_FEC_7W_UNMASK (0xF3) #define GPIO_PAR_FEC_7W_FEC (0x0C) #define GPIO_PAR_FEC_7W_U1RTS (0x04) -#define GPIO_PAR_FEC_MII_MASK (0xFC) +#define GPIO_PAR_FEC_MII_UNMASK (0xFC) #define GPIO_PAR_FEC_MII_FEC (0x03) #define GPIO_PAR_FEC_MII_UnCTS (0x01) @@ -300,17 +299,17 @@ #define GPIO_MSCR_FB_DUP(x) (((x) & 0x03) << 4) #define GPIO_MSCR_FB_DLO(x) (((x) & 0x03) << 2) #define GPIO_MSCR_FB_ADRCTL(x) ((x) & 0x03) -#define GPIO_MSCR_FB_FBCLK_MASK (0x3F) -#define GPIO_MSCR_FB_DUP_MASK (0xCF) -#define GPIO_MSCR_FB_DLO_MASK (0xF3) -#define GPIO_MSCR_FB_ADRCTL_MASK (0xFC) +#define GPIO_MSCR_FB_FBCLK_UNMASK (0x3F) +#define GPIO_MSCR_FB_DUP_UNMASK (0xCF) +#define GPIO_MSCR_FB_DLO_UNMASK (0xF3) +#define GPIO_MSCR_FB_ADRCTL_UNMASK (0xFC) #define GPIO_MSCR_SDR_SDCLKB(x) (((x) & 0x03) << 4) #define GPIO_MSCR_SDR_SDCLK(x) (((x) & 0x03) << 2) #define GPIO_MSCR_SDR_SDRAM(x) ((x) & 0x03) -#define GPIO_MSCR_SDR_SDCLKB_MASK (0xCF) -#define GPIO_MSCR_SDR_SDCLK_MASK (0xF3) -#define GPIO_MSCR_SDR_SDRAM_MASK (0xFC) +#define GPIO_MSCR_SDR_SDCLKB_UNMASK (0xCF) +#define GPIO_MSCR_SDR_SDCLK_UNMASK (0xF3) +#define GPIO_MSCR_SDR_SDRAM_UNMASK (0xFC) #define MSCR_25VDDR (0x03) #define MSCR_18VDDR_FULL (0x02) @@ -318,27 +317,27 @@ #define MSCR_18VDDR_HALF (0x00) #define GPIO_DSCR_I2C(x) ((x) & 0x03) -#define GPIO_DSCR_I2C_MASK (0xFC) +#define GPIO_DSCR_I2C_UNMASK (0xFC) #define GPIO_DSCR_MISC_DBG(x) (((x) & 0x03) << 4) -#define GPIO_DSCR_MISC_DBG_MASK (0xCF) +#define GPIO_DSCR_MISC_DBG_UNMASK (0xCF) #define GPIO_DSCR_MISC_RSTOUT(x) (((x) & 0x03) << 2) -#define GPIO_DSCR_MISC_RSTOUT_MASK (0xF3) +#define GPIO_DSCR_MISC_RSTOUT_UNMASK (0xF3) #define GPIO_DSCR_MISC_TIMER(x) ((x) & 0x03) -#define GPIO_DSCR_MISC_TIMER_MASK (0xFC) +#define GPIO_DSCR_MISC_TIMER_UNMASK (0xFC) #define GPIO_DSCR_FEC(x) ((x) & 0x03) -#define GPIO_DSCR_FEC_MASK (0xFC) +#define GPIO_DSCR_FEC_UNMASK (0xFC) #define GPIO_DSCR_UART_UART1(x) (((x) & 0x03) << 4) -#define GPIO_DSCR_UART_UART1_MASK (0xCF) +#define GPIO_DSCR_UART_UART1_UNMASK (0xCF) #define GPIO_DSCR_UART_UART0(x) (((x) & 0x03) << 2) -#define GPIO_DSCR_UART_UART0_MASK (0xF3) +#define GPIO_DSCR_UART_UART0_UNMASK (0xF3) #define GPIO_DSCR_UART_IRQ(x) ((x) & 0x03) -#define GPIO_DSCR_UART_IRQ_MASK (0xFC) +#define GPIO_DSCR_UART_IRQ_UNMASK (0xFC) #define GPIO_DSCR_QSPI(x) ((x) & 0x03) -#define GPIO_DSCR_QSPI_MASK (0xFC) +#define GPIO_DSCR_QSPI_UNMASK (0xFC) #define DSCR_50PF (0x03) #define DSCR_30PF (0x02) @@ -347,12 +346,12 @@ /* *** Phase Locked Loop (PLL) *** */ #define PLL_PODR_CPUDIV(x) (((x) & 0x0F) << 4) -#define PLL_PODR_CPUDIV_MASK (0x0F) +#define PLL_PODR_CPUDIV_UNMASK (0x0F) #define PLL_PODR_BUSDIV(x) ((x) & 0x0F) -#define PLL_PODR_BUSDIV_MASK (0xF0) +#define PLL_PODR_BUSDIV_UNMASK (0xF0) #define PLL_PCR_DITHEN (0x80) #define PLL_PCR_DITHDEV(x) ((x) & 0x07) -#define PLL_PCR_DITHDEV_MASK (0xF8) +#define PLL_PCR_DITHDEV_UNMASK (0xF8) #endif /* __M520X__ */ diff --git a/include/asm-m68k/m5227x.h b/include/asm-m68k/m5227x.h index 824d33311..c77d5dd65 100644 --- a/include/asm-m68k/m5227x.h +++ b/include/asm-m68k/m5227x.h @@ -117,36 +117,34 @@ /* Bit definitions and macros for CCR */ #define CCM_CCR_DRAMSEL (0x0100) -#define CCM_CCR_CSC_MASK (0xFF3F) +#define CCM_CCR_CSC_UNMASK (0xFF3F) #define CCM_CCR_CSC_FBCS5_CS4 (0x00C0) #define CCM_CCR_CSC_FBCS5_A22 (0x0080) #define CCM_CCR_CSC_FB_A23_A22 (0x0040) #define CCM_CCR_LIMP (0x0020) #define CCM_CCR_LOAD (0x0010) -#define CCM_CCR_BOOTPS_MASK (0xFFF3) +#define CCM_CCR_BOOTPS_UNMASK (0xFFF3) #define CCM_CCR_BOOTPS_PS16 (0x0008) #define CCM_CCR_BOOTPS_PS8 (0x0004) #define CCM_CCR_BOOTPS_PS32 (0x0000) #define CCM_CCR_OSCMODE_OSCBYPASS (0x0002) /* Bit definitions and macros for RCON */ -#define CCM_RCON_CSC_MASK (0xFF3F) +#define CCM_RCON_CSC_UNMASK (0xFF3F) #define CCM_RCON_CSC_FBCS5_CS4 (0x00C0) #define CCM_RCON_CSC_FBCS5_A22 (0x0080) #define CCM_RCON_CSC_FB_A23_A22 (0x0040) #define CCM_RCON_LIMP (0x0020) #define CCM_RCON_LOAD (0x0010) -#define CCM_RCON_BOOTPS_MASK (0xFFF3) +#define CCM_RCON_BOOTPS_UNMASK (0xFFF3) #define CCM_RCON_BOOTPS_PS16 (0x0008) #define CCM_RCON_BOOTPS_PS8 (0x0004) #define CCM_RCON_BOOTPS_PS32 (0x0000) #define CCM_RCON_OSCMODE_OSCBYPASS (0x0002) /* Bit definitions and macros for CIR */ -#define CCM_CIR_PRN(x) (((x)&0x003F)) /* Part revision number */ -#define CCM_CIR_PIN(x) (((x)&0x03FF)<<6) /* Part identification number */ -#define CCM_CIR_PIN_MASK (0xFFC0) -#define CCM_CIR_PRN_MASK (0x003F) +#define CCM_CIR_PIN(x) (((x) & 0xFFC0) >> 6) +#define CCM_CIR_PRN(x) ((x) & 0x003F) #define CCM_CIR_PIN_MCF52277 (0x0000) /* Bit definitions and macros for MISCCR */ @@ -195,7 +193,7 @@ * General Purpose I/O Module (GPIO) *********************************************************************/ /* Bit definitions and macros for PAR_BE */ -#define GPIO_PAR_BE_MASK (0x0F) +#define GPIO_PAR_BE_UNMASK (0x0F) #define GPIO_PAR_BE_BE3_BE3 (0x08) #define GPIO_PAR_BE_BE3_GPIO (0x00) #define GPIO_PAR_BE_BE2_BE2 (0x04) @@ -217,111 +215,111 @@ #define GPIO_PAR_FBCTL_OE (0x80) #define GPIO_PAR_FBCTL_TA (0x40) #define GPIO_PAR_FBCTL_RW (0x20) -#define GPIO_PAR_FBCTL_TS_MASK (0xE7) +#define GPIO_PAR_FBCTL_TS_UNMASK (0xE7) #define GPIO_PAR_FBCTL_TS_FBTS (0x18) #define GPIO_PAR_FBCTL_TS_DMAACK (0x10) #define GPIO_PAR_FBCTL_TS_GPIO (0x00) /* Bit definitions and macros for PAR_FECI2C */ -#define GPIO_PAR_I2C_SCL_MASK (0xF3) +#define GPIO_PAR_I2C_SCL_UNMASK (0xF3) #define GPIO_PAR_I2C_SCL_SCL (0x0C) #define GPIO_PAR_I2C_SCL_CANTXD (0x08) #define GPIO_PAR_I2C_SCL_U2TXD (0x04) #define GPIO_PAR_I2C_SCL_GPIO (0x00) -#define GPIO_PAR_I2C_SDA_MASK (0xFC) +#define GPIO_PAR_I2C_SDA_UNMASK (0xFC) #define GPIO_PAR_I2C_SDA_SDA (0x03) #define GPIO_PAR_I2C_SDA_CANRXD (0x02) #define GPIO_PAR_I2C_SDA_U2RXD (0x01) #define GPIO_PAR_I2C_SDA_GPIO (0x00) /* Bit definitions and macros for PAR_UART */ -#define GPIO_PAR_UART_U1CTS_MASK (0x3FFF) +#define GPIO_PAR_UART_U1CTS_UNMASK (0x3FFF) #define GPIO_PAR_UART_U1CTS_U1CTS (0xC000) #define GPIO_PAR_UART_U1CTS_SSIBCLK (0x8000) #define GPIO_PAR_UART_U1CTS_LCDCLS (0x4000) #define GPIO_PAR_UART_U1CTS_GPIO (0x0000) -#define GPIO_PAR_UART_U1RTS_MASK (0xCFFF) +#define GPIO_PAR_UART_U1RTS_UNMASK (0xCFFF) #define GPIO_PAR_UART_U1RTS_U1RTS (0x3000) #define GPIO_PAR_UART_U1RTS_SSIFS (0x2000) #define GPIO_PAR_UART_U1RTS_LCDPS (0x1000) #define GPIO_PAR_UART_U1RTS_GPIO (0x0000) -#define GPIO_PAR_UART_U1RXD_MASK (0xF3FF) +#define GPIO_PAR_UART_U1RXD_UNMASK (0xF3FF) #define GPIO_PAR_UART_U1RXD_U1RXD (0x0C00) #define GPIO_PAR_UART_U1RXD_SSIRXD (0x0800) #define GPIO_PAR_UART_U1RXD_GPIO (0x0000) -#define GPIO_PAR_UART_U1TXD_MASK (0xFCFF) +#define GPIO_PAR_UART_U1TXD_UNMASK (0xFCFF) #define GPIO_PAR_UART_U1TXD_U1TXD (0x0300) #define GPIO_PAR_UART_U1TXD_SSITXD (0x0200) #define GPIO_PAR_UART_U1TXD_GPIO (0x0000) -#define GPIO_PAR_UART_U0CTS_MASK (0xFF3F) +#define GPIO_PAR_UART_U0CTS_UNMASK (0xFF3F) #define GPIO_PAR_UART_U0CTS_U0CTS (0x00C0) #define GPIO_PAR_UART_U0CTS_T1OUT (0x0080) #define GPIO_PAR_UART_U0CTS_USBVBUSEN (0x0040) #define GPIO_PAR_UART_U0CTS_GPIO (0x0000) -#define GPIO_PAR_UART_U0RTS_MASK (0xFFCF) +#define GPIO_PAR_UART_U0RTS_UNMASK (0xFFCF) #define GPIO_PAR_UART_U0RTS_U0RTS (0x0030) #define GPIO_PAR_UART_U0RTS_T1IN (0x0020) #define GPIO_PAR_UART_U0RTS_USBVBUSOC (0x0010) #define GPIO_PAR_UART_U0RTS_GPIO (0x0000) -#define GPIO_PAR_UART_U0RXD_MASK (0xFFF3) +#define GPIO_PAR_UART_U0RXD_UNMASK (0xFFF3) #define GPIO_PAR_UART_U0RXD_U0RXD (0x000C) #define GPIO_PAR_UART_U0RXD_CANRX (0x0008) #define GPIO_PAR_UART_U0RXD_GPIO (0x0000) -#define GPIO_PAR_UART_U0TXD_MASK (0xFFFC) +#define GPIO_PAR_UART_U0TXD_UNMASK (0xFFFC) #define GPIO_PAR_UART_U0TXD_U0TXD (0x0003) #define GPIO_PAR_UART_U0TXD_CANTX (0x0002) #define GPIO_PAR_UART_U0TXD_GPIO (0x0000) /* Bit definitions and macros for PAR_DSPI */ -#define GPIO_PAR_DSPI_PCS0_MASK (0x3F) +#define GPIO_PAR_DSPI_PCS0_UNMASK (0x3F) #define GPIO_PAR_DSPI_PCS0_PCS0 (0xC0) #define GPIO_PAR_DSPI_PCS0_U2RTS (0x80) #define GPIO_PAR_DSPI_PCS0_GPIO (0x00) -#define GPIO_PAR_DSPI_SIN_MASK (0xCF) +#define GPIO_PAR_DSPI_SIN_UNMASK (0xCF) #define GPIO_PAR_DSPI_SIN_SIN (0x30) #define GPIO_PAR_DSPI_SIN_U2RXD (0x20) #define GPIO_PAR_DSPI_SIN_GPIO (0x00) -#define GPIO_PAR_DSPI_SOUT_MASK (0xF3) +#define GPIO_PAR_DSPI_SOUT_UNMASK (0xF3) #define GPIO_PAR_DSPI_SOUT_SOUT (0x0C) #define GPIO_PAR_DSPI_SOUT_U2TXD (0x08) #define GPIO_PAR_DSPI_SOUT_GPIO (0x00) -#define GPIO_PAR_DSPI_SCK_MASK (0xFC) +#define GPIO_PAR_DSPI_SCK_UNMASK (0xFC) #define GPIO_PAR_DSPI_SCK_SCK (0x03) #define GPIO_PAR_DSPI_SCK_U2CTS (0x02) #define GPIO_PAR_DSPI_SCK_GPIO (0x00) /* Bit definitions and macros for PAR_TIMER */ -#define GPIO_PAR_TIMER_T3IN_MASK (0x3F) +#define GPIO_PAR_TIMER_T3IN_UNMASK (0x3F) #define GPIO_PAR_TIMER_T3IN_T3IN (0xC0) #define GPIO_PAR_TIMER_T3IN_T3OUT (0x80) #define GPIO_PAR_TIMER_T3IN_SSIMCLK (0x40) #define GPIO_PAR_TIMER_T3IN_GPIO (0x00) -#define GPIO_PAR_TIMER_T2IN_MASK (0xCF) +#define GPIO_PAR_TIMER_T2IN_UNMASK (0xCF) #define GPIO_PAR_TIMER_T2IN_T2IN (0x30) #define GPIO_PAR_TIMER_T2IN_T2OUT (0x20) #define GPIO_PAR_TIMER_T2IN_DSPIPCS2 (0x10) #define GPIO_PAR_TIMER_T2IN_GPIO (0x00) -#define GPIO_PAR_TIMER_T1IN_MASK (0xF3) +#define GPIO_PAR_TIMER_T1IN_UNMASK (0xF3) #define GPIO_PAR_TIMER_T1IN_T1IN (0x0C) #define GPIO_PAR_TIMER_T1IN_T1OUT (0x08) #define GPIO_PAR_TIMER_T1IN_LCDCONTRAST (0x04) #define GPIO_PAR_TIMER_T1IN_GPIO (0x00) -#define GPIO_PAR_TIMER_T0IN_MASK (0xFC) +#define GPIO_PAR_TIMER_T0IN_UNMASK (0xFC) #define GPIO_PAR_TIMER_T0IN_T0IN (0x03) #define GPIO_PAR_TIMER_T0IN_T0OUT (0x02) #define GPIO_PAR_TIMER_T0IN_LCDREV (0x01) #define GPIO_PAR_TIMER_T0IN_GPIO (0x00) /* Bit definitions and macros for GPIO_PAR_LCDCTL */ -#define GPIO_PAR_LCDCTL_ACDOE_MASK (0xE7) +#define GPIO_PAR_LCDCTL_ACDOE_UNMASK (0xE7) #define GPIO_PAR_LCDCTL_ACDOE_ACDOE (0x18) #define GPIO_PAR_LCDCTL_ACDOE_SPLSPR (0x10) #define GPIO_PAR_LCDCTL_ACDOE_GPIO (0x00) @@ -330,141 +328,141 @@ #define GPIO_PAR_LCDCTL_LSCLK (0x01) /* Bit definitions and macros for PAR_IRQ */ -#define GPIO_PAR_IRQ_IRQ4_MASK (0xF3) +#define GPIO_PAR_IRQ_IRQ4_UNMASK (0xF3) #define GPIO_PAR_IRQ_IRQ4_SSIINPCLK (0x0C) #define GPIO_PAR_IRQ_IRQ4_DMAREQ0 (0x08) #define GPIO_PAR_IRQ_IRQ4_GPIO (0x00) -#define GPIO_PAR_IRQ_IRQ1_MASK (0xFC) +#define GPIO_PAR_IRQ_IRQ1_UNMASK (0xFC) #define GPIO_PAR_IRQ_IRQ1_PCIINT (0x03) #define GPIO_PAR_IRQ_IRQ1_USBCLKIN (0x02) #define GPIO_PAR_IRQ_IRQ1_SSICLKIN (0x01) #define GPIO_PAR_IRQ_IRQ1_GPIO (0x00) /* Bit definitions and macros for GPIO_PAR_LCDH */ -#define GPIO_PAR_LCDH_LD17_MASK (0xFFFFF3FF) +#define GPIO_PAR_LCDH_LD17_UNMASK (0xFFFFF3FF) #define GPIO_PAR_LCDH_LD17_LD17 (0x00000C00) #define GPIO_PAR_LCDH_LD17_LD11 (0x00000800) #define GPIO_PAR_LCDH_LD17_GPIO (0x00000000) -#define GPIO_PAR_LCDH_LD16_MASK (0xFFFFFCFF) +#define GPIO_PAR_LCDH_LD16_UNMASK (0xFFFFFCFF) #define GPIO_PAR_LCDH_LD16_LD16 (0x00000300) #define GPIO_PAR_LCDH_LD16_LD10 (0x00000200) #define GPIO_PAR_LCDH_LD16_GPIO (0x00000000) -#define GPIO_PAR_LCDH_LD15_MASK (0xFFFFFF3F) +#define GPIO_PAR_LCDH_LD15_UNMASK (0xFFFFFF3F) #define GPIO_PAR_LCDH_LD15_LD15 (0x000000C0) #define GPIO_PAR_LCDH_LD15_LD9 (0x00000080) #define GPIO_PAR_LCDH_LD15_GPIO (0x00000000) -#define GPIO_PAR_LCDH_LD14_MASK (0xFFFFFFCF) +#define GPIO_PAR_LCDH_LD14_UNMASK (0xFFFFFFCF) #define GPIO_PAR_LCDH_LD14_LD14 (0x00000030) #define GPIO_PAR_LCDH_LD14_LD8 (0x00000020) #define GPIO_PAR_LCDH_LD14_GPIO (0x00000000) -#define GPIO_PAR_LCDH_LD13_MASK (0xFFFFFFF3) +#define GPIO_PAR_LCDH_LD13_UNMASK (0xFFFFFFF3) #define GPIO_PAR_LCDH_LD13_LD13 (0x0000000C) #define GPIO_PAR_LCDH_LD13_CANTX (0x00000008) #define GPIO_PAR_LCDH_LD13_GPIO (0x00000000) -#define GPIO_PAR_LCDH_LD12_MASK (0xFFFFFFFC) +#define GPIO_PAR_LCDH_LD12_UNMASK (0xFFFFFFFC) #define GPIO_PAR_LCDH_LD12_LD12 (0x00000003) #define GPIO_PAR_LCDH_LD12_CANRX (0x00000002) #define GPIO_PAR_LCDH_LD12_GPIO (0x00000000) /* Bit definitions and macros for GPIO_PAR_LCDL */ -#define GPIO_PAR_LCDL_LD11_MASK (0x3FFFFFFF) +#define GPIO_PAR_LCDL_LD11_UNMASK (0x3FFFFFFF) #define GPIO_PAR_LCDL_LD11_LD11 (0xC0000000) #define GPIO_PAR_LCDL_LD11_LD7 (0x80000000) #define GPIO_PAR_LCDL_LD11_GPIO (0x00000000) -#define GPIO_PAR_LCDL_LD10_MASK (0xCFFFFFFF) +#define GPIO_PAR_LCDL_LD10_UNMASK (0xCFFFFFFF) #define GPIO_PAR_LCDL_LD10_LD10 (0x30000000) #define GPIO_PAR_LCDL_LD10_LD6 (0x20000000) #define GPIO_PAR_LCDL_LD10_GPIO (0x00000000) -#define GPIO_PAR_LCDL_LD9_MASK (0xF3FFFFFF) +#define GPIO_PAR_LCDL_LD9_UNMASK (0xF3FFFFFF) #define GPIO_PAR_LCDL_LD9_LD9 (0x0C000000) #define GPIO_PAR_LCDL_LD9_LD5 (0x08000000) #define GPIO_PAR_LCDL_LD9_GPIO (0x00000000) -#define GPIO_PAR_LCDL_LD8_MASK (0xFCFFFFFF) +#define GPIO_PAR_LCDL_LD8_UNMASK (0xFCFFFFFF) #define GPIO_PAR_LCDL_LD8_LD8 (0x03000000) #define GPIO_PAR_LCDL_LD8_LD4 (0x02000000) #define GPIO_PAR_LCDL_LD8_GPIO (0x00000000) -#define GPIO_PAR_LCDL_LD7_MASK (0xFF3FFFFF) +#define GPIO_PAR_LCDL_LD7_UNMASK (0xFF3FFFFF) #define GPIO_PAR_LCDL_LD7_LD7 (0x00C00000) #define GPIO_PAR_LCDL_LD7_PWM7 (0x00800000) #define GPIO_PAR_LCDL_LD7_GPIO (0x00000000) -#define GPIO_PAR_LCDL_LD6_MASK (0xFFCFFFFF) +#define GPIO_PAR_LCDL_LD6_UNMASK (0xFFCFFFFF) #define GPIO_PAR_LCDL_LD6_LD6 (0x00300000) #define GPIO_PAR_LCDL_LD6_PWM5 (0x00200000) #define GPIO_PAR_LCDL_LD6_GPIO (0x00000000) -#define GPIO_PAR_LCDL_LD5_MASK (0xFFF3FFFF) +#define GPIO_PAR_LCDL_LD5_UNMASK (0xFFF3FFFF) #define GPIO_PAR_LCDL_LD5_LD5 (0x000C0000) #define GPIO_PAR_LCDL_LD5_LD3 (0x00080000) #define GPIO_PAR_LCDL_LD5_GPIO (0x00000000) -#define GPIO_PAR_LCDL_LD4_MASK (0xFFFCFFFF) +#define GPIO_PAR_LCDL_LD4_UNMASK (0xFFFCFFFF) #define GPIO_PAR_LCDL_LD4_LD4 (0x00030000) #define GPIO_PAR_LCDL_LD4_LD2 (0x00020000) #define GPIO_PAR_LCDL_LD4_GPIO (0x00000000) -#define GPIO_PAR_LCDL_LD3_MASK (0xFFFF3FFF) +#define GPIO_PAR_LCDL_LD3_UNMASK (0xFFFF3FFF) #define GPIO_PAR_LCDL_LD3_LD3 (0x0000C000) #define GPIO_PAR_LCDL_LD3_LD1 (0x00008000) #define GPIO_PAR_LCDL_LD3_GPIO (0x00000000) -#define GPIO_PAR_LCDL_LD2_MASK (0xFFFFCFFF) +#define GPIO_PAR_LCDL_LD2_UNMASK (0xFFFFCFFF) #define GPIO_PAR_LCDL_LD2_LD2 (0x00003000) #define GPIO_PAR_LCDL_LD2_LD0 (0x00002000) #define GPIO_PAR_LCDL_LD2_GPIO (0x00000000) -#define GPIO_PAR_LCDL_LD1_MASK (0xFFFFF3FF) +#define GPIO_PAR_LCDL_LD1_UNMASK (0xFFFFF3FF) #define GPIO_PAR_LCDL_LD1_LD1 (0x00000C00) #define GPIO_PAR_LCDL_LD1_PWM3 (0x00000800) #define GPIO_PAR_LCDL_LD1_GPIO (0x00000000) -#define GPIO_PAR_LCDL_LD0_MASK (0xFFFFFCFF) +#define GPIO_PAR_LCDL_LD0_UNMASK (0xFFFFFCFF) #define GPIO_PAR_LCDL_LD0_LD0 (0x00000300) #define GPIO_PAR_LCDL_LD0_PWM1 (0x00000200) #define GPIO_PAR_LCDL_LD0_GPIO (0x00000000) /* Bit definitions and macros for MSCR_FB */ -#define GPIO_MSCR_FB_DUPPER_MASK (0xCF) +#define GPIO_MSCR_FB_DUPPER_UNMASK (0xCF) #define GPIO_MSCR_FB_DUPPER_25V_33V (0x30) #define GPIO_MSCR_FB_DUPPER_FULL_18V (0x20) #define GPIO_MSCR_FB_DUPPER_OD (0x10) #define GPIO_MSCR_FB_DUPPER_HALF_18V (0x00) -#define GPIO_MSCR_FB_DLOWER_MASK (0xF3) +#define GPIO_MSCR_FB_DLOWER_UNMASK (0xF3) #define GPIO_MSCR_FB_DLOWER_25V_33V (0x0C) #define GPIO_MSCR_FB_DLOWER_FULL_18V (0x08) #define GPIO_MSCR_FB_DLOWER_OD (0x04) #define GPIO_MSCR_FB_DLOWER_HALF_18V (0x00) -#define GPIO_MSCR_FB_ADDRCTL_MASK (0xFC) +#define GPIO_MSCR_FB_ADDRCTL_UNMASK (0xFC) #define GPIO_MSCR_FB_ADDRCTL_25V_33V (0x03) #define GPIO_MSCR_FB_ADDRCTL_FULL_18V (0x02) #define GPIO_MSCR_FB_ADDRCTL_OD (0x01) #define GPIO_MSCR_FB_ADDRCTL_HALF_18V (0x00) /* Bit definitions and macros for MSCR_SDRAM */ -#define GPIO_MSCR_SDRAM_SDCLKB_MASK (0xCF) +#define GPIO_MSCR_SDRAM_SDCLKB_UNMASK (0xCF) #define GPIO_MSCR_SDRAM_SDCLKB_25V_33V (0x30) #define GPIO_MSCR_SDRAM_SDCLKB_FULL_18V (0x20) #define GPIO_MSCR_SDRAM_SDCLKB_OD (0x10) #define GPIO_MSCR_SDRAM_SDCLKB_HALF_18V (0x00) -#define GPIO_MSCR_SDRAM_SDCLK_MASK (0xF3) +#define GPIO_MSCR_SDRAM_SDCLK_UNMASK (0xF3) #define GPIO_MSCR_SDRAM_SDCLK_25V_33V (0x0C) #define GPIO_MSCR_SDRAM_SDCLK_FULL_18V (0x08) #define GPIO_MSCR_SDRAM_SDCLK_OPD (0x04) #define GPIO_MSCR_SDRAM_SDCLK_HALF_18V (0x00) -#define GPIO_MSCR_SDRAM_SDCTL_MASK (0xFC) +#define GPIO_MSCR_SDRAM_SDCTL_UNMASK (0xFC) #define GPIO_MSCR_SDRAM_SDCTL_25V_33V (0x03) #define GPIO_MSCR_SDRAM_SDCTL_FULL_18V (0x02) #define GPIO_MSCR_SDRAM_SDCTL_OPD (0x01) diff --git a/include/asm-m68k/m5235.h b/include/asm-m68k/m5235.h index 22987ac77..71a40d33d 100644 --- a/include/asm-m68k/m5235.h +++ b/include/asm-m68k/m5235.h @@ -557,8 +557,8 @@ #define CCM_RCON_MODE (0x0001) /* Bit definitions and macros for CCM_CIR */ -#define CCM_CIR_PIN(x) (((x)&0x03FF)<<6) -#define CCM_CIR_PRN(x) ((x)&0x003F) +#define CCM_CIR_PIN(x) (((x) & 0xFFC0) >> 6) +#define CCM_CIR_PRN(x) ((x) & 0x003F) /********************************************************************* * PLL Clock Module diff --git a/include/asm-m68k/m5301x.h b/include/asm-m68k/m5301x.h index 80cefc40a..0920a0dc2 100644 --- a/include/asm-m68k/m5301x.h +++ b/include/asm-m68k/m5301x.h @@ -254,7 +254,7 @@ #define CCM_MISCCR_PLL_LOCK (0x2000) #define CCM_MISCCR_LIMP (0x1000) #define CCM_MISCCR_BME (0x8000) -#define CCM_MISCCR_BMT_MASK (0xF8FF) +#define CCM_MISCCR_BMT_UNMASK (0xF8FF) #define CCM_MISCCR_BMT(x) (((x) & 0x0007) << 8) #define CCM_MISCCR_BMT_512 (0x0700) #define CCM_MISCCR_BMT_1024 (0x0600) @@ -330,32 +330,32 @@ #define GPIO_PAR_CS5 (0x40) #define GPIO_PAR_CS4 (0x10) -#define GPIO_PAR_CS1_MASK (0xF3) +#define GPIO_PAR_CS1_UNMASK (0xF3) #define GPIO_PAR_CS1_CS1 (0x0C) #define GPIO_PAR_CS1_SDCS1 (0x08) -#define GPIO_PAR_CS0_MASK (0xFC) +#define GPIO_PAR_CS0_UNMASK (0xFC) #define GPIO_PAR_CS0_CS0 (0x03) #define GPIO_PAR_CS0_CS4 (0x02) -#define GPIO_PAR_DSPIH_SIN_MASK (0x3F) +#define GPIO_PAR_DSPIH_SIN_UNMASK (0x3F) #define GPIO_PAR_DSPIH_SIN (0xC0) #define GPIO_PAR_DSPIH_SIN_U2RXD (0x80) -#define GPIO_PAR_DSPIH_SOUT_MASK (0xCF) +#define GPIO_PAR_DSPIH_SOUT_UNMASK (0xCF) #define GPIO_PAR_DSPIH_SOUT (0x30) #define GPIO_PAR_DSPIH_SOUT_U2TXD (0x20) -#define GPIO_PAR_DSPIH_SCK_MASK (0xF3) +#define GPIO_PAR_DSPIH_SCK_UNMASK (0xF3) #define GPIO_PAR_DSPIH_SCK (0x0C) #define GPIO_PAR_DSPIH_SCK_U2CTS (0x08) -#define GPIO_PAR_DSPIH_PCS0_MASK (0xFC) +#define GPIO_PAR_DSPIH_PCS0_UNMASK (0xFC) #define GPIO_PAR_DSPIH_PCS0 (0x03) #define GPIO_PAR_DSPIH_PCS0_U2RTS (0x02) -#define GPIO_PAR_DSPIL_PCS1_MASK (0x3F) +#define GPIO_PAR_DSPIL_PCS1_UNMASK (0x3F) #define GPIO_PAR_DSPIL_PCS1 (0xC0) -#define GPIO_PAR_DSPIL_PCS2_MASK (0xCF) +#define GPIO_PAR_DSPIL_PCS2_UNMASK (0xCF) #define GPIO_PAR_DSPIL_PCS2 (0x30) #define GPIO_PAR_DSPIL_PCS2_USBH_OC (0x20) -#define GPIO_PAR_DSPIL_PCS3_MASK (0xF3) +#define GPIO_PAR_DSPIL_PCS3_UNMASK (0xF3) #define GPIO_PAR_DSPIL_PCS3 (0x0C) #define GPIO_PAR_DSPIL_PCS3_USBH_EN (0x08) @@ -365,30 +365,30 @@ #define GPIO_PAR_FEC0_RMII_FEC (0x01) /* GPIO_PAR_FECI2C */ -#define GPIO_PAR_FECI2C_RMII0_MASK (0x3F) +#define GPIO_PAR_FECI2C_RMII0_UNMASK (0x3F) #define GPIO_PAR_FECI2C_MDC0 (0x80) #define GPIO_PAR_FECI2C_MDIO0 (0x40) -#define GPIO_PAR_FECI2C_RMII1_MASK (0xCF) +#define GPIO_PAR_FECI2C_RMII1_UNMASK (0xCF) #define GPIO_PAR_FECI2C_MDC1 (0x20) #define GPIO_PAR_FECI2C_MDIO1 (0x10) -#define GPIO_PAR_FECI2C_SDA_MASK (0xF3) +#define GPIO_PAR_FECI2C_SDA_UNMASK (0xF3) #define GPIO_PAR_FECI2C_SDA(x) (((x) & 0x03) << 2) #define GPIO_PAR_FECI2C_SDA_SDA (0x0C) #define GPIO_PAR_FECI2C_SDA_U2TXD (0x08) #define GPIO_PAR_FECI2C_SDA_MDIO1 (0x04) -#define GPIO_PAR_FECI2C_SCL_MASK (0xFC) +#define GPIO_PAR_FECI2C_SCL_UNMASK (0xFC) #define GPIO_PAR_FECI2C_SCL(x) ((x) & 0x03) #define GPIO_PAR_FECI2C_SCL_SCL (0x03) #define GPIO_PAR_FECI2C_SCL_U2RXD (0x02) #define GPIO_PAR_FECI2C_SCL_MDC1 (0x01) -#define GPIO_PAR_IRQ0H_IRQ07_MASK (0x3F) -#define GPIO_PAR_IRQ0H_IRQ06_MASK (0xCF) +#define GPIO_PAR_IRQ0H_IRQ07_UNMASK (0x3F) +#define GPIO_PAR_IRQ0H_IRQ06_UNMASK (0xCF) #define GPIO_PAR_IRQ0H_IRQ06_USBCLKIN (0x10) -#define GPIO_PAR_IRQ0H_IRQ04_MASK (0xFC) +#define GPIO_PAR_IRQ0H_IRQ04_UNMASK (0xFC) #define GPIO_PAR_IRQ0H_IRQ04_DREQ0 (0x02) -#define GPIO_PAR_IRQ0L_IRQ01_MASK (0xF3) +#define GPIO_PAR_IRQ0L_IRQ01_UNMASK (0xF3) #define GPIO_PAR_IRQ0L_IRQ01_DREQ1 (0x08) #define GPIO_PAR_IRQ1H_IRQ17_DDATA3 (0x40) @@ -401,24 +401,24 @@ #define GPIO_PAR_IRQ1L_IRQ11_PST1 (0x04) #define GPIO_PAR_IRQ1L_IRQ10_PST0 (0x01) -#define GPIO_PAR_SIMP1H_DATA1_MASK (0x3F) +#define GPIO_PAR_SIMP1H_DATA1_UNMASK (0x3F) #define GPIO_PAR_SIMP1H_DATA1_SIMDATA1 (0xC0) #define GPIO_PAR_SIMP1H_DATA1_SSITXD (0x80) #define GPIO_PAR_SIMP1H_DATA1_U1TXD (0x40) -#define GPIO_PAR_SIMP1H_VEN1_MASK (0xCF) +#define GPIO_PAR_SIMP1H_VEN1_UNMASK (0xCF) #define GPIO_PAR_SIMP1H_VEN1_SIMVEN1 (0x30) #define GPIO_PAR_SIMP1H_VEN1_SSIRXD (0x20) #define GPIO_PAR_SIMP1H_VEN1_U1RXD (0x10) -#define GPIO_PAR_SIMP1H_RST1_MASK (0xF3) +#define GPIO_PAR_SIMP1H_RST1_UNMASK (0xF3) #define GPIO_PAR_SIMP1H_RST1_SIMRST1 (0x0C) #define GPIO_PAR_SIMP1H_RST1_SSIFS (0x08) #define GPIO_PAR_SIMP1H_RST1_U1RTS (0x04) -#define GPIO_PAR_SIMP1H_PD1_MASK (0xFC) +#define GPIO_PAR_SIMP1H_PD1_UNMASK (0xFC) #define GPIO_PAR_SIMP1H_PD1_SIMPD1 (0x03) #define GPIO_PAR_SIMP1H_PD1_SSIBCLK (0x02) #define GPIO_PAR_SIMP1H_PD1_U1CTS (0x01) -#define GPIO_PAR_SIMP1L_CLK_MASK (0x3F) +#define GPIO_PAR_SIMP1L_CLK_UNMASK (0x3F) #define GPIO_PAR_SIMP1L_CLK_CLK1 (0xC0) #define GPIO_PAR_SIMP1L_CLK_SSIMCLK (0x80) @@ -432,19 +432,19 @@ #define GPIO_PAR_TIN2(x) (((x) & 0x03) << 4) #define GPIO_PAR_TIN1(x) (((x) & 0x03) << 2) #define GPIO_PAR_TIN0(x) ((x) & 0x03) -#define GPIO_PAR_TIN3_MASK (0x3F) +#define GPIO_PAR_TIN3_UNMASK (0x3F) #define GPIO_PAR_TIN3_TIN3 (0xC0) #define GPIO_PAR_TIN3_TOUT3 (0x80) #define GPIO_PAR_TIN3_IRQ03 (0x40) -#define GPIO_PAR_TIN2_MASK (0xCF) +#define GPIO_PAR_TIN2_UNMASK (0xCF) #define GPIO_PAR_TIN2_TIN2 (0x30) #define GPIO_PAR_TIN2_TOUT2 (0x20) #define GPIO_PAR_TIN2_IRQ02 (0x10) -#define GPIO_PAR_TIN1_MASK (0xF3) +#define GPIO_PAR_TIN1_UNMASK (0xF3) #define GPIO_PAR_TIN1_TIN1 (0x0C) #define GPIO_PAR_TIN1_TOUT1 (0x08) #define GPIO_PAR_TIN1_DACK1 (0x04) -#define GPIO_PAR_TIN0_MASK (0xFC) +#define GPIO_PAR_TIN0_UNMASK (0xFC) #define GPIO_PAR_TIN0_TIN0 (0x03) #define GPIO_PAR_TIN0_TOUT0 (0x02) #define GPIO_PAR_TIN0_CODEC_ALTCLK (0x01) @@ -455,10 +455,10 @@ #define GPIO_PAR_UART_U0RXD (0x10) #define GPIO_PAR_UART_RTS0(x) (((x) & 0x03) << 2) #define GPIO_PAR_UART_CTS0(x) ((x) & 0x03) -#define GPIO_PAR_UART_RTS0_MASK (0xF3) +#define GPIO_PAR_UART_RTS0_UNMASK (0xF3) #define GPIO_PAR_UART_RTS0_U0RTS (0x0C) #define GPIO_PAR_UART_RTS0_USBO_VBOC (0x08) -#define GPIO_PAR_UART_CTS0_MASK (0xFC) +#define GPIO_PAR_UART_CTS0_UNMASK (0xFC) #define GPIO_PAR_UART_CTS0_U0CTS (0x03) #define GPIO_PAR_UART_CTS0_USB0_VBEN (0x02) #define GPIO_PAR_UART_CTS0_USB_PULLUP (0x01) @@ -476,20 +476,20 @@ #define GPIO_PAR_SSIH_TXD(x) (((x) & 0x03) << 4) #define GPIO_PAR_SSIH_FS(x) (((x) & 0x03) << 2) #define GPIO_PAR_SSIH_MCLK(x) ((x) & 0x03) -#define GPIO_PAR_SSIH_RXD_MASK (0x3F) +#define GPIO_PAR_SSIH_RXD_UNMASK (0x3F) #define GPIO_PAR_SSIH_RXD_SSIRXD (0xC0) #define GPIO_PAR_SSIH_RXD_U1RXD (0x40) -#define GPIO_PAR_SSIH_TXD_MASK (0xCF) +#define GPIO_PAR_SSIH_TXD_UNMASK (0xCF) #define GPIO_PAR_SSIH_TXD_SSIRXD (0x30) #define GPIO_PAR_SSIH_TXD_U1TXD (0x10) -#define GPIO_PAR_SSIH_FS_MASK (0xF3) +#define GPIO_PAR_SSIH_FS_UNMASK (0xF3) #define GPIO_PAR_SSIH_FS_SSIFS (0x0C) #define GPIO_PAR_SSIH_FS_U1RTS (0x04) -#define GPIO_PAR_SSIH_MCLK_MASK (0xFC) +#define GPIO_PAR_SSIH_MCLK_UNMASK (0xFC) #define GPIO_PAR_SSIH_MCLK_SSIMCLK (0x03) #define GPIO_PAR_SSIH_MCLK_SSICLKIN (0x01) -#define GPIO_PAR_SSIL_MASK (0x3F) +#define GPIO_PAR_SSIL_UNMASK (0x3F) #define GPIO_PAR_SSIL_BCLK (0xC0) #define GPIO_PAR_SSIL_U1CTS (0x40) @@ -497,40 +497,40 @@ #define GPIO_MSCR_MSCR2(x) (((x) & 0x07) << 5) #define GPIO_MSCR_MSCR3(x) (((x) & 0x07) << 5) #define GPIO_MSCR_MSCR4(x) (((x) & 0x07) << 5) -#define GPIO_MSCR_MSCRn_MASK (0x1F) +#define GPIO_MSCR_MSCRn_UNMASK (0x1F) #define GPIO_MSCR_MSCRn_SDR (0xE0) #define GPIO_MSCR_MSCRn_25VDDR (0x60) #define GPIO_MSCR_MSCRn_18VDDR_FULL (0x20) #define GPIO_MSCR_MSCRn_18VDDR_HALF (0x00) #define GPIO_MSCR_MSCR5(x) (((x) & 0x07) << 2) -#define GPIO_MSCR_MSCR5_MASK (0xE3) +#define GPIO_MSCR_MSCR5_UNMASK (0xE3) #define GPIO_MSCR_MSCR5_SDR (0x1C) #define GPIO_MSCR_MSCR5_25VDDR (0x0C) #define GPIO_MSCR_MSCR5_18VDDR_FULL (0x04) #define GPIO_MSCR_MSCR5_18VDDR_HALF (0x00) -#define GPIO_SRCR_DSPI_MASK (0xFC) +#define GPIO_SRCR_DSPI_UNMASK (0xFC) #define GPIO_SRCR_DSPI(x) ((x) & 0x03) -#define GPIO_SRCR_I2C_MASK (0xFC) +#define GPIO_SRCR_I2C_UNMASK (0xFC) #define GPIO_SRCR_I2C(x) ((x) & 0x03) -#define GPIO_SRCR_IRQ_IRQ0_MASK (0xF3) +#define GPIO_SRCR_IRQ_IRQ0_UNMASK (0xF3) #define GPIO_SRCR_IRQ_IRQ0(x) (((x) & 0x03) << 2) -#define GPIO_SRCR_IRQ_IRQ1DBG_MASK (0xFC) +#define GPIO_SRCR_IRQ_IRQ1DBG_UNMASK (0xFC) #define GPIO_SRCR_IRQ_IRQ1DBG(x) ((x) & 0x03) -#define GPIO_SRCR_SIM_SIMP0_MASK (0xF3) +#define GPIO_SRCR_SIM_SIMP0_UNMASK (0xF3) #define GPIO_SRCR_SIM_SIMP0(x) (((x) & 0x03) << 2) -#define GPIO_SRCR_SIM_SIMP1_MASK (0xFC) +#define GPIO_SRCR_SIM_SIMP1_UNMASK (0xFC) #define GPIO_SRCR_SIM_SIMP1(x) ((x) & 0x03) -#define GPIO_SRCR_TIMER_MASK (0xFC) +#define GPIO_SRCR_TIMER_UNMASK (0xFC) #define GPIO_SRCR_TIMER(x) ((x) & 0x03) -#define GPIO_SRCR_UART2_MASK (0xF3) +#define GPIO_SRCR_UART2_UNMASK (0xF3) #define GPIO_SRCR_UART2(x) (((x) & 0x03) << 2) -#define GPIO_SRCR_UART0_MASK (0xFC) +#define GPIO_SRCR_UART0_UNMASK (0xFC) #define GPIO_SRCR_UART0(x) ((x) & 0x03) -#define GPIO_SRCR_SDHC_MASK (0xFC) +#define GPIO_SRCR_SDHC_UNMASK (0xFC) #define GPIO_SRCR_SDHC(x) ((x) & 0x03) -#define GPIO_SRCR_SSI_MASK (0xFC) +#define GPIO_SRCR_SSI_UNMASK (0xFC) #define GPIO_SRCR_SSI(x) ((x) & 0x03) #define SRCR_HIGHEST (0x03) @@ -538,11 +538,11 @@ #define SRCR_LOW (0x01) #define SRCR_LOWEST (0x00) -#define GPIO_DSCR_FEC_RMIICLK_MASK (0xCF) +#define GPIO_DSCR_FEC_RMIICLK_UNMASK (0xCF) #define GPIO_DSCR_FEC_RMIICLK(x) (((x) & 0x03) << 4) -#define GPIO_DSCR_FEC_RMII0_MASK (0xF3) +#define GPIO_DSCR_FEC_RMII0_UNMASK (0xF3) #define GPIO_DSCR_FEC_RMII0(x) (((x) & 0x03) << 2) -#define GPIO_DSCR_FEC_RMII1_MASK (0xFC) +#define GPIO_DSCR_FEC_RMII1_UNMASK (0xFC) #define GPIO_DSCR_FEC_RMII1(x) ((x) & 0x03) #define DSCR_50PF (0x03) @@ -572,18 +572,18 @@ #define PLL_PCR_LOL_IRQ (0x00004000) #define PLL_PCR_LOL_RE (0x00002000) #define PLL_PCR_LOL_EN (0x00001000) -#define PLL_PCR_REFDIV_MASK (0xFFFFF8FF) +#define PLL_PCR_REFDIV_UNMASK (0xFFFFF8FF) #define PLL_PCR_REFDIV(x) (((x) & 0x07) << 8) -#define PLL_PCR_FBDIV_MASK (0xFFFFFFC0) +#define PLL_PCR_FBDIV_UNMASK (0xFFFFFFC0) #define PLL_PCR_FBDIV(x) ((x) & 0x3F) -#define PLL_PDR_OUTDIV4_MASK (0x0FFF) +#define PLL_PDR_OUTDIV4_UNMASK (0x0FFF) #define PLL_PDR_OUTDIV4(x) (((x) & 0x0000000F) << 12) -#define PLL_PDR_OUTDIV3_MASK (0xF0FF) +#define PLL_PDR_OUTDIV3_UNMASK (0xF0FF) #define PLL_PDR_OUTDIV3(x) (((x) & 0x0000000F) << 8) -#define PLL_PDR_OUTDIV2_MASK (0xFF0F) +#define PLL_PDR_OUTDIV2_UNMASK (0xFF0F) #define PLL_PDR_OUTDIV2(x) (((x) & 0x0000000F) << 4) -#define PLL_PDR_OUTDIV1_MASK (0xFFF0) +#define PLL_PDR_OUTDIV1_UNMASK (0xFFF0) #define PLL_PDR_OUTDIV1(x) ((x) & 0x0000000F) #define PLL_PDR_USB(x) PLL_PDR_OUTDIV4(x) #define PLL_PDR_SDRAM(x) PLL_PDR_OUTDIV3(x) diff --git a/include/asm-m68k/m5445x.h b/include/asm-m68k/m5445x.h index 596662191..dfddde62a 100644 --- a/include/asm-m68k/m5445x.h +++ b/include/asm-m68k/m5445x.h @@ -286,13 +286,13 @@ /* Bit definitions and macros for PAR_FEC */ #define GPIO_PAR_FEC_FEC0(x) (((x)&0x07)) #define GPIO_PAR_FEC_FEC1(x) (((x)&0x07)<<4) -#define GPIO_PAR_FEC_FEC1_MASK (0x8F) +#define GPIO_PAR_FEC_FEC1_UNMASK (0x8F) #define GPIO_PAR_FEC_FEC1_MII (0x70) #define GPIO_PAR_FEC_FEC1_RMII_GPIO (0x30) #define GPIO_PAR_FEC_FEC1_RMII_ATA (0x20) #define GPIO_PAR_FEC_FEC1_ATA (0x10) #define GPIO_PAR_FEC_FEC1_GPIO (0x00) -#define GPIO_PAR_FEC_FEC0_MASK (0xF8) +#define GPIO_PAR_FEC_FEC0_UNMASK (0xF8) #define GPIO_PAR_FEC_FEC0_MII (0x07) #define GPIO_PAR_FEC_FEC0_RMII_GPIO (0x03) #define GPIO_PAR_FEC_FEC0_RMII_ULPI (0x02) @@ -304,15 +304,15 @@ #define GPIO_PAR_DMA_DACK0(x) (((x)&0x03)<<2) #define GPIO_PAR_DMA_DREQ1(x) (((x)&0x03)<<4) #define GPIO_PAR_DMA_DACK1(x) (((x)&0x03)<<6) -#define GPIO_PAR_DMA_DACK1_MASK (0x3F) +#define GPIO_PAR_DMA_DACK1_UNMASK (0x3F) #define GPIO_PAR_DMA_DACK1_DACK1 (0xC0) #define GPIO_PAR_DMA_DACK1_ULPI_DIR (0x40) #define GPIO_PAR_DMA_DACK1_GPIO (0x00) -#define GPIO_PAR_DMA_DREQ1_MASK (0xCF) +#define GPIO_PAR_DMA_DREQ1_UNMASK (0xCF) #define GPIO_PAR_DMA_DREQ1_DREQ1 (0x30) #define GPIO_PAR_DMA_DREQ1_USB_CLKIN (0x10) #define GPIO_PAR_DMA_DREQ1_GPIO (0x00) -#define GPIO_PAR_DMA_DACK0_MASK (0xF3) +#define GPIO_PAR_DMA_DACK0_UNMASK (0xF3) #define GPIO_PAR_DMA_DACK0_DACK1 (0x0C) #define GPIO_PAR_DMA_DACK0_ULPI_DIR (0x04) #define GPIO_PAR_DMA_DACK0_GPIO (0x00) @@ -330,7 +330,7 @@ #define GPIO_PAR_FBCTL_TA_GPIO (0x00) #define GPIO_PAR_FBCTL_RW_RW (0x20) #define GPIO_PAR_FBCTL_RW_GPIO (0x00) -#define GPIO_PAR_FBCTL_TS_MASK (0xE7) +#define GPIO_PAR_FBCTL_TS_UNMASK (0xE7) #define GPIO_PAR_FBCTL_TS_TS (0x18) #define GPIO_PAR_FBCTL_TS_ALE (0x10) #define GPIO_PAR_FBCTL_TS_TBST (0x08) @@ -364,11 +364,11 @@ #define GPIO_PAR_BE_BS1 (0x04) #define GPIO_PAR_BE_BS2(x) (((x)&0x03)<<4) #define GPIO_PAR_BE_BS3(x) (((x)&0x03)<<6) -#define GPIO_PAR_BE_BE3_MASK (0x3F) +#define GPIO_PAR_BE_BE3_UNMASK (0x3F) #define GPIO_PAR_BE_BE3_BE3 (0xC0) #define GPIO_PAR_BE_BE3_TSIZ1 (0x80) #define GPIO_PAR_BE_BE3_GPIO (0x00) -#define GPIO_PAR_BE_BE2_MASK (0xCF) +#define GPIO_PAR_BE_BE2_UNMASK (0xCF) #define GPIO_PAR_BE_BE2_BE2 (0x30) #define GPIO_PAR_BE_BE2_TSIZ0 (0x20) #define GPIO_PAR_BE_BE2_GPIO (0x00) @@ -393,22 +393,22 @@ #define GPIO_PAR_TIMER_T1IN(x) (((x)&0x03)<<2) #define GPIO_PAR_TIMER_T2IN(x) (((x)&0x03)<<4) #define GPIO_PAR_TIMER_T3IN(x) (((x)&0x03)<<6) -#define GPIO_PAR_TIMER_T3IN_MASK (0x3F) +#define GPIO_PAR_TIMER_T3IN_UNMASK (0x3F) #define GPIO_PAR_TIMER_T3IN_T3IN (0xC0) #define GPIO_PAR_TIMER_T3IN_T3OUT (0x80) #define GPIO_PAR_TIMER_T3IN_U2RXD (0x40) #define GPIO_PAR_TIMER_T3IN_GPIO (0x00) -#define GPIO_PAR_TIMER_T2IN_MASK (0xCF) +#define GPIO_PAR_TIMER_T2IN_UNMASK (0xCF) #define GPIO_PAR_TIMER_T2IN_T2IN (0x30) #define GPIO_PAR_TIMER_T2IN_T2OUT (0x20) #define GPIO_PAR_TIMER_T2IN_U2TXD (0x10) #define GPIO_PAR_TIMER_T2IN_GPIO (0x00) -#define GPIO_PAR_TIMER_T1IN_MASK (0xF3) +#define GPIO_PAR_TIMER_T1IN_UNMASK (0xF3) #define GPIO_PAR_TIMER_T1IN_T1IN (0x0C) #define GPIO_PAR_TIMER_T1IN_T1OUT (0x08) #define GPIO_PAR_TIMER_T1IN_U2CTS (0x04) #define GPIO_PAR_TIMER_T1IN_GPIO (0x00) -#define GPIO_PAR_TIMER_T0IN_MASK (0xFC) +#define GPIO_PAR_TIMER_T0IN_UNMASK (0xFC) #define GPIO_PAR_TIMER_T0IN_T0IN (0x03) #define GPIO_PAR_TIMER_T0IN_T0OUT (0x02) #define GPIO_PAR_TIMER_T0IN_U2RTS (0x01) @@ -417,12 +417,12 @@ /* Bit definitions and macros for PAR_USB */ #define GPIO_PAR_USB_VBUSOC(x) (((x)&0x03)) #define GPIO_PAR_USB_VBUSEN(x) (((x)&0x03)<<2) -#define GPIO_PAR_USB_VBUSEN_MASK (0xF3) +#define GPIO_PAR_USB_VBUSEN_UNMASK (0xF3) #define GPIO_PAR_USB_VBUSEN_VBUSEN (0x0C) #define GPIO_PAR_USB_VBUSEN_USBPULLUP (0x08) #define GPIO_PAR_USB_VBUSEN_ULPI_NXT (0x04) #define GPIO_PAR_USB_VBUSEN_GPIO (0x00) -#define GPIO_PAR_USB_VBUSOC_MASK (0xFC) +#define GPIO_PAR_USB_VBUSOC_UNMASK (0xFC) #define GPIO_PAR_USB_VBUSOC_VBUSOC (0x03) #define GPIO_PAR_USB_VBUSOC_ULPI_STP (0x01) #define GPIO_PAR_USB_VBUSOC_GPIO (0x00) @@ -460,11 +460,11 @@ #define GPIO_PAR_FECI2C_MDC0 (0x0040) #define GPIO_PAR_FECI2C_MDIO1(x) (((x)&0x0003)<<8) #define GPIO_PAR_FECI2C_MDC1(x) (((x)&0x0003)<<10) -#define GPIO_PAR_FECI2C_MDC1_MASK (0xF3FF) +#define GPIO_PAR_FECI2C_MDC1_UNMASK (0xF3FF) #define GPIO_PAR_FECI2C_MDC1_MDC1 (0x0C00) #define GPIO_PAR_FECI2C_MDC1_ATA_DIOR (0x0800) #define GPIO_PAR_FECI2C_MDC1_GPIO (0x0000) -#define GPIO_PAR_FECI2C_MDIO1_MASK (0xFCFF) +#define GPIO_PAR_FECI2C_MDIO1_UNMASK (0xFCFF) #define GPIO_PAR_FECI2C_MDIO1_MDIO1 (0x0300) #define GPIO_PAR_FECI2C_MDIO1_ATA_DIOW (0x0200) #define GPIO_PAR_FECI2C_MDIO1_GPIO (0x0000) @@ -472,11 +472,11 @@ #define GPIO_PAR_FECI2C_MDC0_GPIO (0x0000) #define GPIO_PAR_FECI2C_MDIO0_MDIO0 (0x0010) #define GPIO_PAR_FECI2C_MDIO0_GPIO (0x0000) -#define GPIO_PAR_FECI2C_SCL_MASK (0xFFF3) +#define GPIO_PAR_FECI2C_SCL_UNMASK (0xFFF3) #define GPIO_PAR_FECI2C_SCL_SCL (0x000C) #define GPIO_PAR_FECI2C_SCL_U2TXD (0x0004) #define GPIO_PAR_FECI2C_SCL_GPIO (0x0000) -#define GPIO_PAR_FECI2C_SDA_MASK (0xFFFC) +#define GPIO_PAR_FECI2C_SDA_UNMASK (0xFFFC) #define GPIO_PAR_FECI2C_SDA_SDA (0x0003) #define GPIO_PAR_FECI2C_SDA_U2RXD (0x0001) #define GPIO_PAR_FECI2C_SDA_GPIO (0x0000) @@ -487,19 +487,19 @@ #define GPIO_PAR_SSI_SRXD(x) (((x)&0x0003)<<4) #define GPIO_PAR_SSI_FS(x) (((x)&0x0003)<<6) #define GPIO_PAR_SSI_BCLK(x) (((x)&0x0003)<<8) -#define GPIO_PAR_SSI_BCLK_MASK (0xFCFF) +#define GPIO_PAR_SSI_BCLK_UNMASK (0xFCFF) #define GPIO_PAR_SSI_BCLK_BCLK (0x0300) #define GPIO_PAR_SSI_BCLK_U1CTS (0x0200) #define GPIO_PAR_SSI_BCLK_GPIO (0x0000) -#define GPIO_PAR_SSI_FS_MASK (0xFF3F) +#define GPIO_PAR_SSI_FS_UNMASK (0xFF3F) #define GPIO_PAR_SSI_FS_FS (0x00C0) #define GPIO_PAR_SSI_FS_U1RTS (0x0080) #define GPIO_PAR_SSI_FS_GPIO (0x0000) -#define GPIO_PAR_SSI_SRXD_MASK (0xFFCF) +#define GPIO_PAR_SSI_SRXD_UNMASK (0xFFCF) #define GPIO_PAR_SSI_SRXD_SRXD (0x0030) #define GPIO_PAR_SSI_SRXD_U1RXD (0x0020) #define GPIO_PAR_SSI_SRXD_GPIO (0x0000) -#define GPIO_PAR_SSI_STXD_MASK (0xFFF3) +#define GPIO_PAR_SSI_STXD_UNMASK (0xFFF3) #define GPIO_PAR_SSI_STXD_STXD (0x000C) #define GPIO_PAR_SSI_STXD_U1TXD (0x0008) #define GPIO_PAR_SSI_STXD_GPIO (0x0000) @@ -552,7 +552,7 @@ #define GPIO_PAR_PCI_GNT1 (0x0400) #define GPIO_PAR_PCI_GNT2 (0x1000) #define GPIO_PAR_PCI_GNT3(x) (((x)&0x0003)<<14) -#define GPIO_PAR_PCI_GNT3_MASK (0x3FFF) +#define GPIO_PAR_PCI_GNT3_UNMASK (0x3FFF) #define GPIO_PAR_PCI_GNT3_GNT3 (0xC000) #define GPIO_PAR_PCI_GNT3_ATA_DMACK (0x8000) #define GPIO_PAR_PCI_GNT3_GPIO (0x0000) @@ -562,7 +562,7 @@ #define GPIO_PAR_PCI_GNT1_GPIO (0x0000) #define GPIO_PAR_PCI_GNT0_GNT0 (0x0100) #define GPIO_PAR_PCI_GNT0_GPIO (0x0000) -#define GPIO_PAR_PCI_REQ3_MASK (0xFF3F) +#define GPIO_PAR_PCI_REQ3_UNMASK (0xFF3F) #define GPIO_PAR_PCI_REQ3_REQ3 (0x00C0) #define GPIO_PAR_PCI_REQ3_ATA_INTRQ (0x0080) #define GPIO_PAR_PCI_REQ3_GPIO (0x0000) @@ -578,22 +578,22 @@ #define GPIO_MSCR_SDRAM_SDCLK(x) (((x)&0x03)<<2) #define GPIO_MSCR_SDRAM_SDDQS(x) (((x)&0x03)<<4) #define GPIO_MSCR_SDRAM_SDDATA(x) (((x)&0x03)<<6) -#define GPIO_MSCR_SDRAM_SDDATA_MASK (0x3F) +#define GPIO_MSCR_SDRAM_SDDATA_UNMASK (0x3F) #define GPIO_MSCR_SDRAM_SDDATA_DDR1 (0xC0) #define GPIO_MSCR_SDRAM_SDDATA_DDR2 (0x80) #define GPIO_MSCR_SDRAM_SDDATA_FS_LPDDR (0x40) #define GPIO_MSCR_SDRAM_SDDATA_HS_LPDDR (0x00) -#define GPIO_MSCR_SDRAM_SDDQS_MASK (0xCF) +#define GPIO_MSCR_SDRAM_SDDQS_UNMASK (0xCF) #define GPIO_MSCR_SDRAM_SDDQS_DDR1 (0x30) #define GPIO_MSCR_SDRAM_SDDQS_DDR2 (0x20) #define GPIO_MSCR_SDRAM_SDDQS_FS_LPDDR (0x10) #define GPIO_MSCR_SDRAM_SDDQS_HS_LPDDR (0x00) -#define GPIO_MSCR_SDRAM_SDCLK_MASK (0xF3) +#define GPIO_MSCR_SDRAM_SDCLK_UNMASK (0xF3) #define GPIO_MSCR_SDRAM_SDCLK_DDR1 (0x0C) #define GPIO_MSCR_SDRAM_SDCLK_DDR2 (0x08) #define GPIO_MSCR_SDRAM_SDCLK_FS_LPDDR (0x04) #define GPIO_MSCR_SDRAM_SDCLK_HS_LPDDR (0x00) -#define GPIO_MSCR_SDRAM_SDCTL_MASK (0xFC) +#define GPIO_MSCR_SDRAM_SDCTL_UNMASK (0xFC) #define GPIO_MSCR_SDRAM_SDCTL_DDR1 (0x03) #define GPIO_MSCR_SDRAM_SDCTL_DDR2 (0x02) #define GPIO_MSCR_SDRAM_SDCTL_FS_LPDDR (0x01) From 52affe04fa5493597d8a5f6202507190950a32e6 Mon Sep 17 00:00:00 2001 From: TsiChung Liew Date: Tue, 9 Mar 2010 19:17:52 -0600 Subject: [PATCH 027/164] ColdFire: Update processors' serial port configuration Provide parameter passing to uart_port_config(). Update port configuration - un-mask it before enable the bits. Signed-off-by: TsiChung Liew --- cpu/mcf5227x/cpu_init.c | 4 +-- cpu/mcf523x/cpu_init.c | 26 +++++++++++---- cpu/mcf52x2/cpu_init.c | 61 +++++++++++++++++++---------------- cpu/mcf532x/cpu_init.c | 29 ++++++++++++----- cpu/mcf5445x/cpu_init.c | 32 +++++++++++++++--- cpu/mcf547x_8x/cpu_init.c | 4 +-- include/asm-m68k/immap_5253.h | 1 + 7 files changed, 106 insertions(+), 51 deletions(-) diff --git a/cpu/mcf5227x/cpu_init.c b/cpu/mcf5227x/cpu_init.c index d336857ed..beb78f583 100644 --- a/cpu/mcf5227x/cpu_init.c +++ b/cpu/mcf5227x/cpu_init.c @@ -125,12 +125,12 @@ int cpu_init_r(void) return (0); } -void uart_port_conf(void) +void uart_port_conf(int port) { volatile gpio_t *gpio = (gpio_t *) MMAP_GPIO; /* Setup Ports: */ - switch (CONFIG_SYS_UART_PORT) { + switch (port) { case 0: gpio->par_uart &= (GPIO_PAR_UART_U0TXD_UNMASK & GPIO_PAR_UART_U0RXD_UNMASK); diff --git a/cpu/mcf523x/cpu_init.c b/cpu/mcf523x/cpu_init.c index 3c04fd413..0f299f0c3 100644 --- a/cpu/mcf523x/cpu_init.c +++ b/cpu/mcf523x/cpu_init.c @@ -130,21 +130,32 @@ int cpu_init_r(void) return (0); } -void uart_port_conf(void) +void uart_port_conf(int port) { volatile gpio_t *gpio = (gpio_t *) MMAP_GPIO; /* Setup Ports: */ - switch (CONFIG_SYS_UART_PORT) { + switch (port) { case 0: - gpio->par_uart = (GPIO_PAR_UART_U0RXD | GPIO_PAR_UART_U0TXD); + gpio->par_uart &= ~(GPIO_PAR_UART_U0RXD | GPIO_PAR_UART_U0TXD); + gpio->par_uart |= (GPIO_PAR_UART_U0RXD | GPIO_PAR_UART_U0TXD); break; case 1: - gpio->par_uart = - (GPIO_PAR_UART_U1RXD_U1RXD | GPIO_PAR_UART_U1TXD_U1TXD); + gpio->par_uart &= + ~(GPIO_PAR_UART_U1RXD_MASK | GPIO_PAR_UART_U1TXD_MASK); + gpio->par_uart |= + (GPIO_PAR_UART_U1RXD_U1RXD | GPIO_PAR_UART_U1TXD_U1TXD); break; case 2: - gpio->par_timer = (GPIO_PAR_UART_U2RXD | GPIO_PAR_UART_U2TXD); +#ifdef CONFIG_SYS_UART2_PRI_GPIO + gpio->par_uart &= ~(GPIO_PAR_UART_U2RXD | GPIO_PAR_UART_U2TXD); + gpio->par_uart |= (GPIO_PAR_UART_U2RXD | GPIO_PAR_UART_U2TXD); +#elif defined(CONFIG_SYS_UART2_ALT1_GPIO) + gpio->feci2c &= + ~(GPIO_PAR_FECI2C_EMDC_MASK | GPIO_PAR_FECI2C_EMDIO_MASK); + gpio->feci2c |= + (GPIO_PAR_FECI2C_EMDC_U2TXD | GPIO_PAR_FECI2C_EMDIO_U2RXD); +#endif break; } } @@ -156,7 +167,8 @@ int fecpin_setclear(struct eth_device *dev, int setclear) if (setclear) { gpio->par_feci2c |= - (GPIO_PAR_FECI2C_EMDC_FECEMDC | GPIO_PAR_FECI2C_EMDIO_FECEMDIO); + (GPIO_PAR_FECI2C_EMDC_FECEMDC | + GPIO_PAR_FECI2C_EMDIO_FECEMDIO); } else { gpio->par_feci2c &= ~(GPIO_PAR_FECI2C_EMDC_MASK | GPIO_PAR_FECI2C_EMDIO_MASK); diff --git a/cpu/mcf52x2/cpu_init.c b/cpu/mcf52x2/cpu_init.c index 747c1cf90..170bbfc35 100644 --- a/cpu/mcf52x2/cpu_init.c +++ b/cpu/mcf52x2/cpu_init.c @@ -135,12 +135,12 @@ int cpu_init_r(void) return (0); } -void uart_port_conf(void) +void uart_port_conf(int port) { volatile gpio_t *gpio = (gpio_t *) MMAP_GPIO; /* Setup Ports: */ - switch (CONFIG_SYS_UART_PORT) { + switch (port) { case 0: gpio->par_uart &= GPIO_PAR_UART0_UNMASK; gpio->par_uart |= (GPIO_PAR_UART_U0TXD | GPIO_PAR_UART_U0RXD); @@ -247,15 +247,19 @@ int cpu_init_r(void) return (0); } -void uart_port_conf(void) +void uart_port_conf(int port) { + volatile u32 *par = (u32 *) MMAP_PAR; + /* Setup Ports: */ - switch (CONFIG_SYS_UART_PORT) { - case 0: - break; + switch (port) { case 1: + *par &= 0xFFE7FFFF; + *par |= 0x00180000; break; case 2: + *par &= 0xFFFFFFFC; + *par &= 0x00000003; break; } } @@ -291,21 +295,26 @@ int cpu_init_r(void) return (0); } -void uart_port_conf(void) +void uart_port_conf(int port) { + u16 temp; + /* Setup Ports: */ - switch (CONFIG_SYS_UART_PORT) { + switch (port) { case 0: - mbar_writeShort(MCF_GPIO_PAR_UART, MCF_GPIO_PAR_UART_U0TXD | - MCF_GPIO_PAR_UART_U0RXD); + temp = mbar_readShort(MCF_GPIO_PAR_UART) & 0xFFF3; + temp |= (MCF_GPIO_PAR_UART_U0TXD | MCF_GPIO_PAR_UART_U0RXD); + mbar_writeShort(MCF_GPIO_PAR_UART, temp); break; case 1: - mbar_writeShort(MCF_GPIO_PAR_UART, - MCF_GPIO_PAR_UART_U1RXD_UART1 | - MCF_GPIO_PAR_UART_U1TXD_UART1); + temp = mbar_readShort(MCF_GPIO_PAR_UART) & 0xF0FF; + temp |= (MCF_GPIO_PAR_UART_U1RXD_UART1 | MCF_GPIO_PAR_UART_U1TXD_UART1); + mbar_writeShort(MCF_GPIO_PAR_UART, temp); break; case 2: - mbar_writeShort(MCF_GPIO_PAR_UART, 0x3000); + temp = mbar_readShort(MCF_GPIO_PAR_UART) & 0xCFFF; + temp |= (0x3000); + mbar_writeShort(MCF_GPIO_PAR_UART, temp); break; } } @@ -409,12 +418,12 @@ int cpu_init_r(void) return (0); } -void uart_port_conf(void) +void uart_port_conf(int port) { volatile gpio_t *gpio = (gpio_t *) MMAP_GPIO; /* Setup Ports: */ - switch (CONFIG_SYS_UART_PORT) { + switch (port) { case 0: gpio->gpio_pbcnt &= ~(GPIO_PBCNT_PB0MSK | GPIO_PBCNT_PB1MSK); gpio->gpio_pbcnt |= (GPIO_PBCNT_URT0_TXD | GPIO_PBCNT_URT0_RXD); @@ -487,19 +496,22 @@ int cpu_init_r(void) return (0); } -void uart_port_conf(void) +void uart_port_conf(int port) { volatile gpio_t *gpio = (gpio_t *) MMAP_GPIO; /* Setup Ports: */ - switch (CONFIG_SYS_UART_PORT) { + switch (port) { case 0: + gpio->par_uart &= ~UART0_ENABLE_MASK; gpio->par_uart |= UART0_ENABLE_MASK; break; case 1: + gpio->par_uart &= ~UART1_ENABLE_MASK; gpio->par_uart |= UART1_ENABLE_MASK; break; case 2: + gpio->par_uart &= ~UART2_ENABLE_MASK; gpio->par_uart |= UART2_ENABLE_MASK; break; } @@ -621,10 +633,10 @@ int cpu_init_r(void) return (0); } -void uart_port_conf(void) +void uart_port_conf(int port) { /* Setup Ports: */ - switch (CONFIG_SYS_UART_PORT) { + switch (port) { case 0: MCFGPIO_PUAPAR &= 0xFc; MCFGPIO_PUAPAR |= 0x03; @@ -729,14 +741,7 @@ int cpu_init_r(void) return (0); } -void uart_port_conf(void) +void uart_port_conf(int port) { - /* Setup Ports: */ - switch (CONFIG_SYS_UART_PORT) { - case 0: - break; - case 1: - break; - } } #endif /* #if defined(CONFIG_M5249) */ diff --git a/cpu/mcf532x/cpu_init.c b/cpu/mcf532x/cpu_init.c index 04160a829..6f551b60c 100644 --- a/cpu/mcf532x/cpu_init.c +++ b/cpu/mcf532x/cpu_init.c @@ -133,19 +133,21 @@ int cpu_init_r(void) return (0); } -void uart_port_conf(void) +void uart_port_conf(int port) { volatile gpio_t *gpio = (gpio_t *) MMAP_GPIO; /* Setup Ports: */ - switch (CONFIG_SYS_UART_PORT) { + switch (port) { case 0: - gpio->par_uart = (GPIO_PAR_UART_U0TXD | GPIO_PAR_UART_U0RXD); + gpio->par_uart &= ~(GPIO_PAR_UART_U0TXD | GPIO_PAR_UART_U0RXD); + gpio->par_uart |= (GPIO_PAR_UART_U0TXD | GPIO_PAR_UART_U0RXD); break; case 1: #ifdef CONFIG_SYS_UART1_ALT1_GPIO gpio->par_simp1h &= - ~(GPIO_PAR_SIMP1H_DATA1_UNMASK | GPIO_PAR_SIMP1H_VEN1_UNMASK); + ~(GPIO_PAR_SIMP1H_DATA1_UNMASK | + GPIO_PAR_SIMP1H_VEN1_UNMASK); gpio->par_simp1h |= (GPIO_PAR_SIMP1H_DATA1_U1TXD | GPIO_PAR_SIMP1H_VEN1_U1RXD); #elif defined(CONFIG_SYS_UART1_ALT2_GPIO) @@ -297,22 +299,33 @@ int cpu_init_r(void) return (0); } -void uart_port_conf(void) +void uart_port_conf(int port) { volatile gpio_t *gpio = (gpio_t *) MMAP_GPIO; /* Setup Ports: */ - switch (CONFIG_SYS_UART_PORT) { + switch (port) { case 0: - gpio->par_uart = (GPIO_PAR_UART_TXD0 | GPIO_PAR_UART_RXD0); + gpio->par_uart &= ~(GPIO_PAR_UART_TXD0 | GPIO_PAR_UART_RXD0); + gpio->par_uart |= (GPIO_PAR_UART_TXD0 | GPIO_PAR_UART_RXD0); break; case 1: - gpio->par_uart = + gpio->par_uart &= + ~(GPIO_PAR_UART_TXD1(3) | GPIO_PAR_UART_RXD1(3)); + gpio->par_uart |= (GPIO_PAR_UART_TXD1(3) | GPIO_PAR_UART_RXD1(3)); break; case 2: +#ifdef CONFIG_SYS_UART2_ALT1_GPIO gpio->par_timer &= 0x0F; gpio->par_timer |= (GPIO_PAR_TIN3_URXD2 | GPIO_PAR_TIN2_UTXD2); +#elif defined(CONFIG_SYS_UART2_ALT2_GPIO) + gpio->par_feci2c &= 0xFF00; + gpio->par_feci2c |= (GPIO_PAR_FECI2C_SCL_UTXD2 | GPIO_PAR_FECI2C_SDA_URXD2); +#elif defined(CONFIG_SYS_UART2_ALT3_GPIO) + gpio->par_ssi &= 0xF0FF; + gpio->par_ssi |= (GPIO_PAR_SSI_RXD(2) | GPIO_PAR_SSI_TXD(2)); +#endif break; } } diff --git a/cpu/mcf5445x/cpu_init.c b/cpu/mcf5445x/cpu_init.c index 00b7910cc..00e0ca6da 100644 --- a/cpu/mcf5445x/cpu_init.c +++ b/cpu/mcf5445x/cpu_init.c @@ -128,19 +128,43 @@ int cpu_init_r(void) return (0); } -void uart_port_conf(void) +void uart_port_conf(int port) { volatile gpio_t *gpio = (gpio_t *) MMAP_GPIO; /* Setup Ports: */ - switch (CONFIG_SYS_UART_PORT) { + switch (port) { case 0: - gpio->par_uart = + gpio->par_uart &= + ~(GPIO_PAR_UART_U0TXD_U0TXD | GPIO_PAR_UART_U0RXD_U0RXD); + gpio->par_uart |= (GPIO_PAR_UART_U0TXD_U0TXD | GPIO_PAR_UART_U0RXD_U0RXD); break; case 1: - gpio->par_uart = +#ifdef CONFIG_SYS_UART1_PRI_GPIO + gpio->par_uart &= + ~(GPIO_PAR_UART_U1TXD_U1TXD | GPIO_PAR_UART_U1RXD_U1RXD); + gpio->par_uart |= (GPIO_PAR_UART_U1TXD_U1TXD | GPIO_PAR_UART_U1RXD_U1RXD); +#elif defined(CONFIG_SYS_UART1_ALT1_GPIO) + gpio->par_ssi &= + (GPIO_PAR_SSI_SRXD_UNMASK | GPIO_PAR_SSI_STXD_UNMASK); + gpio->par_ssi |= + (GPIO_PAR_SSI_SRXD_U1RXD | GPIO_PAR_SSI_STXD_U1TXD); +#endif + break; + case 2: +#if defined(CONFIG_SYS_UART2_ALT1_GPIO) + gpio->par_timer &= + (GPIO_PAR_TIMER_T3IN_UNMASK | GPIO_PAR_TIMER_T2IN_UNMASK); + gpio->par_timer |= + (GPIO_PAR_TIMER_T3IN_U2RXD | GPIO_PAR_TIMER_T2IN_U2TXD); +#elif defined(CONFIG_SYS_UART2_ALT2_GPIO) + gpio->par_timer &= + (GPIO_PAR_FECI2C_SCL_UNMASK | GPIO_PAR_FECI2C_SDA_UNMASK); + gpio->par_timer |= + (GPIO_PAR_FECI2C_SCL_U2TXD | GPIO_PAR_FECI2C_SDA_U2RXD); +#endif break; } } diff --git a/cpu/mcf547x_8x/cpu_init.c b/cpu/mcf547x_8x/cpu_init.c index 96a3132b7..60c91267a 100644 --- a/cpu/mcf547x_8x/cpu_init.c +++ b/cpu/mcf547x_8x/cpu_init.c @@ -113,13 +113,13 @@ int cpu_init_r(void) return (0); } -void uart_port_conf(void) +void uart_port_conf(int port) { volatile gpio_t *gpio = (gpio_t *) MMAP_GPIO; volatile u8 *pscsicr = (u8 *) (CONFIG_SYS_UART_BASE + 0x40); /* Setup Ports: */ - switch (CONFIG_SYS_UART_PORT) { + switch (port) { case 0: gpio->par_psc0 = (GPIO_PAR_PSC0_TXD0 | GPIO_PAR_PSC0_RXD0); break; diff --git a/include/asm-m68k/immap_5253.h b/include/asm-m68k/immap_5253.h index b5a4cb54a..28cd107a8 100644 --- a/include/asm-m68k/immap_5253.h +++ b/include/asm-m68k/immap_5253.h @@ -37,6 +37,7 @@ #define MMAP_CAN0 (CONFIG_SYS_MBAR + 0x00010000) #define MMAP_CAN1 (CONFIG_SYS_MBAR + 0x00011000) +#define MMAP_PAR (CONFIG_SYS_MBAR2 + 0x0000019C) #define MMAP_I2C1 (CONFIG_SYS_MBAR2 + 0x00000440) #define MMAP_UART2 (CONFIG_SYS_MBAR2 + 0x00000C00) From fa9da596212d7f28eb26a3257d79d9515f9838cd Mon Sep 17 00:00:00 2001 From: TsiChung Liew Date: Tue, 9 Mar 2010 19:24:43 -0600 Subject: [PATCH 028/164] ColdFire: Update uart_port_conf in serial driver Provide proper port passing from serial_init to uart_part_conf. Signed-off-by: TsiChung Liew --- drivers/serial/mcfuart.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/serial/mcfuart.c b/drivers/serial/mcfuart.c index 0b531402e..d93b24b89 100644 --- a/drivers/serial/mcfuart.c +++ b/drivers/serial/mcfuart.c @@ -34,7 +34,7 @@ DECLARE_GLOBAL_DATA_PTR; -extern void uart_port_conf(void); +extern void uart_port_conf(int port); int serial_init(void) { @@ -43,7 +43,7 @@ int serial_init(void) uart = (volatile uart_t *)(CONFIG_SYS_UART_BASE); - uart_port_conf(); + uart_port_conf(CONFIG_SYS_UART_PORT); /* write to SICR: SIM2 = uart mode,dcd does not affect rx */ uart->ucr = UART_UCR_RESET_RX; From 68e4e76af55746a4330865f56476e58ce4140ca8 Mon Sep 17 00:00:00 2001 From: TsiChung Liew Date: Thu, 11 Mar 2010 15:04:21 -0600 Subject: [PATCH 029/164] ColdFire: Relocate vector table - mcf5445x Newer ColdFire processors family boot from address 0 instead of 0xFFnn_nnnn. When the boot flash base chip select is set at new location instead of 0, an un-predictable error will occur if there is an vector being trigger and refer it to an invalid address or the vector table handler is not existed at address 0. Signed-off-by: TsiChung Liew --- cpu/mcf5445x/cpu_init.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/cpu/mcf5445x/cpu_init.c b/cpu/mcf5445x/cpu_init.c index 00e0ca6da..8d51d35d6 100644 --- a/cpu/mcf5445x/cpu_init.c +++ b/cpu/mcf5445x/cpu_init.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #if defined(CONFIG_CMD_NET) @@ -105,6 +106,14 @@ void cpu_init_f(void) fbcs->csmr5 = CONFIG_SYS_CS5_MASK; #endif + /* + * now the flash base address is no longer at 0 (Newer ColdFire family + * boot at address 0 instead of 0xFFnn_nnnn). The vector table must + * also move to the new location. + */ + if (CONFIG_SYS_CS0_BASE != 0) + setvbr(CONFIG_SYS_CS0_BASE); + #ifdef CONFIG_FSL_I2C gpio->par_feci2c = GPIO_PAR_FECI2C_SCL_SCL | GPIO_PAR_FECI2C_SDA_SDA; #endif From ac265f7fcab1a09b9a837a34ef8b10acc101695e Mon Sep 17 00:00:00 2001 From: TsiChung Liew Date: Wed, 10 Mar 2010 11:56:36 -0600 Subject: [PATCH 030/164] ColdFire: Update M5253DEMO configuration file Fix incorrect default environment for flash erase or protect range. Change offset from 0 to 0xff80nnnn. Remove default ethernet setup and MAC address. Signed-off-by: TsiChung Liew --- include/configs/M5253DEMO.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h index 5e86e4cb9..f813f8891 100644 --- a/include/configs/M5253DEMO.h +++ b/include/configs/M5253DEMO.h @@ -95,11 +95,6 @@ # define DM9000_DATA (CONFIG_DM9000_BASE + 4) # undef CONFIG_DM9000_DEBUG -# define CONFIG_ETHADDR 00:e0:0c:bc:e5:60 -# define CONFIG_IPADDR 10.82.121.249 -# define CONFIG_NETMASK 255.255.252.0 -# define CONFIG_SERVERIP 10.82.120.80 -# define CONFIG_GATEWAYIP 10.82.123.254 # define CONFIG_OVERWRITE_ETHADDR_ONCE # define CONFIG_EXTRA_ENV_SETTINGS \ @@ -109,8 +104,8 @@ "u-boot=u-boot.bin\0" \ "load=tftp ${loadaddr) ${u-boot}\0" \ "upd=run load; run prog\0" \ - "prog=prot off 0 2ffff;" \ - "era 0 2ffff;" \ + "prog=prot off 0xff800000 0xff82ffff;" \ + "era 0xff800000 0xff82ffff;" \ "cp.b ${loadaddr} 0 ${filesize};" \ "save\0" \ "" From 53e4290f20b5f73c95717f47f4c04ed6932ff931 Mon Sep 17 00:00:00 2001 From: TsiChung Liew Date: Wed, 10 Mar 2010 16:14:01 -0600 Subject: [PATCH 031/164] ColdFire: M5271EVB DRAM Bring up issue Fix proper portsize: The register for portsize is either 00b, 01b, or 1xb. The value that previous assigned is 32d. Fix DRAM bring up: insert asm("nop") for every DRAM register setup Signed-off-by: TsiChung Liew --- board/freescale/m5271evb/m5271evb.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/board/freescale/m5271evb/m5271evb.c b/board/freescale/m5271evb/m5271evb.c index 5505cc42c..446f102e5 100644 --- a/board/freescale/m5271evb/m5271evb.c +++ b/board/freescale/m5271evb/m5271evb.c @@ -47,6 +47,7 @@ phys_size_t initdram (int board_type) { MCF_GPIO_SDRAM_SDWE | MCF_GPIO_SDRAM_SCAS | MCF_GPIO_SDRAM_SRAS | MCF_GPIO_SDRAM_SCKE | MCF_GPIO_SDRAM_SDCS_11); + asm(" nop"); /* * Check to see if the SDRAM has already been initialized @@ -55,8 +56,9 @@ phys_size_t initdram (int board_type) { if (!(mbar_readLong(MCF_SDRAMC_DACR0) & MCF_SDRAMC_DACRn_RE)) { /* Initialize DRAM Control Register: DCR */ mbar_writeShort(MCF_SDRAMC_DCR, - MCF_SDRAMC_DCR_RTIM(0x01) - | MCF_SDRAMC_DCR_RC(0x30)); + MCF_SDRAMC_DCR_RTIM(2) + | MCF_SDRAMC_DCR_RC(0x2E)); + asm(" nop"); /* * Initialize DACR0 @@ -70,15 +72,18 @@ phys_size_t initdram (int board_type) { | MCF_SDRAMC_DACRn_CASL(1) | MCF_SDRAMC_DACRn_CBM(3) | MCF_SDRAMC_DACRn_PS(0)); + asm(" nop"); /* Initialize DMR0 */ mbar_writeLong(MCF_SDRAMC_DMR0, MCF_SDRAMC_DMRn_BAM_16M | MCF_SDRAMC_DMRn_V); + asm(" nop"); /* Set IP bit in DACR */ mbar_writeLong(MCF_SDRAMC_DACR0, mbar_readLong(MCF_SDRAMC_DACR0) | MCF_SDRAMC_DACRn_IP); + asm(" nop"); /* Wait at least 20ns to allow banks to precharge */ for (i = 0; i < 5; i++) @@ -86,6 +91,7 @@ phys_size_t initdram (int board_type) { /* Write to this block to initiate precharge */ *(u32 *)(CONFIG_SYS_SDRAM_BASE) = 0xa5a5a5a5; + asm(" nop"); /* Set RE bit in DACR */ mbar_writeLong(MCF_SDRAMC_DACR0, mbar_readLong(MCF_SDRAMC_DACR0) @@ -98,6 +104,7 @@ phys_size_t initdram (int board_type) { /* Finish the configuration by issuing the MRS */ mbar_writeLong(MCF_SDRAMC_DACR0, mbar_readLong(MCF_SDRAMC_DACR0) | MCF_SDRAMC_DACRn_MRS); + asm(" nop"); /* * Write to the SDRAM Mode Register A0-A11 = 0x400 @@ -109,6 +116,7 @@ phys_size_t initdram (int board_type) { * Burst Length = 1 */ *(u32 *)(CONFIG_SYS_SDRAM_BASE + 0x400) = 0xa5a5a5a5; + asm(" nop"); } return CONFIG_SYS_SDRAM_SIZE * 1024 * 1024; From 0e8a75550695aba9d8cfe9c7f7713da42c1f3e89 Mon Sep 17 00:00:00 2001 From: TsiChung Liew Date: Wed, 10 Mar 2010 16:33:03 -0600 Subject: [PATCH 032/164] ColdFire: Update Extra environment Data for M5275EVB Provide extra environment Data. Remove default network address and MAC address. Signed-off-by: TsiChung Liew --- include/configs/M5275EVB.h | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h index b38015981..f8d43f0a5 100644 --- a/include/configs/M5275EVB.h +++ b/include/configs/M5275EVB.h @@ -121,11 +121,6 @@ #define CONFIG_SYS_I2C_PINMUX_CLR (0xFFF0) #define CONFIG_SYS_I2C_PINMUX_SET (0x000F) -#ifdef CONFIG_MCFFEC -#define CONFIG_ETHADDR 00:06:3b:01:41:55 -#define CONFIG_ETH1ADDR 00:0e:0c:bc:e5:60 -#endif - #define CONFIG_SYS_PROMPT "-> " #define CONFIG_SYS_LONGHELP /* undef to save memory */ @@ -145,6 +140,23 @@ #define CONFIG_SYS_MEMTEST_START 0x400 #define CONFIG_SYS_MEMTEST_END 0x380000 +#ifdef CONFIG_MCFFEC +# define CONFIG_NET_RETRY_COUNT 5 +# define CONFIG_OVERWRITE_ETHADDR_ONCE +#endif /* FEC_ENET */ + +#define CONFIG_EXTRA_ENV_SETTINGS \ + "netdev=eth0\0" \ + "loadaddr=10000\0" \ + "uboot=u-boot.bin\0" \ + "load=tftp ${loadaddr} ${uboot}\0" \ + "upd=run load; run prog\0" \ + "prog=prot off ffe00000 ffe3ffff;" \ + "era ffe00000 ffe3ffff;" \ + "cp.b ${loadaddr} ffe00000 ${filesize};"\ + "save\0" \ + "" + #define CONFIG_SYS_HZ 1000 #define CONFIG_SYS_CLK 150000000 From f9d877a6479878ca96688671f37d87b620c3e77c Mon Sep 17 00:00:00 2001 From: TsiChung Liew Date: Wed, 10 Mar 2010 17:32:13 -0600 Subject: [PATCH 033/164] ColdFire: Add CPU compile flag for mcf5301x and mcf532x Add CPU compile flag -mcpu=53015 in cpu/config.mk Signed-off-by: TsiChung Liew --- cpu/mcf532x/config.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/cpu/mcf532x/config.mk b/cpu/mcf532x/config.mk index 0cb90ac4e..b783444ae 100644 --- a/cpu/mcf532x/config.mk +++ b/cpu/mcf532x/config.mk @@ -24,8 +24,20 @@ # PLATFORM_RELFLAGS += -ffixed-d7 -msep-data + +cfg=$(shell grep configs $(OBJTREE)/include/config.h | sed 's/.*<\(configs.*\)>/\1/') +is5301x:=$(shell grep CONFIG_MCF5301x $(TOPDIR)/include/$(cfg)) +is532x:=$(shell grep CONFIG_MCF532x $(TOPDIR)/include/$(cfg)) + ifneq ($(findstring 4.1,$(shell $(CC) --version)),4.1) + +ifneq (,$(findstring CONFIG_MCF5301x,$(is5301x))) +PLATFORM_CPPFLAGS += -mcpu=53015 -fPIC +endif +ifneq (,$(findstring CONFIG_MCF532x,$(is532x))) PLATFORM_CPPFLAGS += -mcpu=5329 -fPIC +endif + else PLATFORM_CPPFLAGS += -m5307 -fPIC endif From 9e8e927023582231b034e199568e49f84ac032a9 Mon Sep 17 00:00:00 2001 From: TsiChung Liew Date: Wed, 10 Mar 2010 18:24:07 -0600 Subject: [PATCH 034/164] ColdFire: Misc update for M53017 Reside Ethernet buffer descriptors in SRAM instead of DRAM. Add CONFIG_SYS_TX_ETH_BUFFER in platform configuration file. Update DRAM control and SRAM control register setting. Update cache setting where size does not write to proper region. Signed-off-by: TsiChung Liew Signed-off-by: Jason Jin --- cpu/mcf532x/start.S | 2 +- include/configs/M53017EVB.h | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cpu/mcf532x/start.S b/cpu/mcf532x/start.S index 5b134aa47..5abd944eb 100644 --- a/cpu/mcf532x/start.S +++ b/cpu/mcf532x/start.S @@ -284,7 +284,7 @@ _int_handler: icache_enable: move.l #0x01000000, %d0 /* Invalidate cache cmd */ movec %d0, %CACR /* Invalidate cache */ - move.l #(CONFIG_SYS_SDRAM_BASE + 0xc000 + ((CONFIG_SYS_SDRAM_SIZE & 0x1fe0) << 11)), %d0 + move.l #(CONFIG_SYS_SDRAM_BASE + 0xc000 + ((CONFIG_SYS_SDRAM_SIZE & 0x1fe0 - 1) << 16)), %d0 movec %d0, %ACR0 /* Enable cache */ move.l #0x80000200, %d0 /* Setup cache mask */ diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h index 30855bdaa..c351d415c 100644 --- a/include/configs/M53017EVB.h +++ b/include/configs/M53017EVB.h @@ -69,6 +69,8 @@ # define CONFIG_MII_INIT 1 # define CONFIG_SYS_DISCOVER_PHY # define CONFIG_SYS_RX_ETH_BUFFER 8 +# define CONFIG_SYS_TX_ETH_BUFFER 8 +# define CONFIG_SYS_FEC_BUF_USE_SRAM # define CONFIG_SYS_FAULT_ECHO_LINK_DOWN # define CONFIG_HAS_ETH1 @@ -166,7 +168,7 @@ */ #define CONFIG_SYS_INIT_RAM_ADDR 0x80000000 #define CONFIG_SYS_INIT_RAM_END 0x20000 /* End of used area in internal SRAM */ -#define CONFIG_SYS_INIT_RAM_CTRL 0x21 +#define CONFIG_SYS_INIT_RAM_CTRL 0x221 #define CONFIG_SYS_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ #define CONFIG_SYS_GBL_DATA_OFFSET ((CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) - 0x10) #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET @@ -180,7 +182,7 @@ #define CONFIG_SYS_SDRAM_SIZE 64 /* SDRAM size in MB */ #define CONFIG_SYS_SDRAM_CFG1 0x43711630 #define CONFIG_SYS_SDRAM_CFG2 0x56670000 -#define CONFIG_SYS_SDRAM_CTRL 0xE1002000 +#define CONFIG_SYS_SDRAM_CTRL 0xE1092000 #define CONFIG_SYS_SDRAM_EMOD 0x80010000 #define CONFIG_SYS_SDRAM_MODE 0x00CD0000 From f628e2f72daee810aa568619b6629da68ad042d6 Mon Sep 17 00:00:00 2001 From: TsiChung Liew Date: Wed, 10 Mar 2010 18:50:22 -0600 Subject: [PATCH 035/164] ColdFire: Fix SDRAM size on M5208evb rev E The proper SDRAM size is 32MB not 64MB Signed-off-by: Jingchang Lu --- include/configs/M5208EVBE.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h index 32123d2f5..3cc259ffd 100644 --- a/include/configs/M5208EVBE.h +++ b/include/configs/M5208EVBE.h @@ -158,7 +158,7 @@ * Please note that CONFIG_SYS_SDRAM_BASE _must_ start at 0 */ #define CONFIG_SYS_SDRAM_BASE 0x40000000 -#define CONFIG_SYS_SDRAM_SIZE 64 /* SDRAM size in MB */ +#define CONFIG_SYS_SDRAM_SIZE 32 /* SDRAM size in MB */ #define CONFIG_SYS_SDRAM_CFG1 0x43711630 #define CONFIG_SYS_SDRAM_CFG2 0x56670000 #define CONFIG_SYS_SDRAM_CTRL 0xE1002000 From dd9f054ede433de73b137987fb3dc066e8d24ebb Mon Sep 17 00:00:00 2001 From: TsiChung Liew Date: Thu, 11 Mar 2010 22:12:53 -0600 Subject: [PATCH 036/164] ColdFire: Cache update for all platforms The CF will call cache functions in lib_m68/cache.c and the cache settings are defined in platform configuration file. Signed-off-by: TsiChung Liew --- cpu/mcf5227x/start.S | 102 ++------------- cpu/mcf523x/start.S | 75 +---------- cpu/mcf52x2/start.S | 176 ++------------------------ cpu/mcf532x/start.S | 72 +---------- cpu/mcf5445x/start.S | 123 ++---------------- cpu/mcf547x_8x/start.S | 83 +----------- include/asm-m68k/cache.h | 210 +++++++++++++++++++++++++++++++ include/configs/EB+MCF-EV123.h | 12 ++ include/configs/M5208EVBE.h | 13 ++ include/configs/M52277EVB.h | 13 ++ include/configs/M5235EVB.h | 12 ++ include/configs/M5249EVB.h | 15 +++ include/configs/M5253DEMO.h | 15 +++ include/configs/M5253EVBE.h | 15 +++ include/configs/M5271EVB.h | 14 +++ include/configs/M5272C3.h | 14 +++ include/configs/M5275EVB.h | 14 +++ include/configs/M5282EVB.h | 13 ++ include/configs/M53017EVB.h | 11 ++ include/configs/M5329EVB.h | 11 ++ include/configs/M5373EVB.h | 11 ++ include/configs/M54451EVB.h | 15 +++ include/configs/M54455EVB.h | 17 ++- include/configs/M5475EVB.h | 16 +++ include/configs/M5485EVB.h | 16 +++ include/configs/TASREG.h | 11 ++ include/configs/astro_mcf5373l.h | 11 ++ include/configs/cobra5272.h | 13 ++ include/configs/idmr.h | 13 ++ lib_m68k/cache.c | 123 +++++++++++++++++- 30 files changed, 659 insertions(+), 600 deletions(-) create mode 100644 include/asm-m68k/cache.h diff --git a/cpu/mcf5227x/start.S b/cpu/mcf5227x/start.S index 0c9c89c40..30428f15d 100644 --- a/cpu/mcf5227x/start.S +++ b/cpu/mcf5227x/start.S @@ -24,16 +24,12 @@ #include #include #include "version.h" +#include #ifndef CONFIG_IDENT_STRING #define CONFIG_IDENT_STRING "" #endif -/* last three long word reserved for cache status */ -#define ICACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR+CONFIG_SYS_INIT_RAM_END- 4) -#define DCACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR+CONFIG_SYS_INIT_RAM_END- 8) -#define CACR_STATUS (CONFIG_SYS_INIT_RAM_ADDR+CONFIG_SYS_INIT_RAM_END-12) - #define _START _start #define _FAULT _fault @@ -378,22 +374,20 @@ _start: movec %d0, %RAMBAR1 #endif - /* initialize general use internal ram */ - move.l #0, %d0 - move.l #(ICACHE_STATUS), %a1 /* icache */ - move.l #(DCACHE_STATUS), %a2 /* icache */ - move.l #(CACR_STATUS), %a3 /* CACR */ - move.l %d0, (%a1) - move.l %d0, (%a2) - move.l %d0, (%a3) - /* invalidate and disable cache */ - move.l #0x01000000, %d0 /* Invalidate cache cmd */ + move.l #CF_CACR_CINV, %d0 /* Invalidate cache cmd */ movec %d0, %CACR /* Invalidate cache */ move.l #0, %d0 movec %d0, %ACR0 movec %d0, %ACR1 + /* initialize general use internal ram */ + move.l #0, %d0 + move.l #(ICACHE_STATUS), %a1 /* icache */ + move.l #(DCACHE_STATUS), %a2 /* icache */ + move.l %d0, (%a1) + move.l %d0, (%a2) + /* set stackpointer to end of internal ram to get some stackspace for the first c-code */ move.l #(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET), %sp @@ -509,84 +503,6 @@ _int_handler: addql #4,%sp RESTORE_ALL -/*------------------------------------------------------------------------------*/ -/* cache functions */ - .globl icache_enable -icache_enable: - move.l #0x01200000, %d0 /* Invalid cache */ - movec %d0, %CACR - - move.l #(CONFIG_SYS_SDRAM_BASE + 0x1c000), %d0 - movec %d0, %ACR0 - - move.l #0x81600610, %d0 /* Enable cache */ - movec %d0, %CACR - - move.l #(ICACHE_STATUS), %a1 - moveq #1, %d0 - move.l %d0, (%a1) - rts - - .globl icache_disable -icache_disable: - move.l #0x01F00000, %d0 /* Setup cache mask */ - movec %d0, %CACR /* Invalidate icache */ - clr.l %d0 - movec %d0, %ACR0 - movec %d0, %ACR1 - - move.l #(ICACHE_STATUS), %a1 - moveq #0, %d0 - move.l %d0, (%a1) - rts - - .globl icache_status -icache_status: - move.l #(ICACHE_STATUS), %a1 - move.l (%a1), %d0 - rts - - .globl icache_invalid -icache_invalid: - move.l #0x80600610, %d0 /* Invalidate icache */ - movec %d0, %CACR /* Enable and invalidate cache */ - rts - - .globl dcache_enable -dcache_enable: - move.l #0x01200000, %d0 /* Invalid cache */ - movec %d0, %CACR - - move.l #0x81300610, %d0 - movec %d0, %CACR - - move.l #(DCACHE_STATUS), %a1 - moveq #1, %d0 - move.l %d0, (%a1) - rts - - .globl dcache_disable -dcache_disable: - move.l #0x81600610, %d0 /* Setup cache mask */ - movec %d0, %CACR /* Invalidate icache */ - - move.l #(DCACHE_STATUS), %a1 - moveq #0, %d0 - move.l %d0, (%a1) - rts - - .globl dcache_invalid -dcache_invalid: - move.l #0x81100610, %d0 /* Setup cache mask */ - movec %d0, %CACR /* Enable and invalidate cache */ - rts - - .globl dcache_status -dcache_status: - move.l #(DCACHE_STATUS), %a1 - move.l (%a1), %d0 - rts - /*------------------------------------------------------------------------------*/ .globl version_string diff --git a/cpu/mcf523x/start.S b/cpu/mcf523x/start.S index d44da37ec..20b50e757 100644 --- a/cpu/mcf523x/start.S +++ b/cpu/mcf523x/start.S @@ -24,6 +24,7 @@ #include #include #include "version.h" +#include #ifndef CONFIG_IDENT_STRING #define CONFIG_IDENT_STRING "" @@ -135,7 +136,7 @@ _start: movec %d0, %RAMBAR1 /* invalidate and disable cache */ - move.l #0x01000000, %d0 /* Invalidate cache cmd */ + move.l #CF_CACR_CINV, %d0 /* Invalidate cache cmd */ movec %d0, %CACR /* Invalidate cache */ nop move.l #0, %d0 @@ -144,8 +145,8 @@ _start: /* initialize general use internal ram */ move.l #0, %d0 - move.l #(CONFIG_SYS_INIT_RAM_ADDR+CONFIG_SYS_INIT_RAM_END-8), %a1 - move.l #(CONFIG_SYS_INIT_RAM_ADDR+CONFIG_SYS_INIT_RAM_END-4), %a2 + move.l #(ICACHE_STATUS), %a1 /* icache */ + move.l #(DCACHE_STATUS), %a2 /* icache */ move.l %d0, (%a1) move.l %d0, (%a2) @@ -264,74 +265,6 @@ _int_handler: addql #4,%sp RESTORE_ALL -/*------------------------------------------------------------------------------*/ -/* cache functions */ - .globl icache_enable -icache_enable: - move.l #0x01000000, %d0 /* Invalidate cache cmd */ - movec %d0, %CACR /* Invalidate cache */ - nop - move.l #(CONFIG_SYS_SDRAM_BASE + 0xc000), %d0 /* Setup cache mask */ - movec %d0, %ACR0 /* Enable cache */ - move.l #(CONFIG_SYS_FLASH_BASE + 0xc000), %d0 /* Setup cache mask */ - movec %d0, %ACR1 /* Enable cache */ - - move.l #0x80400100, %d0 /* Setup cache mask */ - movec %d0, %CACR /* Enable cache */ - nop - - move.l #(CONFIG_SYS_INIT_RAM_ADDR+CONFIG_SYS_INIT_RAM_END-8), %a1 - moveq #1, %d0 - move.l %d0, (%a1) - rts - - .globl icache_disable -icache_disable: - move.l #0x00000100, %d0 /* Setup cache mask */ - movec %d0, %CACR /* Disable cache */ - clr.l %d0 /* Setup cache mask */ - movec %d0, %ACR0 - movec %d0, %ACR1 - - move.l #(CONFIG_SYS_INIT_RAM_ADDR+CONFIG_SYS_INIT_RAM_END-8), %a1 - moveq #0, %d0 - move.l %d0, (%a1) - rts - - .globl icache_status -icache_status: - move.l #(CONFIG_SYS_INIT_RAM_ADDR+CONFIG_SYS_INIT_RAM_END-8), %a1 - move.l (%a1), %d0 - rts - - .globl icache_invalid -icache_invalid: - move.l #0x80600100, %d0 /* Setup cache mask */ - movec %d0, %CACR /* Enable cache */ - nop - rts - - .globl dcache_enable -dcache_enable: - move.l #(CONFIG_SYS_INIT_RAM_ADDR+CONFIG_SYS_INIT_RAM_END-4), %a1 - moveq #1, %d0 - move.l %d0, (%a1) - rts - - /* No dcache, just a dummy function */ - .globl dcache_disable -dcache_disable: - move.l #(CONFIG_SYS_INIT_RAM_ADDR+CONFIG_SYS_INIT_RAM_END-4), %a1 - moveq #0, %d0 - move.l %d0, (%a1) - rts - - .globl dcache_status -dcache_status: - move.l #(CONFIG_SYS_INIT_RAM_ADDR+CONFIG_SYS_INIT_RAM_END-4), %a1 - move.l (%a1), %d0 - rts - /*------------------------------------------------------------------------------*/ .globl version_string diff --git a/cpu/mcf52x2/start.S b/cpu/mcf52x2/start.S index 0dd4de516..9ef206aa0 100644 --- a/cpu/mcf52x2/start.S +++ b/cpu/mcf52x2/start.S @@ -24,12 +24,12 @@ #include #include #include "version.h" +#include #ifndef CONFIG_IDENT_STRING #define CONFIG_IDENT_STRING "" #endif - #define _START _start #define _FAULT _fault @@ -201,6 +201,13 @@ _after_flashbar_copy: movec %d0, %RAMBAR1 #endif + /* initialize general use internal ram */ + move.l #0, %d0 + move.l #(ICACHE_STATUS), %a1 /* icache */ + move.l #(DCACHE_STATUS), %a2 /* icache */ + move.l %d0, (%a1) + move.l %d0, (%a2) + /* set stackpointer to end of internal ram to get some stackspace for the first c-code */ move.l #(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET), %sp clr.l %sp@- @@ -283,23 +290,6 @@ clear_bss: cmp.l %a2, %a1 bne 7b -#if defined(CONFIG_M5281) || defined(CONFIG_M5282) - /* patch the 3 accesspoints to 3 ichache_state */ - /* quick and dirty */ - - move.l %a0,%d1 - add.l #(icache_state - CONFIG_SYS_MONITOR_BASE),%d1 - move.l %a0,%a1 - add.l #(icache_state_access_1+2 - CONFIG_SYS_MONITOR_BASE),%a1 - move.l %d1,(%a1) - move.l %a0,%a1 - add.l #(icache_state_access_2+2 - CONFIG_SYS_MONITOR_BASE),%a1 - move.l %d1,(%a1) - move.l %a0,%a1 - add.l #(icache_state_access_3+2 - CONFIG_SYS_MONITOR_BASE),%a1 - move.l %d1,(%a1) -#endif - /* calculate relative jump to board_init_r in ram */ move.l %a0, %a1 add.l #(board_init_r - CONFIG_SYS_MONITOR_BASE), %a1 @@ -335,156 +325,6 @@ _int_handler: addql #4,%sp RESTORE_ALL -/*------------------------------------------------------------------------------*/ -/* cache functions */ -#ifdef CONFIG_M5208 - .globl icache_enable -icache_enable: - move.l #0x01000000, %d0 /* Invalidate cache cmd */ - movec %d0, %CACR /* Invalidate cache */ - move.l #(CONFIG_SYS_SDRAM_BASE + 0xC000), %d0 /* Setup cache mask */ - movec %d0, %ACR0 /* Enable cache */ - - move.l #0x80000200, %d0 /* Setup cache mask */ - movec %d0, %CACR /* Enable cache */ - nop - - move.l #(CONFIG_SYS_INIT_RAM_ADDR+CONFIG_SYS_INIT_RAM_END-8), %a1 - moveq #1, %d0 - move.l %d0, (%a1) - rts -#endif - -#ifdef CONFIG_M5271 - .globl icache_enable -icache_enable: - move.l #0x01000000, %d0 /* Invalidate cache cmd */ - movec %d0, %CACR /* Invalidate cache */ - move.l #(CONFIG_SYS_SDRAM_BASE + 0xc000), %d0 /* Setup cache mask */ - movec %d0, %ACR0 /* Enable cache */ - - move.l #0x80000200, %d0 /* Setup cache mask */ - movec %d0, %CACR /* Enable cache */ - nop - - move.l #(CONFIG_SYS_INIT_RAM_ADDR+CONFIG_SYS_INIT_RAM_END-8), %a1 - moveq #1, %d0 - move.l %d0, (%a1) - rts -#endif - -#ifdef CONFIG_M5272 - .globl icache_enable -icache_enable: - move.l #0x01000000, %d0 /* Invalidate cache cmd */ - movec %d0, %CACR /* Invalidate cache */ - move.l #0x0000c000, %d0 /* Setup cache mask */ - movec %d0, %ACR0 /* Enable cache */ - move.l #0xff00c000, %d0 /* Setup cache mask */ - movec %d0, %ACR1 /* Enable cache */ - move.l #0x80000100, %d0 /* Setup cache mask */ - movec %d0, %CACR /* Enable cache */ - moveq #1, %d0 - move.l %d0, icache_state - rts -#endif - -#if defined(CONFIG_M5275) -/* - * Instruction cache only - */ - .globl icache_enable -icache_enable: - move.l #0x01400000, %d0 /* Invalidate cache cmd */ - movec %d0, %CACR /* Invalidate cache */ - move.l #0x0000c000, %d0 /* Setup SDRAM caching */ - movec %d0, %ACR0 /* Enable cache */ - move.l #0x00000000, %d0 /* No other caching */ - movec %d0, %ACR1 /* Enable cache */ - move.l #0x80400100, %d0 /* Setup cache mask */ - movec %d0, %CACR /* Enable cache */ - moveq #1, %d0 - move.l %d0, icache_state - rts -#endif - -#ifdef CONFIG_M5282 - .globl icache_enable -icache_enable: - move.l #0x01000000, %d0 /* Invalidate cache cmd */ - movec %d0, %CACR /* Invalidate cache */ - move.l #0x0000c000, %d0 /* Setup cache mask */ - movec %d0, %ACR0 /* Enable cache */ - move.l #0xff00c000, %d0 /* Setup cache mask */ - movec %d0, %ACR1 /* Enable cache */ - move.l #0x80400100, %d0 /* Setup cache mask, data cache disabel*/ - movec %d0, %CACR /* Enable cache */ - moveq #1, %d0 -icache_state_access_1: - move.l %d0, icache_state - rts -#endif - -#if defined(CONFIG_M5249) || defined(CONFIG_M5253) - .globl icache_enable -icache_enable: - /* - * Note: The 5249 Documentation doesn't give a bit position for CINV! - * From the 5272 and the 5307 documentation, I have deduced that it is - * probably CACR[24]. Should someone say something to Motorola? - * ~Jeremy - */ - move.l #0x01000000, %d0 /* Invalidate whole cache */ - move.c %d0,%CACR - move.l #0xff00c000, %d0 /* Set FLASH cachable: always match (SM=0b10) */ - move.c %d0, %ACR0 - move.l #0x0000c000, %d0 /* Set SDRAM cachable: always match (SM=0b10) */ - move.c %d0, %ACR1 - move.l #0x90000200, %d0 /* Set cache enable cmd */ - move.c %d0,%CACR - moveq #1, %d0 - move.l %d0, icache_state - rts -#endif - - .globl icache_disable -icache_disable: - move.l #0x00000100, %d0 /* Setup cache mask */ - movec %d0, %CACR /* Enable cache */ - clr.l %d0 /* Setup cache mask */ - movec %d0, %ACR0 /* Enable cache */ - movec %d0, %ACR1 /* Enable cache */ - moveq #0, %d0 -icache_state_access_2: - move.l %d0, icache_state - rts - - .globl icache_status -icache_status: -icache_state_access_3: - move.l #(icache_state), %a0 - move.l (%a0), %d0 - rts - - .data -icache_state: - .long 0 /* cache is diabled on inirialization */ - - .globl dcache_enable -dcache_enable: - /* dummy function */ - rts - - .globl dcache_disable -dcache_disable: - /* dummy function */ - rts - - .globl dcache_status -dcache_status: - /* dummy function */ - rts - /*------------------------------------------------------------------------------*/ .globl version_string diff --git a/cpu/mcf532x/start.S b/cpu/mcf532x/start.S index 5abd944eb..a80b0a994 100644 --- a/cpu/mcf532x/start.S +++ b/cpu/mcf532x/start.S @@ -27,6 +27,7 @@ #include #include #include "version.h" +#include #ifndef CONFIG_IDENT_STRING #define CONFIG_IDENT_STRING "" @@ -142,7 +143,7 @@ _start: movec %d0, %RAMBAR1 /* invalidate and disable cache */ - move.l #0x01000000, %d0 /* Invalidate cache cmd */ + move.l #CF_CACR_CINVA, %d0 /* Invalidate cache cmd */ movec %d0, %CACR /* Invalidate cache */ move.l #0, %d0 movec %d0, %ACR0 @@ -158,8 +159,8 @@ _start: /* initialize general use internal ram */ move.l #0, %d0 - move.l #(CONFIG_SYS_INIT_RAM_ADDR+CONFIG_SYS_INIT_RAM_END-8), %a1 - move.l #(CONFIG_SYS_INIT_RAM_ADDR+CONFIG_SYS_INIT_RAM_END-4), %a2 + move.l #(ICACHE_STATUS), %a1 /* icache */ + move.l #(DCACHE_STATUS), %a2 /* icache */ move.l %d0, (%a1) move.l %d0, (%a2) @@ -279,71 +280,6 @@ _int_handler: RESTORE_ALL /*------------------------------------------------------------------------------*/ -/* cache functions */ - .globl icache_enable -icache_enable: - move.l #0x01000000, %d0 /* Invalidate cache cmd */ - movec %d0, %CACR /* Invalidate cache */ - move.l #(CONFIG_SYS_SDRAM_BASE + 0xc000 + ((CONFIG_SYS_SDRAM_SIZE & 0x1fe0 - 1) << 16)), %d0 - movec %d0, %ACR0 /* Enable cache */ - - move.l #0x80000200, %d0 /* Setup cache mask */ - movec %d0, %CACR /* Enable cache */ - nop - - move.l #(CONFIG_SYS_INIT_RAM_ADDR+CONFIG_SYS_INIT_RAM_END-8), %a1 - moveq #1, %d0 - move.l %d0, (%a1) - rts - - .globl icache_disable -icache_disable: - move.l #0x01000000, %d0 /* Setup cache mask */ - movec %d0, %CACR /* Disable cache */ - clr.l %d0 /* Setup cache mask */ - movec %d0, %ACR0 - movec %d0, %ACR1 - - move.l #(CONFIG_SYS_INIT_RAM_ADDR+CONFIG_SYS_INIT_RAM_END-8), %a1 - moveq #0, %d0 - move.l %d0, (%a1) - rts - - .globl icache_status -icache_status: - move.l #(CONFIG_SYS_INIT_RAM_ADDR+CONFIG_SYS_INIT_RAM_END-8), %a1 - move.l (%a1), %d0 - rts - - .globl icache_invalid -icache_invalid: - move.l #0x81000200, %d0 /* Setup cache mask */ - movec %d0, %CACR /* Enable cache */ - rts - - .globl dcache_enable -dcache_enable: - move.l #(CONFIG_SYS_INIT_RAM_ADDR+CONFIG_SYS_INIT_RAM_END-4), %a1 - moveq #1, %d0 - move.l %d0, (%a1) - rts - - /* No dcache, just a dummy function */ - .globl dcache_disable -dcache_disable: - move.l #(CONFIG_SYS_INIT_RAM_ADDR+CONFIG_SYS_INIT_RAM_END-4), %a1 - moveq #0, %d0 - move.l %d0, (%a1) - rts - - .globl dcache_status -dcache_status: - move.l #(CONFIG_SYS_INIT_RAM_ADDR+CONFIG_SYS_INIT_RAM_END-4), %a1 - move.l (%a1), %d0 - rts - -/*------------------------------------------------------------------------------*/ - .globl version_string version_string: .ascii U_BOOT_VERSION diff --git a/cpu/mcf5445x/start.S b/cpu/mcf5445x/start.S index d2d443915..738e4a711 100644 --- a/cpu/mcf5445x/start.S +++ b/cpu/mcf5445x/start.S @@ -24,16 +24,12 @@ #include #include #include "version.h" +#include #ifndef CONFIG_IDENT_STRING #define CONFIG_IDENT_STRING "" #endif -/* last three long word reserved for cache status */ -#define CACR_STATUS (CONFIG_SYS_INIT_RAM_ADDR+CONFIG_SYS_INIT_RAM_END-12) -#define ICACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR+CONFIG_SYS_INIT_RAM_END- 8) -#define DCACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR+CONFIG_SYS_INIT_RAM_END- 4) - #define _START _start #define _FAULT _fault @@ -160,15 +156,13 @@ asm_dram_init: /* initialize general use internal ram */ move.l #0, %d0 - move.l #(CACR_STATUS), %a1 /* CACR */ - move.l #(ICACHE_STATUS), %a2 /* icache */ - move.l #(DCACHE_STATUS), %a3 /* dcache */ + move.l #(ICACHE_STATUS), %a1 /* icache */ + move.l #(DCACHE_STATUS), %a2 /* dcache */ move.l %d0, (%a1) move.l %d0, (%a2) - move.l %d0, (%a3) /* invalidate and disable cache */ - move.l #0x01004100, %d0 /* Invalidate cache cmd */ + move.l #(CONFIG_SYS_ICACHE_INV + CONFIG_SYS_DCACHE_INV), %d0 movec %d0, %CACR /* Invalidate cache */ move.l #0, %d0 movec %d0, %ACR0 @@ -411,15 +405,13 @@ _start: /* initialize general use internal ram */ move.l #0, %d0 - move.l #(CACR_STATUS), %a1 /* CACR */ - move.l #(ICACHE_STATUS), %a2 /* icache */ - move.l #(DCACHE_STATUS), %a3 /* dcache */ + move.l #(ICACHE_STATUS), %a1 /* icache */ + move.l #(DCACHE_STATUS), %a2 /* dcache */ move.l %d0, (%a1) move.l %d0, (%a2) - move.l %d0, (%a3) /* invalidate and disable cache */ - move.l #0x01004100, %d0 /* Invalidate cache cmd */ + move.l #(CONFIG_SYS_ICACHE_INV + CONFIG_SYS_DCACHE_INV), %d0 movec %d0, %CACR /* Invalidate cache */ move.l #0, %d0 movec %d0, %ACR0 @@ -543,107 +535,6 @@ _int_handler: addql #4,%sp RESTORE_ALL -/*------------------------------------------------------------------------------*/ -/* cache functions */ - .globl icache_enable -icache_enable: - move.l #(CACR_STATUS), %a1 /* read CACR Status */ - move.l (%a1), %d1 - - move.l #0x00040100, %d0 /* Invalidate icache */ - movec %d0, %CACR - - move.l #(CONFIG_SYS_SDRAM_BASE + 0xC000), %d0 /* Setup icache */ - movec %d0, %ACR2 - - move.l #0x04088020, %d0 /* Enable bcache and icache */ - movec %d0, %CACR - - move.l #(ICACHE_STATUS), %a1 - moveq #1, %d0 - move.l %d0, (%a1) - rts - - .globl icache_disable -icache_disable: - move.l #(CACR_STATUS), %a1 /* read CACR Status */ - move.l (%a1), %d0 - - move.l #0xFFF77BFF, %d0 - or.l #0x00040100, %d0 /* Setup cache mask */ - movec %d0, %CACR /* Invalidate icache */ - clr.l %d0 - movec %d0, %ACR2 - movec %d0, %ACR3 - - move.l #(ICACHE_STATUS), %a1 - moveq #0, %d0 - move.l %d0, (%a1) - rts - - .globl icache_status -icache_status: - move.l #(ICACHE_STATUS), %a1 - move.l (%a1), %d0 - rts - - .globl icache_invalid -icache_invalid: - move.l #(CACR_STATUS), %a1 /* read CACR Status */ - move.l (%a1), %d0 - - move.l #0x00040100, %d0 /* Invalidate icache */ - movec %d0, %CACR /* Enable and invalidate cache */ - rts - - .globl dcache_enable -dcache_enable: - move.l #(CACR_STATUS), %a1 /* read CACR Status */ - move.l (%a1), %d1 - - move.l #0x01040100, %d0 - movec %d0, %CACR /* Invalidate dcache */ - - move.l #0x80088020, %d0 /* Enable bcache and icache */ - movec %d0, %CACR - - move.l #(DCACHE_STATUS), %a1 - moveq #1, %d0 - move.l %d0, (%a1) - rts - - .globl dcache_disable -dcache_disable: - move.l #(CACR_STATUS), %a1 /* read CACR Status */ - move.l (%a1), %d0 - - and.l #0x7FFFFFFF, %d0 - or.l #0x01000000, %d0 /* Setup cache mask */ - movec %d0, %CACR /* Disable dcache */ - clr.l %d0 - movec %d0, %ACR0 - movec %d0, %ACR1 - - move.l #(DCACHE_STATUS), %a1 - moveq #0, %d0 - move.l %d0, (%a1) - rts - - .globl dcache_invalid -dcache_invalid: - move.l #(CACR_STATUS), %a1 /* read CACR Status */ - move.l (%a1), %d0 - - move.l #0x81088020, %d0 /* Setup cache mask */ - movec %d0, %CACR /* Enable and invalidate cache */ - rts - - .globl dcache_status -dcache_status: - move.l #(DCACHE_STATUS), %a1 - move.l (%a1), %d0 - rts - /*------------------------------------------------------------------------------*/ .globl version_string diff --git a/cpu/mcf547x_8x/start.S b/cpu/mcf547x_8x/start.S index 94ef14bf3..84118629e 100644 --- a/cpu/mcf547x_8x/start.S +++ b/cpu/mcf547x_8x/start.S @@ -24,16 +24,12 @@ #include #include #include "version.h" +#include #ifndef CONFIG_IDENT_STRING #define CONFIG_IDENT_STRING "" #endif -/* last three long word reserved for cache status */ -#define ICACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR+CONFIG_SYS_INIT_RAM_END- 4) -#define DCACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR+CONFIG_SYS_INIT_RAM_END- 8) -#define CACR_STATUS (CONFIG_SYS_INIT_RAM_ADDR+CONFIG_SYS_INIT_RAM_END-12) - #define _START _start #define _FAULT _fault @@ -158,10 +154,8 @@ _start: move.l #0, %d0 move.l #(ICACHE_STATUS), %a1 /* icache */ move.l #(DCACHE_STATUS), %a2 /* icache */ - move.l #(CACR_STATUS), %a3 /* CACR */ move.l %d0, (%a1) move.l %d0, (%a2) - move.l %d0, (%a3) /* set stackpointer to end of internal ram to get some stackspace for the first c-code */ @@ -278,81 +272,6 @@ _int_handler: addql #4,%sp RESTORE_ALL -/*------------------------------------------------------------------------------*/ -/* cache functions */ - .globl icache_enable -icache_enable: - move.l #(CONFIG_SYS_SDRAM_BASE + 0x1c000), %d0 - movec %d0, %ACR2 /* Enable cache */ - - move.l #0x020C8100, %d0 /* Setup cache mask */ - movec %d0, %CACR /* Enable cache */ - nop - - move.l #(ICACHE_STATUS), %a1 - moveq #1, %d0 - move.l %d0, (%a1) - rts - - .globl icache_disable -icache_disable: - move.l #0x000C8100, %d0 /* Setup cache mask */ - movec %d0, %CACR /* Disable cache */ - clr.l %d0 /* Setup cache mask */ - movec %d0, %ACR2 - movec %d0, %ACR3 - - move.l #(ICACHE_STATUS), %a1 - moveq #0, %d0 - move.l %d0, (%a1) - rts - - .globl icache_invalid -icache_invalid: - move.l #0x000C8100, %d0 /* Setup cache mask */ - movec %d0, %CACR /* Enable cache */ - rts - - .globl icache_status -icache_status: - move.l #(ICACHE_STATUS), %a1 - move.l (%a1), %d0 - rts - - .globl dcache_enable -dcache_enable: - bsr icache_disable - - move.l #(CONFIG_SYS_SDRAM_BASE + 0xc000), %d0 - movec %d0, %ACR0 /* Enable cache */ - - move.l #0xA30C8100, %d0 /* Invalidate cache cmd */ - movec %d0, %CACR /* Invalidate cache */ - - move.l #(DCACHE_STATUS), %a1 - moveq #1, %d0 - move.l %d0, (%a1) - rts - - .globl dcache_disable -dcache_disable: - move.l #0xA30C8100, %d0 /* Setup cache mask */ - movec %d0, %CACR /* Disable cache */ - clr.l %d0 /* Setup cache mask */ - movec %d0, %ACR0 - movec %d0, %ACR1 - - move.l #(DCACHE_STATUS), %a1 - moveq #0, %d0 - move.l %d0, (%a1) - rts - - .globl dcache_status -dcache_status: - move.l #(DCACHE_STATUS), %a1 - move.l (%a1), %d0 - rts - /*------------------------------------------------------------------------------*/ .globl version_string diff --git a/include/asm-m68k/cache.h b/include/asm-m68k/cache.h new file mode 100644 index 000000000..7c84e4847 --- /dev/null +++ b/include/asm-m68k/cache.h @@ -0,0 +1,210 @@ +/* + * ColdFire cache + * + * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. + * TsiChung Liew (Tsi-Chung.Liew@freescale.com) + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#ifndef __CACHE_H +#define __CACHE_H + +#if defined(CONFIG_MCF520x) || defined(CONFIG_MCF523x) || \ + defined(CONFIG_MCF52x2) || defined(CONFIG_MCF5227x) +#define CONFIG_CF_V2 +#endif + +#if defined(CONFIG_MCF532x) || defined(CONFIG_MCF5301x) +#define CONFIG_CF_V3 +#endif + +#if defined(CONFIG_MCF547x_8x) || defined(CONFIG_MCF5445x) +#define CONFIG_CF_V4 +#if defined(CONFIG_MCF5441x) +#define CONFIG_CF_V4E /* Four Extra ACRn */ +#endif +#endif + +/* ***** CACR ***** */ +/* V2 Core */ +#ifdef CONFIG_CF_V2 + +#define CF_CACR_CENB (1 << 31) +#define CF_CACR_CPD (1 << 28) +#define CF_CACR_CFRZ (1 << 27) +#define CF_CACR_CEIB (1 << 10) +#define CF_CACR_DCM (1 << 9) +#define CF_CACR_DBWE (1 << 8) + +#if defined(CONFIG_MCF5249) || defined(CONFIG_MCF5253) +#define CF_CACR_DWP (1 << 6) +#else +#define CF_CACR_CINV (1 << 24) +#define CF_CACR_DISI (1 << 23) +#define CF_CACR_DISD (1 << 22) +#define CF_CACR_INVI (1 << 21) +#define CF_CACR_INVD (1 << 20) +#define CF_CACR_DWP (1 << 5) +#define CF_CACR_EUSP (1 << 4) +#endif /* CONFIG_MCF5249 || CONFIG_MCF5253 */ + +#endif /* CONFIG_CF_V2 */ + +/* V3 Core */ +#ifdef CONFIG_CF_V3 + +#define CF_CACR_EC (1 << 31) +#define CF_CACR_ESB (1 << 29) +#define CF_CACR_DPI (1 << 28) +#define CF_CACR_HLCK (1 << 27) +#define CF_CACR_CINVA (1 << 24) +#define CF_CACR_DNFB (1 << 10) +#define CF_CACR_DCM_UNMASK 0xFFFFFCFF +#define CF_CACR_DCM_WT (0 << 8) +#define CF_CACR_DCM_CB (1 << 8) +#define CF_CACR_DCM_P (2 << 8) +#define CF_CACR_DCM_IP (3 << 8) +#define CF_CACR_DW (1 << 5) +#define CF_CACR_EUSP (1 << 4) + +#endif /* CONFIG_CF_V3 */ + +/* V4 Core */ +#ifdef CONFIG_CF_V4 + +#define CF_CACR_DEC (1 << 31) +#define CF_CACR_DW (1 << 30) +#define CF_CACR_DESB (1 << 29) +#define CF_CACR_DDPI (1 << 28) +#define CF_CACR_DHLCK (1 << 27) +#define CF_CACR_DDCM_UNMASK (0xF9FFFFFF) +#define CF_CACR_DDCM_WT (0 << 25) +#define CF_CACR_DDCM_CB (1 << 25) +#define CF_CACR_DDCM_P (2 << 25) +#define CF_CACR_DDCM_IP (3 << 25) +#define CF_CACR_DCINVA (1 << 24) + +#define CF_CACR_DDSP (1 << 23) +#define CF_CACR_BEC (1 << 19) +#define CF_CACR_BCINVA (1 << 18) +#define CF_CACR_IEC (1 << 15) +#define CF_CACR_DNFB (1 << 13) +#define CF_CACR_IDPI (1 << 12) +#define CF_CACR_IHLCK (1 << 11) +#define CF_CACR_IDCM (1 << 10) +#define CF_CACR_ICINVA (1 << 8) +#define CF_CACR_IDSP (1 << 7) +#define CF_CACR_EUSP (1 << 5) + +#ifdef CONFIG_MCF5445x +#define CF_CACR_IVO (1 << 20) +#define CF_CACR_SPA (1 << 14) +#else +#define CF_CACR_DF (1 << 4) +#endif + +#endif /* CONFIG_CF_V4 */ + +/* ***** ACR ***** */ +#define CF_ACR_ADR_UNMASK (0x00FFFFFF) +#define CF_ACR_ADR(x) ((x & 0xFF) << 24) +#define CF_ACR_ADRMSK_UNMASK (0xFF00FFFF) +#define CF_ACR_ADRMSK(x) ((x & 0xFF) << 16) +#define CF_ACR_EN (1 << 15) +#define CF_ACR_SM_UNMASK (0xFFFF9FFF) +#define CF_ACR_SM_UM (0 << 13) +#define CF_ACR_SM_SM (1 << 13) +#define CF_ACR_SM_ALL (3 << 13) +#define CF_ACR_WP (1 << 2) + +/* V2 Core */ +#ifdef CONFIG_CF_V2 +#define CF_ACR_CM (1 << 6) +#define CF_ACR_BWE (1 << 5) +#else +/* V3 & V4 */ +#define CF_ACR_CM_UNMASK (0xFFFFFF9F) +#define CF_ACR_CM_WT (0 << 5) +#define CF_ACR_CM_CB (1 << 5) +#define CF_ACR_CM_P (2 << 5) +#define CF_ACR_CM_IP (3 << 5) +#endif /* CONFIG_CF_V2 */ + +/* V4 Core */ +#ifdef CONFIG_CF_V4 +#define CF_ACR_AMM (1 << 10) +#define CF_ACR_SP (1 << 3) +#endif /* CONFIG_CF_V4 */ + + +#ifndef CONFIG_SYS_CACHE_ICACR +#define CONFIG_SYS_CACHE_ICACR 0 +#endif + +#ifndef CONFIG_SYS_CACHE_DCACR +#ifdef CONFIG_SYS_CACHE_ICACR +#define CONFIG_SYS_CACHE_DCACR CONFIG_SYS_CACHE_ICACR +#else +#define CONFIG_SYS_CACHE_DCACR 0 +#endif +#endif + +#ifndef CONFIG_SYS_CACHE_ACR0 +#define CONFIG_SYS_CACHE_ACR0 0 +#endif + +#ifndef CONFIG_SYS_CACHE_ACR1 +#define CONFIG_SYS_CACHE_ACR1 0 +#endif + +#ifndef CONFIG_SYS_CACHE_ACR2 +#define CONFIG_SYS_CACHE_ACR2 0 +#endif + +#ifndef CONFIG_SYS_CACHE_ACR3 +#define CONFIG_SYS_CACHE_ACR3 0 +#endif + +#ifndef CONFIG_SYS_CACHE_ACR4 +#define CONFIG_SYS_CACHE_ACR4 0 +#endif + +#ifndef CONFIG_SYS_CACHE_ACR5 +#define CONFIG_SYS_CACHE_ACR5 0 +#endif + +#ifndef CONFIG_SYS_CACHE_ACR6 +#define CONFIG_SYS_CACHE_ACR6 0 +#endif + +#ifndef CONFIG_SYS_CACHE_ACR7 +#define CONFIG_SYS_CACHE_ACR7 0 +#endif + +#define CF_ADDRMASK(x) (((x > 0x10) ? ((x >> 4) - 1) : (x)) << 16) + +#ifndef __ASSEMBLY__ /* put C only stuff in this section */ + +void icache_invalid(void); +void dcache_invalid(void); + +#endif + +#endif /* __CACHE_H */ diff --git a/include/configs/EB+MCF-EV123.h b/include/configs/EB+MCF-EV123.h index a0b27a89c..880cb4ee6 100644 --- a/include/configs/EB+MCF-EV123.h +++ b/include/configs/EB+MCF-EV123.h @@ -208,6 +208,18 @@ */ #define CONFIG_SYS_CACHELINE_SIZE 16 +#define ICACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_INIT_RAM_END - 8) +#define DCACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_INIT_RAM_END - 4) +#define CONFIG_SYS_ICACHE_INV (CF_CACR_CINV + CF_CACR_DCM) +#define CONFIG_SYS_CACHE_ACR0 (CONFIG_SYS_SDRAM_BASE | \ + CF_ADDRMASK(CONFIG_SYS_SDRAM_SIZE) | \ + CF_ACR_EN | CF_ACR_SM_ALL) +#define CONFIG_SYS_CACHE_ICACR (CF_CACR_CENB | CF_CACR_DISD | \ + CF_CACR_CEIB | CF_CACR_DBWE | \ + CF_CACR_EUSP) + /*----------------------------------------------------------------------- * Memory bank definitions */ diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h index 3cc259ffd..e6632acbe 100644 --- a/include/configs/M5208EVBE.h +++ b/include/configs/M5208EVBE.h @@ -207,6 +207,19 @@ /* Cache Configuration */ #define CONFIG_SYS_CACHELINE_SIZE 16 +#define ICACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_INIT_RAM_END - 8) +#define DCACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_INIT_RAM_END - 4) +#define CONFIG_SYS_ICACHE_INV (CF_CACR_CINV | CF_CACR_INVI) +#define CONFIG_SYS_CACHE_ACR0 (CONFIG_SYS_SDRAM_BASE | \ + CF_ADDRMASK(CONFIG_SYS_SDRAM_SIZE) | \ + CF_ACR_EN | CF_ACR_SM_ALL) +#define CONFIG_SYS_CACHE_ICACR (CF_CACR_CENB | CF_CACR_CINV | \ + CF_CACR_DISD | CF_CACR_INVI | \ + CF_CACR_CEIB | CF_CACR_DCM | \ + CF_CACR_EUSP) + /* Chipselect bank definitions */ /* * CS0 - NOR Flash diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h index 1801d9d7d..6c6b5d6d5 100644 --- a/include/configs/M52277EVB.h +++ b/include/configs/M52277EVB.h @@ -302,6 +302,19 @@ */ #define CONFIG_SYS_CACHELINE_SIZE 16 +#define ICACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_INIT_RAM_END - 8) +#define DCACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_INIT_RAM_END - 4) +#define CONFIG_SYS_ICACHE_INV (CF_CACR_CINV | CF_CACR_INVI) +#define CONFIG_SYS_CACHE_ACR0 (CONFIG_SYS_SDRAM_BASE | \ + CF_ADDRMASK(CONFIG_SYS_SDRAM_SIZE) | \ + CF_ACR_EN | CF_ACR_SM_ALL) +#define CONFIG_SYS_CACHE_ICACR (CF_CACR_CENB | CF_CACR_CINV | \ + CF_CACR_DISD | CF_CACR_INVI | \ + CF_CACR_CEIB | CF_CACR_DCM | \ + CF_CACR_EUSP) + /*----------------------------------------------------------------------- * Memory bank definitions */ diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h index 2b816ceae..5c0dc842a 100644 --- a/include/configs/M5235EVB.h +++ b/include/configs/M5235EVB.h @@ -237,6 +237,18 @@ */ #define CONFIG_SYS_CACHELINE_SIZE 16 +#define ICACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_INIT_RAM_END - 8) +#define DCACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_INIT_RAM_END - 4) +#define CONFIG_SYS_ICACHE_INV (CF_CACR_CINV) +#define CONFIG_SYS_CACHE_ACR0 (CONFIG_SYS_SDRAM_BASE | \ + CF_ADDRMASK(CONFIG_SYS_SDRAM_SIZE) | \ + CF_ACR_EN | CF_ACR_SM_ALL) +#define CONFIG_SYS_CACHE_ICACR (CF_CACR_CENB | CF_CACR_DISD | \ + CF_CACR_CEIB | CF_CACR_DCM | \ + CF_CACR_EUSP) + /*----------------------------------------------------------------------- * Chipselect bank definitions */ diff --git a/include/configs/M5249EVB.h b/include/configs/M5249EVB.h index e3830e536..33ac2859d 100644 --- a/include/configs/M5249EVB.h +++ b/include/configs/M5249EVB.h @@ -60,6 +60,7 @@ * Command line configuration. */ #include +#define CONFIG_CMD_CACHE #undef CONFIG_CMD_NET #define CONFIG_SYS_PROMPT "=> " @@ -165,6 +166,20 @@ */ #define CONFIG_SYS_CACHELINE_SIZE 16 +#define ICACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_INIT_RAM_END - 8) +#define DCACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_INIT_RAM_END - 4) +#define CONFIG_SYS_ICACHE_INV (CF_CACR_DCM) +#define CONFIG_SYS_CACHE_ACR0 (CONFIG_SYS_FLASH_BASE | \ + CF_ADDRMASK(2) | \ + CF_ACR_EN | CF_ACR_SM_ALL) +#define CONFIG_SYS_CACHE_ACR1 (CONFIG_SYS_SDRAM_BASE | \ + CF_ADDRMASK(CONFIG_SYS_SDRAM_SIZE) | \ + CF_ACR_EN | CF_ACR_SM_ALL) +#define CONFIG_SYS_CACHE_ICACR (CF_CACR_CENB | CF_CACR_CEIB | \ + CF_CACR_DBWE) + /*----------------------------------------------------------------------- * Memory bank definitions */ diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h index f813f8891..9944e12fe 100644 --- a/include/configs/M5253DEMO.h +++ b/include/configs/M5253DEMO.h @@ -57,6 +57,7 @@ */ #include +#define CONFIG_CMD_CACHE #define CONFIG_CMD_LOADB #define CONFIG_CMD_LOADS #define CONFIG_CMD_EXT2 @@ -226,6 +227,20 @@ /* Cache Configuration */ #define CONFIG_SYS_CACHELINE_SIZE 16 +#define ICACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_INIT_RAM_END - 8) +#define DCACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_INIT_RAM_END - 4) +#define CONFIG_SYS_ICACHE_INV (CF_CACR_DCM) +#define CONFIG_SYS_CACHE_ACR0 (CONFIG_SYS_FLASH_BASE | \ + CF_ADDRMASK(8) | \ + CF_ACR_EN | CF_ACR_SM_ALL) +#define CONFIG_SYS_CACHE_ACR1 (CONFIG_SYS_SDRAM_BASE | \ + CF_ADDRMASK(CONFIG_SYS_SDRAM_SIZE) | \ + CF_ACR_EN | CF_ACR_SM_ALL) +#define CONFIG_SYS_CACHE_ICACR (CF_CACR_CENB | CF_CACR_CEIB | \ + CF_CACR_DBWE) + /* Port configuration */ #define CONFIG_SYS_FECI2C 0xF0 diff --git a/include/configs/M5253EVBE.h b/include/configs/M5253EVBE.h index df6970cdf..206d1152e 100644 --- a/include/configs/M5253EVBE.h +++ b/include/configs/M5253EVBE.h @@ -64,6 +64,7 @@ * Command line configuration. */ #include +#define CONFIG_CMD_CACHE #undef CONFIG_CMD_NET #define CONFIG_CMD_LOADB #define CONFIG_CMD_LOADS @@ -179,6 +180,20 @@ /* Cache Configuration */ #define CONFIG_SYS_CACHELINE_SIZE 16 +#define ICACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_INIT_RAM_END - 8) +#define DCACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_INIT_RAM_END - 4) +#define CONFIG_SYS_ICACHE_INV (CF_CACR_DCM) +#define CONFIG_SYS_CACHE_ACR0 (CONFIG_SYS_FLASH_BASE | \ + CF_ADDRMASK(2) | \ + CF_ACR_EN | CF_ACR_SM_ALL) +#define CONFIG_SYS_CACHE_ACR1 (CONFIG_SYS_SDRAM_BASE | \ + CF_ADDRMASK(CONFIG_SYS_SDRAM_SIZE) | \ + CF_ACR_EN | CF_ACR_SM_ALL) +#define CONFIG_SYS_CACHE_ICACR (CF_CACR_CENB | CF_CACR_CEIB | \ + CF_CACR_DBWE) + /* Port configuration */ #define CONFIG_SYS_FECI2C 0xF0 diff --git a/include/configs/M5271EVB.h b/include/configs/M5271EVB.h index 50b3ab280..798949cc5 100644 --- a/include/configs/M5271EVB.h +++ b/include/configs/M5271EVB.h @@ -72,6 +72,7 @@ */ #include +#define CONFIG_CMD_CACHE #define CONFIG_CMD_PING #define CONFIG_CMD_NET #define CONFIG_CMD_MII @@ -229,6 +230,19 @@ /* Cache Configuration */ #define CONFIG_SYS_CACHELINE_SIZE 16 +#define ICACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_INIT_RAM_END - 8) +#define DCACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_INIT_RAM_END - 4) +#define CONFIG_SYS_ICACHE_INV (CF_CACR_CINV | CF_CACR_INVI) +#define CONFIG_SYS_CACHE_ACR0 (CONFIG_SYS_SDRAM_BASE | \ + CF_ADDRMASK(CONFIG_SYS_SDRAM_SIZE) | \ + CF_ACR_EN | CF_ACR_SM_ALL) +#define CONFIG_SYS_CACHE_ICACR (CF_CACR_CENB | CF_CACR_CINV | \ + CF_CACR_DISD | CF_CACR_INVI | \ + CF_CACR_CEIB | CF_CACR_DCM | \ + CF_CACR_EUSP) + /* Chip Select 0 : Boot Flash */ #define CONFIG_SYS_CS0_BASE 0xFFE00000 #define CONFIG_SYS_CS0_MASK 0x001F0001 diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h index f824158a6..f704bb3ff 100644 --- a/include/configs/M5272C3.h +++ b/include/configs/M5272C3.h @@ -74,6 +74,7 @@ */ #include +#define CONFIG_CMD_CACHE #define CONFIG_CMD_MII #define CONFIG_CMD_NET #define CONFIG_CMD_PING @@ -211,6 +212,19 @@ */ #define CONFIG_SYS_CACHELINE_SIZE 16 +#define ICACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_INIT_RAM_END - 8) +#define DCACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_INIT_RAM_END - 4) +#define CONFIG_SYS_ICACHE_INV (CF_CACR_CINV | CF_CACR_INVI) +#define CONFIG_SYS_CACHE_ACR0 (CONFIG_SYS_SDRAM_BASE | \ + CF_ADDRMASK(CONFIG_SYS_SDRAM_SIZE) | \ + CF_ACR_EN | CF_ACR_SM_ALL) +#define CONFIG_SYS_CACHE_ICACR (CF_CACR_CENB | CF_CACR_CINV | \ + CF_CACR_DISD | CF_CACR_INVI | \ + CF_CACR_CEIB | CF_CACR_DCM | \ + CF_CACR_EUSP) + /*----------------------------------------------------------------------- * Memory bank definitions */ diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h index f8d43f0a5..981670ac0 100644 --- a/include/configs/M5275EVB.h +++ b/include/configs/M5275EVB.h @@ -72,6 +72,7 @@ /* Available command configuration */ #include +#define CONFIG_CMD_CACHE #define CONFIG_CMD_PING #define CONFIG_CMD_MII #define CONFIG_CMD_NET @@ -220,6 +221,19 @@ */ #define CONFIG_SYS_CACHELINE_SIZE 16 +#define ICACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_INIT_RAM_END - 8) +#define DCACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_INIT_RAM_END - 4) +#define CONFIG_SYS_ICACHE_INV (CF_CACR_CINV | CF_CACR_INVI) +#define CONFIG_SYS_CACHE_ACR0 (CONFIG_SYS_SDRAM_BASE | \ + CF_ADDRMASK(CONFIG_SYS_SDRAM_SIZE) | \ + CF_ACR_EN | CF_ACR_SM_ALL) +#define CONFIG_SYS_CACHE_ICACR (CF_CACR_CENB | CF_CACR_CINV | \ + CF_CACR_DISD | CF_CACR_INVI | \ + CF_CACR_CEIB | CF_CACR_DCM | \ + CF_CACR_EUSP) + /*----------------------------------------------------------------------- * Memory bank definitions */ diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h index 15590cfcd..6e0aa14d3 100644 --- a/include/configs/M5282EVB.h +++ b/include/configs/M5282EVB.h @@ -64,6 +64,7 @@ * Command line configuration. */ #include +#define CONFIG_CMD_CACHE #define CONFIG_CMD_NET #define CONFIG_CMD_PING #define CONFIG_CMD_MII @@ -209,6 +210,18 @@ */ #define CONFIG_SYS_CACHELINE_SIZE 16 +#define ICACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_INIT_RAM_END - 8) +#define DCACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_INIT_RAM_END - 4) +#define CONFIG_SYS_ICACHE_INV (CF_CACR_CINV + CF_CACR_DCM) +#define CONFIG_SYS_CACHE_ACR0 (CONFIG_SYS_SDRAM_BASE | \ + CF_ADDRMASK(CONFIG_SYS_SDRAM_SIZE) | \ + CF_ACR_EN | CF_ACR_SM_ALL) +#define CONFIG_SYS_CACHE_ICACR (CF_CACR_CENB | CF_CACR_DISD | \ + CF_CACR_CEIB | CF_CACR_DBWE | \ + CF_CACR_EUSP) + /*----------------------------------------------------------------------- * Memory bank definitions */ diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h index c351d415c..d983a8fed 100644 --- a/include/configs/M53017EVB.h +++ b/include/configs/M53017EVB.h @@ -233,6 +233,17 @@ */ #define CONFIG_SYS_CACHELINE_SIZE 16 +#define ICACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_INIT_RAM_END - 8) +#define DCACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_INIT_RAM_END - 4) +#define CONFIG_SYS_ICACHE_INV (CF_CACR_CINVA) +#define CONFIG_SYS_CACHE_ACR0 (CONFIG_SYS_SDRAM_BASE | \ + CF_ADDRMASK(CONFIG_SYS_SDRAM_SIZE) | \ + CF_ACR_EN | CF_ACR_SM_ALL) +#define CONFIG_SYS_CACHE_ICACR (CF_CACR_EC | CF_CACR_CINVA | \ + CF_CACR_DCM_P) + /*----------------------------------------------------------------------- * Chipselect bank definitions */ diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h index 8180c05e6..159b178f4 100644 --- a/include/configs/M5329EVB.h +++ b/include/configs/M5329EVB.h @@ -237,6 +237,17 @@ */ #define CONFIG_SYS_CACHELINE_SIZE 16 +#define ICACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_INIT_RAM_END - 8) +#define DCACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_INIT_RAM_END - 4) +#define CONFIG_SYS_ICACHE_INV (CF_CACR_CINVA) +#define CONFIG_SYS_CACHE_ACR0 (CONFIG_SYS_SDRAM_BASE | \ + CF_ADDRMASK(CONFIG_SYS_SDRAM_SIZE) | \ + CF_ACR_EN | CF_ACR_SM_ALL) +#define CONFIG_SYS_CACHE_ICACR (CF_CACR_EC | CF_CACR_CINVA | \ + CF_CACR_DCM_P) + /*----------------------------------------------------------------------- * Chipselect bank definitions */ diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h index 8652a80aa..af1988ce0 100644 --- a/include/configs/M5373EVB.h +++ b/include/configs/M5373EVB.h @@ -237,6 +237,17 @@ */ #define CONFIG_SYS_CACHELINE_SIZE 16 +#define ICACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_INIT_RAM_END - 8) +#define DCACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_INIT_RAM_END - 4) +#define CONFIG_SYS_ICACHE_INV (CF_CACR_CINVA) +#define CONFIG_SYS_CACHE_ACR0 (CONFIG_SYS_SDRAM_BASE | \ + CF_ADDRMASK(CONFIG_SYS_SDRAM_SIZE) | \ + CF_ACR_EN | CF_ACR_SM_ALL) +#define CONFIG_SYS_CACHE_ICACR (CF_CACR_EC | CF_CACR_CINVA | \ + CF_CACR_DCM_P) + /*----------------------------------------------------------------------- * Chipselect bank definitions */ diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h index a5acfd284..a80d33047 100644 --- a/include/configs/M54451EVB.h +++ b/include/configs/M54451EVB.h @@ -309,6 +309,21 @@ /* Cache Configuration */ #define CONFIG_SYS_CACHELINE_SIZE 16 +#define ICACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_INIT_RAM_END - 8) +#define DCACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_INIT_RAM_END - 4) +#define CONFIG_SYS_ICACHE_INV (CF_CACR_BCINVA + CF_CACR_ICINVA) +#define CONFIG_SYS_DCACHE_INV (CF_CACR_DCINVA) +#define CONFIG_SYS_CACHE_ACR2 (CONFIG_SYS_SDRAM_BASE | \ + CF_ADDRMASK(CONFIG_SYS_SDRAM_SIZE) | \ + CF_ACR_EN | CF_ACR_SM_ALL) +#define CONFIG_SYS_CACHE_ICACR (CF_CACR_BEC | CF_CACR_IEC | \ + CF_CACR_ICINVA | CF_CACR_EUSP) +#define CONFIG_SYS_CACHE_DCACR ((CONFIG_SYS_CACHE_ICACR | \ + CF_CACR_DEC | CF_CACR_DDCM_P | \ + CF_CACR_DCINVA) & ~CF_CACR_ICINVA) + /*----------------------------------------------------------------------- * Memory bank definitions */ diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h index 7737284aa..5b4bba8c2 100644 --- a/include/configs/M54455EVB.h +++ b/include/configs/M54455EVB.h @@ -279,7 +279,7 @@ * Definitions for initial stack pointer and data area (in DPRAM) */ #define CONFIG_SYS_INIT_RAM_ADDR 0x80000000 -#define CONFIG_SYS_INIT_RAM_END 0x8000 /* End of used area in internal SRAM */ +#define CONFIG_SYS_INIT_RAM_END 0x8000 /* End of used area in internal SRAM */ #define CONFIG_SYS_INIT_RAM_CTRL 0x221 #define CONFIG_SYS_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ #define CONFIG_SYS_GBL_DATA_OFFSET ((CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) - 32) @@ -408,6 +408,21 @@ */ #define CONFIG_SYS_CACHELINE_SIZE 16 +#define ICACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_INIT_RAM_END - 8) +#define DCACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_INIT_RAM_END - 4) +#define CONFIG_SYS_ICACHE_INV (CF_CACR_BCINVA + CF_CACR_ICINVA) +#define CONFIG_SYS_DCACHE_INV (CF_CACR_DCINVA) +#define CONFIG_SYS_CACHE_ACR2 (CONFIG_SYS_SDRAM_BASE | \ + CF_ADDRMASK(CONFIG_SYS_SDRAM_SIZE) | \ + CF_ACR_EN | CF_ACR_SM_ALL) +#define CONFIG_SYS_CACHE_ICACR (CF_CACR_BEC | CF_CACR_IEC | \ + CF_CACR_ICINVA | CF_CACR_EUSP) +#define CONFIG_SYS_CACHE_DCACR ((CONFIG_SYS_CACHE_ICACR | \ + CF_CACR_DEC | CF_CACR_DDCM_P | \ + CF_CACR_DCINVA) & ~CF_CACR_ICINVA) + /*----------------------------------------------------------------------- * Memory bank definitions */ diff --git a/include/configs/M5475EVB.h b/include/configs/M5475EVB.h index 4534002e4..d0077667f 100644 --- a/include/configs/M5475EVB.h +++ b/include/configs/M5475EVB.h @@ -286,6 +286,22 @@ */ #define CONFIG_SYS_CACHELINE_SIZE 16 +#define ICACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_INIT_RAM_END - 8) +#define DCACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_INIT_RAM_END - 4) +#define CONFIG_SYS_ICACHE_INV (CF_CACR_BCINVA + CF_CACR_ICINVA + \ + CF_CACR_IDCM) +#define CONFIG_SYS_DCACHE_INV (CF_CACR_DCINVA) +#define CONFIG_SYS_CACHE_ACR2 (CONFIG_SYS_SDRAM_BASE | \ + CF_ADDRMASK(CONFIG_SYS_SDRAM_SIZE) | \ + CF_ACR_EN | CF_ACR_SM_ALL) +#define CONFIG_SYS_CACHE_ICACR (CF_CACR_BEC | CF_CACR_BCINVA | \ + CF_CACR_IEC | CF_CACR_ICINVA) +#define CONFIG_SYS_CACHE_DCACR ((CONFIG_SYS_CACHE_ICACR | \ + CF_CACR_DEC | CF_CACR_DDCM_P | \ + CF_CACR_DCINVA) & ~CF_CACR_ICINVA) + /*----------------------------------------------------------------------- * Chipselect bank definitions */ diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h index 971cb67ba..f23b8b0ef 100644 --- a/include/configs/M5485EVB.h +++ b/include/configs/M5485EVB.h @@ -272,6 +272,22 @@ */ #define CONFIG_SYS_CACHELINE_SIZE 16 +#define ICACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_INIT_RAM_END - 8) +#define DCACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_INIT_RAM_END - 4) +#define CONFIG_SYS_ICACHE_INV (CF_CACR_BCINVA + CF_CACR_ICINVA + \ + CF_CACR_IDCM) +#define CONFIG_SYS_DCACHE_INV (CF_CACR_DCINVA) +#define CONFIG_SYS_CACHE_ACR2 (CONFIG_SYS_SDRAM_BASE | \ + CF_ADDRMASK(CONFIG_SYS_SDRAM_SIZE) | \ + CF_ACR_EN | CF_ACR_SM_ALL) +#define CONFIG_SYS_CACHE_ICACR (CF_CACR_BEC | CF_CACR_BCINVA | \ + CF_CACR_IEC | CF_CACR_ICINVA) +#define CONFIG_SYS_CACHE_DCACR ((CONFIG_SYS_CACHE_ICACR | \ + CF_CACR_DEC | CF_CACR_DDCM_P | \ + CF_CACR_DCINVA) & ~CF_CACR_ICINVA) + /*----------------------------------------------------------------------- * Chipselect bank definitions */ diff --git a/include/configs/TASREG.h b/include/configs/TASREG.h index 25f3a26f3..b69f015c7 100644 --- a/include/configs/TASREG.h +++ b/include/configs/TASREG.h @@ -252,6 +252,17 @@ */ #define CONFIG_SYS_CACHELINE_SIZE 16 +#define ICACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_INIT_RAM_END - 8) +#define DCACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_INIT_RAM_END - 4) +#define CONFIG_SYS_ICACHE_INV (CF_CACR_DCM) +#define CONFIG_SYS_CACHE_ACR1 (CONFIG_SYS_SDRAM_BASE | \ + CF_ADDRMASK(CONFIG_SYS_SDRAM_SIZE) | \ + CF_ACR_EN | CF_ACR_SM_ALL) +#define CONFIG_SYS_CACHE_ICACR (CF_CACR_CENB | CF_CACR_CEIB | \ + CF_CACR_DBWE) + /*----------------------------------------------------------------------- * Memory bank definitions */ diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h index 1fe42f682..7c8281cae 100644 --- a/include/configs/astro_mcf5373l.h +++ b/include/configs/astro_mcf5373l.h @@ -386,4 +386,15 @@ /* Cache Configuration */ #define CONFIG_SYS_CACHELINE_SIZE 16 +#define ICACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_INIT_RAM_END - 8) +#define DCACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_INIT_RAM_END - 4) +#define CONFIG_SYS_ICACHE_INV (CF_CACR_CINVA) +#define CONFIG_SYS_CACHE_ACR0 (CONFIG_SYS_SDRAM_BASE | \ + CF_ADDRMASK(CONFIG_SYS_SDRAM_SIZE) | \ + CF_ACR_EN | CF_ACR_SM_ALL) +#define CONFIG_SYS_CACHE_ICACR (CF_CACR_EC | CF_CACR_CINVA | \ + CF_CACR_DCM_P) + #endif /* _CONFIG_ASTRO_MCF5373L_H */ diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h index 1c3ea23c7..330e3ac66 100644 --- a/include/configs/cobra5272.h +++ b/include/configs/cobra5272.h @@ -331,6 +331,19 @@ from which user programs will be started */ */ #define CONFIG_SYS_CACHELINE_SIZE 16 +#define ICACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_INIT_RAM_END - 8) +#define DCACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_INIT_RAM_END - 4) +#define CONFIG_SYS_ICACHE_INV (CF_CACR_CINV | CF_CACR_INVI) +#define CONFIG_SYS_CACHE_ACR0 (CONFIG_SYS_SDRAM_BASE | \ + CF_ADDRMASK(CONFIG_SYS_SDRAM_SIZE) | \ + CF_ACR_EN | CF_ACR_SM_ALL) +#define CONFIG_SYS_CACHE_ICACR (CF_CACR_CENB | CF_CACR_CINV | \ + CF_CACR_DISD | CF_CACR_INVI | \ + CF_CACR_CEIB | CF_CACR_DCM | \ + CF_CACR_EUSP) + /*----------------------------------------------------------------------- * Memory bank definitions * diff --git a/include/configs/idmr.h b/include/configs/idmr.h index 841affb7c..61e3bad4f 100644 --- a/include/configs/idmr.h +++ b/include/configs/idmr.h @@ -224,6 +224,19 @@ /* Cache Configuration */ #define CONFIG_SYS_CACHELINE_SIZE 16 +#define ICACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_INIT_RAM_END - 8) +#define DCACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_INIT_RAM_END - 4) +#define CONFIG_SYS_ICACHE_INV (CF_CACR_CINV | CF_CACR_INVI) +#define CONFIG_SYS_CACHE_ACR0 (CONFIG_SYS_SDRAM_BASE | \ + CF_ADDRMASK(CONFIG_SYS_SDRAM_SIZE) | \ + CF_ACR_EN | CF_ACR_SM_ALL) +#define CONFIG_SYS_CACHE_ICACR (CF_CACR_CENB | CF_CACR_CINV | \ + CF_CACR_DISD | CF_CACR_INVI | \ + CF_CACR_CEIB | CF_CACR_DCM | \ + CF_CACR_EUSP) + /* Port configuration */ #define CONFIG_SYS_FECI2C 0xF0 diff --git a/lib_m68k/cache.c b/lib_m68k/cache.c index 84fb6c2fb..ed881783f 100644 --- a/lib_m68k/cache.c +++ b/lib_m68k/cache.c @@ -22,8 +22,129 @@ */ #include +#include +#include -void flush_cache (ulong start_addr, ulong size) +volatile int *cf_icache_status = (int *)ICACHE_STATUS; +volatile int *cf_dcache_status = (int *)DCACHE_STATUS; + +void flush_cache(ulong start_addr, ulong size) { /* Must be implemented for all M68k processors with copy-back data cache */ } + +int icache_status(void) +{ + return *cf_icache_status; +} + +int dcache_status(void) +{ + return *cf_dcache_status; +} + +void icache_enable(void) +{ + icache_invalid(); + + *cf_icache_status = 1; + +#ifdef CONFIG_CF_V4 + __asm__ __volatile__("movec %0, %%acr2"::"r"(CONFIG_SYS_CACHE_ACR2)); + __asm__ __volatile__("movec %0, %%acr3"::"r"(CONFIG_SYS_CACHE_ACR3)); +#elif defined(CONFIG_CF_V4e) + __asm__ __volatile__("movec %0, %%acr6"::"r"(CONFIG_SYS_CACHE_ACR6)); + __asm__ __volatile__("movec %0, %%acr7"::"r"(CONFIG_SYS_CACHE_ACR7)); +#else + __asm__ __volatile__("movec %0, %%acr0"::"r"(CONFIG_SYS_CACHE_ACR0)); + __asm__ __volatile__("movec %0, %%acr1"::"r"(CONFIG_SYS_CACHE_ACR1)); +#endif + + __asm__ __volatile__("movec %0, %%cacr"::"r"(CONFIG_SYS_CACHE_ICACR)); +} + +void icache_disable(void) +{ + u32 temp = 0; + + *cf_icache_status = 0; + icache_invalid(); + +#ifdef CONFIG_CF_V4 + __asm__ __volatile__("movec %0, %%acr2"::"r"(temp)); + __asm__ __volatile__("movec %0, %%acr3"::"r"(temp)); +#elif defined(CONFIG_CF_V4e) + __asm__ __volatile__("movec %0, %%acr6"::"r"(temp)); + __asm__ __volatile__("movec %0, %%acr7"::"r"(temp)); +#else + __asm__ __volatile__("movec %0, %%acr0"::"r"(temp)); + __asm__ __volatile__("movec %0, %%acr1"::"r"(temp)); + +#endif +} + +void icache_invalid(void) +{ + u32 temp; + + temp = CONFIG_SYS_ICACHE_INV; + if (*cf_icache_status) + temp |= CONFIG_SYS_CACHE_ICACR; + + __asm__ __volatile__("movec %0, %%cacr"::"r"(temp)); +} + +/* + * data cache only for ColdFire V4 such as MCF547x_8x, MCF5445x + * the dcache will be dummy in ColdFire V2 and V3 + */ +void dcache_enable(void) +{ + dcache_invalid(); + *cf_dcache_status = 1; + +#ifdef CONFIG_CF_V4 + __asm__ __volatile__("movec %0, %%acr0"::"r"(CONFIG_SYS_CACHE_ACR0)); + __asm__ __volatile__("movec %0, %%acr1"::"r"(CONFIG_SYS_CACHE_ACR1)); +#elif defined(CONFIG_CF_V4e) + __asm__ __volatile__("movec %0, %%acr4"::"r"(CONFIG_SYS_CACHE_ACR4)); + __asm__ __volatile__("movec %0, %%acr5"::"r"(CONFIG_SYS_CACHE_ACR5)); + +#endif + + __asm__ __volatile__("movec %0, %%cacr"::"r"(CONFIG_SYS_CACHE_DCACR)); +} + +void dcache_disable(void) +{ + u32 temp = 0; + + *cf_dcache_status = 0; + dcache_invalid(); + + __asm__ __volatile__("movec %0, %%cacr"::"r"(temp)); + +#ifdef CONFIG_CF_V4 + __asm__ __volatile__("movec %0, %%acr0"::"r"(temp)); + __asm__ __volatile__("movec %0, %%acr1"::"r"(temp)); +#elif defined(CONFIG_CF_V4e) + __asm__ __volatile__("movec %0, %%acr4"::"r"(temp)); + __asm__ __volatile__("movec %0, %%acr5"::"r"(temp)); + +#endif +} + +void dcache_invalid(void) +{ +#ifdef CONFIG_CF_V4 + u32 temp; + + temp = CONFIG_SYS_DCACHE_INV; + if (*cf_dcache_status) + temp |= CONFIG_SYS_CACHE_DCACR; + if (*cf_icache_status) + temp |= CONFIG_SYS_CACHE_ICACR; + + __asm__ __volatile__("movec %0, %%cacr"::"r"(temp)); +#endif +} From f26a247308568e32857a5cc054f7219510a7d44e Mon Sep 17 00:00:00 2001 From: TsiChung Liew Date: Mon, 15 Mar 2010 19:39:21 -0500 Subject: [PATCH 037/164] ColdFire: Fix incorrect M5253DEMO default environment The flash location is at 0xff800000, not 0 Signed-off-by: TsiChung Liew --- include/configs/M5253DEMO.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h index 9944e12fe..b5af493b8 100644 --- a/include/configs/M5253DEMO.h +++ b/include/configs/M5253DEMO.h @@ -107,7 +107,7 @@ "upd=run load; run prog\0" \ "prog=prot off 0xff800000 0xff82ffff;" \ "era 0xff800000 0xff82ffff;" \ - "cp.b ${loadaddr} 0 ${filesize};" \ + "cp.b ${loadaddr} 0xff800000 ${filesize};" \ "save\0" \ "" #endif From 9d3a86aec52cb3c0e9badd12167d9292184ce4dd Mon Sep 17 00:00:00 2001 From: TsiChung Liew Date: Tue, 16 Mar 2010 12:39:36 -0500 Subject: [PATCH 038/164] ColdFire: Fix m54455EVB save environment bug The ATMEL flash does not have buffer write feature. Assgined buffer_size = 1, so that when there is a write to the flash will not use buffer write function. Signed-off-by: TsiChung Liew --- board/freescale/m54455evb/m54455evb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/freescale/m54455evb/m54455evb.c b/board/freescale/m54455evb/m54455evb.c index 866694fb0..2a84514a3 100644 --- a/board/freescale/m54455evb/m54455evb.c +++ b/board/freescale/m54455evb/m54455evb.c @@ -185,7 +185,7 @@ ulong board_flash_get_legacy (ulong base, int banknum, flash_info_t * info) info->flash_id = 0x01000000; info->portwidth = 1; info->chipwidth = 1; - info->buffer_size = 32; + info->buffer_size = 1; info->erase_blk_tout = 16384; info->write_tout = 2; info->buffer_write_tout = 5; From c40c94a3d20a8616264c2dfcda85279185d69aeb Mon Sep 17 00:00:00 2001 From: Renato Andreola Date: Wed, 24 Mar 2010 23:00:47 +0800 Subject: [PATCH 039/164] cfi_flash: precision and underflow problem in tout calculation With old configuration it could happen tout=0 if CONFIG_SYS_HZ<1000. Signed-off-by: Renato Andreola Signed-off-by: Alessandro Rubini Signed-off-by: Thomas Chou Signed-off-by: Stefan Roese --- drivers/mtd/cfi_flash.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index fdba297c8..cd1a86eba 100644 --- a/drivers/mtd/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c @@ -537,7 +537,10 @@ static int flash_status_check (flash_info_t * info, flash_sect_t sector, ulong start; #if CONFIG_SYS_HZ != 1000 - tout *= CONFIG_SYS_HZ/1000; + if ((ulong)CONFIG_SYS_HZ > 100000) + tout *= (ulong)CONFIG_SYS_HZ / 1000; /* for a big HZ, avoid overflow */ + else + tout = DIV_ROUND_UP(tout * (ulong)CONFIG_SYS_HZ, 1000); #endif /* Wait for command completion */ From e5720823f6f81a0f3a9e3404dbc37059bf6644f1 Mon Sep 17 00:00:00 2001 From: Thomas Chou Date: Fri, 26 Mar 2010 08:17:00 +0800 Subject: [PATCH 040/164] cfi flash: add status polling method for amd flash This patch adds status polling method to offer an alternative to data toggle method for amd flash chips. This patch is needed for nios2 cfi flash interface, where the bus controller performs 4 bytes read cycles for a single byte read instruction. The data toggle method can not detect chip busy status correctly. So we have to poll DQ7, which will be inverted when the chip is busy. This feature is enabled with the config def, CONFIG_SYS_CFI_FLASH_STATUS_POLL Signed-off-by: Thomas Chou Signed-off-by: Stefan Roese --- drivers/mtd/cfi_flash.c | 93 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 86 insertions(+), 7 deletions(-) diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index fdba297c8..15a4220d4 100644 --- a/drivers/mtd/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c @@ -602,6 +602,63 @@ static int flash_full_status_check (flash_info_t * info, flash_sect_t sector, return retcode; } +static int use_flash_status_poll(flash_info_t *info) +{ +#ifdef CONFIG_SYS_CFI_FLASH_STATUS_POLL + if (info->vendor == CFI_CMDSET_AMD_EXTENDED || + info->vendor == CFI_CMDSET_AMD_STANDARD) + return 1; +#endif + return 0; +} + +static int flash_status_poll(flash_info_t *info, void *src, void *dst, + ulong tout, char *prompt) +{ +#ifdef CONFIG_SYS_CFI_FLASH_STATUS_POLL + ulong start; + int ready; + +#if CONFIG_SYS_HZ != 1000 + if ((ulong)CONFIG_SYS_HZ > 100000) + tout *= (ulong)CONFIG_SYS_HZ / 1000; /* for a big HZ, avoid overflow */ + else + tout = DIV_ROUND_UP(tout * (ulong)CONFIG_SYS_HZ, 1000); +#endif + + /* Wait for command completion */ + start = get_timer(0); + while (1) { + switch (info->portwidth) { + case FLASH_CFI_8BIT: + ready = flash_read8(dst) == flash_read8(src); + break; + case FLASH_CFI_16BIT: + ready = flash_read16(dst) == flash_read16(src); + break; + case FLASH_CFI_32BIT: + ready = flash_read32(dst) == flash_read32(src); + break; + case FLASH_CFI_64BIT: + ready = flash_read64(dst) == flash_read64(src); + break; + default: + ready = 0; + break; + } + if (ready) + break; + if (get_timer(start) > tout) { + printf("Flash %s timeout at address %lx data %lx\n", + prompt, (ulong)dst, (ulong)flash_read8(dst)); + return ERR_TIMOUT; + } + udelay(1); /* also triggers watchdog */ + } +#endif /* CONFIG_SYS_CFI_FLASH_STATUS_POLL */ + return ERR_OK; +} + /*----------------------------------------------------------------------- */ static void flash_add_byte (flash_info_t * info, cfiword_t * cword, uchar c) @@ -749,7 +806,12 @@ static int flash_write_cfiword (flash_info_t * info, ulong dest, if (!sect_found) sect = find_sector (info, dest); - return flash_full_status_check (info, sect, info->write_tout, "write"); + if (use_flash_status_poll(info)) + return flash_status_poll(info, &cword, dstaddr, + info->write_tout, "write"); + else + return flash_full_status_check(info, sect, + info->write_tout, "write"); } #ifdef CONFIG_SYS_FLASH_USE_BUFFER_WRITE @@ -911,9 +973,15 @@ static int flash_write_cfibuffer (flash_info_t * info, ulong dest, uchar * cp, } flash_write_cmd (info, sector, 0, AMD_CMD_WRITE_BUFFER_CONFIRM); - retcode = flash_full_status_check (info, sector, - info->buffer_write_tout, - "buffer write"); + if (use_flash_status_poll(info)) + retcode = flash_status_poll(info, src - (1 << shift), + dst - (1 << shift), + info->buffer_write_tout, + "buffer write"); + else + retcode = flash_full_status_check(info, sector, + info->buffer_write_tout, + "buffer write"); break; default: @@ -935,6 +1003,7 @@ int flash_erase (flash_info_t * info, int s_first, int s_last) int rcode = 0; int prot; flash_sect_t sect; + int st; if (info->flash_id != FLASH_MAN_CFI) { puts ("Can't erase unknown flash type - aborted\n"); @@ -998,10 +1067,20 @@ int flash_erase (flash_info_t * info, int s_first, int s_last) break; } - if (flash_full_status_check - (info, sect, info->erase_blk_tout, "erase")) { + if (use_flash_status_poll(info)) { + cfiword_t cword = (cfiword_t)0xffffffffffffffffULL; + void *dest; + dest = flash_map(info, sect, 0); + st = flash_status_poll(info, &cword, dest, + info->erase_blk_tout, "erase"); + flash_unmap(info, sect, 0, dest); + } else + st = flash_full_status_check(info, sect, + info->erase_blk_tout, + "erase"); + if (st) rcode = 1; - } else if (flash_verbose) + else if (flash_verbose) putc ('.'); } } From 04387d24a17b1ee13024dd4779da4b84d47c65cc Mon Sep 17 00:00:00 2001 From: Wolfgang Denk Date: Sat, 27 Mar 2010 23:37:46 +0100 Subject: [PATCH 041/164] mkimage: fix Segmentation Fault when run without "-n name" option The restructuring of the mkimage command in commit 89a4d6b1 ("tools: mkimage: split code into core, default and FIT image specific") introduced a bug that caused mkimage to segfault when run without "-n name" option. Initialize the imagename entry to prevent that. Signed-off-by: Wolfgang Denk --- tools/mkimage.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/mkimage.c b/tools/mkimage.c index f71f8e732..5c3e87290 100644 --- a/tools/mkimage.c +++ b/tools/mkimage.c @@ -37,6 +37,7 @@ struct mkimage_params params = { .type = IH_TYPE_KERNEL, .comp = IH_COMP_GZIP, .dtc = MKIMAGE_DEFAULT_DTC_OPTIONS, + .imagename = "", }; /* From a574cff121b1479c8e962b7a2a29310020387260 Mon Sep 17 00:00:00 2001 From: Wolfgang Denk Date: Wed, 24 Mar 2010 12:19:19 +0100 Subject: [PATCH 042/164] ml300: remove support for broken, orphaned board The ml300 board has a number of issues, but nobody cares about this long-orphaned board any more. Remove it. Signed-off-by: Wolfgang Denk Acked-by: Michal Simek --- MAKEALL | 1 - Makefile | 3 - board/xilinx/ml300/Makefile | 70 ---- board/xilinx/ml300/config.mk | 32 -- board/xilinx/ml300/init.S | 44 --- board/xilinx/ml300/ml300.c | 128 ------- board/xilinx/ml300/serial.c | 154 -------- board/xilinx/ml300/u-boot.lds | 146 ------- board/xilinx/ml300/u-boot.lds.debug | 135 ------- board/xilinx/ml300/xparameters.h | 196 ---------- board/xilinx/xilinx_iic/iic_adapter.c | 529 -------------------------- doc/README.ml300 | 128 ------- include/configs/ml300.h | 181 --------- 13 files changed, 1747 deletions(-) delete mode 100644 board/xilinx/ml300/Makefile delete mode 100644 board/xilinx/ml300/config.mk delete mode 100644 board/xilinx/ml300/init.S delete mode 100644 board/xilinx/ml300/ml300.c delete mode 100644 board/xilinx/ml300/serial.c delete mode 100644 board/xilinx/ml300/u-boot.lds delete mode 100644 board/xilinx/ml300/u-boot.lds.debug delete mode 100644 board/xilinx/ml300/xparameters.h delete mode 100644 board/xilinx/xilinx_iic/iic_adapter.c delete mode 100644 doc/README.ml300 delete mode 100644 include/configs/ml300.h diff --git a/MAKEALL b/MAKEALL index beacb5f51..5c303f9a4 100755 --- a/MAKEALL +++ b/MAKEALL @@ -238,7 +238,6 @@ LIST_4xx=" \ MIP405 \ MIP405T \ ML2 \ - ml300 \ ml507 \ ml507_flash \ neo \ diff --git a/Makefile b/Makefile index c37f8682a..27e6e62a7 100644 --- a/Makefile +++ b/Makefile @@ -1435,9 +1435,6 @@ MIP405T_config: unconfig ML2_config: unconfig @$(MKCONFIG) $(@:_config=) ppc ppc4xx ml2 -ml300_config: unconfig - @$(MKCONFIG) $(@:_config=) ppc ppc4xx ml300 xilinx - ml507_flash_config: unconfig @mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic @mkdir -p $(obj)include $(obj)board/xilinx/ml507 diff --git a/board/xilinx/ml300/Makefile b/board/xilinx/ml300/Makefile deleted file mode 100644 index b8a2d64c4..000000000 --- a/board/xilinx/ml300/Makefile +++ /dev/null @@ -1,70 +0,0 @@ -# -# (C) Copyright 2000-2006 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -include $(TOPDIR)/config.mk -ifneq ($(OBJTREE),$(SRCTREE)) -$(shell mkdir -p $(obj)../common) -$(shell mkdir -p $(obj)../xilinx_enet) -$(shell mkdir -p $(obj)../xilinx_iic) -endif - -INCS := -I../common -I../xilinx_enet -I../xilinx_iic -CFLAGS += $(INCS) -HOSTCFLAGS += $(INCS) - -LIB = $(obj)lib$(BOARD).a - -COBJS = $(BOARD).o \ - serial.o \ - ../xilinx_enet/emac_adapter.o ../xilinx_enet/xemac.o \ - ../xilinx_enet/xemac_options.o ../xilinx_enet/xemac_polled.o \ - ../xilinx_enet/xemac_intr.o ../xilinx_enet/xemac_g.o \ - ../xilinx_enet/xemac_intr_dma.o ../xilinx_iic/iic_adapter.o \ - ../xilinx_iic/xiic_l.o ../common/xipif_v1_23_b.o \ - ../common/xbasic_types.o ../common/xdma_channel.o \ - ../common/xdma_channel_sg.o ../common/xpacket_fifo_v1_00_b.o \ - ../common/xversion.o \ - -SOBJS = init.o - -SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) -OBJS := $(addprefix $(obj),$(COBJS)) -SOBJS := $(addprefix $(obj),$(SOBJS)) - -$(LIB): $(OBJS) $(SOBJS) - $(AR) $(ARFLAGS) $@ $^ - -clean: - rm -f $(SOBJS) $(OBJS) - -distclean: clean - rm -f $(LIB) core *.bak $(obj).depend - -######################################################################### - -# defines $(obj).depend target -include $(SRCTREE)/rules.mk - -sinclude $(obj).depend - -######################################################################### diff --git a/board/xilinx/ml300/config.mk b/board/xilinx/ml300/config.mk deleted file mode 100644 index 208a25ba1..000000000 --- a/board/xilinx/ml300/config.mk +++ /dev/null @@ -1,32 +0,0 @@ -# -# (C) Copyright 2000 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -# -# esd ADCIOP boards -# - -#TEXT_BASE = 0xFFFE0000 -TEXT_BASE = 0x04000000 - -# Use board specific linker script -LDSCRIPT := $(SRCTREE)/board/xilinx/ml300/u-boot.lds diff --git a/board/xilinx/ml300/init.S b/board/xilinx/ml300/init.S deleted file mode 100644 index a282c9ae2..000000000 --- a/board/xilinx/ml300/init.S +++ /dev/null @@ -1,44 +0,0 @@ -/* - * init.S: Stubs for U-Boot initialization - * - * Author: Xilinx, Inc. - * - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * - * XILINX IS PROVIDING THIS DESIGN, CODE, OR INFORMATION "AS IS" AS A - * COURTESY TO YOU. BY PROVIDING THIS DESIGN, CODE, OR INFORMATION AS - * ONE POSSIBLE IMPLEMENTATION OF THIS FEATURE, APPLICATION OR STANDARD, - * XILINX IS MAKING NO REPRESENTATION THAT THIS IMPLEMENTATION IS FREE - * FROM ANY CLAIMS OF INFRINGEMENT, AND YOU ARE RESPONSIBLE FOR OBTAINING - * ANY THIRD PARTY RIGHTS YOU MAY REQUIRE FOR YOUR IMPLEMENTATION. - * XILINX EXPRESSLY DISCLAIMS ANY WARRANTY WHATSOEVER WITH RESPECT TO - * THE ADEQUACY OF THE IMPLEMENTATION, INCLUDING BUT NOT LIMITED TO ANY - * WARRANTIES OR REPRESENTATIONS THAT THIS IMPLEMENTATION IS FREE FROM - * CLAIMS OF INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. - * - * - * Xilinx hardware products are not intended for use in life support - * appliances, devices, or systems. Use in such applications is - * expressly prohibited. - * - * - * (c) Copyright 2002-2004 Xilinx Inc. - * All rights reserved. - * - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 675 Mass Ave, Cambridge, MA 02139, USA. - * - * - */ - - .globl ext_bus_cntlr_init -ext_bus_cntlr_init: - blr diff --git a/board/xilinx/ml300/ml300.c b/board/xilinx/ml300/ml300.c deleted file mode 100644 index e64beccc1..000000000 --- a/board/xilinx/ml300/ml300.c +++ /dev/null @@ -1,128 +0,0 @@ -/* - * ml300.c: U-Boot platform support for Xilinx ML300 board - * - * Author: Xilinx, Inc. - * - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * - * XILINX IS PROVIDING THIS DESIGN, CODE, OR INFORMATION "AS IS" AS A - * COURTESY TO YOU. BY PROVIDING THIS DESIGN, CODE, OR INFORMATION AS - * ONE POSSIBLE IMPLEMENTATION OF THIS FEATURE, APPLICATION OR STANDARD, - * XILINX IS MAKING NO REPRESENTATION THAT THIS IMPLEMENTATION IS FREE - * FROM ANY CLAIMS OF INFRINGEMENT, AND YOU ARE RESPONSIBLE FOR OBTAINING - * ANY THIRD PARTY RIGHTS YOU MAY REQUIRE FOR YOUR IMPLEMENTATION. - * XILINX EXPRESSLY DISCLAIMS ANY WARRANTY WHATSOEVER WITH RESPECT TO - * THE ADEQUACY OF THE IMPLEMENTATION, INCLUDING BUT NOT LIMITED TO ANY - * WARRANTIES OR REPRESENTATIONS THAT THIS IMPLEMENTATION IS FREE FROM - * CLAIMS OF INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. - * - * - * Xilinx hardware products are not intended for use in life support - * appliances, devices, or systems. Use in such applications is - * expressly prohibited. - * - * - * (c) Copyright 2002-2004 Xilinx Inc. - * All rights reserved. - * - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 675 Mass Ave, Cambridge, MA 02139, USA. - * - */ - -#include -#include -#include - -#ifdef CONFIG_ENV_IS_IN_EEPROM -extern void convert_env(void); -#endif - -int -board_pre_init(void) -{ - return 0; -} - -int -checkboard(void) -{ - char tmp[64]; /* long enough for environment variables */ - char *s, *e; - int i = getenv_r("L", tmp, sizeof (tmp)); - - if (i < 0) { - printf("### No HW ID - assuming ML300"); - } else { - for (e = tmp; *e; ++e) { - if (*e == ' ') - break; - } - - printf("### Board Serial# is "); - - for (s = tmp; s < e; ++s) { - putc(*s); - } - - } - putc('\n'); - - return (0); -} - -phys_size_t -initdram(int board_type) -{ - return 128 * 1024 * 1024; -} - -int -testdram(void) -{ - printf("test: xxx MB - ok\n"); - - return (0); -} - -/* implement functions originally in cpu/ppc4xx/speed.c */ -void -get_sys_info(sys_info_t * sysInfo) -{ - sysInfo->freqProcessor = XPAR_CORE_CLOCK_FREQ_HZ; - - /* only correct if the PLB and OPB run at the same frequency */ - sysInfo->freqPLB = XPAR_UARTNS550_0_CLOCK_FREQ_HZ; - sysInfo->freqPCI = XPAR_UARTNS550_0_CLOCK_FREQ_HZ / 3; -} - -ulong -get_PCI_freq(void) -{ - ulong val; - PPC4xx_SYS_INFO sys_info; - - get_sys_info(&sys_info); - val = sys_info.freqPCI; - return val; -} - -#ifdef CONFIG_MISC_INIT_R - -int -misc_init_r() -{ - /* convert env name and value to u-boot standard */ - convert_env(); - return 0; -} - -#endif diff --git a/board/xilinx/ml300/serial.c b/board/xilinx/ml300/serial.c deleted file mode 100644 index 421551337..000000000 --- a/board/xilinx/ml300/serial.c +++ /dev/null @@ -1,154 +0,0 @@ -/* - * Author: Xilinx, Inc. - * - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * - * XILINX IS PROVIDING THIS DESIGN, CODE, OR INFORMATION "AS IS" AS A - * COURTESY TO YOU. BY PROVIDING THIS DESIGN, CODE, OR INFORMATION AS - * ONE POSSIBLE IMPLEMENTATION OF THIS FEATURE, APPLICATION OR STANDARD, - * XILINX IS MAKING NO REPRESENTATION THAT THIS IMPLEMENTATION IS FREE - * FROM ANY CLAIMS OF INFRINGEMENT, AND YOU ARE RESPONSIBLE FOR OBTAINING - * ANY THIRD PARTY RIGHTS YOU MAY REQUIRE FOR YOUR IMPLEMENTATION. - * XILINX EXPRESSLY DISCLAIMS ANY WARRANTY WHATSOEVER WITH RESPECT TO - * THE ADEQUACY OF THE IMPLEMENTATION, INCLUDING BUT NOT LIMITED TO ANY - * WARRANTIES OR REPRESENTATIONS THAT THIS IMPLEMENTATION IS FREE FROM - * CLAIMS OF INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. - * - * - * Xilinx hardware products are not intended for use in life support - * appliances, devices, or systems. Use in such applications is - * expressly prohibited. - * - * - * (c) Copyright 2002-2004 Xilinx Inc. - * All rights reserved. - * - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 675 Mass Ave, Cambridge, MA 02139, USA. - * - */ - -#include -#include -#include -#include -#include - -DECLARE_GLOBAL_DATA_PTR; - -#define USE_CHAN1 \ - ((defined XPAR_UARTNS550_0_BASEADDR) && (defined CONFIG_SYS_INIT_CHAN1)) -#define USE_CHAN2 \ - ((defined XPAR_UARTNS550_1_BASEADDR) && (defined CONFIG_SYS_INIT_CHAN2)) - -#if USE_CHAN1 -#include -#endif - -#if USE_CHAN1 -const NS16550_t COM_PORTS[] = { (NS16550_t) (XPAR_UARTNS550_0_BASEADDR + 3) -#if USE_CHAN2 - , (NS16550_t) (XPAR_UARTNS550_1_BASEADDR + 3) -#endif -}; -#endif - -int -serial_init(void) -{ -#if USE_CHAN1 - int clock_divisor; - - clock_divisor = XPAR_UARTNS550_0_CLOCK_FREQ_HZ / 16 / gd->baudrate; - (void) NS16550_init(COM_PORTS[0], clock_divisor); -#if USE_CHAN2 - clock_divisor = XPAR_UARTNS550_1_CLOCK_FREQ_HZ / 16 / gd->baudrate; - (void) NS16550_init(COM_PORTS[1], clock_divisor); -#endif -#endif - return 0; - -} - -void -serial_putc(const char c) -{ - if (c == '\n') - NS16550_putc(COM_PORTS[CONFIG_SYS_DUART_CHAN], '\r'); - - NS16550_putc(COM_PORTS[CONFIG_SYS_DUART_CHAN], c); -} - -int -serial_getc(void) -{ - return NS16550_getc(COM_PORTS[CONFIG_SYS_DUART_CHAN]); -} - -int -serial_tstc(void) -{ - return NS16550_tstc(COM_PORTS[CONFIG_SYS_DUART_CHAN]); -} - -void -serial_setbrg(void) -{ -#if USE_CHAN1 - int clock_divisor; - - clock_divisor = XPAR_UARTNS550_0_CLOCK_FREQ_HZ / 16 / gd->baudrate; - NS16550_reinit(COM_PORTS[0], clock_divisor); -#if USE_CHAN2 - clock_divisor = XPAR_UARTNS550_1_CLOCK_FREQ_HZ / 16 / gd->baudrate; - NS16550_reinit(COM_PORTS[1], clock_divisor); -#endif -#endif -} - -void -serial_puts(const char *s) -{ - while (*s) { - serial_putc(*s++); - } -} - -#if defined(CONFIG_CMD_KGDB) -void -kgdb_serial_init(void) -{ -} - -void -putDebugChar(int c) -{ - serial_putc(c); -} - -void -putDebugStr(const char *str) -{ - serial_puts(str); -} - -int -getDebugChar(void) -{ - return serial_getc(); -} - -void -kgdb_interruptible(int yes) -{ - return; -} -#endif diff --git a/board/xilinx/ml300/u-boot.lds b/board/xilinx/ml300/u-boot.lds deleted file mode 100644 index b9899408d..000000000 --- a/board/xilinx/ml300/u-boot.lds +++ /dev/null @@ -1,146 +0,0 @@ -/* - * (C) Copyright 2000 - * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - -OUTPUT_ARCH(powerpc) -ENTRY(_start) -/* Do we need any of these for elf? - __DYNAMIC = 0; */ -SECTIONS -{ - /* Read-only sections, merged into text segment: */ - . = + SIZEOF_HEADERS; - .interp : { *(.interp) } - .hash : { *(.hash) } - .dynsym : { *(.dynsym) } - .dynstr : { *(.dynstr) } - .rel.text : { *(.rel.text) } - .rela.text : { *(.rela.text) } - .rel.data : { *(.rel.data) } - .rela.data : { *(.rela.data) } - .rel.rodata : { *(.rel.rodata) } - .rela.rodata : { *(.rela.rodata) } - .rel.got : { *(.rel.got) } - .rela.got : { *(.rela.got) } - .rel.ctors : { *(.rel.ctors) } - .rela.ctors : { *(.rela.ctors) } - .rel.dtors : { *(.rel.dtors) } - .rela.dtors : { *(.rela.dtors) } - .rel.bss : { *(.rel.bss) } - .rela.bss : { *(.rela.bss) } - .rel.plt : { *(.rel.plt) } - .rela.plt : { *(.rela.plt) } - .init : { *(.init) } - .plt : { *(.plt) } - .text : - { - /* WARNING - the following is hand-optimized to fit within */ - /* the sector layout of our flash chips! XXX FIXME XXX */ -/* - cpu/ppc4xx/start.o (.text) - board/xilinx/ml300/init.o (.text) - cpu/ppc4xx/kgdb.o (.text) - cpu/ppc4xx/traps.o (.text) - cpu/ppc4xx/interrupts.o (.text) - cpu/ppc4xx/4xx_uart.o (.text) - cpu/ppc4xx/cpu_init.o (.text) - cpu/ppc4xx/speed.o (.text) - drivers/net/4xx_enet.o (.text) - common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) - lib_generic/zlib.o (.text) -*/ -/* . = env_offset;*/ -/* common/env_embedded.o(.text)*/ - - *(.text) - *(.got1) - } - _etext = .; - PROVIDE (etext = .); - .rodata : - { - *(.eh_frame) - *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) - } - .fini : { *(.fini) } =0 - .ctors : { *(.ctors) } - .dtors : { *(.dtors) } - - /* Read-write section, merged into data segment: */ - . = (. + 0x00FF) & 0xFFFFFF00; - _erotext = .; - PROVIDE (erotext = .); - .reloc : - { - *(.got) - _GOT2_TABLE_ = .; - *(.got2) - _FIXUP_TABLE_ = .; - *(.fixup) - } - __got2_entries = (_FIXUP_TABLE_ - _GOT2_TABLE_) >>2; - __fixup_entries = (. - _FIXUP_TABLE_)>>2; - - .data : - { - *(.data) - *(.data1) - *(.sdata) - *(.sdata2) - *(.dynamic) - CONSTRUCTORS - } - _edata = .; - PROVIDE (edata = .); - - . = .; - __u_boot_cmd_start = .; - .u_boot_cmd : { *(.u_boot_cmd) } - __u_boot_cmd_end = .; - - - . = .; - __start___ex_table = .; - __ex_table : { *(__ex_table) } - __stop___ex_table = .; - - . = ALIGN(256); - __init_begin = .; - .text.init : { *(.text.init) } - .data.init : { *(.data.init) } - . = ALIGN(256); - __init_end = .; - - __bss_start = .; - .bss (NOLOAD) : - { - *(.sbss) *(.scommon) - *(.dynbss) - *(.bss) - *(COMMON) - . = ALIGN(4); - } - _end = . ; - PROVIDE (end = .); -} diff --git a/board/xilinx/ml300/u-boot.lds.debug b/board/xilinx/ml300/u-boot.lds.debug deleted file mode 100644 index 970628d55..000000000 --- a/board/xilinx/ml300/u-boot.lds.debug +++ /dev/null @@ -1,135 +0,0 @@ -/* - * (C) Copyright 2000 - * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - -OUTPUT_ARCH(powerpc) -/* Do we need any of these for elf? - __DYNAMIC = 0; */ -SECTIONS -{ - /* Read-only sections, merged into text segment: */ - . = + SIZEOF_HEADERS; - .interp : { *(.interp) } - .hash : { *(.hash) } - .dynsym : { *(.dynsym) } - .dynstr : { *(.dynstr) } - .rel.text : { *(.rel.text) } - .rela.text : { *(.rela.text) } - .rel.data : { *(.rel.data) } - .rela.data : { *(.rela.data) } - .rel.rodata : { *(.rel.rodata) } - .rela.rodata : { *(.rela.rodata) } - .rel.got : { *(.rel.got) } - .rela.got : { *(.rela.got) } - .rel.ctors : { *(.rel.ctors) } - .rela.ctors : { *(.rela.ctors) } - .rel.dtors : { *(.rel.dtors) } - .rela.dtors : { *(.rela.dtors) } - .rel.bss : { *(.rel.bss) } - .rela.bss : { *(.rela.bss) } - .rel.plt : { *(.rel.plt) } - .rela.plt : { *(.rela.plt) } - .init : { *(.init) } - .plt : { *(.plt) } - .text : - { - /* WARNING - the following is hand-optimized to fit within */ - /* the sector layout of our flash chips! XXX FIXME XXX */ - - mpc8xx/start.o (.text) - common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) - - common/env_embedded.o(.text) - - *(.text) - *(.got1) - } - _etext = .; - PROVIDE (etext = .); - .rodata : - { - *(.rodata) - *(.rodata1) - *(.rodata.str1.4) - *(.eh_frame) - } - .fini : { *(.fini) } =0 - .ctors : { *(.ctors) } - .dtors : { *(.dtors) } - - /* Read-write section, merged into data segment: */ - . = (. + 0x0FFF) & 0xFFFFF000; - _erotext = .; - PROVIDE (erotext = .); - .reloc : - { - *(.got) - _GOT2_TABLE_ = .; - *(.got2) - _FIXUP_TABLE_ = .; - *(.fixup) - } - __got2_entries = (_FIXUP_TABLE_ - _GOT2_TABLE_) >>2; - __fixup_entries = (. - _FIXUP_TABLE_)>>2; - - .data : - { - *(.data) - *(.data1) - *(.sdata) - *(.sdata2) - *(.dynamic) - CONSTRUCTORS - } - _edata = .; - PROVIDE (edata = .); - - __u_boot_cmd_start = .; - .u_boot_cmd : { *(.u_boot_cmd) } - __u_boot_cmd_end = .; - - - __start___ex_table = .; - __ex_table : { *(__ex_table) } - __stop___ex_table = .; - - . = ALIGN(4096); - __init_begin = .; - .text.init : { *(.text.init) } - .data.init : { *(.data.init) } - . = ALIGN(4096); - __init_end = .; - - __bss_start = .; - .bss : - { - *(.sbss) *(.scommon) - *(.dynbss) - *(.bss) - *(COMMON) - } - _end = . ; - PROVIDE (end = .); -} diff --git a/board/xilinx/ml300/xparameters.h b/board/xilinx/ml300/xparameters.h deleted file mode 100644 index 2c56737dc..000000000 --- a/board/xilinx/ml300/xparameters.h +++ /dev/null @@ -1,196 +0,0 @@ -/******************************************************************* -* -* CAUTION: This file is automatically generated by libgen. -* Version: Xilinx EDK 6.2 EDK_Gm.11 -* DO NOT EDIT. -* -* Copyright (c) 2003 Xilinx, Inc. All rights reserved. -* -* Description: Driver parameters -* -*******************************************************************/ - -/******************************************************************/ - -/* U-Boot Redefines */ - -/******************************************************************/ - -#define XPAR_UARTNS550_0_BASEADDR (XPAR_OPB_UART16550_0_BASEADDR+0x1000) -#define XPAR_UARTNS550_0_HIGHADDR XPAR_OPB_UART16550_0_HIGHADDR -#define XPAR_UARTNS550_0_CLOCK_FREQ_HZ XPAR_XUARTNS550_CLOCK_HZ -#define XPAR_UARTNS550_0_DEVICE_ID XPAR_OPB_UART16550_0_DEVICE_ID -#define XPAR_UARTNS550_1_BASEADDR (XPAR_OPB_UART16550_1_BASEADDR+0x1000) -#define XPAR_UARTNS550_1_HIGHADDR XPAR_OPB_UART16550_1_HIGHADDR -#define XPAR_UARTNS550_1_CLOCK_FREQ_HZ XPAR_XUARTNS550_CLOCK_HZ -#define XPAR_UARTNS550_1_DEVICE_ID XPAR_OPB_UART16550_1_DEVICE_ID - -/******************************************************************/ - -#define XPAR_IIC_0_BASEADDR XPAR_OPB_IIC_0_BASEADDR -#define XPAR_IIC_0_HIGHADDR XPAR_OPB_IIC_0_HIGHADDR -#define XPAR_IIC_0_TEN_BIT_ADR XPAR_OPB_IIC_0_TEN_BIT_ADR -#define XPAR_IIC_0_DEVICE_ID XPAR_OPB_IIC_0_DEVICE_ID - -/******************************************************************/ - -#define XPAR_EMAC_0_BASEADDR XPAR_OPB_ETHERNET_0_BASEADDR -#define XPAR_EMAC_0_HIGHADDR XPAR_OPB_ETHERNET_0_HIGHADDR -#define XPAR_EMAC_0_DMA_PRESENT XPAR_OPB_ETHERNET_0_DMA_PRESENT -#define XPAR_EMAC_0_MII_EXIST XPAR_OPB_ETHERNET_0_MII_EXIST -#define XPAR_EMAC_0_ERR_COUNT_EXIST XPAR_OPB_ETHERNET_0_ERR_COUNT_EXIST -#define XPAR_EMAC_0_DEVICE_ID XPAR_OPB_ETHERNET_0_DEVICE_ID - -/******************************************************************/ - -#define XPAR_CORE_CLOCK_FREQ_HZ XPAR_CPU_PPC405_CORE_CLOCK_FREQ_HZ - -/******************************************************************/ - -#define XPAR_PERSISTENT_0_IIC_0_BASEADDR 0x00000400 -#define XPAR_PERSISTENT_0_IIC_0_HIGHADDR 0x000007FF -#define XPAR_PERSISTENT_0_IIC_0_EEPROMADDR 0xA0 - -/******************************************************************/ - -#define XPAR_XPCI_NUM_INSTANCES 1 -#define XPAR_XPCI_CLOCK_HZ 33333333 -#define XPAR_OPB_PCI_REF_0_DEVICE_ID 0 -#define XPAR_OPB_PCI_REF_0_BASEADDR 0x20000000 -#define XPAR_OPB_PCI_REF_0_HIGHADDR 0x3FFFFFFF -#define XPAR_OPB_PCI_REF_0_CONFIG_ADDR 0x3C000000 -#define XPAR_OPB_PCI_REF_0_CONFIG_DATA 0x3C000004 -#define XPAR_OPB_PCI_REF_0_LCONFIG_ADDR 0x3E000000 -#define XPAR_OPB_PCI_REF_0_MEM_BASEADDR 0x20000000 -#define XPAR_OPB_PCI_REF_0_MEM_HIGHADDR 0x37FFFFFF -#define XPAR_OPB_PCI_REF_0_IO_BASEADDR 0x38000000 -#define XPAR_OPB_PCI_REF_0_IO_HIGHADDR 0x3BFFFFFF - -/******************************************************************/ - -#define XPAR_XEMAC_NUM_INSTANCES 1 -#define XPAR_OPB_ETHERNET_0_BASEADDR 0x60000000 -#define XPAR_OPB_ETHERNET_0_HIGHADDR 0x60003FFF -#define XPAR_OPB_ETHERNET_0_DEVICE_ID 0 -#define XPAR_OPB_ETHERNET_0_ERR_COUNT_EXIST 1 -#define XPAR_OPB_ETHERNET_0_DMA_PRESENT 1 -#define XPAR_OPB_ETHERNET_0_MII_EXIST 1 - -/******************************************************************/ - -#define XPAR_MY_OPB_GPIO_0_DEVICE_ID_0 0 -#define XPAR_MY_OPB_GPIO_0_BASEADDR_0 0x90000000 -#define XPAR_MY_OPB_GPIO_0_HIGHADDR_0 (0x90000000+0x7) -#define XPAR_MY_OPB_GPIO_0_DEVICE_ID_1 1 -#define XPAR_MY_OPB_GPIO_0_BASEADDR_1 (0x90000000+0x8) -#define XPAR_MY_OPB_GPIO_0_HIGHADDR_1 (0x90000000+0x1F) -#define XPAR_XGPIO_NUM_INSTANCES 2 - -/******************************************************************/ - -#define XPAR_XIIC_NUM_INSTANCES 1 -#define XPAR_OPB_IIC_0_BASEADDR 0xA8000000 -#define XPAR_OPB_IIC_0_HIGHADDR 0xA80001FF -#define XPAR_OPB_IIC_0_DEVICE_ID 0 -#define XPAR_OPB_IIC_0_TEN_BIT_ADR 0 - -/******************************************************************/ - -#define XPAR_XUARTNS550_NUM_INSTANCES 2 -#define XPAR_XUARTNS550_CLOCK_HZ 100000000 -#define XPAR_OPB_UART16550_0_BASEADDR 0xA0000000 -#define XPAR_OPB_UART16550_0_HIGHADDR 0xA0001FFF -#define XPAR_OPB_UART16550_0_DEVICE_ID 0 -#define XPAR_OPB_UART16550_1_BASEADDR 0xA0010000 -#define XPAR_OPB_UART16550_1_HIGHADDR 0xA0011FFF -#define XPAR_OPB_UART16550_1_DEVICE_ID 1 - -/******************************************************************/ - -#define XPAR_XSPI_NUM_INSTANCES 1 -#define XPAR_OPB_SPI_0_BASEADDR 0xA4000000 -#define XPAR_OPB_SPI_0_HIGHADDR 0xA400007F -#define XPAR_OPB_SPI_0_DEVICE_ID 0 -#define XPAR_OPB_SPI_0_FIFO_EXIST 1 -#define XPAR_OPB_SPI_0_SPI_SLAVE_ONLY 0 -#define XPAR_OPB_SPI_0_NUM_SS_BITS 1 - -/******************************************************************/ - -#define XPAR_XPS2_NUM_INSTANCES 2 -#define XPAR_OPB_PS2_DUAL_REF_0_DEVICE_ID_0 0 -#define XPAR_OPB_PS2_DUAL_REF_0_BASEADDR_0 0xA9000000 -#define XPAR_OPB_PS2_DUAL_REF_0_HIGHADDR_0 (0xA9000000+0x3F) -#define XPAR_OPB_PS2_DUAL_REF_0_DEVICE_ID_1 1 -#define XPAR_OPB_PS2_DUAL_REF_0_BASEADDR_1 (0xA9000000+0x1000) -#define XPAR_OPB_PS2_DUAL_REF_0_HIGHADDR_1 (0xA9000000+0x103F) - -/******************************************************************/ - -#define XPAR_XTOUCHSCREEN_NUM_INSTANCES 1 -#define XPAR_OPB_TSD_REF_0_BASEADDR 0xAA000000 -#define XPAR_OPB_TSD_REF_0_HIGHADDR 0xAA000007 -#define XPAR_OPB_TSD_REF_0_DEVICE_ID 0 - -/******************************************************************/ - -#define XPAR_OPB_AC97_CONTROLLER_REF_0_BASEADDR 0xA6000000 -#define XPAR_OPB_AC97_CONTROLLER_REF_0_HIGHADDR 0xA60000FF -#define XPAR_OPB_PAR_PORT_REF_0_BASEADDR 0x90010000 -#define XPAR_OPB_PAR_PORT_REF_0_HIGHADDR 0x900100FF -#define XPAR_PLB_DDR_0_BASEADDR 0x00000000 -#define XPAR_PLB_DDR_0_HIGHADDR 0x0FFFFFFF - -/******************************************************************/ - -#define XPAR_XINTC_HAS_IPR 1 -#define XPAR_INTC_MAX_NUM_INTR_INPUTS 18 -#define XPAR_XINTC_USE_DCR 0 -#define XPAR_XINTC_NUM_INSTANCES 1 -#define XPAR_DCR_INTC_0_BASEADDR 0xD0000FC0 -#define XPAR_DCR_INTC_0_HIGHADDR 0xD0000FDF -#define XPAR_DCR_INTC_0_DEVICE_ID 0 -#define XPAR_DCR_INTC_0_KIND_OF_INTR 0x00038000 - -/******************************************************************/ - -#define XPAR_DCR_INTC_0_MISC_LOGIC_0_PHY_MII_INT_INTR 0 -#define XPAR_DCR_INTC_0_OPB_ETHERNET_0_IP2INTC_IRPT_INTR 1 -#define XPAR_DCR_INTC_0_MISC_LOGIC_0_IIC_TEMP_CRIT_INTR 2 -#define XPAR_DCR_INTC_0_MISC_LOGIC_0_IIC_IRQ_INTR 3 -#define XPAR_DCR_INTC_0_OPB_IIC_0_IP2INTC_IRPT_INTR 4 -#define XPAR_DCR_INTC_0_OPB_SYSACE_0_SYSACE_IRQ_INTR 5 -#define XPAR_DCR_INTC_0_OPB_UART16550_0_IP2INTC_IRPT_INTR 6 -#define XPAR_DCR_INTC_0_OPB_UART16550_1_IP2INTC_IRPT_INTR 7 -#define XPAR_DCR_INTC_0_OPB_PS2_DUAL_REF_0_SYS_INTR1_INTR 8 -#define XPAR_DCR_INTC_0_OPB_PS2_DUAL_REF_0_SYS_INTR2_INTR 9 -#define XPAR_DCR_INTC_0_OPB_SPI_0_IP2INTC_IRPT_INTR 10 -#define XPAR_DCR_INTC_0_OPB_TSD_REF_0_INTR_INTR 11 -#define XPAR_DCR_INTC_0_OPB_AC97_CONTROLLER_REF_0_PLAYBACK_INTERRUPT_INTR 12 -#define XPAR_DCR_INTC_0_OPB_AC97_CONTROLLER_REF_0_RECORD_INTERRUPT_INTR 13 -#define XPAR_DCR_INTC_0_OPB_PCI_REF_0_INTR_OUT_INTR 14 -#define XPAR_DCR_INTC_0_PLB2OPB_BRIDGE_0_BUS_ERROR_DET_INTR 15 -#define XPAR_DCR_INTC_0_PLB_V34_0_BUS_ERROR_DET_INTR 16 -#define XPAR_DCR_INTC_0_OPB2PLB_BRIDGE_0_BUS_ERROR_DET_INTR 17 - -/******************************************************************/ - -#define XPAR_XTFT_NUM_INSTANCES 1 -#define XPAR_PLB_TFT_CNTLR_REF_0_DCR_BASEADDR 0xD0000200 -#define XPAR_PLB_TFT_CNTLR_REF_0_DCR_HIGHADDR 0xD0000207 -#define XPAR_PLB_TFT_CNTLR_REF_0_DEVICE_ID 0 - -/******************************************************************/ - -#define XPAR_XSYSACE_MEM_WIDTH 8 -#define XPAR_XSYSACE_NUM_INSTANCES 1 -#define XPAR_OPB_SYSACE_0_BASEADDR 0xCF000000 -#define XPAR_OPB_SYSACE_0_HIGHADDR 0xCF0001FF -#define XPAR_OPB_SYSACE_0_DEVICE_ID 0 -#define XPAR_OPB_SYSACE_0_MEM_WIDTH 8 - -/******************************************************************/ - -#define XPAR_CPU_PPC405_CORE_CLOCK_FREQ_HZ 300000000 - -/******************************************************************/ diff --git a/board/xilinx/xilinx_iic/iic_adapter.c b/board/xilinx/xilinx_iic/iic_adapter.c deleted file mode 100644 index 58aaeb769..000000000 --- a/board/xilinx/xilinx_iic/iic_adapter.c +++ /dev/null @@ -1,529 +0,0 @@ -/****************************************************************************** -* -* Author: Xilinx, Inc. -* -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of the GNU General Public License as published by the -* Free Software Foundation; either version 2 of the License, or (at your -* option) any later version. -* -* -* XILINX IS PROVIDING THIS DESIGN, CODE, OR INFORMATION "AS IS" AS A -* COURTESY TO YOU. BY PROVIDING THIS DESIGN, CODE, OR INFORMATION AS -* ONE POSSIBLE IMPLEMENTATION OF THIS FEATURE, APPLICATION OR STANDARD, -* XILINX IS MAKING NO REPRESENTATION THAT THIS IMPLEMENTATION IS FREE -* FROM ANY CLAIMS OF INFRINGEMENT, AND YOU ARE RESPONSIBLE FOR OBTAINING -* ANY THIRD PARTY RIGHTS YOU MAY REQUIRE FOR YOUR IMPLEMENTATION. -* XILINX EXPRESSLY DISCLAIMS ANY WARRANTY WHATSOEVER WITH RESPECT TO -* THE ADEQUACY OF THE IMPLEMENTATION, INCLUDING BUT NOT LIMITED TO ANY -* WARRANTIES OR REPRESENTATIONS THAT THIS IMPLEMENTATION IS FREE FROM -* CLAIMS OF INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND -* FITNESS FOR A PARTICULAR PURPOSE. -* -* -* Xilinx hardware products are not intended for use in life support -* appliances, devices, or systems. Use in such applications is -* expressly prohibited. -* -* -* (c) Copyright 2002-2004 Xilinx Inc. -* All rights reserved. -* -* -* You should have received a copy of the GNU General Public License along -* with this program; if not, write to the Free Software Foundation, Inc., -* 675 Mass Ave, Cambridge, MA 02139, USA. -* -******************************************************************************/ - -#include -#include -#include -#include - -#ifdef CONFIG_ENV_IS_IN_EEPROM -#include -#include "xiic_l.h" - -#define IIC_DELAY 5000 - -static u8 envStep = 0; /* 0 means crc has not been read */ -const u8 hex[] = "0123456789ABCDEF"; /* lookup table for ML300 CRC */ - -/************************************************************************ - * Use Xilinx provided driver to send data to EEPROM using iic bus. - */ -static void -send(u32 adr, u8 * data, u32 len) -{ - u8 sendBuf[34]; /* first 2-bit is address and others are data */ - u32 pos, wlen; - u32 ret; - - wlen = 32; - for (pos = 0; pos < len; pos += 32) { - if ((len - pos) < 32) - wlen = len - pos; - - /* Put address and data bits together */ - sendBuf[0] = (u8) ((adr + pos) >> 8); - sendBuf[1] = (u8) (adr + pos); - memcpy(&sendBuf[2], &data[pos], wlen); - - /* Send to EEPROM through iic bus */ - ret = XIic_Send(XPAR_IIC_0_BASEADDR, CONFIG_SYS_I2C_EEPROM_ADDR >> 1, - sendBuf, wlen + 2); - - udelay(IIC_DELAY); - } -} - -/************************************************************************ - * Use Xilinx provided driver to read data from EEPROM using the iic bus. - */ -static void -receive(u32 adr, u8 * data, u32 len) -{ - u8 address[2]; - u32 ret; - - address[0] = (u8) (adr >> 8); - address[1] = (u8) adr; - - /* Provide EEPROM address */ - ret = - XIic_Send(XPAR_IIC_0_BASEADDR, CONFIG_SYS_I2C_EEPROM_ADDR >> 1, address, - 2); - /* Receive data from EEPROM */ - ret = - XIic_Recv(XPAR_IIC_0_BASEADDR, CONFIG_SYS_I2C_EEPROM_ADDR >> 1, data, len); -} - -/************************************************************************ - * Convert a hexadecimal string to its equivalent integer value. - */ -static u8 -axtoi(u8 * hexStg) -{ - u8 n; /* position in string */ - u8 m; /* position in digit[] to shift */ - u8 count; /* loop index */ - u8 intValue; /* integer value of hex string */ - u8 digit[2]; /* hold values to convert */ - - for (n = 0; n < 2; n++) { - if (hexStg[n] == '\0') - break; - if (hexStg[n] > 0x29 && hexStg[n] < 0x40) - digit[n] = hexStg[n] & 0x0f; - else if (hexStg[n] >= 'a' && hexStg[n] <= 'f') - digit[n] = (hexStg[n] & 0x0f) + 9; - else if (hexStg[n] >= 'A' && hexStg[n] <= 'F') - digit[n] = (hexStg[n] & 0x0f) + 9; - else - break; - } - - intValue = 0; - count = n; - m = n - 1; - n = 0; - while (n < count) { - intValue = intValue | (digit[n] << (m << 2)); - m--; /* adjust the position to set */ - n++; /* next digit to process */ - } - - return (intValue); -} - -/************************************************************************ - * Convert an integer string to its equivalent value. - */ -static u8 -atoi(uchar * string) -{ - u8 res = 0; - while (*string >= '0' && *string <= '9') { - res *= 10; - res += *string - '0'; - string++; - } - - return res; -} - -/************************************************************************ - * Key-value pairs are separated by "=" sign. - */ -static void -findKey(uchar * buffer, int *loc, u8 len) -{ - u32 i; - - for (i = 0; i < len; i++) - if (buffer[i] == '=') { - *loc = i; - return; - } - - /* return -1 is no "=" sign found */ - *loc = -1; -} - -/************************************************************************ - * Compute a new ML300 CRC when user calls the saveenv command. - * Also update EEPROM with new CRC value. - */ -static u8 -update_crc(u32 len, uchar * data) -{ - uchar temp[6] = { 'C', '=', 0x00, 0x00, 0x00, 0x00 }; - u32 crc; /* new crc value */ - u32 i; - - crc = 0; - - /* calculate new CRC */ - for (i = 0; i < len; i++) - crc += data[i]; - - /* CRC includes key for check sum */ - crc += 'C' + '='; - - /* compose new CRC to be updated */ - temp[2] = hex[(crc >> 4) & 0xf]; - temp[3] = hex[crc & 0xf]; - - /* check to see if env size exceeded */ - if (len + 6 > ENV_SIZE) { - printf("ERROR: not enough space to store CRC on EEPROM"); - return 1; - } - - memcpy(data + len, temp, 6); - return 0; -} - -/************************************************************************ - * Read out ML300 CRC and compare it with a runtime calculated ML300 CRC. - * If equal, then pass back a u-boot CRC value, otherwise pass back - * junk to indicate CRC error. -*/ -static void -read_crc(uchar * buffer, int len) -{ - u32 addr, n; - u32 crc; /* runtime crc */ - u8 old[2] = { 0xff, 0xff }; /* current CRC in EEPROM */ - u8 stop; /* indication of end of env data */ - u8 pre; /* previous EEPROM data bit */ - int i, loc; - - addr = CONFIG_ENV_OFFSET; /* start from first env address */ - n = 0; - pre = 1; - stop = 1; - crc = 0; - - /* calculate runtime CRC according to ML300 and read back - old CRC stored in the EEPROM */ - while (n < CONFIG_ENV_SIZE) { - receive(addr, buffer, len); - - /* found two null chars, end of env */ - if ((pre || buffer[0]) == 0) - break; - - findKey(buffer, &loc, len); - - /* found old check sum, read and store old CRC */ - if ((loc == 0 && pre == 'C') - || (loc > 0 && buffer[loc - 1] == 'C')) - receive(addr + loc + 1, old, 2); - - pre = buffer[len - 1]; - - /* calculate runtime ML300 CRC */ - crc += buffer[0]; - i = 1; - do { - crc += buffer[i]; - stop = buffer[i] || buffer[i - 1]; - i++; - } while (stop && (i < len)); - - if (stop == 0) - break; - - n += len; - addr += len; - } - - /* exclude old CRC from runtime calculation */ - crc -= (old[0] + old[1]); - - /* match CRC values, send back u-boot CRC */ - if ((old[0] == hex[(crc >> 4) & 0xf]) - && (old[1] == hex[crc & 0xf])) { - crc = 0; - n = 0; - addr = - CONFIG_ENV_OFFSET - offsetof(env_t, crc) + offsetof(env_t, - data); - /* calculate u-boot crc */ - while (n < ENV_SIZE) { - receive(addr, buffer, len); - crc = crc32(crc, buffer, len); - n += len; - addr += len; - } - - memcpy(buffer, &crc, 4); - } -} - -/************************************************************************ - * Convert IP address to hexadecimals. - */ -static void -ip_ml300(uchar * s, uchar * res) -{ - char temp[2]; - u8 i; - - res[0] = 0x00; - - for (i = 0; i < 4; i++) { - sprintf(temp, "%02x", atoi(s)); - s = (uchar *)strchr((char *)s, '.') + 1; - strcat((char *)res, temp); - } -} - -/************************************************************************ - * Change 0xff (255), a dummy null char to 0x00. - */ -static void -change_null(uchar * s) -{ - if (s != NULL) { - change_null((uchar *)strchr((char *)s + 1, 255)); - *(strchr((char *)s, 255)) = '\0'; - } -} - -/************************************************************************ - * Update environment variable name and values to u-boot standard. - */ -void -convert_env(void) -{ - char *s; /* pointer to env value */ - char temp[20]; /* temp storage for addresses */ - - /* E -> ethaddr */ - s = getenv("E"); - if (s != NULL) { - sprintf(temp, "%c%c.%c%c.%c%c.%c%c.%c%c.%c%c", - s[0], s[1], s[ 2], s[ 3], - s[4], s[5], s[ 6], s[ 7], - s[8], s[9], s[10], s[11] ); - setenv("ethaddr", temp); - setenv("E", NULL); - } - - /* L -> serial# */ - s = getenv("L"); - if (s != NULL) { - setenv("serial#", s); - setenv("L", NULL); - } - - /* I -> ipaddr */ - s = getenv("I"); - if (s != NULL) { - sprintf(temp, "%d.%d.%d.%d", axtoi((u8 *)s), axtoi((u8 *)(s + 2)), - axtoi((u8 *)(s + 4)), axtoi((u8 *)(s + 6))); - setenv("ipaddr", temp); - setenv("I", NULL); - } - - /* S -> serverip */ - s = getenv("S"); - if (s != NULL) { - sprintf(temp, "%d.%d.%d.%d", axtoi((u8 *)s), axtoi((u8 *)(s + 2)), - axtoi((u8 *)(s + 4)), axtoi((u8 *)(s + 6))); - setenv("serverip", temp); - setenv("S", NULL); - } - - /* A -> bootargs */ - s = getenv("A"); - if (s != NULL) { - setenv("bootargs", s); - setenv("A", NULL); - } - - /* F -> bootfile */ - s = getenv("F"); - if (s != NULL) { - setenv("bootfile", s); - setenv("F", NULL); - } - - /* M -> bootcmd */ - s = getenv("M"); - if (s != NULL) { - setenv("bootcmd", s); - setenv("M", NULL); - } - - /* Don't include C (CRC) */ - setenv("C", NULL); -} - -/************************************************************************ - * Save user modified environment values back to EEPROM. - */ -static void -save_env(void) -{ - char eprom[ENV_SIZE]; /* buffer to be written back to EEPROM */ - char *s, temp[20]; - char ff[] = { 0xff, 0x00 }; /* dummy null value */ - u32 len; /* length of env to be written to EEPROM */ - - eprom[0] = 0x00; - - /* ethaddr -> E */ - s = getenv("ethaddr"); - if (s != NULL) { - strcat(eprom, "E="); - sprintf(temp, "%c%c%c%c%c%c%c%c%c%c%c%c", - *s, *(s + 1), *(s + 3), *(s + 4), *(s + 6), *(s + 7), - *(s + 9), *(s + 10), *(s + 12), *(s + 13), *(s + 15), - *(s + 16)); - strcat(eprom, temp); - strcat(eprom, ff); - } - - /* serial# -> L */ - s = getenv("serial#"); - if (s != NULL) { - strcat(eprom, "L="); - strcat(eprom, s); - strcat(eprom, ff); - } - - /* ipaddr -> I */ - s = getenv("ipaddr"); - if (s != NULL) { - strcat(eprom, "I="); - ip_ml300((uchar *)s, (uchar *)temp); - strcat(eprom, temp); - strcat(eprom, ff); - } - - /* serverip -> S */ - s = getenv("serverip"); - if (s != NULL) { - strcat(eprom, "S="); - ip_ml300((uchar *)s, (uchar *)temp); - strcat(eprom, temp); - strcat(eprom, ff); - } - - /* bootargs -> A */ - s = getenv("bootargs"); - if (s != NULL) { - strcat(eprom, "A="); - strcat(eprom, s); - strcat(eprom, ff); - } - - /* bootfile -> F */ - s = getenv("bootfile"); - if (s != NULL) { - strcat(eprom, "F="); - strcat(eprom, s); - strcat(eprom, ff); - } - - /* bootcmd -> M */ - s = getenv("bootcmd"); - if (s != NULL) { - strcat(eprom, "M="); - strcat(eprom, s); - strcat(eprom, ff); - } - - len = strlen(eprom); /* find env length without crc */ - change_null((uchar *)eprom); /* change 0xff to 0x00 */ - - /* update EEPROM env values if there is enough space */ - if (update_crc(len, (uchar *)eprom) == 0) - send(CONFIG_ENV_OFFSET, (uchar *)eprom, len + 6); -} - -/************************************************************************ - * U-boot call for EEPROM read associated activities. - */ -int -i2c_read(uchar chip, uint addr, int alen, uchar * buffer, int len) -{ - - if (envStep == 0) { - /* first read call is for crc */ - read_crc(buffer, len); - ++envStep; - return 0; - } else if (envStep == 1) { - /* then read out EEPROM content for runtime u-boot CRC calculation */ - receive(addr, buffer, len); - - if (addr + len - CONFIG_ENV_OFFSET == CONFIG_ENV_SIZE) - /* end of runtime crc read */ - ++envStep; - return 0; - } - - if (len < 2) { - /* when call getenv_r */ - receive(addr, buffer, len); - } else if (addr + len < CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) { - /* calling env_relocate(), but don't read out - crc value from EEPROM */ - receive(addr, buffer + 4, len); - } else { - receive(addr, buffer + 4, len - 4); - } - - return 0; - -} - -/************************************************************************ - * U-boot call for EEPROM write acativities. - */ -int -i2c_write(uchar chip, uint addr, int alen, uchar * buffer, int len) -{ - /* save env on last page write called by u-boot */ - if (addr + len >= CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) - save_env(); - - return 0; -} - -/************************************************************************ - * Dummy function. - */ -int -i2c_probe(uchar chip) -{ - return 1; -} - -#endif diff --git a/doc/README.ml300 b/doc/README.ml300 deleted file mode 100644 index 27c5b9278..000000000 --- a/doc/README.ml300 +++ /dev/null @@ -1,128 +0,0 @@ -Xilinx ML300 platform -===================== - -0. Introduction ---------------- - -The Xilinx ML300 board is based on the Virtex-II Pro FPGA with -integrated AMCC PowerPC 405 core. The board is normally booted from -System ACE CF. U-Boot is then run out of main memory. - -An FPGA is a configurable and thus very flexible device. To -accommodate for this flexibility this port of U-Boot includes the -required means to regenerate the drivers and configuration files if -you decide to change the hardware design. The required steps are -described below. - - -1. Requirements ---------------- - -To compile and run U-Boot on the Xilinx ML300 platform you need the -following items. - -- A Xilinx ML300 platform (see http://www.xilinx.com/ml300) -- EDK and ISE development tools (shipping with ML300) -- Parallel4 cable (shipping with ML300) -- The EDK reference design for ML300. You can get this as design #6 from - http://www.xilinx.com/ise/embedded/edk_examples.htm -- A BOOTP/TFTP server - - -2. Quick Start --------------- - -To compile and run U-Boot on ML300 follow the steps below. Make sure -to consult the documentation for U-Boot, EDK, and the EDK reference -design for ML300 if you have any questions. - -1. Implement the EDK reference design for ML300. You can use any of - the project files, for example from a xygwin shell: - $ xps -nw system_linux.xmp - XPS% run init_bram -2. Configure and compile U-Boot. Change into the root directory of - U-Boot and run: - $ export CROSS_COMPILE=powerpc-eabi- - $ make ml300_config - $ make -3. Set up the ML300, connect the Parallel4 and the serial cable. Start - a terminal on your host computer and set the communication - parameters to 9600,8N1,no handshake. -4. Set up the BOOTP/TFTP server on your host machine. U-Boot is - preconfigured to use a fixed HW MAC address of 00:0A:35:00:22:01. -5. Download the bitstream to the ML300. -6. Use XMD to download and run U-Boot on the ML300: - $ xmd - XMD% ppcconnect - XMD% dow u-boot - XMD% run - -You can now make an ACE file out of bitstream and U-Boot: - $ xmd genace.tcl -jprog -board ml300 -hw \ - implementation/download.bit -elf u-boot -ace top.ace - -Put the ACE file onto the MicroDrive, for example into xilinx/myace, -and reboot ML300. - - -3. Generating a Custom BSP for U-Boot -------------------------------------- - -If you decide to change the EDK reference design for ML300 or if you -build a new design from scratch either with the Base System Builder in -XPS or all by hand you most likely will change the base addresses for -the Uart and the Ethernet peripheral. If you do so you will have two -options: - -1. Edit boards/xilinx/ml300/xparameters.h to reflect the changes you - made to your hardware. -2. Use the MLD technology provided by Xilinx Platform Studio to make - the changes automatically. To do so go to the root directory of the - EDK reference design for ML300. Copy the Linux project file and the - Linux software configuration file: - $ cp system_linux.xmp system_uboot.xmp - $ cp system_linux.mss system_uboot.mss - - Edit system_uboot.xmp and and have it point to system_uboot.mss for - the software configuration. - - Then, copy the sw_services directory in - boards/xilinx/ml300/sw_services to the root directory of the EDK - reference design for ML300. - $ cp -R /boards/xilinx/ml300/sw_services - - Modify system_uboot.mss. Look for the Linux library definition - and change it to generate a BSP for U-Boot. An example, might look - like this: - - BEGIN LIBRARY - PARAMETER LIBRARY_NAME = uboot - PARAMETER LIBRARY_VER = 1.00.a - PARAMETER CONNECTED_PERIPHS = (opb_uart16550_0,opb_ethernet_0) - PARAMETER TARGET_DIR = - END - - Now, you are ready to generate the Xilinx ML300 BSP for U-Boot: - $ xps -nw system_uboot.xmp - XPS% run libs - - If all goes well the new configuration has been copied into the - right places within the U-Boot source tree. Recompile U-Boot and - run it on the ML300. - - -4. ToDo -------- - -- Add support for all other peripherals on ML300. -- Read the MAC address out of the IIC EEPROM. -- Store the bootargs in the IIC EEPROM. - - -5. References -------------- - -ML300: http://www.xilinx.com/ml300 -EDK: http://www.xilinx.com/edk -ISE: http://www.xilinx.com/ise -Reference Design: http://www.xilinx.com/ise/embedded/edk_examples.htm diff --git a/include/configs/ml300.h b/include/configs/ml300.h deleted file mode 100644 index 68d0c85e1..000000000 --- a/include/configs/ml300.h +++ /dev/null @@ -1,181 +0,0 @@ -/* - * ML300.h: ML300 specific config options - * - * http://www.xilinx.com/ml300 - * - * Derived from : ML2.h - * - * Author: Xilinx, Inc. - * - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * - * XILINX IS PROVIDING THIS DESIGN, CODE, OR INFORMATION "AS IS" AS A - * COURTESY TO YOU. BY PROVIDING THIS DESIGN, CODE, OR INFORMATION AS - * ONE POSSIBLE IMPLEMENTATION OF THIS FEATURE, APPLICATION OR STANDARD, - * XILINX IS MAKING NO REPRESENTATION THAT THIS IMPLEMENTATION IS FREE - * FROM ANY CLAIMS OF INFRINGEMENT, AND YOU ARE RESPONSIBLE FOR - * OBTAINING ANY RIGHTS YOU MAY REQUIRE FOR YOUR IMPLEMENTATION. - * XILINX EXPRESSLY DISCLAIMS ANY WARRANTY WHATSOEVER WITH RESPECT TO - * THE ADEQUACY OF THE IMPLEMENTATION, INCLUDING BUT NOT LIMITED TO ANY - * WARRANTIES OR REPRESENTATIONS THAT THIS IMPLEMENTATION IS FREE FROM - * CLAIMS OF INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. - * - * - * Xilinx products are not intended for use in life support appliances, - * devices, or systems. Use in such applications is expressly prohibited. - * - * - * (c) Copyright 2002 Xilinx Inc. - * All rights reserved. - * - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 675 Mass Ave, Cambridge, MA 02139, USA. - * - */ - -#ifndef __CONFIG_H -#define __CONFIG_H - -/* #define DEBUG */ -/* #define ET_DEBUG 1 */ - -/* - * High Level Configuration Options - * (easy to change) - */ - -#define CONFIG_405 1 /* This is a PPC405 CPU */ -#define CONFIG_4xx 1 /* ...member of PPC4xx family */ -#define CONFIG_XILINX_405 1 -#define CONFIG_XILINX_ML300 1 /* ...on a Xilinx ML300 board */ - -#define CONFIG_SYSTEMACE 1 -#define CONFIG_DOS_PARTITION 1 -#define CONFIG_SYS_SYSTEMACE_BASE XPAR_OPB_SYSACE_0_BASEADDR -#define CONFIG_SYS_SYSTEMACE_WIDTH XPAR_XSYSACE_MEM_WIDTH - -#define CONFIG_ENV_IS_IN_EEPROM 1 /* environment is in EEPROM */ - -/* following are used only if env is in EEPROM */ -#ifdef CONFIG_ENV_IS_IN_EEPROM -#define CONFIG_SYS_I2C_EEPROM_ADDR XPAR_PERSISTENT_0_IIC_0_EEPROMADDR -#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 -#define CONFIG_ENV_OFFSET XPAR_PERSISTENT_0_IIC_0_BASEADDR -#define CONFIG_MISC_INIT_R 1 /* used to call out convert_env() */ -#define CONFIG_ENV_OVERWRITE 1 /* allow users to update ethaddr and serial# */ -#endif - -#include "../board/xilinx/ml300/xparameters.h" - -#define CONFIG_SYS_NO_FLASH 1 /* no flash */ -#define CONFIG_ENV_SIZE XPAR_PERSISTENT_0_IIC_0_HIGHADDR - XPAR_PERSISTENT_0_IIC_0_BASEADDR + 1 -#define CONFIG_BAUDRATE 9600 -#define CONFIG_BOOTDELAY 3 /* autoboot after 3 seconds */ - -#define CONFIG_BOOTCOMMAND "bootp" /* autoboot command */ - -#define CONFIG_BOOTARGS "console=ttyS0,9600 ip=off " \ - "root=/dev/xsysace/disc0/part3 rw" - -#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ -#define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ - - -/* - * BOOTP options - */ -#define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME - - -/* - * Command line configuration. - */ -#include - -#define CONFIG_CMD_NET - -#undef CONFIG_CMD_FLASH -#undef CONFIG_CMD_LOADS -#undef CONFIG_CMD_FAT -#undef CONFIG_CMD_IMLS - - -/* #define CONFIG_SYS_CLK_FREQ XPAR_CORE_CLOCK_FREQ_HZ */ -/* 300000000 */ - -/* - * Miscellaneous configurable options - */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_SYS_PROMPT "=> " /* Monitor Command Prompt */ - -#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ - -#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */ -#define CONFIG_SYS_MAXARGS 16 /* max number of command args */ -#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */ - -#define CONFIG_SYS_MEMTEST_START 0x0400000 /* memtest works on */ -#define CONFIG_SYS_MEMTEST_END 0x0C00000 /* 4 ... 12 MB in DRAM */ - -#define CONFIG_SYS_DUART_CHAN 0 -#define CONFIG_SYS_NS16550_REG_SIZE -4 -#define CONFIG_SYS_NS16550 1 -#define CONFIG_SYS_INIT_CHAN1 1 - -/* The following table includes the supported baudrates */ -#define CONFIG_SYS_BAUDRATE_TABLE \ - {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400} - -#define CONFIG_SYS_LOAD_ADDR 0x400000 /* default load address */ -#define CONFIG_SYS_EXTBDINFO 1 /* To use extended board_into (bd_t) */ - -#define CONFIG_SYS_HZ 1000 /* decrementer freq: 1 ms ticks */ - -/*----------------------------------------------------------------------- - * Start addresses for the final memory configuration - * (Set up by the startup code) - * Please note that CONFIG_SYS_SDRAM_BASE _must_ start at 0 - */ -#define CONFIG_SYS_SDRAM_BASE 0x00000000 -#define CONFIG_SYS_MONITOR_BASE 0x04000000 -#define CONFIG_SYS_MONITOR_LEN (192 * 1024) /* Reserve 196 kB for Monitor */ -#define CONFIG_SYS_MALLOC_LEN (128 * 1024) /* Reserve 128 kB for malloc() */ - -/* - * For booting Linux, the board info and command line data - * have to be in the first 8 MB of memory, since this is - * the maximum mapped by the Linux kernel during initialization. - */ -#define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */ - -/*----------------------------------------------------------------------- - * Definitions for initial stack pointer and data area (in DPRAM) - */ - -#define CONFIG_SYS_INIT_RAM_ADDR 0x800000 /* inside of SDRAM */ -#define CONFIG_SYS_INIT_RAM_END 0x2000 /* End of used area in RAM */ -#define CONFIG_SYS_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ -#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) -#define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET - -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -#endif /* __CONFIG_H */ From 060f28532b09dd3d2c78423bdd809ac768a27629 Mon Sep 17 00:00:00 2001 From: Wolfgang Denk Date: Thu, 25 Mar 2010 14:07:23 +0100 Subject: [PATCH 043/164] cmd_usb.c: print debug messages only when DEBUG is defined Signed-off-by: Wolfgang Denk --- common/cmd_usb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/cmd_usb.c b/common/cmd_usb.c index 9de515c32..6b5c58255 100644 --- a/common/cmd_usb.c +++ b/common/cmd_usb.c @@ -601,7 +601,7 @@ int do_usb(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) ok++; if (devno) printf("\n"); - printf("print_part of %x\n", devno); + debug("print_part of %x\n", devno); print_part(stor_dev); } } @@ -610,7 +610,7 @@ int do_usb(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) stor_dev = usb_stor_get_dev(devno); if (stor_dev->type != DEV_TYPE_UNKNOWN) { ok++; - printf("print_part of %x\n", devno); + debug("print_part of %x\n", devno); print_part(stor_dev); } } From 2883cc2d48e99fd1873ef8af03fee7966611b735 Mon Sep 17 00:00:00 2001 From: Wolfgang Denk Date: Sun, 28 Mar 2010 00:25:14 +0100 Subject: [PATCH 044/164] Prepare 2010.03-rc3 Update CHANGELOG Signed-off-by: Wolfgang Denk --- CHANGELOG | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ Makefile | 2 +- 2 files changed, 101 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 2dd7fe4e1..cc1113b91 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,103 @@ +commit 060f28532b09dd3d2c78423bdd809ac768a27629 +Author: Wolfgang Denk +Date: Thu Mar 25 14:07:23 2010 +0100 + + cmd_usb.c: print debug messages only when DEBUG is defined + + Signed-off-by: Wolfgang Denk + +commit a574cff121b1479c8e962b7a2a29310020387260 +Author: Wolfgang Denk +Date: Wed Mar 24 12:19:19 2010 +0100 + + ml300: remove support for broken, orphaned board + + The ml300 board has a number of issues, but nobody cares about this + long-orphaned board any more. Remove it. + + Signed-off-by: Wolfgang Denk + Acked-by: Michal Simek + +commit 04387d24a17b1ee13024dd4779da4b84d47c65cc +Author: Wolfgang Denk +Date: Sat Mar 27 23:37:46 2010 +0100 + + mkimage: fix Segmentation Fault when run without "-n name" option + + The restructuring of the mkimage command in commit 89a4d6b1 ("tools: + mkimage: split code into core, default and FIT image specific") + introduced a bug that caused mkimage to segfault when run without + "-n name" option. Initialize the imagename entry to prevent that. + + Signed-off-by: Wolfgang Denk + +commit c40c94a3d20a8616264c2dfcda85279185d69aeb +Author: Renato Andreola +Date: Wed Mar 24 23:00:47 2010 +0800 + + cfi_flash: precision and underflow problem in tout calculation + + With old configuration it could happen tout=0 if CONFIG_SYS_HZ<1000. + + Signed-off-by: Renato Andreola + Signed-off-by: Alessandro Rubini + Signed-off-by: Thomas Chou + Signed-off-by: Stefan Roese + +commit c550afada5fcad426aa6a219a329feb9eedae8b2 +Author: Rupjyoti Sarmah +Date: Wed Mar 24 16:52:02 2010 +0530 + + ppc4xx fix unstable 440EPx bootstrap options + + 440EPx fixed bootstrap options A, B, D, and E sets PLL FWDVA to a value = 1. + This results in the PLLOUTB being greater than the CPU clock frequency + resulting unstable 440EPx operation resulting in various software hang + conditions. + + This patch reprograms the FWDVA satisfying the requirement of setting FWDVB + to a value greater than 1 while using one of the four deafult bootstrap options. + + Signed-off-by: Rupjyoti Sarmah + Acked-by : Victor Gallardo + Signed-off-by: Stefan Roese + +commit fb508b8b39a52a4063d098f5a9b4355bc5b30c14 +Author: Matthias Fuchs +Date: Wed Mar 24 10:16:20 2010 +0100 + + at91: Get rid of some warnings when building for otc570 + + The soft-i2c code for AT91 defines I2C_SOFT_DECLARATIONS + for direct access by dereferencing a pio pointer. + The OTC570 platform uses the AT91 gpio API so it does not + need the pio variable. + + Signed-off-by: Matthias Fuchs + +commit acb13868936a28502782a16e1edaec378e494a29 +Author: Alessandro Rubini +Date: Sat Mar 13 17:44:08 2010 +0100 + + lcd: make 16bpp work + + Support for 16bpp was supposed to be in the code but was not working. + This makes it work and has been tested in the nhk8815 board. + + Signed-off-by: Alessandro Rubini + Acked-by: Andrea Gallo + Signed-off-by: Anatolij Gustschin + +commit 152dda3d94e97ede7af3f9560a59a659384d4585 +Author: Wolfgang Denk +Date: Mon Mar 22 23:25:00 2010 +0100 + + Prepare v2010.03-rc2 + + Update CHANGELOG + + Signed-off-by: Wolfgang Denk + commit d650da2dd4af99967aabc43cccbd8f160eb4cea6 Author: Matthias Kaehlcke Date: Tue Mar 9 22:13:33 2010 +0100 diff --git a/Makefile b/Makefile index 27e6e62a7..67e62d746 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ VERSION = 2010 PATCHLEVEL = 03 SUBLEVEL = -EXTRAVERSION = -rc2 +EXTRAVERSION = -rc3 ifneq "$(SUBLEVEL)" "" U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) else From 3a6dcb988eee3fd3cd9c5ef96855a8da729a290e Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Fri, 26 Mar 2010 09:46:38 +0100 Subject: [PATCH 045/164] cmd_i2c.c: declared local functions as static Declared all functions that were not called outside the file as static Signed-off-by: Frans Meulenbroeks --- common/cmd_i2c.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/common/cmd_i2c.c b/common/cmd_i2c.c index ee9577cb6..b00aafb4c 100644 --- a/common/cmd_i2c.c +++ b/common/cmd_i2c.c @@ -159,7 +159,7 @@ int i2c_set_bus_speed(unsigned int) * i2c read {i2c_chip} {devaddr}{.0, .1, .2} {len} {memaddr} */ -int do_i2c_read ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +static int do_i2c_read ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { u_char chip; uint devaddr, alen, length; @@ -211,7 +211,7 @@ int do_i2c_read ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) return 0; } -int do_i2c_md ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +static int do_i2c_md ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { u_char chip; uint addr, alen, length; @@ -317,7 +317,7 @@ int do_i2c_md ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) * Syntax: * i2c mw {i2c_chip} {addr}{.0, .1, .2} {data} [{count}] */ -int do_i2c_mw ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +static int do_i2c_mw ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { uchar chip; ulong addr; @@ -389,7 +389,7 @@ int do_i2c_mw ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) * Syntax: * i2c crc32 {i2c_chip} {addr}{.0, .1, .2} {count} */ -int do_i2c_crc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +static int do_i2c_crc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { uchar chip; ulong addr; @@ -592,7 +592,7 @@ mod_i2c_mem(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char *argv[]) * Syntax: * i2c probe {addr}{.0, .1, .2} */ -int do_i2c_probe (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +static int do_i2c_probe (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { int j; #if defined(CONFIG_SYS_I2C_NOPROBES) @@ -636,7 +636,7 @@ int do_i2c_probe (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) * {length} - Number of bytes to read * {delay} - A DECIMAL number and defaults to 1000 uSec */ -int do_i2c_loop(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +static int do_i2c_loop(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { u_char chip; ulong alen; @@ -756,7 +756,7 @@ static void decode_bits (u_char const b, char const *str[], int const do_once) * Syntax: * i2c sdram {i2c_chip} */ -int do_sdram (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) +static int do_sdram (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) { enum { unknown, EDO, SDRAM, DDR2 } type; @@ -1233,7 +1233,7 @@ int do_sdram (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) #endif #if defined(CONFIG_I2C_MUX) -int do_i2c_add_bus(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) +static int do_i2c_add_bus(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) { int ret=0; @@ -1264,7 +1264,7 @@ int do_i2c_add_bus(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) #endif /* CONFIG_I2C_MUX */ #if defined(CONFIG_I2C_MULTI_BUS) -int do_i2c_bus_num(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) +static int do_i2c_bus_num(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) { int bus_idx, ret=0; @@ -1282,7 +1282,7 @@ int do_i2c_bus_num(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) } #endif /* CONFIG_I2C_MULTI_BUS */ -int do_i2c_bus_speed(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) +static int do_i2c_bus_speed(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) { int speed, ret=0; @@ -1299,17 +1299,17 @@ int do_i2c_bus_speed(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) return ret; } -int do_i2c_mm(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) +static int do_i2c_mm(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) { return mod_i2c_mem (cmdtp, 1, flag, argc, argv); } -int do_i2c_nm(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) +static int do_i2c_nm(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) { return mod_i2c_mem (cmdtp, 0, flag, argc, argv); } -int do_i2c_reset(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) +static int do_i2c_reset(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) { i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE); return 0; @@ -1337,7 +1337,7 @@ static cmd_tbl_t cmd_i2c_sub[] = { U_BOOT_CMD_MKENT(speed, 1, 1, do_i2c_bus_speed, "", ""), }; -int do_i2c(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) +static int do_i2c(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) { cmd_tbl_t *c; From 4a8cf3382a6fea5cccc1e2ae61a4601bf26490c3 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Fri, 26 Mar 2010 09:46:39 +0100 Subject: [PATCH 046/164] cmd_i2c: moved mispositioned comment for i2c md Signed-off-by: Frans Meulenbroeks --- common/cmd_i2c.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common/cmd_i2c.c b/common/cmd_i2c.c index b00aafb4c..a7672cf76 100644 --- a/common/cmd_i2c.c +++ b/common/cmd_i2c.c @@ -148,10 +148,6 @@ int __def_i2c_set_bus_speed(unsigned int speed) int i2c_set_bus_speed(unsigned int) __attribute__((weak, alias("__def_i2c_set_bus_speed"))); -/* - * Syntax: - * i2c md {i2c_chip} {addr}{.0, .1, .2} {len} - */ #define DISP_LINE_LEN 16 /* @@ -211,6 +207,10 @@ static int do_i2c_read ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) return 0; } +/* + * Syntax: + * i2c md {i2c_chip} {addr}{.0, .1, .2} {len} + */ static int do_i2c_md ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { u_char chip; From a266fe955a55bb7a03a67f3c91033068f317b337 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Fri, 26 Mar 2010 09:46:40 +0100 Subject: [PATCH 047/164] cmd_i2c: moved a define to before the functions Signed-off-by: Frans Meulenbroeks --- common/cmd_i2c.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/cmd_i2c.c b/common/cmd_i2c.c index a7672cf76..bf7f6d352 100644 --- a/common/cmd_i2c.c +++ b/common/cmd_i2c.c @@ -130,6 +130,8 @@ DECLARE_GLOBAL_DATA_PTR; #endif +#define DISP_LINE_LEN 16 + /* TODO: Implement architecture-specific get/set functions */ unsigned int __def_i2c_get_bus_speed(void) { @@ -148,8 +150,6 @@ int __def_i2c_set_bus_speed(unsigned int speed) int i2c_set_bus_speed(unsigned int) __attribute__((weak, alias("__def_i2c_set_bus_speed"))); -#define DISP_LINE_LEN 16 - /* * Syntax: * i2c read {i2c_chip} {devaddr}{.0, .1, .2} {len} {memaddr} From 2c0dc990202c69a6231122ec2463c4e3076a16f3 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Fri, 26 Mar 2010 09:46:41 +0100 Subject: [PATCH 048/164] cmd_i2c: introduced get_alen helper function The code to parse alen appeared 6 times in the function. Factored this out in a small helper function Signed-off-by: Frans Meulenbroeks --- common/cmd_i2c.c | 119 +++++++++++++++++++---------------------------- 1 file changed, 47 insertions(+), 72 deletions(-) diff --git a/common/cmd_i2c.c b/common/cmd_i2c.c index bf7f6d352..e98b35c74 100644 --- a/common/cmd_i2c.c +++ b/common/cmd_i2c.c @@ -150,6 +150,29 @@ int __def_i2c_set_bus_speed(unsigned int speed) int i2c_set_bus_speed(unsigned int) __attribute__((weak, alias("__def_i2c_set_bus_speed"))); +/* + * get_alen: small parser helper function to get address length + * returns the address length,or 0 on error + */ +static uint get_alen(char *arg) +{ + int j; + int alen; + + alen = 1; + for (j = 0; j < 8; j++) { + if (arg[j] == '.') { + alen = arg[j+1] - '0'; + if (alen > 3) { + return 0; + } + break; + } else if (arg[j] == '\0') + break; + } + return alen; +} + /* * Syntax: * i2c read {i2c_chip} {devaddr}{.0, .1, .2} {len} {memaddr} @@ -160,7 +183,6 @@ static int do_i2c_read ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) u_char chip; uint devaddr, alen, length; u_char *memaddr; - int j; if (argc != 5) { cmd_usage(cmdtp); @@ -177,17 +199,10 @@ static int do_i2c_read ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) * 2 bytes long. Some day it might be 3 bytes long :-). */ devaddr = simple_strtoul(argv[2], NULL, 16); - alen = 1; - for (j = 0; j < 8; j++) { - if (argv[2][j] == '.') { - alen = argv[2][j+1] - '0'; - if (alen > 3) { - cmd_usage(cmdtp); - return 1; - } - break; - } else if (argv[2][j] == '\0') - break; + alen = get_alen(argv[2]); + if (alen == 0) { + cmd_usage(cmdtp); + return 1; } /* @@ -234,7 +249,6 @@ static int do_i2c_md ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) /* * New command specified. */ - alen = 1; /* * I2C chip address @@ -246,17 +260,10 @@ static int do_i2c_md ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) * 2 bytes long. Some day it might be 3 bytes long :-). */ addr = simple_strtoul(argv[2], NULL, 16); - alen = 1; - for (j = 0; j < 8; j++) { - if (argv[2][j] == '.') { - alen = argv[2][j+1] - '0'; - if (alen > 3) { - cmd_usage(cmdtp); - return 1; - } - break; - } else if (argv[2][j] == '\0') - break; + alen = get_alen(argv[2]); + if (alen == 0) { + cmd_usage(cmdtp); + return 1; } /* @@ -324,7 +331,6 @@ static int do_i2c_mw ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) uint alen; uchar byte; int count; - int j; if ((argc < 4) || (argc > 5)) { cmd_usage(cmdtp); @@ -340,17 +346,10 @@ static int do_i2c_mw ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) * Address is always specified. */ addr = simple_strtoul(argv[2], NULL, 16); - alen = 1; - for (j = 0; j < 8; j++) { - if (argv[2][j] == '.') { - alen = argv[2][j+1] - '0'; - if (alen > 3) { - cmd_usage(cmdtp); - return 1; - } - break; - } else if (argv[2][j] == '\0') - break; + alen = get_alen(argv[2]); + if (alen == 0) { + cmd_usage(cmdtp); + return 1; } /* @@ -398,7 +397,6 @@ static int do_i2c_crc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) uchar byte; ulong crc; ulong err; - int j; if (argc < 4) { cmd_usage(cmdtp); @@ -414,17 +412,10 @@ static int do_i2c_crc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) * Address is always specified. */ addr = simple_strtoul(argv[2], NULL, 16); - alen = 1; - for (j = 0; j < 8; j++) { - if (argv[2][j] == '.') { - alen = argv[2][j+1] - '0'; - if (alen > 3) { - cmd_usage(cmdtp); - return 1; - } - break; - } else if (argv[2][j] == '\0') - break; + alen = get_alen(argv[2]); + if (alen == 0) { + cmd_usage(cmdtp); + return 1; } /* @@ -469,7 +460,6 @@ mod_i2c_mem(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char *argv[]) ulong data; int size = 1; int nbytes; - int j; extern char console_buffer[]; if (argc != 3) { @@ -504,17 +494,10 @@ mod_i2c_mem(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char *argv[]) * Address is always specified. */ addr = simple_strtoul(argv[2], NULL, 16); - alen = 1; - for (j = 0; j < 8; j++) { - if (argv[2][j] == '.') { - alen = argv[2][j+1] - '0'; - if (alen > 3) { - cmd_usage(cmdtp); - return 1; - } - break; - } else if (argv[2][j] == '\0') - break; + alen = get_alen(argv[2]); + if (alen == 0) { + cmd_usage(cmdtp); + return 1; } } @@ -644,7 +627,6 @@ static int do_i2c_loop(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) uint length; u_char bytes[16]; int delay; - int j; if (argc < 3) { cmd_usage(cmdtp); @@ -660,17 +642,10 @@ static int do_i2c_loop(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) * Address is always specified. */ addr = simple_strtoul(argv[2], NULL, 16); - alen = 1; - for (j = 0; j < 8; j++) { - if (argv[2][j] == '.') { - alen = argv[2][j+1] - '0'; - if (alen > 3) { - cmd_usage(cmdtp); - return 1; - } - break; - } else if (argv[2][j] == '\0') - break; + alen = get_alen(argv[2]); + if (alen == 0) { + cmd_usage(cmdtp); + return 1; } /* From fd03ea89641d6f6ade6d1a8580c1bb9f52b8542c Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Fri, 26 Mar 2010 09:46:42 +0100 Subject: [PATCH 049/164] i2c: made unused function i2c_mux_add_device static and removed it from the .h file Signed-off-by: Frans Meulenbroeks --- common/cmd_i2c.c | 2 +- include/i2c.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/common/cmd_i2c.c b/common/cmd_i2c.c index e98b35c74..8b9c2c949 100644 --- a/common/cmd_i2c.c +++ b/common/cmd_i2c.c @@ -1357,7 +1357,7 @@ U_BOOT_CMD( ); #if defined(CONFIG_I2C_MUX) -int i2c_mux_add_device(I2C_MUX_DEVICE *dev) +static int i2c_mux_add_device(I2C_MUX_DEVICE *dev) { I2C_MUX_DEVICE *devtmp = i2c_mux_devices; diff --git a/include/i2c.h b/include/i2c.h index 31088b675..d82896425 100644 --- a/include/i2c.h +++ b/include/i2c.h @@ -127,8 +127,6 @@ typedef struct _mux_device { struct _mux_device *next; } I2C_MUX_DEVICE; -int i2c_mux_add_device(I2C_MUX_DEVICE *dev); - I2C_MUX_DEVICE *i2c_mux_search_device(int id); I2C_MUX_DEVICE *i2c_mux_ident_muxstring (uchar *buf); int i2x_mux_select_mux(int bus); From 24de2f4be00f81c58270d0df47296bf3a3601cef Mon Sep 17 00:00:00 2001 From: Heiko Schocher Date: Mon, 29 Mar 2010 13:15:48 +0200 Subject: [PATCH 050/164] bootm, linux: fix booting Multi-File Image with "kernel+ramdisk+fdt" Booting a "Multi-File Image" including a linux kernel, ramdisk and fdt, generated with mkimage -A ppc \ -O linux \ -T multi \ -C gzip \ -a 00000000 \ -e 00000000 \ -n "kernel-2.6+initrd+dtb" \ -d "vmlinux.bin.gz:ramdisk_image.gz:board.dtb" \ multi.bin actually fails, because ramdisk start and end addresses didn;t get initialized. This patch fixes this issue. Tested on the KUP4K board. Signed-off-by: Heiko Schocher --- common/cmd_bootm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 23ab0c4aa..995e37835 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -291,7 +291,8 @@ static int bootm_start(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) return 1; } - if ((images.os.type == IH_TYPE_KERNEL) && + if (((images.os.type == IH_TYPE_KERNEL) || + (images.os.type == IH_TYPE_MULTI)) && (images.os.os == IH_OS_LINUX)) { /* find ramdisk */ ret = boot_get_ramdisk (argc, argv, &images, IH_INITRD_ARCH, From 1a332da61df9c38b567359af114daeaaaefaead8 Mon Sep 17 00:00:00 2001 From: Stefan Roese Date: Mon, 29 Mar 2010 15:30:46 +0200 Subject: [PATCH 051/164] ppc4xx: Fix problem with I2C bus >= 1 initialization This patch fixes a problem introduced with patch eb5eb2b0 [ppc4xx: Cleanup PPC4xx I2C infrastructure]. We need to assign the I2C base address to the "i2c" pointer inside of the controller loop. Otherwise controller 0 is initialized multiple times instead of initializing each I2C controller sequentially. Tested on Katmai. Signed-off-by: Stefan Roese Acked-by: Heiko Schocher --- cpu/ppc4xx/i2c.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cpu/ppc4xx/i2c.c b/cpu/ppc4xx/i2c.c index 7976e75e0..9b86187a7 100644 --- a/cpu/ppc4xx/i2c.c +++ b/cpu/ppc4xx/i2c.c @@ -93,7 +93,7 @@ static void _i2c_bus_reset(void) void i2c_init(int speed, int slaveaddr) { - struct ppc4xx_i2c *i2c = (struct ppc4xx_i2c *)I2C_BASE_ADDR; + struct ppc4xx_i2c *i2c; int val, divisor; int bus; @@ -109,6 +109,9 @@ void i2c_init(int speed, int slaveaddr) for (bus = 0; bus < CONFIG_SYS_MAX_I2C_BUS; bus++) { I2C_SET_BUS(bus); + /* Set i2c pointer after calling I2C_SET_BUS() */ + i2c = (struct ppc4xx_i2c *)I2C_BASE_ADDR; + /* Handle possible failed I2C state */ /* FIXME: put this into i2c_init_board()? */ _i2c_bus_reset(); From 33f57bd553edf29dffef5a6c7d76e169c79a6049 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Fri, 26 Mar 2010 15:14:43 -0500 Subject: [PATCH 052/164] 85xx: Fix enabling of L1 cache parity on secondary cores Use the same code between primary and secondary cores to init the L1 cache. We were not enabling cache parity on the secondary cores. Also, reworked the L1 cache init code to match the e500mc L2 init code that first invalidates the cache and locks. Than enables the cache and makes sure its enabled before continuing. Signed-off-by: Kumar Gala --- cpu/mpc85xx/release.S | 38 +++++++++++++++++++++++++++++-------- cpu/mpc85xx/start.S | 38 ++++++++++++++++++++++++++++++++----- include/asm-ppc/processor.h | 2 ++ 3 files changed, 65 insertions(+), 13 deletions(-) diff --git a/cpu/mpc85xx/release.S b/cpu/mpc85xx/release.S index 00c4c547f..dab784efa 100644 --- a/cpu/mpc85xx/release.S +++ b/cpu/mpc85xx/release.S @@ -70,18 +70,40 @@ __secondary_start_page: mttbu r3 /* Enable/invalidate the I-Cache */ - mfspr r0,SPRN_L1CSR1 - ori r0,r0,(L1CSR1_ICFI|L1CSR1_ICE) - mtspr SPRN_L1CSR1,r0 + lis r2,(L1CSR1_ICFI|L1CSR1_ICLFR)@h + ori r2,r2,(L1CSR1_ICFI|L1CSR1_ICLFR)@l + mtspr SPRN_L1CSR1,r2 +1: + mfspr r3,SPRN_L1CSR1 + and. r1,r3,r2 + bne 1b + + lis r3,(L1CSR1_CPE|L1CSR1_ICE)@h + ori r3,r3,(L1CSR1_CPE|L1CSR1_ICE)@l + mtspr SPRN_L1CSR1,r3 isync +2: + mfspr r3,SPRN_L1CSR1 + andi. r1,r3,L1CSR1_ICE@l + beq 2b /* Enable/invalidate the D-Cache */ - mfspr r0,SPRN_L1CSR0 - ori r0,r0,(L1CSR0_DCFI|L1CSR0_DCE) - msync - isync - mtspr SPRN_L1CSR0,r0 + lis r2,(L1CSR0_DCFI|L1CSR0_DCLFR)@h + ori r2,r2,(L1CSR0_DCFI|L1CSR0_DCLFR)@l + mtspr SPRN_L1CSR0,r2 +1: + mfspr r3,SPRN_L1CSR0 + and. r1,r3,r2 + bne 1b + + lis r3,(L1CSR0_CPE|L1CSR0_DCE)@h + ori r3,r3,(L1CSR0_CPE|L1CSR0_DCE)@l + mtspr SPRN_L1CSR0,r3 isync +2: + mfspr r3,SPRN_L1CSR0 + andi. r1,r3,L1CSR0_DCE@l + beq 2b #define toreset(x) (x - __secondary_start_page + 0xfffff000) diff --git a/cpu/mpc85xx/start.S b/cpu/mpc85xx/start.S index 386fa8199..af18c1c8e 100644 --- a/cpu/mpc85xx/start.S +++ b/cpu/mpc85xx/start.S @@ -108,13 +108,41 @@ _start_e500: mtspr L1CSR2,r2 #endif - lis r2,L1CSR0_CPE@H /* enable parity */ - ori r2,r2,L1CSR0_DCE - mtspr L1CSR0,r2 /* enable L1 Dcache */ + /* Enable/invalidate the I-Cache */ + lis r2,(L1CSR1_ICFI|L1CSR1_ICLFR)@h + ori r2,r2,(L1CSR1_ICFI|L1CSR1_ICLFR)@l + mtspr SPRN_L1CSR1,r2 +1: + mfspr r3,SPRN_L1CSR1 + and. r1,r3,r2 + bne 1b + + lis r3,(L1CSR1_CPE|L1CSR1_ICE)@h + ori r3,r3,(L1CSR1_CPE|L1CSR1_ICE)@l + mtspr SPRN_L1CSR1,r3 isync - mtspr L1CSR1,r2 /* enable L1 Icache */ +2: + mfspr r3,SPRN_L1CSR1 + andi. r1,r3,L1CSR1_ICE@l + beq 2b + + /* Enable/invalidate the D-Cache */ + lis r2,(L1CSR0_DCFI|L1CSR0_DCLFR)@h + ori r2,r2,(L1CSR0_DCFI|L1CSR0_DCLFR)@l + mtspr SPRN_L1CSR0,r2 +1: + mfspr r3,SPRN_L1CSR0 + and. r1,r3,r2 + bne 1b + + lis r3,(L1CSR0_CPE|L1CSR0_DCE)@h + ori r3,r3,(L1CSR0_CPE|L1CSR0_DCE)@l + mtspr SPRN_L1CSR0,r3 isync - msync +2: + mfspr r3,SPRN_L1CSR0 + andi. r1,r3,L1CSR0_DCE@l + beq 2b /* Setup interrupt vectors */ lis r1,TEXT_BASE@h diff --git a/include/asm-ppc/processor.h b/include/asm-ppc/processor.h index c6da41163..9b3d616a6 100644 --- a/include/asm-ppc/processor.h +++ b/include/asm-ppc/processor.h @@ -485,10 +485,12 @@ #define SPRN_L2CFG0 0x207 /* L2 Cache Configuration Register 0 */ #define SPRN_L1CSR0 0x3f2 /* L1 Data Cache Control and Status Register 0 */ #define L1CSR0_CPE 0x00010000 /* Data Cache Parity Enable */ +#define L1CSR0_DCLFR 0x00000100 /* D-Cache Lock Flash Reset */ #define L1CSR0_DCFI 0x00000002 /* Data Cache Flash Invalidate */ #define L1CSR0_DCE 0x00000001 /* Data Cache Enable */ #define SPRN_L1CSR1 0x3f3 /* L1 Instruction Cache Control and Status Register 1 */ #define L1CSR1_CPE 0x00010000 /* Instruction Cache Parity Enable */ +#define L1CSR1_ICLFR 0x00000100 /* I-Cache Lock Flash Reset */ #define L1CSR1_ICFI 0x00000002 /* Instruction Cache Flash Invalidate */ #define L1CSR1_ICE 0x00000001 /* Instruction Cache Enable */ #define SPRN_L1CSR2 0x25e /* L1 Data Cache Control and Status Register 2 */ From 9ff32d8ccf0e23b5577c25610f001af8d761b4a2 Mon Sep 17 00:00:00 2001 From: Timur Tabi Date: Mon, 29 Mar 2010 12:51:07 -0500 Subject: [PATCH 053/164] mpc86xx: set the DDR BATs after calculating true DDR size After determining how much DDR is actually in the system, set DBAT0 and IBAT0 accordingly. This ensures that the CPU won't attempt to access (via speculation) addresses outside of actual memory. On 86xx systems, DBAT0 and IBAT0 (the BATs for DDR) are initialized to 2GB and kept that way. If the system has less than 2GB of memory (typical for an MPC8610 HPCD), the CPU may attempt to access this memory during speculation. The zlib code is notorious for generating such memory reads, and indeed on the MPC8610, uncompressing the Linux kernel causes a machine check (without this patch). Currently we are limited to power of two sized DDR since we only use a single bat. If a non-power of two size is used that is less than CONFIG_MAX_MEM_MAPPED u-boot will crash. Signed-off-by: Timur Tabi Signed-off-by: Kumar Gala --- board/freescale/mpc8610hpcd/mpc8610hpcd.c | 2 ++ board/freescale/mpc8641hpcn/mpc8641hpcn.c | 2 ++ cpu/mpc86xx/cpu.c | 36 ++++++++++++++++++++++- cpu/mpc86xx/cpu_init.c | 4 +++ include/asm-ppc/mmu.h | 6 +++- include/configs/MPC8610HPCD.h | 6 ++-- include/configs/MPC8641HPCN.h | 4 +-- include/mpc86xx.h | 2 ++ 8 files changed, 53 insertions(+), 9 deletions(-) diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd.c b/board/freescale/mpc8610hpcd/mpc8610hpcd.c index 784a2ed68..ab5f80045 100644 --- a/board/freescale/mpc8610hpcd/mpc8610hpcd.c +++ b/board/freescale/mpc8610hpcd/mpc8610hpcd.c @@ -127,6 +127,8 @@ initdram(int board_type) dram_size = fixed_sdram(); #endif + setup_ddr_bat(dram_size); + puts(" DDR: "); return dram_size; } diff --git a/board/freescale/mpc8641hpcn/mpc8641hpcn.c b/board/freescale/mpc8641hpcn/mpc8641hpcn.c index c521527d8..443c9fd8e 100644 --- a/board/freescale/mpc8641hpcn/mpc8641hpcn.c +++ b/board/freescale/mpc8641hpcn/mpc8641hpcn.c @@ -74,6 +74,8 @@ initdram(int board_type) dram_size = fixed_sdram(); #endif + setup_ddr_bat(dram_size); + puts(" DDR: "); return dram_size; } diff --git a/cpu/mpc86xx/cpu.c b/cpu/mpc86xx/cpu.c index f7e012db5..188757587 100644 --- a/cpu/mpc86xx/cpu.c +++ b/cpu/mpc86xx/cpu.c @@ -1,5 +1,5 @@ /* - * Copyright 2006,2009 Freescale Semiconductor, Inc. + * Copyright 2006,2009-2010 Freescale Semiconductor, Inc. * Jeff Brown * Srikanth Srinivasan (srikanth.srinivasan@freescale.com) * @@ -197,3 +197,37 @@ void mpc86xx_reginfo(void) printf("\tBR7\t0x%08X\tOR7\t0x%08X \n", in_be32(&lbc->br7), in_be32(&lbc->or7)); } + +/* + * Set the DDR BATs to reflect the actual size of DDR. + * + * dram_size is the actual size of DDR, in bytes + * + * Note: we assume that CONFIG_MAX_MEM_MAPPED is 2G or smaller as we only + * are using a single BAT to cover DDR. + * + * If this is not true, (e.g. CONFIG_MAX_MEM_MAPPED is 2GB but HID0_XBSEN + * is not defined) then we might have a situation where U-Boot will attempt + * to relocated itself outside of the region mapped by DBAT0. + * This will cause a machine check. + * + * Currently we are limited to power of two sized DDR since we only use a + * single bat. If a non-power of two size is used that is less than + * CONFIG_MAX_MEM_MAPPED u-boot will crash. + * + */ +void setup_ddr_bat(phys_addr_t dram_size) +{ + unsigned long batu, bl; + + bl = TO_BATU_BL(min(dram_size, CONFIG_MAX_MEM_MAPPED)); + + if (BATU_SIZE(bl) != dram_size) { + u64 sz = (u64)dram_size - BATU_SIZE(bl); + print_size(sz, " left unmapped\n"); + } + + batu = bl | BATU_VS | BATU_VP; + write_bat(DBAT0, batu, CONFIG_SYS_DBAT0L); + write_bat(IBAT0, batu, CONFIG_SYS_IBAT0L); +} diff --git a/cpu/mpc86xx/cpu_init.c b/cpu/mpc86xx/cpu_init.c index 5a78a9cdc..b4f047d85 100644 --- a/cpu/mpc86xx/cpu_init.c +++ b/cpu/mpc86xx/cpu_init.c @@ -138,8 +138,12 @@ int cpu_init_r(void) /* Set up BAT registers */ void setup_bats(void) { +#if defined(CONFIG_SYS_DBAT0U) && defined(CONFIG_SYS_DBAT0L) write_bat(DBAT0, CONFIG_SYS_DBAT0U, CONFIG_SYS_DBAT0L); +#endif +#if defined(CONFIG_SYS_IBAT0U) && defined(CONFIG_SYS_IBAT0L) write_bat(IBAT0, CONFIG_SYS_IBAT0U, CONFIG_SYS_IBAT0L); +#endif write_bat(DBAT1, CONFIG_SYS_DBAT1U, CONFIG_SYS_DBAT1L); write_bat(IBAT1, CONFIG_SYS_IBAT1U, CONFIG_SYS_IBAT1L); write_bat(DBAT2, CONFIG_SYS_DBAT2U, CONFIG_SYS_DBAT2L); diff --git a/include/asm-ppc/mmu.h b/include/asm-ppc/mmu.h index fd1024947..ce7f08100 100644 --- a/include/asm-ppc/mmu.h +++ b/include/asm-ppc/mmu.h @@ -213,7 +213,11 @@ extern void print_bats(void); #define BATL_PADDR(x) ((phys_addr_t)((x & 0xfffe0000) \ | ((x & 0x0e00ULL) << 24) \ | ((x & 0x04ULL) << 30))) -#define BATU_SIZE(x) (1UL << (fls((x & BATU_BL_MAX) >> 2) + 17)) +#define BATU_SIZE(x) (1ULL << (fls((x & BATU_BL_MAX) >> 2) + 17)) + +/* bytes into BATU_BL */ +#define TO_BATU_BL(x) \ + (u32)((((1ull << __ilog2_u64((u64)x)) / (128 * 1024)) - 1) * 4) /* Used to set up SDR1 register */ #define HASH_TABLE_SIZE_64K 0x00010000 diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index 1d2d65923..fed441eb3 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -341,10 +341,8 @@ * BAT0 2G Cacheable, non-guarded * 0x0000_0000 2G DDR */ -#define CONFIG_SYS_DBAT0L (BATL_PP_RW | BATL_MEMCOHERENCE) -#define CONFIG_SYS_DBAT0U (BATU_BL_2G | BATU_VS | BATU_VP) -#define CONFIG_SYS_IBAT0L (BATL_PP_RW | BATL_MEMCOHERENCE ) -#define CONFIG_SYS_IBAT0U CONFIG_SYS_DBAT0U +#define CONFIG_SYS_DBAT0L (BATL_PP_RW) +#define CONFIG_SYS_IBAT0L (BATL_PP_RW) /* * BAT1 1G Cache-inhibited, guarded diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h index 12a8f6039..94e4d243e 100644 --- a/include/configs/MPC8641HPCN.h +++ b/include/configs/MPC8641HPCN.h @@ -482,9 +482,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); * BAT0 DDR */ #define CONFIG_SYS_DBAT0L (BATL_PP_RW | BATL_MEMCOHERENCE) -#define CONFIG_SYS_DBAT0U (BATU_BL_2G | BATU_VS | BATU_VP) -#define CONFIG_SYS_IBAT0L (BATL_PP_RW | BATL_MEMCOHERENCE ) -#define CONFIG_SYS_IBAT0U CONFIG_SYS_DBAT0U +#define CONFIG_SYS_IBAT0L (BATL_PP_RW | BATL_MEMCOHERENCE) /* * BAT1 LBC (PIXIS/CF) diff --git a/include/mpc86xx.h b/include/mpc86xx.h index c6f30f9fd..eb85d60ca 100644 --- a/include/mpc86xx.h +++ b/include/mpc86xx.h @@ -83,5 +83,7 @@ static __inline__ unsigned long get_l2cr (void) return l2cr_val; } +void setup_ddr_bat(phys_addr_t dram_size); + #endif /* _ASMLANGUAGE */ #endif /* __MPC86xx_H__ */ From 2d2018f3db5ed834bc1ee208a2c6212fdf00bca1 Mon Sep 17 00:00:00 2001 From: Heiko Schocher Date: Wed, 24 Mar 2010 13:22:50 +0100 Subject: [PATCH 054/164] jffs2, suen3: Fix compiler warning $ ./MAKEALL suen3 jffs2_1pass.c: In function 'get_fl_mem': jffs2_1pass.c:399: warning: unused variable 'id' jffs2_1pass.c: In function 'get_node_mem': jffs2_1pass.c:423: warning: unused variable 'id' Signed-off-by: Heiko Schocher Tested-by: Tom --- fs/jffs2/jffs2_1pass.c | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c index 93651f53e..c4f744522 100644 --- a/fs/jffs2/jffs2_1pass.c +++ b/fs/jffs2/jffs2_1pass.c @@ -398,23 +398,26 @@ static inline void *get_fl_mem(u32 off, u32 size, void *ext_buf) { struct mtdids *id = current_part->dev->id; + switch(id->type) { #if defined(CONFIG_CMD_FLASH) - if (id->type == MTD_DEV_TYPE_NOR) { + case MTD_DEV_TYPE_NOR: return get_fl_mem_nor(off, size, ext_buf); - } + break; #endif - #if defined(CONFIG_JFFS2_NAND) && defined(CONFIG_CMD_NAND) - if (id->type == MTD_DEV_TYPE_NAND) + case MTD_DEV_TYPE_NAND: return get_fl_mem_nand(off, size, ext_buf); + break; #endif - #if defined(CONFIG_CMD_ONENAND) - if (id->type == MTD_DEV_TYPE_ONENAND) + case MTD_DEV_TYPE_ONENAND: return get_fl_mem_onenand(off, size, ext_buf); + break; #endif - - printf("get_fl_mem: unknown device type, using raw offset!\n"); + default: + printf("get_fl_mem: unknown device type, " \ + "using raw offset!\n"); + } return (void*)off; } @@ -422,23 +425,27 @@ static inline void *get_node_mem(u32 off, void *ext_buf) { struct mtdids *id = current_part->dev->id; + switch(id->type) { #if defined(CONFIG_CMD_FLASH) - if (id->type == MTD_DEV_TYPE_NOR) + case MTD_DEV_TYPE_NOR: return get_node_mem_nor(off, ext_buf); + break; #endif - #if defined(CONFIG_JFFS2_NAND) && \ defined(CONFIG_CMD_NAND) - if (id->type == MTD_DEV_TYPE_NAND) + case MTD_DEV_TYPE_NAND: return get_node_mem_nand(off, ext_buf); + break; #endif - #if defined(CONFIG_CMD_ONENAND) - if (id->type == MTD_DEV_TYPE_ONENAND) + case MTD_DEV_TYPE_ONENAND: return get_node_mem_onenand(off, ext_buf); + break; #endif - - printf("get_node_mem: unknown device type, using raw offset!\n"); + default: + printf("get_fl_mem: unknown device type, " \ + "using raw offset!\n"); + } return (void*)off; } From d5a64237d58ded31c2eed455c7a346e1c85f5565 Mon Sep 17 00:00:00 2001 From: Felix Radensky Date: Tue, 30 Mar 2010 15:02:13 +0300 Subject: [PATCH 055/164] doc: Fix ramdisk examples in doc/uImage.FIT/multi.its The ramdisk sections in doc/uImage.FIT/multi.its lack load address and entry point properties. Using examples from this file will result in unbootable image, u-boot will issue the following error messages: Can't get ramdisk subimage load address! Ramdisk image is corrupt or invalid This patch adds missing properties to ramdisk sections. Signed-off-by: Felix Radensky --- doc/uImage.FIT/multi.its | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/uImage.FIT/multi.its b/doc/uImage.FIT/multi.its index a120da038..881b74952 100644 --- a/doc/uImage.FIT/multi.its +++ b/doc/uImage.FIT/multi.its @@ -61,6 +61,8 @@ arch = "ppc"; os = "linux"; compression = "gzip"; + load = <00000000>; + entry = <00000000>; hash@1 { algo = "sha1"; }; @@ -73,6 +75,8 @@ arch = "ppc"; os = "linux"; compression = "gzip"; + load = <00000000>; + entry = <00000000>; hash@1 { algo = "crc32"; }; From b78b48c6a0c34b2991e31fc4548aaf773d34f2b3 Mon Sep 17 00:00:00 2001 From: Heiko Schocher Date: Wed, 31 Mar 2010 08:34:46 +0200 Subject: [PATCH 056/164] net, fec_mxc: only setup the device enetaddr with eeprom value Only fill the device enetaddr with the contents of the eeprom, do not program it in MAC address registers Signed-off-by: Heiko Schocher Acked-by: Ben Warren --- drivers/net/fec_mxc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index 5af9cdba2..8c4ade5ab 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -752,7 +752,6 @@ static int fec_probe(bd_t *bd) if (fec_get_hwaddr(edev, ethaddr) == 0) { printf("got MAC address from EEPROM: %pM\n", ethaddr); memcpy(edev->enetaddr, ethaddr, 6); - fec_set_hwaddr(edev); } return 0; From 8e64d6efd8d778a5f83d8bff9cd273a86dcc182f Mon Sep 17 00:00:00 2001 From: Heiko Schocher Date: Wed, 31 Mar 2010 08:34:51 +0200 Subject: [PATCH 057/164] net, doc: How to setup MAC address correctly As this seems unclear, document how the flow of setting up the MAC address is correct. Signed-off-by: Heiko Schocher Text changed slightly, adding input from Mike Frysinger. Signed-off-by: Wolfgang Denk --- doc/README.enetaddr | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/doc/README.enetaddr b/doc/README.enetaddr index 1d75aa387..94d800a02 100644 --- a/doc/README.enetaddr +++ b/doc/README.enetaddr @@ -28,6 +28,17 @@ Here are the places where MAC addresses might be stored: purpose of passing this information to an OS kernel we are about to boot +Correct flow of setting up the MAC address (summarized): + +1. Read from hardware in initialize() function +2. Read from environment in net/eth.c after initialize() +3. Give priority to the value in the environment if a conflict +4. Program hardware in the device's init() function. + +If somebody wants to subvert the design philosophy, this can be done +in the board-specific board_eth_init() function by calling eth_init() +after all the NICs have been registered. + ------- Usage ------- From ca6e1c136ddb720c3bb2cc043b99f7f06bc46c55 Mon Sep 17 00:00:00 2001 From: Wolfgang Denk Date: Wed, 31 Mar 2010 23:54:39 +0200 Subject: [PATCH 058/164] Prepare v2010.03 Signed-off-by: Wolfgang Denk --- CHANGELOG | 152 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ Makefile | 2 +- 2 files changed, 153 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index cc1113b91..d4cd8f121 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,155 @@ +commit 8e64d6efd8d778a5f83d8bff9cd273a86dcc182f +Author: Heiko Schocher +Date: Wed Mar 31 08:34:51 2010 +0200 + + net, doc: How to setup MAC address correctly + + As this seems unclear, document how the flow of setting up + the MAC address is correct. + + Signed-off-by: Heiko Schocher + + Text changed slightly, adding input from Mike Frysinger. + + Signed-off-by: Wolfgang Denk + +commit b78b48c6a0c34b2991e31fc4548aaf773d34f2b3 +Author: Heiko Schocher +Date: Wed Mar 31 08:34:46 2010 +0200 + + net, fec_mxc: only setup the device enetaddr with eeprom value + + Only fill the device enetaddr with the contents of the eeprom, + do not program it in MAC address registers + + Signed-off-by: Heiko Schocher + Acked-by: Ben Warren + +commit d5a64237d58ded31c2eed455c7a346e1c85f5565 +Author: Felix Radensky +Date: Tue Mar 30 15:02:13 2010 +0300 + + doc: Fix ramdisk examples in doc/uImage.FIT/multi.its + + The ramdisk sections in doc/uImage.FIT/multi.its lack + load address and entry point properties. Using examples + from this file will result in unbootable image, u-boot + will issue the following error messages: + + Can't get ramdisk subimage load address! + Ramdisk image is corrupt or invalid + + This patch adds missing properties to ramdisk sections. + + Signed-off-by: Felix Radensky + +commit 2d2018f3db5ed834bc1ee208a2c6212fdf00bca1 +Author: Heiko Schocher +Date: Wed Mar 24 13:22:50 2010 +0100 + + jffs2, suen3: Fix compiler warning + + $ ./MAKEALL suen3 + jffs2_1pass.c: In function 'get_fl_mem': + jffs2_1pass.c:399: warning: unused variable 'id' + jffs2_1pass.c: In function 'get_node_mem': + jffs2_1pass.c:423: warning: unused variable 'id' + + Signed-off-by: Heiko Schocher + Tested-by: Tom + +commit 9ff32d8ccf0e23b5577c25610f001af8d761b4a2 +Author: Timur Tabi +Date: Mon Mar 29 12:51:07 2010 -0500 + + mpc86xx: set the DDR BATs after calculating true DDR size + + After determining how much DDR is actually in the system, set DBAT0 and + IBAT0 accordingly. This ensures that the CPU won't attempt to access + (via speculation) addresses outside of actual memory. + + On 86xx systems, DBAT0 and IBAT0 (the BATs for DDR) are initialized to 2GB + and kept that way. If the system has less than 2GB of memory (typical for + an MPC8610 HPCD), the CPU may attempt to access this memory during + speculation. The zlib code is notorious for generating such memory reads, + and indeed on the MPC8610, uncompressing the Linux kernel causes a machine + check (without this patch). + + Currently we are limited to power of two sized DDR since we only use a + single bat. If a non-power of two size is used that is less than + CONFIG_MAX_MEM_MAPPED u-boot will crash. + + Signed-off-by: Timur Tabi + Signed-off-by: Kumar Gala + +commit 33f57bd553edf29dffef5a6c7d76e169c79a6049 +Author: Kumar Gala +Date: Fri Mar 26 15:14:43 2010 -0500 + + 85xx: Fix enabling of L1 cache parity on secondary cores + + Use the same code between primary and secondary cores to init the + L1 cache. We were not enabling cache parity on the secondary cores. + + Also, reworked the L1 cache init code to match the e500mc L2 init code + that first invalidates the cache and locks. Than enables the cache and + makes sure its enabled before continuing. + + Signed-off-by: Kumar Gala + +commit 1a332da61df9c38b567359af114daeaaaefaead8 +Author: Stefan Roese +Date: Mon Mar 29 15:30:46 2010 +0200 + + ppc4xx: Fix problem with I2C bus >= 1 initialization + + This patch fixes a problem introduced with patch eb5eb2b0 + [ppc4xx: Cleanup PPC4xx I2C infrastructure]. We need to assign the I2C + base address to the "i2c" pointer inside of the controller loop. + Otherwise controller 0 is initialized multiple times instead of + initializing each I2C controller sequentially. + + Tested on Katmai. + + Signed-off-by: Stefan Roese + Acked-by: Heiko Schocher + +commit 24de2f4be00f81c58270d0df47296bf3a3601cef +Author: Heiko Schocher +Date: Mon Mar 29 13:15:48 2010 +0200 + + bootm, linux: fix booting Multi-File Image with "kernel+ramdisk+fdt" + + Booting a "Multi-File Image" including a linux kernel, ramdisk and + fdt, generated with + + mkimage -A ppc \ + -O linux \ + -T multi \ + -C gzip \ + -a 00000000 \ + -e 00000000 \ + -n "kernel-2.6+initrd+dtb" \ + -d "vmlinux.bin.gz:ramdisk_image.gz:board.dtb" \ + multi.bin + + actually fails, because ramdisk start and end addresses + didn;t get initialized. This patch fixes this issue. + + Tested on the KUP4K board. + + Signed-off-by: Heiko Schocher + +commit 2883cc2d48e99fd1873ef8af03fee7966611b735 +Author: Wolfgang Denk +Date: Sun Mar 28 00:25:14 2010 +0100 + + Prepare 2010.03-rc3 + + Update CHANGELOG + + Signed-off-by: Wolfgang Denk + commit 060f28532b09dd3d2c78423bdd809ac768a27629 Author: Wolfgang Denk Date: Thu Mar 25 14:07:23 2010 +0100 diff --git a/Makefile b/Makefile index 67e62d746..e141cb2af 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ VERSION = 2010 PATCHLEVEL = 03 SUBLEVEL = -EXTRAVERSION = -rc3 +EXTRAVERSION = ifneq "$(SUBLEVEL)" "" U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) else From c9d4f46b5d639a45747d5eaabd31d35856cb918f Mon Sep 17 00:00:00 2001 From: Scott McNutt Date: Fri, 19 Mar 2010 19:03:28 -0400 Subject: [PATCH 059/164] nios2: Move serial drivers to individual files in drivers/serial The standard Altera UART & JTAG UART as well as the OpenCores YANU driver are now in individual files in drivers/serial rather than a single file uner cpu/nios2. Signed-off-by: Scott McNutt --- cpu/nios2/Makefile | 2 +- drivers/serial/Makefile | 3 + drivers/serial/altera_jtag_uart.c | 70 ++++++++++ drivers/serial/altera_uart.c | 94 ++++++++++++++ .../serial/opencores_yanu.c | 121 ------------------ include/configs/EP1C20.h | 3 +- include/configs/EP1S10.h | 3 +- include/configs/EP1S40.h | 3 +- include/configs/PCI5441.h | 3 +- include/configs/PK1C20.h | 3 +- 10 files changed, 178 insertions(+), 127 deletions(-) create mode 100644 drivers/serial/altera_jtag_uart.c create mode 100644 drivers/serial/altera_uart.c rename cpu/nios2/serial.c => drivers/serial/opencores_yanu.c (64%) diff --git a/cpu/nios2/Makefile b/cpu/nios2/Makefile index 75f30b43a..3dfaa833c 100644 --- a/cpu/nios2/Makefile +++ b/cpu/nios2/Makefile @@ -27,7 +27,7 @@ LIB = $(obj)lib$(CPU).a START = start.o SOBJS = exceptions.o -COBJS = cpu.o interrupts.o serial.o sysid.o traps.o epcs.o +COBJS = cpu.o interrupts.o sysid.o traps.o epcs.o SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile index 3c77a7c6c..d2b4820b6 100644 --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile @@ -25,11 +25,14 @@ include $(TOPDIR)/config.mk LIB := $(obj)libserial.a +COBJS-$(CONFIG_ALTERA_UART) += altera_uart.o +COBJS-$(CONFIG_ALTERA_JTAG_UART) += altera_jtag_uart.o COBJS-$(CONFIG_ARM_DCC) += arm_dcc.o COBJS-$(CONFIG_AT91RM9200_USART) += at91rm9200_usart.o COBJS-$(CONFIG_ATMEL_USART) += atmel_usart.o COBJS-$(CONFIG_MCFUART) += mcfuart.o COBJS-$(CONFIG_NS9750_UART) += ns9750_serial.o +COBJS-$(CONFIG_OPENCORES_YANU) += opencores_yanu.o COBJS-$(CONFIG_SYS_NS16550) += ns16550.o COBJS-$(CONFIG_DRIVER_S3C4510_UART) += s3c4510b_uart.o COBJS-$(CONFIG_S3C64XX) += s3c64xx.o diff --git a/drivers/serial/altera_jtag_uart.c b/drivers/serial/altera_jtag_uart.c new file mode 100644 index 000000000..9eccaa0c2 --- /dev/null +++ b/drivers/serial/altera_jtag_uart.c @@ -0,0 +1,70 @@ +/* + * (C) Copyright 2004, Psyent Corporation + * Scott McNutt + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#include +#include +#include +#include + +DECLARE_GLOBAL_DATA_PTR; + +/*------------------------------------------------------------------ + * JTAG acts as the serial port + *-----------------------------------------------------------------*/ +static nios_jtag_t *jtag = (nios_jtag_t *)CONFIG_SYS_NIOS_CONSOLE; + +void serial_setbrg( void ){ return; } +int serial_init( void ) { return(0);} + +void serial_putc (char c) +{ + while (NIOS_JTAG_WSPACE ( readl (&jtag->control)) == 0) + WATCHDOG_RESET (); + writel (&jtag->data, (unsigned char)c); +} + +void serial_puts (const char *s) +{ + while (*s != 0) + serial_putc (*s++); +} + +int serial_tstc (void) +{ + return ( readl (&jtag->control) & NIOS_JTAG_RRDY); +} + +int serial_getc (void) +{ + int c; + unsigned val; + + while (1) { + WATCHDOG_RESET (); + val = readl (&jtag->data); + if (val & NIOS_JTAG_RVALID) + break; + } + c = val & 0x0ff; + return (c); +} diff --git a/drivers/serial/altera_uart.c b/drivers/serial/altera_uart.c new file mode 100644 index 000000000..995e37468 --- /dev/null +++ b/drivers/serial/altera_uart.c @@ -0,0 +1,94 @@ +/* + * (C) Copyright 2004, Psyent Corporation + * Scott McNutt + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + + +#include +#include +#include +#include + +DECLARE_GLOBAL_DATA_PTR; + +/*------------------------------------------------------------------ + * UART the serial port + *-----------------------------------------------------------------*/ + +static nios_uart_t *uart = (nios_uart_t *) CONFIG_SYS_NIOS_CONSOLE; + +#if defined(CONFIG_SYS_NIOS_FIXEDBAUD) + +/* Everything's already setup for fixed-baud PTF + * assignment + */ +void serial_setbrg (void){ return; } +int serial_init (void) { return (0);} + +#else + +void serial_setbrg (void) +{ + unsigned div; + + div = (CONFIG_SYS_CLK_FREQ/gd->baudrate)-1; + writel (&uart->divisor,div); + return; +} + +int serial_init (void) +{ + serial_setbrg (); + return (0); +} + +#endif /* CONFIG_SYS_NIOS_FIXEDBAUD */ + +/*----------------------------------------------------------------------- + * UART CONSOLE + *---------------------------------------------------------------------*/ +void serial_putc (char c) +{ + if (c == '\n') + serial_putc ('\r'); + while ((readl (&uart->status) & NIOS_UART_TRDY) == 0) + WATCHDOG_RESET (); + writel (&uart->txdata,(unsigned char)c); +} + +void serial_puts (const char *s) +{ + while (*s != 0) { + serial_putc (*s++); + } +} + +int serial_tstc (void) +{ + return (readl (&uart->status) & NIOS_UART_RRDY); +} + +int serial_getc (void) +{ + while (serial_tstc () == 0) + WATCHDOG_RESET (); + return (readl (&uart->rxdata) & 0x00ff ); +} diff --git a/cpu/nios2/serial.c b/drivers/serial/opencores_yanu.c similarity index 64% rename from cpu/nios2/serial.c rename to drivers/serial/opencores_yanu.c index 6c835af4b..dacda5341 100644 --- a/cpu/nios2/serial.c +++ b/drivers/serial/opencores_yanu.c @@ -1,8 +1,4 @@ /* - * (C) Copyright 2004, Psyent Corporation - * Scott McNutt - * - * YANU Support: * Copyright 2010, Renato Andreola * * See file CREDITS for list of people who contributed to this @@ -24,61 +20,13 @@ * MA 02111-1307 USA */ - #include #include #include -#include #include DECLARE_GLOBAL_DATA_PTR; -/*------------------------------------------------------------------ - * JTAG acts as the serial port - *-----------------------------------------------------------------*/ -#if defined(CONFIG_CONSOLE_JTAG) - -static nios_jtag_t *jtag = (nios_jtag_t *)CONFIG_SYS_NIOS_CONSOLE; - -void serial_setbrg( void ){ return; } -int serial_init( void ) { return(0);} - -void serial_putc (char c) -{ - unsigned val; - - while (NIOS_JTAG_WSPACE ( readl (&jtag->control)) == 0) - WATCHDOG_RESET (); - writel (&jtag->data, (unsigned char)c); -} - -void serial_puts (const char *s) -{ - while (*s != 0) - serial_putc (*s++); -} - -int serial_tstc (void) -{ - return ( readl (&jtag->control) & NIOS_JTAG_RRDY); -} - -int serial_getc (void) -{ - int c; - unsigned val; - - while (1) { - WATCHDOG_RESET (); - val = readl (&jtag->data); - if (val & NIOS_JTAG_RVALID) - break; - } - c = val & 0x0ff; - return (c); -} - -#elif defined(CONFIG_CONSOLE_YANU) /*-----------------------------------------------------------------*/ /* YANU Imagos serial port */ /*-----------------------------------------------------------------*/ @@ -238,72 +186,3 @@ int serial_getc (void) return(readl(&uart->data) & YANU_DATA_CHAR_MASK); } - -#else /*CONFIG_CONSOLE_YANU*/ - -/*------------------------------------------------------------------ - * UART the serial port - *-----------------------------------------------------------------*/ - -static nios_uart_t *uart = (nios_uart_t *) CONFIG_SYS_NIOS_CONSOLE; - -#if defined(CONFIG_SYS_NIOS_FIXEDBAUD) - -/* Everything's already setup for fixed-baud PTF - * assignment - */ -void serial_setbrg (void){ return; } -int serial_init (void) { return (0);} - -#else - -void serial_setbrg (void) -{ - unsigned div; - - div = (CONFIG_SYS_CLK_FREQ/gd->baudrate)-1; - writel (&uart->divisor,div); - return; -} - -int serial_init (void) -{ - serial_setbrg (); - return (0); -} - -#endif /* CONFIG_SYS_NIOS_FIXEDBAUD */ - - -/*----------------------------------------------------------------------- - * UART CONSOLE - *---------------------------------------------------------------------*/ -void serial_putc (char c) -{ - if (c == '\n') - serial_putc ('\r'); - while ((readl (&uart->status) & NIOS_UART_TRDY) == 0) - WATCHDOG_RESET (); - writel (&uart->txdata,(unsigned char)c); -} - -void serial_puts (const char *s) -{ - while (*s != 0) { - serial_putc (*s++); - } -} - -int serial_tstc (void) -{ - return (readl (&uart->status) & NIOS_UART_RRDY); -} - -int serial_getc (void) -{ - while (serial_tstc () == 0) - WATCHDOG_RESET (); - return (readl (&uart->rxdata) & 0x00ff ); -} - -#endif /* CONFIG_JTAG_CONSOLE */ diff --git a/include/configs/EP1C20.h b/include/configs/EP1C20.h index 61d8e20f9..dc82e54e8 100644 --- a/include/configs/EP1C20.h +++ b/include/configs/EP1C20.h @@ -94,7 +94,8 @@ /*------------------------------------------------------------------------ * CONSOLE *----------------------------------------------------------------------*/ -#if defined(CONFIG_CONSOLE_JTAG) +#define CONFIG_ALTERA_UART 1 /* Use altera uart */ +#if defined(CONFIG_ALTERA_JTAG_UART) #define CONFIG_SYS_NIOS_CONSOLE 0x021208b0 /* JTAG UART base addr */ #else #define CONFIG_SYS_NIOS_CONSOLE 0x02120840 /* UART base addr */ diff --git a/include/configs/EP1S10.h b/include/configs/EP1S10.h index 41e64e6d1..498f26df1 100644 --- a/include/configs/EP1S10.h +++ b/include/configs/EP1S10.h @@ -92,7 +92,8 @@ /*------------------------------------------------------------------------ * CONSOLE *----------------------------------------------------------------------*/ -#if defined(CONFIG_CONSOLE_JTAG) +#define CONFIG_ALTERA_UART 1 /* Use altera uart */ +#if defined(CONFIG_ALTERA_JTAG_UART) #define CONFIG_SYS_NIOS_CONSOLE 0x021208b0 /* JTAG UART base addr */ #else #define CONFIG_SYS_NIOS_CONSOLE 0x02120840 /* UART base addr */ diff --git a/include/configs/EP1S40.h b/include/configs/EP1S40.h index 5b332e40e..4ad65d84a 100644 --- a/include/configs/EP1S40.h +++ b/include/configs/EP1S40.h @@ -92,7 +92,8 @@ /*------------------------------------------------------------------------ * CONSOLE *----------------------------------------------------------------------*/ -#if defined(CONFIG_CONSOLE_JTAG) +#define CONFIG_ALTERA_UART 1 /* Use altera uart */ +#if defined(CONFIG_ALTERA_JTAG_UART) #define CONFIG_SYS_NIOS_CONSOLE 0x021208b0 /* JTAG UART base addr */ #else #define CONFIG_SYS_NIOS_CONSOLE 0x02120840 /* UART base addr */ diff --git a/include/configs/PCI5441.h b/include/configs/PCI5441.h index 831a60d9a..d06b7f827 100644 --- a/include/configs/PCI5441.h +++ b/include/configs/PCI5441.h @@ -92,7 +92,8 @@ /*------------------------------------------------------------------------ * CONSOLE *----------------------------------------------------------------------*/ -#if defined(CONFIG_CONSOLE_JTAG) +#define CONFIG_ALTERA_UART 1 /* Use altera uart */ +#if defined(CONFIG_ALTERA_JTAG_UART) #define CONFIG_SYS_NIOS_CONSOLE 0x00920820 /* JTAG UART base addr */ #else #define CONFIG_SYS_NIOS_CONSOLE 0x009208a0 /* UART base addr */ diff --git a/include/configs/PK1C20.h b/include/configs/PK1C20.h index cf6f7a9e8..165dde043 100644 --- a/include/configs/PK1C20.h +++ b/include/configs/PK1C20.h @@ -94,7 +94,8 @@ /*------------------------------------------------------------------------ * CONSOLE *----------------------------------------------------------------------*/ -#if defined(CONFIG_CONSOLE_JTAG) +#define CONFIG_ALTERA_UART 1 /* Use altera uart */ +#if defined(CONFIG_ALTERA_JTAG_UART) #define CONFIG_SYS_NIOS_CONSOLE 0x021208b0 /* JTAG UART base addr */ #else #define CONFIG_SYS_NIOS_CONSOLE 0x02120840 /* UART base addr */ From 54d809e7553939629e8941ab9eef1f762463a2b3 Mon Sep 17 00:00:00 2001 From: Thomas Chou Date: Sat, 20 Mar 2010 07:05:44 +0800 Subject: [PATCH 060/164] nios2: add asm-nios2/errno.h Just pull in asm-generic. Signed-off-by: Thomas Chou Signed-off-by: Scott McNutt --- include/asm-nios2/errno.h | 1 + 1 file changed, 1 insertion(+) create mode 100644 include/asm-nios2/errno.h diff --git a/include/asm-nios2/errno.h b/include/asm-nios2/errno.h new file mode 100644 index 000000000..4c82b503d --- /dev/null +++ b/include/asm-nios2/errno.h @@ -0,0 +1 @@ +#include From d8b73dffa9866d6de3c05c8a2d07ecd4bc0d5d7e Mon Sep 17 00:00:00 2001 From: Thomas Chou Date: Sat, 20 Mar 2010 07:05:45 +0800 Subject: [PATCH 061/164] nios2: add local_irq_enable/disable to asm-nios2/system.h Copy from linux header. This is needed for generic bitops. Signed-off-by: Thomas Chou Signed-off-by: Scott McNutt --- include/asm-nios2/system.h | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/include/asm-nios2/system.h b/include/asm-nios2/system.h index ec84f5935..bb03ca531 100644 --- a/include/asm-nios2/system.h +++ b/include/asm-nios2/system.h @@ -23,4 +23,37 @@ #ifndef __ASM_NIOS2_SYSTEM_H_ #define __ASM_NIOS2_SYSTEM_H_ +#define local_irq_enable() __asm__ __volatile__ ( \ + "rdctl r8, status\n" \ + "ori r8, r8, 1\n" \ + "wrctl status, r8\n" \ + : : : "r8") + +#define local_irq_disable() __asm__ __volatile__ ( \ + "rdctl r8, status\n" \ + "andi r8, r8, 0xfffe\n" \ + "wrctl status, r8\n" \ + : : : "r8") + +#define local_save_flags(x) __asm__ __volatile__ ( \ + "rdctl r8, status\n" \ + "mov %0, r8\n" \ + : "=r" (x) : : "r8", "memory") + +#define local_irq_restore(x) __asm__ __volatile__ ( \ + "mov r8, %0\n" \ + "wrctl status, r8\n" \ + : : "r" (x) : "r8", "memory") + +/* For spinlocks etc */ +#define local_irq_save(x) do { local_save_flags(x); local_irq_disable(); } \ + while (0) + +#define irqs_disabled() \ +({ \ + unsigned long flags; \ + local_save_flags(flags); \ + ((flags & NIOS2_STATUS_PIE_MSK) == 0x0); \ +}) + #endif /* __ASM_NIOS2_SYSTEM_H */ From 3bef253f0802c6292b8e2acc0089894019e99e62 Mon Sep 17 00:00:00 2001 From: Thomas Chou Date: Sat, 20 Mar 2010 07:05:46 +0800 Subject: [PATCH 062/164] nios2: use bitops from linux-2.6 asm-generic These are needed to use ubi/ubifs. Signed-off-by: Thomas Chou Signed-off-by: Scott McNutt --- include/asm-nios2/bitops.h | 14 +- include/asm-nios2/bitops/atomic.h | 189 ++++++++++++++++++++++++++ include/asm-nios2/bitops/ffs.h | 41 ++++++ include/asm-nios2/bitops/non-atomic.h | 108 +++++++++++++++ 4 files changed, 342 insertions(+), 10 deletions(-) create mode 100644 include/asm-nios2/bitops/atomic.h create mode 100644 include/asm-nios2/bitops/ffs.h create mode 100644 include/asm-nios2/bitops/non-atomic.h diff --git a/include/asm-nios2/bitops.h b/include/asm-nios2/bitops.h index 5776bda3e..cf48ff7a1 100644 --- a/include/asm-nios2/bitops.h +++ b/include/asm-nios2/bitops.h @@ -24,15 +24,9 @@ #ifndef __ASM_NIOS2_BITOPS_H_ #define __ASM_NIOS2_BITOPS_H_ - -extern void set_bit(int nr, volatile void * a); -extern void clear_bit(int nr, volatile void * a); -extern int test_and_clear_bit(int nr, volatile void * a); -extern void change_bit(unsigned long nr, volatile void *addr); -extern int test_and_set_bit(int nr, volatile void * a); -extern int test_and_change_bit(int nr, volatile void * addr); -extern int test_bit(int nr, volatile void * a); -extern int ffs(int i); -#define PLATFORM_FFS +/* copied from linux-2.6/include/asm-generic/bitops */ +#include +#include +#include #endif /* __ASM_NIOS2_BITOPS_H */ diff --git a/include/asm-nios2/bitops/atomic.h b/include/asm-nios2/bitops/atomic.h new file mode 100644 index 000000000..c8946465e --- /dev/null +++ b/include/asm-nios2/bitops/atomic.h @@ -0,0 +1,189 @@ +#ifndef _ASM_GENERIC_BITOPS_ATOMIC_H_ +#define _ASM_GENERIC_BITOPS_ATOMIC_H_ + +#include +#include + +#ifdef CONFIG_SMP +#include +#include /* we use L1_CACHE_BYTES */ + +/* Use an array of spinlocks for our atomic_ts. + * Hash function to index into a different SPINLOCK. + * Since "a" is usually an address, use one spinlock per cacheline. + */ +# define ATOMIC_HASH_SIZE 4 +# define ATOMIC_HASH(a) (&(__atomic_hash[ (((unsigned long) a)/L1_CACHE_BYTES) & (ATOMIC_HASH_SIZE-1) ])) + +extern raw_spinlock_t __atomic_hash[ATOMIC_HASH_SIZE] __lock_aligned; + +/* Can't use raw_spin_lock_irq because of #include problems, so + * this is the substitute */ +#define _atomic_spin_lock_irqsave(l,f) do { \ + raw_spinlock_t *s = ATOMIC_HASH(l); \ + local_irq_save(f); \ + __raw_spin_lock(s); \ +} while(0) + +#define _atomic_spin_unlock_irqrestore(l,f) do { \ + raw_spinlock_t *s = ATOMIC_HASH(l); \ + __raw_spin_unlock(s); \ + local_irq_restore(f); \ +} while(0) + + +#else +# define _atomic_spin_lock_irqsave(l,f) do { local_irq_save(f); } while (0) +# define _atomic_spin_unlock_irqrestore(l,f) do { local_irq_restore(f); } while (0) +#endif + +/* + * NMI events can occur at any time, including when interrupts have been + * disabled by *_irqsave(). So you can get NMI events occurring while a + * *_bit function is holding a spin lock. If the NMI handler also wants + * to do bit manipulation (and they do) then you can get a deadlock + * between the original caller of *_bit() and the NMI handler. + * + * by Keith Owens + */ + +/** + * set_bit - Atomically set a bit in memory + * @nr: the bit to set + * @addr: the address to start counting from + * + * This function is atomic and may not be reordered. See __set_bit() + * if you do not require the atomic guarantees. + * + * Note: there are no guarantees that this function will not be reordered + * on non x86 architectures, so if you are writing portable code, + * make sure not to rely on its reordering guarantees. + * + * Note that @nr may be almost arbitrarily large; this function is not + * restricted to acting on a single-word quantity. + */ +static inline void set_bit(int nr, volatile unsigned long *addr) +{ + unsigned long mask = BIT_MASK(nr); + unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr); + unsigned long flags; + + _atomic_spin_lock_irqsave(p, flags); + *p |= mask; + _atomic_spin_unlock_irqrestore(p, flags); +} + +/** + * clear_bit - Clears a bit in memory + * @nr: Bit to clear + * @addr: Address to start counting from + * + * clear_bit() is atomic and may not be reordered. However, it does + * not contain a memory barrier, so if it is used for locking purposes, + * you should call smp_mb__before_clear_bit() and/or smp_mb__after_clear_bit() + * in order to ensure changes are visible on other processors. + */ +static inline void clear_bit(int nr, volatile unsigned long *addr) +{ + unsigned long mask = BIT_MASK(nr); + unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr); + unsigned long flags; + + _atomic_spin_lock_irqsave(p, flags); + *p &= ~mask; + _atomic_spin_unlock_irqrestore(p, flags); +} + +/** + * change_bit - Toggle a bit in memory + * @nr: Bit to change + * @addr: Address to start counting from + * + * change_bit() is atomic and may not be reordered. It may be + * reordered on other architectures than x86. + * Note that @nr may be almost arbitrarily large; this function is not + * restricted to acting on a single-word quantity. + */ +static inline void change_bit(int nr, volatile unsigned long *addr) +{ + unsigned long mask = BIT_MASK(nr); + unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr); + unsigned long flags; + + _atomic_spin_lock_irqsave(p, flags); + *p ^= mask; + _atomic_spin_unlock_irqrestore(p, flags); +} + +/** + * test_and_set_bit - Set a bit and return its old value + * @nr: Bit to set + * @addr: Address to count from + * + * This operation is atomic and cannot be reordered. + * It may be reordered on other architectures than x86. + * It also implies a memory barrier. + */ +static inline int test_and_set_bit(int nr, volatile unsigned long *addr) +{ + unsigned long mask = BIT_MASK(nr); + unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr); + unsigned long old; + unsigned long flags; + + _atomic_spin_lock_irqsave(p, flags); + old = *p; + *p = old | mask; + _atomic_spin_unlock_irqrestore(p, flags); + + return (old & mask) != 0; +} + +/** + * test_and_clear_bit - Clear a bit and return its old value + * @nr: Bit to clear + * @addr: Address to count from + * + * This operation is atomic and cannot be reordered. + * It can be reorderdered on other architectures other than x86. + * It also implies a memory barrier. + */ +static inline int test_and_clear_bit(int nr, volatile unsigned long *addr) +{ + unsigned long mask = BIT_MASK(nr); + unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr); + unsigned long old; + unsigned long flags; + + _atomic_spin_lock_irqsave(p, flags); + old = *p; + *p = old & ~mask; + _atomic_spin_unlock_irqrestore(p, flags); + + return (old & mask) != 0; +} + +/** + * test_and_change_bit - Change a bit and return its old value + * @nr: Bit to change + * @addr: Address to count from + * + * This operation is atomic and cannot be reordered. + * It also implies a memory barrier. + */ +static inline int test_and_change_bit(int nr, volatile unsigned long *addr) +{ + unsigned long mask = BIT_MASK(nr); + unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr); + unsigned long old; + unsigned long flags; + + _atomic_spin_lock_irqsave(p, flags); + old = *p; + *p = old ^ mask; + _atomic_spin_unlock_irqrestore(p, flags); + + return (old & mask) != 0; +} + +#endif /* _ASM_GENERIC_BITOPS_ATOMIC_H */ diff --git a/include/asm-nios2/bitops/ffs.h b/include/asm-nios2/bitops/ffs.h new file mode 100644 index 000000000..fbbb43af7 --- /dev/null +++ b/include/asm-nios2/bitops/ffs.h @@ -0,0 +1,41 @@ +#ifndef _ASM_GENERIC_BITOPS_FFS_H_ +#define _ASM_GENERIC_BITOPS_FFS_H_ + +/** + * ffs - find first bit set + * @x: the word to search + * + * This is defined the same way as + * the libc and compiler builtin ffs routines, therefore + * differs in spirit from the above ffz (man ffs). + */ +static inline int ffs(int x) +{ + int r = 1; + + if (!x) + return 0; + if (!(x & 0xffff)) { + x >>= 16; + r += 16; + } + if (!(x & 0xff)) { + x >>= 8; + r += 8; + } + if (!(x & 0xf)) { + x >>= 4; + r += 4; + } + if (!(x & 3)) { + x >>= 2; + r += 2; + } + if (!(x & 1)) { + x >>= 1; + r += 1; + } + return r; +} + +#endif /* _ASM_GENERIC_BITOPS_FFS_H_ */ diff --git a/include/asm-nios2/bitops/non-atomic.h b/include/asm-nios2/bitops/non-atomic.h new file mode 100644 index 000000000..697cc2b7e --- /dev/null +++ b/include/asm-nios2/bitops/non-atomic.h @@ -0,0 +1,108 @@ +#ifndef _ASM_GENERIC_BITOPS_NON_ATOMIC_H_ +#define _ASM_GENERIC_BITOPS_NON_ATOMIC_H_ + +#include + +/** + * __set_bit - Set a bit in memory + * @nr: the bit to set + * @addr: the address to start counting from + * + * Unlike set_bit(), this function is non-atomic and may be reordered. + * If it's called on the same region of memory simultaneously, the effect + * may be that only one operation succeeds. + */ +static inline void __set_bit(int nr, volatile unsigned long *addr) +{ + unsigned long mask = BIT_MASK(nr); + unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr); + + *p |= mask; +} + +static inline void __clear_bit(int nr, volatile unsigned long *addr) +{ + unsigned long mask = BIT_MASK(nr); + unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr); + + *p &= ~mask; +} + +/** + * __change_bit - Toggle a bit in memory + * @nr: the bit to change + * @addr: the address to start counting from + * + * Unlike change_bit(), this function is non-atomic and may be reordered. + * If it's called on the same region of memory simultaneously, the effect + * may be that only one operation succeeds. + */ +static inline void __change_bit(int nr, volatile unsigned long *addr) +{ + unsigned long mask = BIT_MASK(nr); + unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr); + + *p ^= mask; +} + +/** + * __test_and_set_bit - Set a bit and return its old value + * @nr: Bit to set + * @addr: Address to count from + * + * This operation is non-atomic and can be reordered. + * If two examples of this operation race, one can appear to succeed + * but actually fail. You must protect multiple accesses with a lock. + */ +static inline int __test_and_set_bit(int nr, volatile unsigned long *addr) +{ + unsigned long mask = BIT_MASK(nr); + unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr); + unsigned long old = *p; + + *p = old | mask; + return (old & mask) != 0; +} + +/** + * __test_and_clear_bit - Clear a bit and return its old value + * @nr: Bit to clear + * @addr: Address to count from + * + * This operation is non-atomic and can be reordered. + * If two examples of this operation race, one can appear to succeed + * but actually fail. You must protect multiple accesses with a lock. + */ +static inline int __test_and_clear_bit(int nr, volatile unsigned long *addr) +{ + unsigned long mask = BIT_MASK(nr); + unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr); + unsigned long old = *p; + + *p = old & ~mask; + return (old & mask) != 0; +} + +/* WARNING: non atomic and it can be reordered! */ +static inline int __test_and_change_bit(int nr, + volatile unsigned long *addr) +{ + unsigned long mask = BIT_MASK(nr); + unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr); + unsigned long old = *p; + + *p = old ^ mask; + return (old & mask) != 0; +} + +/** + * test_bit - Determine whether a bit is set + * @nr: bit number to test + * @addr: Address to start counting from + */ +static inline int test_bit(int nr, const volatile unsigned long *addr) +{ + return 1UL & (addr[BIT_WORD(nr)] >> (nr & (BITS_PER_LONG-1))); +} + +#endif /* _ASM_GENERIC_BITOPS_NON_ATOMIC_H_ */ From c72bfafbc94e61ea3ff3915c84aa7f9d91a045a0 Mon Sep 17 00:00:00 2001 From: Thomas Chou Date: Sat, 20 Mar 2010 07:05:47 +0800 Subject: [PATCH 063/164] nios2: add struct stat support in linux/stat.h This is needed for jffs2 support. Signed-off-by: Thomas Chou Signed-off-by: Scott McNutt --- include/linux/stat.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/stat.h b/include/linux/stat.h index 2ce1c25ac..cef636959 100644 --- a/include/linux/stat.h +++ b/include/linux/stat.h @@ -68,7 +68,7 @@ struct stat { #endif /* __PPC__ */ #if defined (__ARM__) || defined (__I386__) || defined (__M68K__) || defined (__bfin__) ||\ - defined (__microblaze__) + defined (__microblaze__) || defined (__nios2__) struct stat { unsigned short st_dev; From 3fd2a1f3eb83a0bbb84a1397ff9c2af7e6f5d069 Mon Sep 17 00:00:00 2001 From: Scott McNutt Date: Sun, 21 Mar 2010 13:26:33 -0400 Subject: [PATCH 064/164] nios2: Add missing Ethernet initialization to board_init(). Signed-off-by: Scott McNutt --- lib_nios2/board.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib_nios2/board.c b/lib_nios2/board.c index 41d329719..8ec66a354 100644 --- a/lib_nios2/board.c +++ b/lib_nios2/board.c @@ -139,6 +139,13 @@ void board_init (void) board_late_init (); #endif +#if defined(CONFIG_CMD_NET) +#if defined(CONFIG_NET_MULTI) + puts ("Net: "); +#endif + eth_initialize (bd); +#endif + /* main_loop */ for (;;) { WATCHDOG_RESET (); From 64da04d24ea685483f9afa07088f76931b6c0e01 Mon Sep 17 00:00:00 2001 From: Scott McNutt Date: Sun, 21 Mar 2010 15:36:44 -0400 Subject: [PATCH 065/164] nios2: Add support for EPCS16 and EPCS64 configuration devices. Signed-off-by: Scott McNutt --- cpu/nios2/epcs.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/cpu/nios2/epcs.c b/cpu/nios2/epcs.c index 483b249cd..a2e3fe3d1 100644 --- a/cpu/nios2/epcs.c +++ b/cpu/nios2/epcs.c @@ -207,6 +207,8 @@ static void epcs_status_wr (unsigned char status) static struct epcs_devinfo_t devinfo[] = { { "EPCS1 ", 0x10, 17, 4, 15, 8, 0x0c }, { "EPCS4 ", 0x12, 19, 8, 16, 8, 0x1c }, + { "EPCS16", 0x14, 21, 32, 16, 8, 0x1c }, + { "EPCS64", 0x16, 23,128, 16, 8, 0x1c }, { 0, 0, 0, 0, 0, 0 } }; @@ -501,15 +503,17 @@ void do_epcs_info (struct epcs_devinfo_t *dev, int argc, char *argv[]) } /* Sector info */ - for (i=0; inum_sects; i++) { + for (i=0; (i < dev->num_sects) && (argc > 1); i++) { erased = epcs_sect_erased (i, &tmp, dev); - printf (" %d: %06x ", + if ((i & 0x03) == 0) printf ("\n"); + printf ("%4d: %07x ", i, i*(1<sz_sect) ); if (erased) - printf ("erased\n"); + printf ("E "); else - printf ("data @ 0x%06x\n", tmp); + printf (" "); } + printf ("\n"); return; } From 3ea0037f2337de692b5fd2b6a4449db1de3067a2 Mon Sep 17 00:00:00 2001 From: Scott McNutt Date: Sun, 21 Mar 2010 21:24:43 -0400 Subject: [PATCH 066/164] nios2: Fix outx/writex parameter order in io.h The outx/writex macros were using writex(addr, val) rather than the standard writex(val, addr), resulting in incompatibilty with architecture independent components. This change set uses standard parameter order. Signed-off-by: Scott McNutt --- board/altera/common/AMDLV065D.c | 18 +++++++++--------- board/altera/common/epled.c | 6 +++--- board/psyent/common/AMDLV065D.c | 18 +++++++++--------- board/psyent/pk1c20/led.c | 6 +++--- cpu/nios2/epcs.c | 6 +++--- cpu/nios2/interrupts.c | 16 ++++++++-------- drivers/serial/altera_jtag_uart.c | 2 +- drivers/serial/altera_uart.c | 4 ++-- drivers/serial/opencores_yanu.c | 12 ++++++------ include/asm-nios2/io.h | 18 +++++++++--------- 10 files changed, 53 insertions(+), 53 deletions(-) diff --git a/board/altera/common/AMDLV065D.c b/board/altera/common/AMDLV065D.c index 0fcf354cd..72b0a9f80 100644 --- a/board/altera/common/AMDLV065D.c +++ b/board/altera/common/AMDLV065D.c @@ -122,12 +122,12 @@ int flash_erase (flash_info_t * info, int s_first, int s_last) for (sect = s_first; sect <= s_last; sect++) { if (info->protect[sect] == 0) { /* not protected */ addr2 = (unsigned char *) info->start[sect]; - writeb (addr, 0xaa); - writeb (addr, 0x55); - writeb (addr, 0x80); - writeb (addr, 0xaa); - writeb (addr, 0x55); - writeb (addr2, 0x30); + writeb (0xaa, addr); + writeb (0x55, addr); + writeb (0x80, addr); + writeb (0xaa, addr); + writeb (0x55, addr); + writeb (0x30, addr2); /* Now just wait for 0xff & provide some user * feedback while we wait. */ @@ -169,9 +169,9 @@ int write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cnt) return (2); } - writeb (cmd, 0xaa); - writeb (cmd, 0x55); - writeb (cmd, 0xa0); + writeb (0xaa, cmd); + writeb (0x55, cmd); + writeb (0xa0, cmd); writeb (dst, b); /* Verify write */ diff --git a/board/altera/common/epled.c b/board/altera/common/epled.c index e5e770576..d0197358f 100644 --- a/board/altera/common/epled.c +++ b/board/altera/common/epled.c @@ -39,7 +39,7 @@ void __led_init (led_id_t mask, int state) val &= ~mask; else val |= mask; - writel (&pio->data, val); + writel (val, &pio->data); } void __led_set (led_id_t mask, int state) @@ -50,7 +50,7 @@ void __led_set (led_id_t mask, int state) val &= ~mask; else val |= mask; - writel (&pio->data, val); + writel (val, &pio->data); } void __led_toggle (led_id_t mask) @@ -58,5 +58,5 @@ void __led_toggle (led_id_t mask) nios_pio_t *pio = (nios_pio_t *)CONFIG_SYS_LEDPIO_ADDR; val ^= mask; - writel (&pio->data, val); + writel (val, &pio->data); } diff --git a/board/psyent/common/AMDLV065D.c b/board/psyent/common/AMDLV065D.c index 0fcf354cd..72b0a9f80 100644 --- a/board/psyent/common/AMDLV065D.c +++ b/board/psyent/common/AMDLV065D.c @@ -122,12 +122,12 @@ int flash_erase (flash_info_t * info, int s_first, int s_last) for (sect = s_first; sect <= s_last; sect++) { if (info->protect[sect] == 0) { /* not protected */ addr2 = (unsigned char *) info->start[sect]; - writeb (addr, 0xaa); - writeb (addr, 0x55); - writeb (addr, 0x80); - writeb (addr, 0xaa); - writeb (addr, 0x55); - writeb (addr2, 0x30); + writeb (0xaa, addr); + writeb (0x55, addr); + writeb (0x80, addr); + writeb (0xaa, addr); + writeb (0x55, addr); + writeb (0x30, addr2); /* Now just wait for 0xff & provide some user * feedback while we wait. */ @@ -169,9 +169,9 @@ int write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cnt) return (2); } - writeb (cmd, 0xaa); - writeb (cmd, 0x55); - writeb (cmd, 0xa0); + writeb (0xaa, cmd); + writeb (0x55, cmd); + writeb (0xa0, cmd); writeb (dst, b); /* Verify write */ diff --git a/board/psyent/pk1c20/led.c b/board/psyent/pk1c20/led.c index e5e770576..d0197358f 100644 --- a/board/psyent/pk1c20/led.c +++ b/board/psyent/pk1c20/led.c @@ -39,7 +39,7 @@ void __led_init (led_id_t mask, int state) val &= ~mask; else val |= mask; - writel (&pio->data, val); + writel (val, &pio->data); } void __led_set (led_id_t mask, int state) @@ -50,7 +50,7 @@ void __led_set (led_id_t mask, int state) val &= ~mask; else val |= mask; - writel (&pio->data, val); + writel (val, &pio->data); } void __led_toggle (led_id_t mask) @@ -58,5 +58,5 @@ void __led_toggle (led_id_t mask) nios_pio_t *pio = (nios_pio_t *)CONFIG_SYS_LEDPIO_ADDR; val ^= mask; - writel (&pio->data, val); + writel (val, &pio->data); } diff --git a/cpu/nios2/epcs.c b/cpu/nios2/epcs.c index a2e3fe3d1..ab7d746b5 100644 --- a/cpu/nios2/epcs.c +++ b/cpu/nios2/epcs.c @@ -85,7 +85,7 @@ static int epcs_cs (int assert) if (assert) { tmp = readl (&epcs->control); - writel (&epcs->control, tmp | NIOS_SPI_SSO); + writel (tmp | NIOS_SPI_SSO, &epcs->control); } else { /* Let all bits shift out */ start = get_timer (0); @@ -93,7 +93,7 @@ static int epcs_cs (int assert) if (get_timer (start) > EPCS_TIMEOUT) return (-1); tmp = readl (&epcs->control); - writel (&epcs->control, tmp & ~NIOS_SPI_SSO); + writel (tmp & ~NIOS_SPI_SSO, &epcs->control); } return (0); } @@ -106,7 +106,7 @@ static int epcs_tx (unsigned char c) while ((readl (&epcs->status) & NIOS_SPI_TRDY) == 0) if (get_timer (start) > EPCS_TIMEOUT) return (-1); - writel (&epcs->txdata, c); + writel (c, &epcs->txdata); return (0); } diff --git a/cpu/nios2/interrupts.c b/cpu/nios2/interrupts.c index 1c3566ebf..5c3b5e614 100644 --- a/cpu/nios2/interrupts.c +++ b/cpu/nios2/interrupts.c @@ -81,7 +81,7 @@ void tmr_isr (void *arg) /* Interrupt is cleared by writing anything to the * status register. */ - writel (&tmr->status, 0); + writel (0, &tmr->status); timestamp += CONFIG_SYS_NIOS_TMRMS; #ifdef CONFIG_STATUS_LED status_led_tick(timestamp); @@ -92,16 +92,16 @@ static void tmr_init (void) { nios_timer_t *tmr =(nios_timer_t *)CONFIG_SYS_NIOS_TMRBASE; - writel (&tmr->status, 0); - writel (&tmr->control, 0); - writel (&tmr->control, NIOS_TIMER_STOP); + writel (0, &tmr->status); + writel (0, &tmr->control); + writel (NIOS_TIMER_STOP, &tmr->control); #if defined(CONFIG_SYS_NIOS_TMRCNT) - writel (&tmr->periodl, CONFIG_SYS_NIOS_TMRCNT & 0xffff); - writel (&tmr->periodh, (CONFIG_SYS_NIOS_TMRCNT >> 16) & 0xffff); + writel (CONFIG_SYS_NIOS_TMRCNT & 0xffff, &tmr->periodl); + writel ((CONFIG_SYS_NIOS_TMRCNT >> 16) & 0xffff, &tmr->periodh); #endif - writel (&tmr->control, NIOS_TIMER_ITO | NIOS_TIMER_CONT | - NIOS_TIMER_START ); + writel (NIOS_TIMER_ITO | NIOS_TIMER_CONT | NIOS_TIMER_START, + &tmr->control); irq_install_handler (CONFIG_SYS_NIOS_TMRIRQ, tmr_isr, (void *)tmr); } diff --git a/drivers/serial/altera_jtag_uart.c b/drivers/serial/altera_jtag_uart.c index 9eccaa0c2..fb28aa9eb 100644 --- a/drivers/serial/altera_jtag_uart.c +++ b/drivers/serial/altera_jtag_uart.c @@ -40,7 +40,7 @@ void serial_putc (char c) { while (NIOS_JTAG_WSPACE ( readl (&jtag->control)) == 0) WATCHDOG_RESET (); - writel (&jtag->data, (unsigned char)c); + writel ((unsigned char)c, &jtag->data); } void serial_puts (const char *s) diff --git a/drivers/serial/altera_uart.c b/drivers/serial/altera_uart.c index 995e37468..045f1197a 100644 --- a/drivers/serial/altera_uart.c +++ b/drivers/serial/altera_uart.c @@ -50,7 +50,7 @@ void serial_setbrg (void) unsigned div; div = (CONFIG_SYS_CLK_FREQ/gd->baudrate)-1; - writel (&uart->divisor,div); + writel (div, &uart->divisor); return; } @@ -71,7 +71,7 @@ void serial_putc (char c) serial_putc ('\r'); while ((readl (&uart->status) & NIOS_UART_TRDY) == 0) WATCHDOG_RESET (); - writel (&uart->txdata,(unsigned char)c); + writel ((unsigned char)c, &uart->txdata); } void serial_puts (const char *s) diff --git a/drivers/serial/opencores_yanu.c b/drivers/serial/opencores_yanu.c index dacda5341..f18f7f444 100644 --- a/drivers/serial/opencores_yanu.c +++ b/drivers/serial/opencores_yanu.c @@ -61,7 +61,7 @@ void serial_setbrg (void) ((unsigned)CONFIG_SYS_CLK_FREQ >> k); baud = best_m + best_n * YANU_BAUDE; - writel(&uart->baud, baud); + writel(baud, &uart->baud); return; } @@ -92,7 +92,7 @@ void serial_setbrg (void) ((unsigned)CONFIG_SYS_CLK_FREQ >> k); baud = best_m + best_n * YANU_BAUDE; - writel(&uart->baud, baud); + writel(baud, &uart->baud); return; } @@ -113,7 +113,7 @@ int serial_init (void) YANU_ACTION_RPE | YANU_ACTION_RFE | YANU_ACTION_RFIFO_CLEAR | YANU_ACTION_TFIFO_CLEAR; - writel(&uart->action, action); + writel(action, &uart->action); /* control register cleanup */ /* no interrupts enabled */ @@ -127,7 +127,7 @@ int serial_init (void) control |= YANU_CONTROL_RDYDLY * YANU_RXFIFO_DLY; control |= YANU_CONTROL_TXTHR * YANU_TXFIFO_THR; - writel(&uart->control, control); + writel(control, &uart->control); /* to set baud rate */ serial_setbrg(); @@ -156,7 +156,7 @@ void serial_putc (char c) WATCHDOG_RESET (); } - writel(&uart->data, (unsigned char)c); + writel((unsigned char)c, &uart->data); } void serial_puts (const char *s) @@ -182,7 +182,7 @@ int serial_getc (void) WATCHDOG_RESET (); /* first we pull the char */ - writel(&uart->action, YANU_ACTION_RFIFO_PULL); + writel(YANU_ACTION_RFIFO_PULL, &uart->action); return(readl(&uart->data) & YANU_DATA_CHAR_MASK); } diff --git a/include/asm-nios2/io.h b/include/asm-nios2/io.h index 01d11efec..121405cd6 100644 --- a/include/asm-nios2/io.h +++ b/include/asm-nios2/io.h @@ -80,19 +80,19 @@ extern unsigned inl (unsigned port); ({unsigned long val;\ asm volatile( "ldwio %0, 0(%1)" :"=r"(val) : "r" (addr)); val;}) -#define writeb(addr,val)\ - asm volatile ("stbio %1, 0(%0)" : : "r" (addr), "r" (val)) -#define writew(addr,val)\ - asm volatile ("sthio %1, 0(%0)" : : "r" (addr), "r" (val)) -#define writel(addr,val)\ - asm volatile ("stwio %1, 0(%0)" : : "r" (addr), "r" (val)) +#define writeb(val,addr)\ + asm volatile ("stbio %0, 0(%1)" : : "r" (val), "r" (addr)) +#define writew(val,addr)\ + asm volatile ("sthio %0, 0(%1)" : : "r" (val), "r" (addr)) +#define writel(val,addr)\ + asm volatile ("stwio %0, 0(%1)" : : "r" (val), "r" (addr)) #define inb(addr) readb(addr) #define inw(addr) readw(addr) #define inl(addr) readl(addr) -#define outb(addr,val) writeb(addr,val) -#define outw(addr,val) writew(addr,val) -#define outl(addr,val) writel(addr,val) +#define outb(val, addr) writeb(val,addr) +#define outw(val, addr) writew(val,addr) +#define outl(val, addr) writel(val,addr) static inline void insb (unsigned long port, void *dst, unsigned long count) { From 3a89a91a10fed545af458418e63d911953a9849c Mon Sep 17 00:00:00 2001 From: Scott McNutt Date: Tue, 30 Mar 2010 20:23:04 -0400 Subject: [PATCH 067/164] nios2: Set CONFIG_SYS_HZ to 1000 all nios2 boards. CONFIG_SYS_HZ was being calculated (incorrectly) in nios2 configuration headers. Updated comments to accurately describe timebase macros. Signed-off-by: Scott McNutt --- include/configs/EP1C20.h | 14 ++++++++------ include/configs/EP1S10.h | 14 ++++++++------ include/configs/EP1S40.h | 14 ++++++++------ include/configs/PCI5441.h | 14 ++++++++------ include/configs/PK1C20.h | 14 ++++++++------ 5 files changed, 40 insertions(+), 30 deletions(-) diff --git a/include/configs/EP1C20.h b/include/configs/EP1C20.h index dc82e54e8..3920d3526 100644 --- a/include/configs/EP1C20.h +++ b/include/configs/EP1C20.h @@ -124,14 +124,16 @@ * TIMEBASE -- * * The high res timer defaults to 1 msec. Since it includes the period - * registers, we can slow it down to 10 msec using TMRCNT. If the default - * period is acceptable, TMRCNT can be left undefined. + * registers, the interrupt frequency can be reduced using TMRCNT. + * If the default period is acceptable, TMRCNT can be left undefined. + * TMRMS represents the desired mecs per tick (msecs per interrupt). *----------------------------------------------------------------------*/ +#define CONFIG_SYS_HZ 1000 /* Always 1000 */ #define CONFIG_SYS_NIOS_TMRBASE 0x02120820 /* Tick timer base addr */ -#define CONFIG_SYS_NIOS_TMRIRQ 3 /* Timer IRQ num */ -#define CONFIG_SYS_NIOS_TMRMS 10 /* 10 msec per tick */ -#define CONFIG_SYS_NIOS_TMRCNT (CONFIG_SYS_NIOS_TMRMS * (CONFIG_SYS_CLK_FREQ/1000)) -#define CONFIG_SYS_HZ (CONFIG_SYS_CLK_FREQ/(CONFIG_SYS_NIOS_TMRCNT + 1)) +#define CONFIG_SYS_NIOS_TMRIRQ 3 /* Timer IRQ num */ +#define CONFIG_SYS_NIOS_TMRMS 10 /* Desired period (msec)*/ +#define CONFIG_SYS_NIOS_TMRCNT \ + (CONFIG_SYS_NIOS_TMRMS * (CONFIG_SYS_CLK_FREQ/1000)) /*------------------------------------------------------------------------ * STATUS LED -- Provides a simple blinking led. For Nios2 each board diff --git a/include/configs/EP1S10.h b/include/configs/EP1S10.h index 498f26df1..bfbf8c111 100644 --- a/include/configs/EP1S10.h +++ b/include/configs/EP1S10.h @@ -119,14 +119,16 @@ * TIMEBASE -- * * The high res timer defaults to 1 msec. Since it includes the period - * registers, we can slow it down to 10 msec using TMRCNT. If the default - * period is acceptable, TMRCNT can be left undefined. + * registers, the interrupt frequency can be reduced using TMRCNT. + * If the default period is acceptable, TMRCNT can be left undefined. + * TMRMS represents the desired mecs per tick (msecs per interrupt). *----------------------------------------------------------------------*/ +#define CONFIG_SYS_HZ 1000 /* Always 1000 */ #define CONFIG_SYS_NIOS_TMRBASE 0x02120820 /* Tick timer base addr */ -#define CONFIG_SYS_NIOS_TMRIRQ 3 /* Timer IRQ num */ -#define CONFIG_SYS_NIOS_TMRMS 10 /* 10 msec per tick */ -#define CONFIG_SYS_NIOS_TMRCNT (CONFIG_SYS_NIOS_TMRMS * (CONFIG_SYS_CLK_FREQ/1000)) -#define CONFIG_SYS_HZ (CONFIG_SYS_CLK_FREQ/(CONFIG_SYS_NIOS_TMRCNT + 1)) +#define CONFIG_SYS_NIOS_TMRIRQ 3 /* Timer IRQ num */ +#define CONFIG_SYS_NIOS_TMRMS 10 /* Desired period (msec)*/ +#define CONFIG_SYS_NIOS_TMRCNT \ + (CONFIG_SYS_NIOS_TMRMS * (CONFIG_SYS_CLK_FREQ/1000)) /*------------------------------------------------------------------------ * STATUS LED -- Provides a simple blinking led. For Nios2 each board diff --git a/include/configs/EP1S40.h b/include/configs/EP1S40.h index 4ad65d84a..4d905fee3 100644 --- a/include/configs/EP1S40.h +++ b/include/configs/EP1S40.h @@ -119,14 +119,16 @@ * TIMEBASE -- * * The high res timer defaults to 1 msec. Since it includes the period - * registers, we can slow it down to 10 msec using TMRCNT. If the default - * period is acceptable, TMRCNT can be left undefined. + * registers, the interrupt frequency can be reduced using TMRCNT. + * If the default period is acceptable, TMRCNT can be left undefined. + * TMRMS represents the desired mecs per tick (msecs per interrupt). *----------------------------------------------------------------------*/ +#define CONFIG_SYS_HZ 1000 /* Always 1000 */ #define CONFIG_SYS_NIOS_TMRBASE 0x02120820 /* Tick timer base addr */ -#define CONFIG_SYS_NIOS_TMRIRQ 3 /* Timer IRQ num */ -#define CONFIG_SYS_NIOS_TMRMS 10 /* 10 msec per tick */ -#define CONFIG_SYS_NIOS_TMRCNT (CONFIG_SYS_NIOS_TMRMS * (CONFIG_SYS_CLK_FREQ/1000)) -#define CONFIG_SYS_HZ (CONFIG_SYS_CLK_FREQ/(CONFIG_SYS_NIOS_TMRCNT + 1)) +#define CONFIG_SYS_NIOS_TMRIRQ 3 /* Timer IRQ num */ +#define CONFIG_SYS_NIOS_TMRMS 10 /* Desired period (msec) */ +#define CONFIG_SYS_NIOS_TMRCNT \ + (CONFIG_SYS_NIOS_TMRMS * (CONFIG_SYS_CLK_FREQ/1000)) /*------------------------------------------------------------------------ * STATUS LED -- Provides a simple blinking led. For Nios2 each board diff --git a/include/configs/PCI5441.h b/include/configs/PCI5441.h index d06b7f827..c60a9f7bc 100644 --- a/include/configs/PCI5441.h +++ b/include/configs/PCI5441.h @@ -114,14 +114,16 @@ * TIMEBASE -- * * The high res timer defaults to 1 msec. Since it includes the period - * registers, we can slow it down to 10 msec using TMRCNT. If the default - * period is acceptable, TMRCNT can be left undefined. + * registers, the interrupt frequency can be reduced using TMRCNT. + * If the default period is acceptable, TMRCNT can be left undefined. + * TMRMS represents the desired mecs per tick (msecs per interrupt). *----------------------------------------------------------------------*/ +#define CONFIG_SYS_HZ 1000 /* Always 1000 */ #define CONFIG_SYS_NIOS_TMRBASE 0x00920860 /* Tick timer base addr */ -#define CONFIG_SYS_NIOS_TMRIRQ 3 /* Timer IRQ num */ -#define CONFIG_SYS_NIOS_TMRMS 10 /* 10 msec per tick */ -#define CONFIG_SYS_NIOS_TMRCNT (CONFIG_SYS_NIOS_TMRMS * (CONFIG_SYS_CLK_FREQ/1000)) -#define CONFIG_SYS_HZ (CONFIG_SYS_CLK_FREQ/(CONFIG_SYS_NIOS_TMRCNT + 1)) +#define CONFIG_SYS_NIOS_TMRIRQ 3 /* Timer IRQ num */ +#define CONFIG_SYS_NIOS_TMRMS 10 /* Desired period (msec)*/ +#define CONFIG_SYS_NIOS_TMRCNT \ + (CONFIG_SYS_NIOS_TMRMS * (CONFIG_SYS_CLK_FREQ/1000)) /* diff --git a/include/configs/PK1C20.h b/include/configs/PK1C20.h index 165dde043..874c20b93 100644 --- a/include/configs/PK1C20.h +++ b/include/configs/PK1C20.h @@ -124,14 +124,16 @@ * TIMEBASE -- * * The high res timer defaults to 1 msec. Since it includes the period - * registers, we can slow it down to 10 msec using TMRCNT. If the default - * period is acceptable, TMRCNT can be left undefined. + * registers, the interrupt frequency can be reduced using TMRCNT. + * If the default period is acceptable, TMRCNT can be left undefined. + * TMRMS represents the desired mecs per tick (msecs per interrupt). *----------------------------------------------------------------------*/ +#define CONFIG_SYS_HZ 1000 /* Always 1000 */ #define CONFIG_SYS_NIOS_TMRBASE 0x02120820 /* Tick timer base addr */ -#define CONFIG_SYS_NIOS_TMRIRQ 3 /* Timer IRQ num */ -#define CONFIG_SYS_NIOS_TMRMS 10 /* 10 msec per tick */ -#define CONFIG_SYS_NIOS_TMRCNT (CONFIG_SYS_NIOS_TMRMS * (CONFIG_SYS_CLK_FREQ/1000)) -#define CONFIG_SYS_HZ (CONFIG_SYS_CLK_FREQ/(CONFIG_SYS_NIOS_TMRCNT + 1)) +#define CONFIG_SYS_NIOS_TMRIRQ 3 /* Timer IRQ num */ +#define CONFIG_SYS_NIOS_TMRMS 10 /* Desired period */ +#define CONFIG_SYS_NIOS_TMRCNT \ + (CONFIG_SYS_NIOS_TMRMS * (CONFIG_SYS_CLK_FREQ/1000)) /*------------------------------------------------------------------------ * STATUS LED -- Provides a simple blinking led. For Nios2 each board From 9e486ab1c98ea7ab357520307fe5d5a0847cd1bb Mon Sep 17 00:00:00 2001 From: Scott McNutt Date: Tue, 30 Mar 2010 20:26:15 -0400 Subject: [PATCH 068/164] nios2: Fix AMDLV065D flash write bug in altera board common tree. Signed-off-by: Scott McNutt --- board/altera/common/AMDLV065D.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/altera/common/AMDLV065D.c b/board/altera/common/AMDLV065D.c index 72b0a9f80..7a1b4d3c2 100644 --- a/board/altera/common/AMDLV065D.c +++ b/board/altera/common/AMDLV065D.c @@ -172,7 +172,7 @@ int write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cnt) writeb (0xaa, cmd); writeb (0x55, cmd); writeb (0xa0, cmd); - writeb (dst, b); + writeb (b, dst); /* Verify write */ start = get_timer (0); From ed2941578480d30b413e081b6f1a5675d4afd9e2 Mon Sep 17 00:00:00 2001 From: Thomas Chou Date: Wed, 24 Mar 2010 11:41:46 +0800 Subject: [PATCH 069/164] nios2: pass command line and initrd to linux in bootm.c This patch adds bootargs passing to nios2 linux. The args passing is enabled with, r4 : 'NIOS' magic r5 : pointer to initrd start r6 : pointer to initrd end r7 : pointer to command line Signed-off-by: Thomas Chou Signed-off-by: Scott McNutt --- lib_nios2/bootm.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/lib_nios2/bootm.c b/lib_nios2/bootm.c index 675bfac63..5d25edf80 100644 --- a/lib_nios2/bootm.c +++ b/lib_nios2/bootm.c @@ -26,21 +26,26 @@ #include #include +#define NIOS_MAGIC 0x534f494e /* enable command line and initrd passing */ + int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images) { - void (*kernel)(void) = (void (*)(void))images->ep; + void (*kernel)(int, int, int, char *) = (void *)images->ep; + char *commandline = getenv("bootargs"); + ulong initrd_start = images->rd_start; + ulong initrd_end = images->rd_end; if ((flag != 0) && (flag != BOOTM_STATE_OS_GO)) return 1; /* flushes data and instruction caches before calling the kernel */ - flush_dcache (0,CONFIG_SYS_DCACHE_SIZE); - flush_icache (0,CONFIG_SYS_ICACHE_SIZE); + disable_interrupts(); + flush_dcache((ulong)kernel, CONFIG_SYS_DCACHE_SIZE); + flush_icache((ulong)kernel, CONFIG_SYS_ICACHE_SIZE); - /* For now we assume the Microtronix linux ... which only - * needs to be called ;-) - */ - kernel (); + debug("bootargs=%s @ 0x%lx\n", commandline, (ulong)&commandline); + debug("initrd=0x%lx-0x%lx\n", (ulong)initrd_start, (ulong)initrd_end); + kernel(NIOS_MAGIC, initrd_start, initrd_end, commandline); /* does not return */ return 1; From d8bc0a2889700ba063598de6d4e7d135360b537e Mon Sep 17 00:00:00 2001 From: Scott McNutt Date: Thu, 1 Apr 2010 00:00:56 -0400 Subject: [PATCH 070/164] nios2: Reload timer count in reset_timer() When the timestamp is incremented via interrupt and the interrupt period is greater than 1 msec, successive calls to get_timer() can produce inaccurate timing since the interrupts are asynchronous to the timing loop. For example, with an interrupt period of 10 msec two successive calls to get_timer() could indicate an elapsed time of 10 msec after only several hundred usecs -- depending on when the next interrupt actually occurs. This behavior can cause reliability issues with components such as CFI and NAND. This can be remedied by calling reset_timer() prior to establishing the base timestamp with get_timer(0), provided reset_timer() resets the hardware timer (rather than simply resetting only the timestamp). This has the effect of synchronizing the interrupts (and the advance of the timestamp) with the timing loop. Signed-off-by: Scott McNutt --- cpu/nios2/interrupts.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/cpu/nios2/interrupts.c b/cpu/nios2/interrupts.c index 5c3b5e614..b552db4eb 100644 --- a/cpu/nios2/interrupts.c +++ b/cpu/nios2/interrupts.c @@ -56,7 +56,40 @@ volatile ulong timestamp = 0; void reset_timer (void) { + nios_timer_t *tmr =(nios_timer_t *)CONFIG_SYS_NIOS_TMRBASE; + + /* From Embedded Peripherals Handbook: + * + * "When the hardware is configured with Writeable period + * disabled, writing to one of the period_n registers causes + * the counter to reset to the fixed Timeout Period specified + * at system generation time." + * + * Here we force a reload to prevent early timeouts from + * get_timer() when the interrupt period is greater than + * than 1 msec. + * + * Simply write to periodl with its own value to force an + * internal counter reload, THEN reset the timestamp. + */ + writel (readl (&tmr->periodl), &tmr->periodl); timestamp = 0; + + /* From Embedded Peripherals Handbook: + * + * "Writing to one of the period_n registers stops the internal + * counter, except when the hardware is configured with Start/Stop + * control bits off. If Start/Stop control bits is off, writing + * either register does not stop the counter." + * + * In order to accomodate either configuration, the control + * register is re-written. If the counter is stopped, it will + * be restarted. If it is running, the write is essentially + * a nop. + */ + writel (NIOS_TIMER_ITO | NIOS_TIMER_CONT | NIOS_TIMER_START, + &tmr->control); + } ulong get_timer (ulong base) From c937c42431923c96a617e9462e2c0ecbaf2ad72d Mon Sep 17 00:00:00 2001 From: Vipin KUMAR Date: Mon, 8 Mar 2010 10:46:07 +0530 Subject: [PATCH 071/164] SPEAr : Adding maintainer name for spear SoCs Signed-off-by: Vipin Kumar --- MAINTAINERS | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index bb03f1778..a85db4f20 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -641,6 +641,13 @@ Prakash Kumar cerf250 xscale +Vipin Kumar + + spear300 ARM926EJS (spear300 Soc) + spear310 ARM926EJS (spear310 Soc) + spear320 ARM926EJS (spear320 Soc) + spear600 ARM926EJS (spear600 Soc) + Sergey Lapin afeb9260 ARM926EJS (AT91SAM9260 SoC) From 2ca551dd7ad6ec11418f113b1b50c96fdd15a370 Mon Sep 17 00:00:00 2001 From: Minkyu Kang Date: Mon, 8 Mar 2010 16:22:33 +0900 Subject: [PATCH 072/164] MAINTAINERS: sort the list of ARM Maintainers by last name Signed-off-by: Minkyu Kang --- MAINTAINERS | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index a85db4f20..0658bc327 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -616,6 +616,10 @@ Simon Kagstrom openrd_base ARM926EJS (Kirkwood SoC) +Minkyu Kang + + SMDKC100 ARM CORTEX-A8 (S5PC100 SoC) + Nishant Kamat omap1610h2 ARM926EJS @@ -630,13 +634,6 @@ Sergey Kubushyn SONATA ARM926EJS SCHMOOGIE ARM926EJS -Sandeep Paulraj - - davinci_dm355evm ARM926EJS - davinci_dm355leopard ARM926EJS - davinci_dm365evm ARM926EJS - davinci_dm6467evm ARM926EJS - Prakash Kumar cerf250 xscale @@ -680,6 +677,13 @@ Kyungmin Park apollon ARM1136EJS +Sandeep Paulraj + + davinci_dm355evm ARM926EJS + davinci_dm355leopard ARM926EJS + davinci_dm365evm ARM926EJS + davinci_dm6467evm ARM926EJS + Peter Pearse integratorcp All current ARM supplied & supported core modules -see http://www.arm.com/products/DevTools/Hardware_Platforms.html @@ -780,10 +784,6 @@ Alex Z lart SA1100 dnp1110 SA1110 -Minkyu Kang - - SMDKC100 ARM CORTEX-A8 (S5PC100 SoC) - ------------------------------------------------------------------------- Unknown / orphaned boards: From 6c71a8fec95a9e0f90fbc47469c389c6f35d96bc Mon Sep 17 00:00:00 2001 From: Naveen Krishna CH Date: Thu, 4 Feb 2010 14:17:38 +0900 Subject: [PATCH 073/164] S5PC100: Moves the Macros to a common header file The get_pll_clk(int) API returns the PLL frequency based on the (int) argument which is defined locally in clock.c Moving that #define to common header file (clk.h) would be helpful when using the API from other files. Signed-off-by: Naveen Krishna Ch Signed-off-by: Minkyu Kang --- cpu/arm_cortexa8/s5pc1xx/clock.c | 7 +------ include/asm-arm/arch-s5pc1xx/clk.h | 6 ++++++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/cpu/arm_cortexa8/s5pc1xx/clock.c b/cpu/arm_cortexa8/s5pc1xx/clock.c index a9e78dd79..19619f92c 100644 --- a/cpu/arm_cortexa8/s5pc1xx/clock.c +++ b/cpu/arm_cortexa8/s5pc1xx/clock.c @@ -25,12 +25,7 @@ #include #include #include - -#define APLL 0 -#define MPLL 1 -#define EPLL 2 -#define HPLL 3 -#define VPLL 4 +#include #define CLK_M 0 #define CLK_D 1 diff --git a/include/asm-arm/arch-s5pc1xx/clk.h b/include/asm-arm/arch-s5pc1xx/clk.h index f1aa44fd2..3e59abe78 100644 --- a/include/asm-arm/arch-s5pc1xx/clk.h +++ b/include/asm-arm/arch-s5pc1xx/clk.h @@ -23,6 +23,12 @@ #ifndef __ASM_ARM_ARCH_CLK_H_ #define __ASM_ARM_ARCH_CLK_H_ +#define APLL 0 +#define MPLL 1 +#define EPLL 2 +#define HPLL 3 +#define VPLL 4 + void s5pc1xx_clock_init(void); extern unsigned long (*get_pll_clk)(int pllreg); From 7b92159bd9fc0acaddd65b314da252b715d1b44e Mon Sep 17 00:00:00 2001 From: Joonyoung Shim Date: Mon, 8 Feb 2010 22:00:52 +0900 Subject: [PATCH 074/164] s3c64xx: Add ifdef at the S3C64XX only codes The s3c6400.h file is only for S3C64XX cpu and the pheripheral port address(0x70000000 - 0x7fffffff) exists at only S3C64XX cpu, so they should be included by only S3C64XX cpu. Signed-off-by: Joonyoung Shim Signed-off-by: Minkyu Kang --- cpu/arm1176/cpu.c | 2 ++ cpu/arm1176/start.S | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/cpu/arm1176/cpu.c b/cpu/arm1176/cpu.c index 2c0014f2b..befa0cdcc 100644 --- a/cpu/arm1176/cpu.c +++ b/cpu/arm1176/cpu.c @@ -33,7 +33,9 @@ #include #include +#ifdef CONFIG_S3C64XX #include +#endif #include static void cache_flush (void); diff --git a/cpu/arm1176/start.S b/cpu/arm1176/start.S index 68a356d13..e2b6c9b08 100644 --- a/cpu/arm1176/start.S +++ b/cpu/arm1176/start.S @@ -35,7 +35,9 @@ #ifdef CONFIG_ENABLE_MMU #include #endif +#ifdef CONFIG_S3C64XX #include +#endif #if !defined(CONFIG_ENABLE_MMU) && !defined(CONFIG_SYS_PHY_UBOOT_BASE) #define CONFIG_SYS_PHY_UBOOT_BASE CONFIG_SYS_UBOOT_BASE @@ -190,10 +192,12 @@ mmu_disable: #endif mmu_disable_phys: +#ifdef CONFIG_S3C64XX /* Peri port setup */ ldr r0, =0x70000000 orr r0, r0, #0x13 mcr p15,0,r0,c15,c2,4 @ 256M (0x70000000 - 0x7fffffff) +#endif /* * Go setup Memory and board specific bits prior to relocation. From ab693e9c4c06b42d1746a0d7a03541968fb55bb9 Mon Sep 17 00:00:00 2001 From: Minkyu Kang Date: Fri, 12 Feb 2010 18:17:52 +0900 Subject: [PATCH 075/164] s5pc1xx: support the GPIO interface This patch adds support the GPIO interface Signed-off-by: Minkyu Kang --- cpu/arm_cortexa8/s5pc1xx/Makefile | 1 + cpu/arm_cortexa8/s5pc1xx/gpio.c | 143 ++++++++++++++++++++++++++++ include/asm-arm/arch-s5pc1xx/gpio.h | 29 ++++++ 3 files changed, 173 insertions(+) create mode 100644 cpu/arm_cortexa8/s5pc1xx/gpio.c diff --git a/cpu/arm_cortexa8/s5pc1xx/Makefile b/cpu/arm_cortexa8/s5pc1xx/Makefile index 4f922e686..7290c2f52 100644 --- a/cpu/arm_cortexa8/s5pc1xx/Makefile +++ b/cpu/arm_cortexa8/s5pc1xx/Makefile @@ -33,6 +33,7 @@ SOBJS += reset.o COBJS += clock.o COBJS += cpu_info.o +COBJS += gpio.o COBJS += timer.o SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) diff --git a/cpu/arm_cortexa8/s5pc1xx/gpio.c b/cpu/arm_cortexa8/s5pc1xx/gpio.c new file mode 100644 index 000000000..a97244bf3 --- /dev/null +++ b/cpu/arm_cortexa8/s5pc1xx/gpio.c @@ -0,0 +1,143 @@ +/* + * (C) Copyright 2009 Samsung Electronics + * Minkyu Kang + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#include +#include +#include + +#define CON_MASK(x) (0xf << ((x) << 2)) +#define CON_SFR(x, v) ((v) << ((x) << 2)) + +#define DAT_MASK(x) (0x1 << (x)) +#define DAT_SET(x) (0x1 << (x)) + +#define PULL_MASK(x) (0x3 << ((x) << 1)) +#define PULL_MODE(x, v) ((v) << ((x) << 1)) + +#define DRV_MASK(x) (0x3 << ((x) << 1)) +#define DRV_SET(x, m) ((m) << ((x) << 1)) +#define RATE_MASK(x) (0x1 << (x + 16)) +#define RATE_SET(x) (0x1 << (x + 16)) + +void gpio_cfg_pin(struct s5pc1xx_gpio_bank *bank, int gpio, int cfg) +{ + unsigned int value; + + value = readl(&bank->con); + value &= ~CON_MASK(gpio); + value |= CON_SFR(gpio, cfg); + writel(value, &bank->con); +} + +void gpio_direction_output(struct s5pc1xx_gpio_bank *bank, int gpio, int en) +{ + unsigned int value; + + gpio_cfg_pin(bank, gpio, GPIO_OUTPUT); + + value = readl(&bank->dat); + value &= ~DAT_MASK(gpio); + if (en) + value |= DAT_SET(gpio); + writel(value, &bank->dat); +} + +void gpio_direction_input(struct s5pc1xx_gpio_bank *bank, int gpio) +{ + gpio_cfg_pin(bank, gpio, GPIO_INPUT); +} + +void gpio_set_value(struct s5pc1xx_gpio_bank *bank, int gpio, int en) +{ + unsigned int value; + + value = readl(&bank->dat); + value &= ~DAT_MASK(gpio); + if (en) + value |= DAT_SET(gpio); + writel(value, &bank->dat); +} + +unsigned int gpio_get_value(struct s5pc1xx_gpio_bank *bank, int gpio) +{ + unsigned int value; + + value = readl(&bank->dat); + return !!(value & DAT_MASK(gpio)); +} + +void gpio_set_pull(struct s5pc1xx_gpio_bank *bank, int gpio, int mode) +{ + unsigned int value; + + value = readl(&bank->pull); + value &= ~PULL_MASK(gpio); + + switch (mode) { + case GPIO_PULL_DOWN: + case GPIO_PULL_UP: + value |= PULL_MODE(gpio, mode); + break; + default: + return; + } + + writel(value, &bank->pull); +} + +void gpio_set_drv(struct s5pc1xx_gpio_bank *bank, int gpio, int mode) +{ + unsigned int value; + + value = readl(&bank->drv); + value &= ~DRV_MASK(gpio); + + switch (mode) { + case GPIO_DRV_1X: + case GPIO_DRV_2X: + case GPIO_DRV_3X: + case GPIO_DRV_4X: + value |= DRV_SET(gpio, mode); + break; + default: + return; + } + + writel(value, &bank->drv); +} + +void gpio_set_rate(struct s5pc1xx_gpio_bank *bank, int gpio, int mode) +{ + unsigned int value; + + value = readl(&bank->drv); + value &= ~RATE_MASK(gpio); + + switch (mode) { + case GPIO_DRV_FAST: + case GPIO_DRV_SLOW: + value |= RATE_SET(gpio); + break; + default: + return; + } + + writel(value, &bank->drv); +} diff --git a/include/asm-arm/arch-s5pc1xx/gpio.h b/include/asm-arm/arch-s5pc1xx/gpio.h index afbc7ea5a..8e4bb863f 100644 --- a/include/asm-arm/arch-s5pc1xx/gpio.h +++ b/include/asm-arm/arch-s5pc1xx/gpio.h @@ -124,6 +124,35 @@ struct s5pc110_gpio { struct s5pc1xx_gpio_bank gpio_h2; struct s5pc1xx_gpio_bank gpio_h3; }; + +/* functions */ +void gpio_cfg_pin(struct s5pc1xx_gpio_bank *bank, int gpio, int cfg); +void gpio_direction_output(struct s5pc1xx_gpio_bank *bank, int gpio, int en); +void gpio_direction_input(struct s5pc1xx_gpio_bank *bank, int gpio); +void gpio_set_value(struct s5pc1xx_gpio_bank *bank, int gpio, int en); +unsigned int gpio_get_value(struct s5pc1xx_gpio_bank *bank, int gpio); +void gpio_set_pull(struct s5pc1xx_gpio_bank *bank, int gpio, int mode); +void gpio_set_drv(struct s5pc1xx_gpio_bank *bank, int gpio, int mode); +void gpio_set_rate(struct s5pc1xx_gpio_bank *bank, int gpio, int mode); #endif +/* Pin configurations */ +#define GPIO_INPUT 0x0 +#define GPIO_OUTPUT 0x1 +#define GPIO_IRQ 0xf +#define GPIO_FUNC(x) (x) + +/* Pull mode */ +#define GPIO_PULL_NONE 0x0 +#define GPIO_PULL_DOWN 0x1 +#define GPIO_PULL_UP 0x2 + +/* Drive Strength level */ +#define GPIO_DRV_1X 0x0 +#define GPIO_DRV_2X 0x1 +#define GPIO_DRV_3X 0x2 +#define GPIO_DRV_4X 0x3 +#define GPIO_DRV_FAST 0x0 +#define GPIO_DRV_SLOW 0x1 + #endif From abbe18c353c297a40c428ba92f3e1a85e8e694fc Mon Sep 17 00:00:00 2001 From: Minkyu Kang Date: Fri, 12 Feb 2010 18:21:17 +0900 Subject: [PATCH 076/164] s5pc1xx: update the README file Because adds support the GPIO Interface, README file is updated. Signed-off-by: Minkyu Kang --- doc/README.s5pc1xx | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/doc/README.s5pc1xx b/doc/README.s5pc1xx index 5a0fe33db..ab1f02469 100644 --- a/doc/README.s5pc1xx +++ b/doc/README.s5pc1xx @@ -41,7 +41,23 @@ To check SoC: printf("cpu is s5pc110\n"); gpio - not supported yet. + + struct s5pc100_gpio *gpio = (struct s5pc100_gpio*)S5PC100_GPIO_BASE; + + /* GPA[0] pin set to irq */ + gpio_cfg_pin(&gpio->gpio_a, 0, GPIO_IRQ); + + /* GPA[0] pin set to input */ + gpio_direction_input(&gpio->gpio_a, 0); + + /* GPA[0] pin set to output/high */ + gpio_direction_output(&gpio->gpio_a, 0, 1); + + /* GPA[0] value set to low */ + gpio_set_value(&gpio->gpio_a, 0, 0); + + /* get GPA[0] value */ + value = gpio_get_value(&gpio->gpio_a, 0); Links ===== From a28bec89ccc17b56a50d841c8f0778e927434d1c Mon Sep 17 00:00:00 2001 From: Naveen Krishna CH Date: Fri, 5 Mar 2010 17:15:13 +0900 Subject: [PATCH 077/164] S5PC100: Memory SubSystem Header file, register description(SROMC). Memory subsystem of S5PC100 handles SROM, SRAM, OneDRAM, OneNand, NAND Flash, DDRs. smc.h is a common place for the register description of Memory subsystem of S5PC100. Note: Only SROM related registers are descibed now. Signed-off-by: Naveen Krishna Ch Signed-off-by: Minkyu Kang --- include/asm-arm/arch-s5pc1xx/smc.h | 50 ++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 include/asm-arm/arch-s5pc1xx/smc.h diff --git a/include/asm-arm/arch-s5pc1xx/smc.h b/include/asm-arm/arch-s5pc1xx/smc.h new file mode 100644 index 000000000..e1a53995a --- /dev/null +++ b/include/asm-arm/arch-s5pc1xx/smc.h @@ -0,0 +1,50 @@ +/* + * (C) Copyright 2010 Samsung Electronics + * Naveen Krishna Ch + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + * Note: This file contains the register description for Memory subsystem + * (SROM, NAND Flash, OneNand, DDR, OneDRAM) on S5PC1XX. + * + * Only SROMC is defined as of now + */ + +#ifndef __ASM_ARCH_SMC_H_ +#define __ASM_ARCH_SMC_H_ + +#define SMC_DATA16_WIDTH(x) (1<<((x*4)+0)) +#define SMC_BYTE_ADDR_MODE(x) (1<<((x*4)+1)) /* 0-> Half-word base address*/ + /* 1-> Byte base address*/ +#define SMC_WAIT_ENABLE(x) (1<<((x*4)+2)) +#define SMC_BYTE_ENABLE(x) (1<<((x*4)+3)) + +#define SMC_BC_TACS(x) (x << 28) /* 0clk address set-up */ +#define SMC_BC_TCOS(x) (x << 24) /* 4clk chip selection set-up */ +#define SMC_BC_TACC(x) (x << 16) /* 14clk access cycle */ +#define SMC_BC_TCOH(x) (x << 12) /* 1clk chip selection hold */ +#define SMC_BC_TAH(x) (x << 8) /* 4clk address holding time */ +#define SMC_BC_TACP(x) (x << 4) /* 6clk page mode access cycle */ +#define SMC_BC_PMC(x) (x << 0) /* normal(1data)page mode configuration */ + +#ifndef __ASSEMBLY__ +struct s5pc1xx_smc { + unsigned int bw; + unsigned int bc[6]; +}; +#endif /* __ASSEMBLY__ */ + +#endif /* __ASM_ARCH_SMC_H_ */ From 01802e0d22a4bb3903b342ff2357ea3bbcccd289 Mon Sep 17 00:00:00 2001 From: Naveen Krishna CH Date: Fri, 5 Mar 2010 17:15:38 +0900 Subject: [PATCH 078/164] S5PC100: Function to configure the SROMC registers. Nand Flash, Ethernet, other features might need to configure the SROMC registers accordingly. The config_sromc() functions helps with this. Signed-off-by: Naveen Krishna Ch Signed-off-by: Minkyu Kang --- cpu/arm_cortexa8/s5pc1xx/Makefile | 1 + cpu/arm_cortexa8/s5pc1xx/sromc.c | 53 ++++++++++++++++++++++++++++++ include/asm-arm/arch-s5pc1xx/smc.h | 3 ++ 3 files changed, 57 insertions(+) create mode 100644 cpu/arm_cortexa8/s5pc1xx/sromc.c diff --git a/cpu/arm_cortexa8/s5pc1xx/Makefile b/cpu/arm_cortexa8/s5pc1xx/Makefile index 7290c2f52..01c93feda 100644 --- a/cpu/arm_cortexa8/s5pc1xx/Makefile +++ b/cpu/arm_cortexa8/s5pc1xx/Makefile @@ -34,6 +34,7 @@ SOBJS += reset.o COBJS += clock.o COBJS += cpu_info.o COBJS += gpio.o +COBJS += sromc.o COBJS += timer.o SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) diff --git a/cpu/arm_cortexa8/s5pc1xx/sromc.c b/cpu/arm_cortexa8/s5pc1xx/sromc.c new file mode 100644 index 000000000..380be81be --- /dev/null +++ b/cpu/arm_cortexa8/s5pc1xx/sromc.c @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2010 Samsung Electronics + * Naveen Krishna Ch + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#include +#include +#include + +/* + * s5pc1xx_config_sromc() - select the proper SROMC Bank and configure the + * band width control and bank control registers + * srom_bank - SROM Bank 0 to 5 + * smc_bw_conf - SMC Band witdh reg configuration value + * smc_bc_conf - SMC Bank Control reg configuration value + */ +void s5pc1xx_config_sromc(u32 srom_bank, u32 smc_bw_conf, u32 smc_bc_conf) +{ + u32 tmp; + struct s5pc1xx_smc *srom; + + if (cpu_is_s5pc100()) + srom = (struct s5pc1xx_smc *)S5PC100_SROMC_BASE; + else + srom = (struct s5pc1xx_smc *)S5PC110_SROMC_BASE; + + /* Configure SMC_BW register to handle proper SROMC bank */ + tmp = srom->bw; + tmp &= ~(0xF << (srom_bank * 4)); + tmp |= smc_bw_conf; + srom->bw = tmp; + + /* Configure SMC_BC register */ + srom->bc[srom_bank] = smc_bc_conf; +} diff --git a/include/asm-arm/arch-s5pc1xx/smc.h b/include/asm-arm/arch-s5pc1xx/smc.h index e1a53995a..88f4ffe33 100644 --- a/include/asm-arm/arch-s5pc1xx/smc.h +++ b/include/asm-arm/arch-s5pc1xx/smc.h @@ -47,4 +47,7 @@ struct s5pc1xx_smc { }; #endif /* __ASSEMBLY__ */ +/* Configure the Band Width and Bank Control Regs for required SROMC Bank */ +void s5pc1xx_config_sromc(u32 srom_bank, u32 smc_bw_conf, u32 smc_bc_conf); + #endif /* __ASM_ARCH_SMC_H_ */ From 2528dc52361bea49e6bd4a95ce2374d0004ca56f Mon Sep 17 00:00:00 2001 From: Naveen Krishna CH Date: Fri, 5 Mar 2010 17:16:05 +0900 Subject: [PATCH 079/164] SAMSUNG: SMDKC100: Adds ethernet support. Add setup for ethernet on SMDKC100, allowing kernel/ramdisk to be loaded over tftp. The preinit function will configure GPIO (GPK0CON) & SROMC to look for environment in SROM Bank 3. Signed-off-by: Naveen Krishna Ch Signed-off-by: Minkyu Kang --- board/samsung/smdkc100/smdkc100.c | 39 +++++++++++++++++++++++++++++++ include/configs/smdkc100.h | 12 +++++++++- 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/board/samsung/smdkc100/smdkc100.c b/board/samsung/smdkc100/smdkc100.c index 15a1a27c3..fb466c6ec 100644 --- a/board/samsung/smdkc100/smdkc100.c +++ b/board/samsung/smdkc100/smdkc100.c @@ -23,10 +23,40 @@ */ #include +#include +#include +#include +#include + DECLARE_GLOBAL_DATA_PTR; +/* + * Miscellaneous platform dependent initialisations + */ +static void smc9115_pre_init(void) +{ + u32 smc_bw_conf, smc_bc_conf; + + struct s5pc100_gpio *const gpio = + (struct s5pc100_gpio *)S5PC100_GPIO_BASE; + + /* gpio configuration GPK0CON */ + gpio_cfg_pin(&gpio->gpio_k0, CONFIG_ENV_SROM_BANK, GPIO_FUNC(2)); + + /* Ethernet needs bus width of 16 bits */ + smc_bw_conf = SMC_DATA16_WIDTH(CONFIG_ENV_SROM_BANK); + smc_bc_conf = SMC_BC_TACS(0x0) | SMC_BC_TCOS(0x4) | SMC_BC_TACC(0xe) + | SMC_BC_TCOH(0x1) | SMC_BC_TAH(0x4) + | SMC_BC_TACP(0x6) | SMC_BC_PMC(0x0); + + /* Select and configure the SROMC bank */ + s5pc1xx_config_sromc(CONFIG_ENV_SROM_BANK, smc_bw_conf, smc_bc_conf); +} + int board_init(void) { + smc9115_pre_init(); + gd->bd->bi_arch_number = MACH_TYPE_SMDKC100; gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100; @@ -49,3 +79,12 @@ int checkboard(void) return 0; } #endif + +int board_eth_init(bd_t *bis) +{ + int rc = 0; +#ifdef CONFIG_SMC911X + rc = smc911x_initialize(0, CONFIG_SMC911X_BASE); +#endif + return rc; +} diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h index a8ba0528b..09bce6d0f 100644 --- a/include/configs/smdkc100.h +++ b/include/configs/smdkc100.h @@ -83,7 +83,6 @@ #undef CONFIG_CMD_FLASH #undef CONFIG_CMD_IMLS #undef CONFIG_CMD_NAND -#undef CONFIG_CMD_NET #define CONFIG_CMD_CACHE #define CONFIG_CMD_REGINFO @@ -235,4 +234,15 @@ #define CONFIG_DOS_PARTITION 1 +/* + * Ethernet Contoller driver + */ +#ifdef CONFIG_CMD_NET +#define CONFIG_NET_MULTI +#define CONFIG_SMC911X 1 /* we have a SMC9115 on-board */ +#define CONFIG_SMC911X_16_BIT 1 /* SMC911X_16_BIT Mode */ +#define CONFIG_SMC911X_BASE 0x98800300 /* SMC911X Drive Base */ +#define CONFIG_ENV_SROM_BANK 3 /* Select SROM Bank-3 for Ethernet*/ +#endif /* CONFIG_CMD_NET */ + #endif /* __CONFIG_H */ From 33eef04bf8541f7b15d4f694ad10f9b912b9caa6 Mon Sep 17 00:00:00 2001 From: Matthias Kaehlcke Date: Tue, 9 Mar 2010 22:13:47 +0100 Subject: [PATCH 080/164] ep93xx timer: Rename struct timer_reg pointers ep93xx timer: Renamed pointers to struct timer_regs from name 'timer' to 'timer_regs' in order to avoid confusion with the global variable 'timer' Signed-off-by: Matthias Kaehlcke --- cpu/arm920t/ep93xx/timer.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cpu/arm920t/ep93xx/timer.c b/cpu/arm920t/ep93xx/timer.c index 31304b7f9..943f193ad 100644 --- a/cpu/arm920t/ep93xx/timer.c +++ b/cpu/arm920t/ep93xx/timer.c @@ -63,9 +63,9 @@ static inline unsigned long long usecs_to_ticks(unsigned long usecs) static inline unsigned long read_timer(void) { - struct timer_regs *timer = (struct timer_regs *)TIMER_BASE; + struct timer_regs *timer_regs = (struct timer_regs *)TIMER_BASE; - return TIMER_MAX_VAL - readl(&timer->timer3.value); + return TIMER_MAX_VAL - readl(&timer_regs->timer3.value); } /* @@ -120,17 +120,17 @@ void __udelay(unsigned long usec) int timer_init(void) { - struct timer_regs *timer = (struct timer_regs *)TIMER_BASE; + struct timer_regs *timer_regs = (struct timer_regs *)TIMER_BASE; /* use timer 3 with 508KHz and free running */ - writel(TIMER_CLKSEL, &timer->timer3.control); + writel(TIMER_CLKSEL, &timer_regs->timer3.control); /* set initial timer value 3 */ - writel(TIMER_MAX_VAL, &timer->timer3.load); + writel(TIMER_MAX_VAL, &timer_regs->timer3.load); /* Enable the timer */ writel(TIMER_ENABLE | TIMER_CLKSEL, - &timer->timer3.control); + &timer_regs->timer3.control); reset_timer_masked(); From b032698ff687034286c98c09fd4830d804cd1786 Mon Sep 17 00:00:00 2001 From: Matthias Kaehlcke Date: Tue, 9 Mar 2010 22:13:56 +0100 Subject: [PATCH 081/164] ep93xx timer: refactoring ep93xx timer: Simplified the timer code by eliminating clk_to_systicks() and performing (almost) all manipulation of the timer structure in read_timer() Signed-off-by: Matthias Kaehlcke --- cpu/arm920t/ep93xx/timer.c | 52 ++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 28 deletions(-) diff --git a/cpu/arm920t/ep93xx/timer.c b/cpu/arm920t/ep93xx/timer.c index 943f193ad..4a0ce4da6 100644 --- a/cpu/arm920t/ep93xx/timer.c +++ b/cpu/arm920t/ep93xx/timer.c @@ -1,8 +1,7 @@ /* * Cirrus Logic EP93xx timer support. * - * Copyright (C) 2009, 2010 - * Matthias Kaehlcke + * Copyright (C) 2009, 2010 Matthias Kaehlcke * * Copyright (C) 2004, 2005 * Cory T. Tusar, Videon Central, Inc., @@ -42,17 +41,9 @@ static struct ep93xx_timer { unsigned long long ticks; - unsigned long last_update; + unsigned long last_read; } timer; -static inline unsigned long clk_to_systicks(unsigned long long clk_ticks) -{ - unsigned long long sys_ticks = (clk_ticks * CONFIG_SYS_HZ); - do_div(sys_ticks, TIMER_FREQ); - - return (unsigned long)sys_ticks; -} - static inline unsigned long long usecs_to_ticks(unsigned long usecs) { unsigned long long ticks = (unsigned long long)usecs * TIMER_FREQ; @@ -61,11 +52,18 @@ static inline unsigned long long usecs_to_ticks(unsigned long usecs) return ticks; } -static inline unsigned long read_timer(void) +static inline void read_timer(void) { struct timer_regs *timer_regs = (struct timer_regs *)TIMER_BASE; + const unsigned long now = TIMER_MAX_VAL - readl(&timer_regs->timer3.value); - return TIMER_MAX_VAL - readl(&timer_regs->timer3.value); + if (now >= timer.last_read) + timer.ticks += now - timer.last_read; + else + /* an overflow occurred */ + timer.ticks += TIMER_MAX_VAL - timer.last_read + now; + + timer.last_read = now; } /* @@ -73,17 +71,14 @@ static inline unsigned long read_timer(void) */ unsigned long long get_ticks(void) { - const unsigned long now = read_timer(); + unsigned long long sys_ticks; - if (now >= timer.last_update) - timer.ticks += now - timer.last_update; - else - /* an overflow occurred */ - timer.ticks += TIMER_MAX_VAL - timer.last_update + now; + read_timer(); - timer.last_update = now; + sys_ticks = timer.ticks * CONFIG_SYS_HZ; + do_div(sys_ticks, TIMER_FREQ); - return clk_to_systicks(timer.ticks); + return sys_ticks; } unsigned long get_timer_masked(void) @@ -98,7 +93,7 @@ unsigned long get_timer(unsigned long base) void reset_timer_masked(void) { - timer.last_update = read_timer(); + read_timer(); timer.ticks = 0; } @@ -109,23 +104,24 @@ void reset_timer(void) void __udelay(unsigned long usec) { - /* read the timer and update timer.ticks */ - get_ticks(); + unsigned long long target; - const unsigned long long target = timer.ticks + usecs_to_ticks(usec); + read_timer(); + + target = timer.ticks + usecs_to_ticks(usec); while (timer.ticks < target) - get_ticks(); + read_timer(); } int timer_init(void) { struct timer_regs *timer_regs = (struct timer_regs *)TIMER_BASE; - /* use timer 3 with 508KHz and free running */ + /* use timer 3 with 508KHz and free running, not enabled now */ writel(TIMER_CLKSEL, &timer_regs->timer3.control); - /* set initial timer value 3 */ + /* set initial timer value */ writel(TIMER_MAX_VAL, &timer_regs->timer3.load); /* Enable the timer */ From c9f72b3da8855c3c9679c821127cccd91e0380ed Mon Sep 17 00:00:00 2001 From: Daniel Gorsulowski Date: Wed, 17 Mar 2010 08:21:11 +0100 Subject: [PATCH 082/164] at91: boards cleanup for deprecated CONFIG_CMD_AUTOSCRIPT CONFIG_CMD_AUTOSCRIPT support is deprecated and non-existing This clean up patch removes the references for esd boards Signed-off-by: Daniel Gorsulowski --- include/configs/meesc.h | 1 - include/configs/otc570.h | 1 - 2 files changed, 2 deletions(-) diff --git a/include/configs/meesc.h b/include/configs/meesc.h index d002b9751..e085f4a47 100644 --- a/include/configs/meesc.h +++ b/include/configs/meesc.h @@ -82,7 +82,6 @@ */ #include #undef CONFIG_CMD_BDI -#undef CONFIG_CMD_AUTOSCRIPT #undef CONFIG_CMD_FPGA #undef CONFIG_CMD_LOADS #undef CONFIG_CMD_IMLS diff --git a/include/configs/otc570.h b/include/configs/otc570.h index 4fde012c8..fb0f576f4 100644 --- a/include/configs/otc570.h +++ b/include/configs/otc570.h @@ -131,7 +131,6 @@ * Command line configuration. */ #include -#undef CONFIG_CMD_AUTOSCRIPT #undef CONFIG_CMD_FPGA #undef CONFIG_CMD_LOADS #undef CONFIG_CMD_IMLS From f936aa0528fe4f5d86168575528e0c52b485c642 Mon Sep 17 00:00:00 2001 From: Achim Ehrlich Date: Wed, 17 Mar 2010 14:50:29 +0100 Subject: [PATCH 083/164] Convert at91 watchdog driver to new SoC access This converts the at91 watchdog driver to new c structure type to access registers of the SoC Signed-off-by: Achim Ehrlich --- drivers/watchdog/at91sam9_wdt.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c index 5bb8b77af..25afae748 100644 --- a/drivers/watchdog/at91sam9_wdt.c +++ b/drivers/watchdog/at91sam9_wdt.c @@ -42,11 +42,10 @@ static int at91_wdt_settimeout(unsigned int timeout) { unsigned int reg; - unsigned int mr; + at91_wdt_t *wd = (at91_wdt_t *) AT91_WDT_BASE; /* Check if disabled */ - mr = at91_sys_read(AT91_WDT_MR); - if (mr & AT91_WDT_WDDIS) { + if (readl(&wd->mr) & AT91_WDT_MR_WDDIS) { printf("sorry, watchdog is disabled\n"); return -1; } @@ -57,19 +56,21 @@ static int at91_wdt_settimeout(unsigned int timeout) * Since WDV is a 12-bit counter, the maximum period is * 4096 / 256 = 16 seconds. */ - reg = AT91_WDT_WDRSTEN /* causes watchdog reset */ - /* | AT91_WDT_WDRPROC causes processor reset only */ - | AT91_WDT_WDDBGHLT /* disabled in debug mode */ - | AT91_WDT_WDD /* restart at any time */ - | (timeout & AT91_WDT_WDV); /* timer value */ - at91_sys_write(AT91_WDT_MR, reg); + + reg = AT91_WDT_MR_WDRSTEN /* causes watchdog reset */ + | AT91_WDT_MR_WDDBGHLT /* disabled in debug mode */ + | AT91_WDT_MR_WDD(0xfff) /* restart at any time */ + | AT91_WDT_MR_WDV(timeout); /* timer value */ + + writel(reg, &wd->mr); return 0; } void hw_watchdog_reset(void) { - at91_sys_write(AT91_WDT_CR, AT91_WDT_KEY | AT91_WDT_WDRSTT); + at91_wdt_t *wd = (at91_wdt_t *) AT91_WDT_BASE; + writel(AT91_WDT_CR_WDRSTT | AT91_WDT_CR_KEY, &wd->cr); } void hw_watchdog_init(void) From 4b894a97d307c3207af40031d9e820e2960de57f Mon Sep 17 00:00:00 2001 From: Alessandro Rubini Date: Wed, 25 Nov 2009 23:41:51 +0100 Subject: [PATCH 084/164] Nomadik: fix reset_timer() Previous code was failing when reading back the timer less than 400us after resetting it. This lead nand operations to incorrectly timeout any now and then. Moreover, writing the load register isn't immediately reflected in the value register. We must wait for a clock edge, so read_timer now waits for the value to change at least once, otherwise nand operation would timeout anyways (though less frequently). Signed-off-by: Alessandro Rubini Acked-by: Andrea Gallo --- cpu/arm926ejs/nomadik/timer.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/cpu/arm926ejs/nomadik/timer.c b/cpu/arm926ejs/nomadik/timer.c index 047b9e351..1d98ef3eb 100644 --- a/cpu/arm926ejs/nomadik/timer.c +++ b/cpu/arm926ejs/nomadik/timer.c @@ -34,8 +34,8 @@ #define TICKS_PER_HZ (TIMER_CLOCK / CONFIG_SYS_HZ) #define TICKS_TO_HZ(x) ((x) / TICKS_PER_HZ) -/* macro to read the 32 bit timer: since it decrements, we invert read value */ -#define READ_TIMER() (~readl(CONFIG_SYS_TIMERBASE + MTU_VAL(0))) +/* macro to read the decrementing 32 bit timer as an increasing count */ +#define READ_TIMER() (0 - readl(CONFIG_SYS_TIMERBASE + MTU_VAL(0))) /* Configure a free-running, auto-wrap counter with no prescaler */ int timer_init(void) @@ -49,7 +49,16 @@ int timer_init(void) /* Restart counting from 0 */ void reset_timer(void) { - writel(0, CONFIG_SYS_TIMERBASE + MTU_LR(0)); /* Immediate effect */ + ulong val; + writel(0, CONFIG_SYS_TIMERBASE + MTU_LR(0)); + /* + * The load-register isn't really immediate: it changes on clock + * edges, so we must wait for our newly-written value to appear. + * Since we might miss reading 0, wait for any change in value. + */ + val = READ_TIMER(); + while (READ_TIMER() == val) + ; } /* Return how many HZ passed since "base" */ From e99056e3877d1f04a36991aa48f1c690547f5ab9 Mon Sep 17 00:00:00 2001 From: Asen Dimov Date: Thu, 18 Mar 2010 13:46:45 +0200 Subject: [PATCH 085/164] using AT91_PMC_MCKR_MDIV_ instead of LEGACY one in at91/clock.c Signed-off-by: Asen Dimov --- cpu/arm926ejs/at91/clock.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cpu/arm926ejs/at91/clock.c b/cpu/arm926ejs/at91/clock.c index b06d7601b..ecf91f518 100644 --- a/cpu/arm926ejs/at91/clock.c +++ b/cpu/arm926ejs/at91/clock.c @@ -203,7 +203,8 @@ int at91_clock_init(unsigned long main_clock) if (mckr & AT91_PMC_MCKR_MDIV_MASK) freq /= 2; /* processor clock division */ #elif defined(CONFIG_AT91SAM9G45) || defined(CONFIG_AT91SAM9M10G45) - mck_rate_hz = (mckr & AT91_PMC_MCKR_MDIV_MASK) == AT91SAM9_PMC_MDIV_3 + mck_rate_hz = (mckr & AT91_PMC_MCKR_MDIV_MASK) == + (AT91_PMC_MCKR_MDIV_2 | AT91_PMC_MCKR_MDIV_4) ? freq / 3 : freq / (1 << ((mckr & AT91_PMC_MCKR_MDIV_MASK) >> 8)); #else From 0701f730cebc8dd065b70812ca0332055dcf10f8 Mon Sep 17 00:00:00 2001 From: Matthias Fuchs Date: Thu, 25 Mar 2010 14:30:13 +0100 Subject: [PATCH 086/164] at91: use C structs for AT91 OHCI code This patch is part of migrating the AT91 support towards using C struct for all SOC access. It removes one more CONFIG_AT91_LEGACY warning. at91_pmc.h needs cleanup after migration of the drivers has been done. Signed-off-by: Matthias Fuchs --- drivers/usb/host/ohci-at91.c | 28 +++++++++++++--------------- include/asm-arm/arch-at91/at91_pmc.h | 23 ++++++++++++++++++----- 2 files changed, 31 insertions(+), 20 deletions(-) diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c index 29f3ba186..b2e03bc58 100644 --- a/drivers/usb/host/ohci-at91.c +++ b/drivers/usb/host/ohci-at91.c @@ -25,11 +25,6 @@ #if defined(CONFIG_USB_OHCI_NEW) && defined(CONFIG_SYS_USB_OHCI_CPU_INIT) -#ifndef CONFIG_AT91_LEGACY -#define CONFIG_AT91_LEGACY -#warning Please update to use C structur SoC access ! -#endif - #include #include #include @@ -37,22 +32,23 @@ int usb_cpu_init(void) { + at91_pmc_t *pmc = (at91_pmc_t *)AT91_PMC_BASE; #if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \ defined(CONFIG_AT91SAM9263) || defined(CONFIG_AT91SAM9G20) || \ defined(CONFIG_AT91SAM9261) /* Enable PLLB */ - at91_sys_write(AT91_CKGR_PLLBR, get_pllb_init()); - while ((at91_sys_read(AT91_PMC_SR) & AT91_PMC_LOCKB) != AT91_PMC_LOCKB) + writel(get_pllb_init(), &pmc->pllbr); + while ((readl(&pmc->sr) & AT91_PMC_LOCKB) != AT91_PMC_LOCKB) ; #endif /* Enable USB host clock. */ - at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_UHP); + writel(1 << AT91_ID_UHP, &pmc->pcer); #ifdef CONFIG_AT91SAM9261 - at91_sys_write(AT91_PMC_SCER, AT91_PMC_UHP | AT91_PMC_HCK0); + writel(AT91_PMC_UHP | AT91_PMC_HCK0, &pmc->scer); #else - at91_sys_write(AT91_PMC_SCER, AT91_PMC_UHP); + writel(AT91_PMC_UHP, &pmc->scer); #endif return 0; @@ -60,19 +56,21 @@ int usb_cpu_init(void) int usb_cpu_stop(void) { + at91_pmc_t *pmc = (at91_pmc_t *)AT91_PMC_BASE; + /* Disable USB host clock. */ - at91_sys_write(AT91_PMC_PCDR, 1 << AT91_ID_UHP); + writel(1 << AT91_ID_UHP, &pmc->pcdr); #ifdef CONFIG_AT91SAM9261 - at91_sys_write(AT91_PMC_SCDR, AT91_PMC_UHP | AT91_PMC_HCK0); + writel(AT91_PMC_UHP | AT91_PMC_HCK0, &pmc->scdr); #else - at91_sys_write(AT91_PMC_SCDR, AT91_PMC_UHP); + writel(AT91_PMC_UHP, &pmc->scdr); #endif #if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \ defined(CONFIG_AT91SAM9263) || defined(CONFIG_AT91SAM9G20) /* Disable PLLB */ - at91_sys_write(AT91_CKGR_PLLBR, 0); - while ((at91_sys_read(AT91_PMC_SR) & AT91_PMC_LOCKB) != 0) + writel(0, &pmc->pllbr); + while ((readl(&pmc->sr) & AT91_PMC_LOCKB) != 0) ; #endif diff --git a/include/asm-arm/arch-at91/at91_pmc.h b/include/asm-arm/arch-at91/at91_pmc.h index 680fe3327..5b1a85d05 100644 --- a/include/asm-arm/arch-at91/at91_pmc.h +++ b/include/asm-arm/arch-at91/at91_pmc.h @@ -108,11 +108,12 @@ typedef struct at91_pmc { #define AT91_PMC_IXR_PCKRDY3 0x00000800 #ifdef CONFIG_AT91_LEGACY - #define AT91_PMC_SCER (AT91_PMC + 0x00) /* System Clock Enable Register */ #define AT91_PMC_SCDR (AT91_PMC + 0x04) /* System Clock Disable Register */ #define AT91_PMC_SCSR (AT91_PMC + 0x08) /* System Clock Status Register */ +#endif + #define AT91_PMC_PCK (1 << 0) /* Processor Clock */ #define AT91RM9200_PMC_UDP (1 << 1) /* USB Devcice Port Clock [AT91RM9200 only] */ #define AT91RM9200_PMC_MCKUDP (1 << 2) /* USB Device Port Master Clock Automatic Disable on Suspend [AT91RM9200 only] */ @@ -128,27 +129,34 @@ typedef struct at91_pmc { #define AT91_PMC_HCK0 (1 << 16) /* AHB Clock (USB host) [AT91SAM9261 only] */ #define AT91_PMC_HCK1 (1 << 17) /* AHB Clock (LCD) [AT91SAM9261 only] */ +#ifdef CONFIG_AT91_LEGACY #define AT91_PMC_PCER (AT91_PMC + 0x10) /* Peripheral Clock Enable Register */ #define AT91_PMC_PCDR (AT91_PMC + 0x14) /* Peripheral Clock Disable Register */ #define AT91_PMC_PCSR (AT91_PMC + 0x18) /* Peripheral Clock Status Register */ #define AT91_CKGR_UCKR (AT91_PMC + 0x1C) /* UTMI Clock Register [SAM9RL, CAP9] */ +#endif + #define AT91_PMC_UPLLEN (1 << 16) /* UTMI PLL Enable */ #define AT91_PMC_UPLLCOUNT (0xf << 20) /* UTMI PLL Start-up Time */ #define AT91_PMC_BIASEN (1 << 24) /* UTMI BIAS Enable */ #define AT91_PMC_BIASCOUNT (0xf << 28) /* UTMI PLL Start-up Time */ +#ifdef CONFIG_AT91_LEGACY #define AT91_CKGR_MOR (AT91_PMC + 0x20) /* Main Oscillator Register [not on SAM9RL] */ +#endif #define AT91_PMC_MOSCEN (1 << 0) /* Main Oscillator Enable */ #define AT91_PMC_OSCBYPASS (1 << 1) /* Oscillator Bypass [SAM9x, CAP9] */ #define AT91_PMC_OSCOUNT (0xff << 8) /* Main Oscillator Start-up Time */ - +#ifdef CONFIG_AT91_LEGACY #define AT91_CKGR_MCFR (AT91_PMC + 0x24) /* Main Clock Frequency Register */ +#endif #define AT91_PMC_MAINF (0xffff << 0) /* Main Clock Frequency */ #define AT91_PMC_MAINRDY (1 << 16) /* Main Clock Ready */ - +#ifdef CONFIG_AT91_LEGACY #define AT91_CKGR_PLLAR (AT91_PMC + 0x28) /* PLL A Register */ #define AT91_CKGR_PLLBR (AT91_PMC + 0x2c) /* PLL B Register */ +#endif #define AT91_PMC_DIV (0xff << 0) /* Divider */ #define AT91_PMC_PLLCOUNT (0x3f << 8) /* PLL Counter */ #define AT91_PMC_OUT (3 << 14) /* PLL Clock Frequency Range */ @@ -160,7 +168,9 @@ typedef struct at91_pmc { #define AT91_PMC_USB96M (1 << 28) /* Divider by 2 Enable (PLLB only) */ #define AT91_PMC_PLLA_WR_ERRATA (1 << 29) /* Bit 29 must always be set to 1 when programming the CKGR_PLLAR register */ +#ifdef CONFIG_AT91_LEGACY #define AT91_PMC_MCKR (AT91_PMC + 0x30) /* Master Clock Register */ +#endif #define AT91_PMC_CSS (3 << 0) /* Master Clock Selection */ #define AT91_PMC_CSS_SLOW (0 << 0) #define AT91_PMC_CSS_MAIN (1 << 0) @@ -188,11 +198,13 @@ typedef struct at91_pmc { #define AT91_PMC_PDIV_1 (0 << 12) #define AT91_PMC_PDIV_2 (1 << 12) +#ifdef CONFIG_AT91_LEGACY #define AT91_PMC_PCKR(n) (AT91_PMC + 0x40 + ((n) * 4)) /* Programmable Clock 0-3 Registers */ #define AT91_PMC_IER (AT91_PMC + 0x60) /* Interrupt Enable Register */ #define AT91_PMC_IDR (AT91_PMC + 0x64) /* Interrupt Disable Register */ #define AT91_PMC_SR (AT91_PMC + 0x68) /* Status Register */ +#endif #define AT91_PMC_MOSCS (1 << 0) /* MOSCS Flag */ #define AT91_PMC_LOCKA (1 << 1) /* PLLA Lock */ #define AT91_PMC_LOCKB (1 << 2) /* PLLB Lock */ @@ -203,12 +215,13 @@ typedef struct at91_pmc { #define AT91_PMC_PCK1RDY (1 << 9) /* Programmable Clock 1 */ #define AT91_PMC_PCK2RDY (1 << 10) /* Programmable Clock 2 */ #define AT91_PMC_PCK3RDY (1 << 11) /* Programmable Clock 3 */ +#ifdef CONFIG_AT91_LEGACY #define AT91_PMC_IMR (AT91_PMC + 0x6c) /* Interrupt Mask Register */ #define AT91_PMC_PROT (AT91_PMC + 0xe4) /* Protect Register [AT91CAP9 revC only] */ +#endif #define AT91_PMC_PROTKEY 0x504d4301 /* Activation Code */ - +#ifdef CONFIG_AT91_LEGACY #define AT91_PMC_VER (AT91_PMC + 0xfc) /* PMC Module Version [AT91CAP9 only] */ - #endif /* CONFIG_AT91_LEGACY */ #endif From b5045cdda556c73e2697cd1d3ea6563315cbf490 Mon Sep 17 00:00:00 2001 From: Detlev Zundel Date: Wed, 31 Mar 2010 15:38:55 +0200 Subject: [PATCH 087/164] arm/integrator: Remove unneccessary CONFIG_PCI check. pci_eth_init() is already conditional to CONFIG_PCI so not every caller needs to have conditionals. This is the only place in the current code base where such a check is still at the calling site. Signed-off-by: Detlev Zundel CC: Ben Warren CC: Peter Pearse --- board/armltd/integrator/integrator.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/board/armltd/integrator/integrator.c b/board/armltd/integrator/integrator.c index 518944e07..9bb56b520 100644 --- a/board/armltd/integrator/integrator.c +++ b/board/armltd/integrator/integrator.c @@ -132,9 +132,7 @@ int board_eth_init(bd_t *bis) #ifdef CONFIG_SMC91111 rc = smc91111_initialize(0, CONFIG_SMC91111_BASE); #endif -#ifdef CONFIG_PCI rc += pci_eth_init(bis); -#endif return rc; } #endif From d0b0dcaa220549999d6ea74cf87487846c186a0f Mon Sep 17 00:00:00 2001 From: Stefan Roese Date: Thu, 1 Apr 2010 14:37:24 +0200 Subject: [PATCH 088/164] i2c: Move PPC4xx I2C driver into drivers/i2c directory This patch moves the PPC4xx specific I2C device driver into the I2C drivers directory. All 4xx config headers are updated to include this driver. Signed-off-by: Stefan Roese --- cpu/ppc4xx/Makefile | 1 - drivers/i2c/Makefile | 1 + cpu/ppc4xx/i2c.c => drivers/i2c/ppc4xx_i2c.c | 0 include/configs/ASH405.h | 1 + include/configs/CANBT.h | 1 + include/configs/CMS700.h | 1 + include/configs/CPCI2DP.h | 1 + include/configs/CPCI405.h | 1 + include/configs/CPCI4052.h | 1 + include/configs/CPCI405AB.h | 1 + include/configs/CPCI405DT.h | 1 + include/configs/CPCIISER4.h | 1 + include/configs/CRAYL1.h | 1 + include/configs/DP405.h | 1 + include/configs/DU405.h | 1 + include/configs/DU440.h | 1 + include/configs/ERIC.h | 1 + include/configs/G2000.h | 1 + include/configs/HH405.h | 1 + include/configs/HUB405.h | 1 + include/configs/JSE.h | 1 + include/configs/KAREF.h | 1 + include/configs/METROBOX.h | 1 + include/configs/MIP405.h | 1 + include/configs/OCRTC.h | 1 + include/configs/ORSG.h | 1 + include/configs/PCI405.h | 1 + include/configs/PIP405.h | 1 + include/configs/PLU405.h | 1 + include/configs/PMC405.h | 1 + include/configs/PMC405DE.h | 1 + include/configs/PMC440.h | 1 + include/configs/PPChameleonEVB.h | 1 + include/configs/VOH405.h | 1 + include/configs/VOM405.h | 1 + include/configs/W7OLMC.h | 1 + include/configs/W7OLMG.h | 1 + include/configs/WUH405.h | 1 + include/configs/XPEDITE1000.h | 1 + include/configs/alpr.h | 1 + include/configs/amcc-common.h | 1 + include/configs/csb272.h | 1 + include/configs/csb472.h | 1 + include/configs/korat.h | 1 + include/configs/lwmon5.h | 1 + include/configs/netstal-common.h | 1 + include/configs/p3p440.h | 1 + include/configs/pcs440ep.h | 1 + include/configs/quad100hd.h | 1 + include/configs/sbc405.h | 1 + include/configs/sc3.h | 1 + include/configs/zeus.h | 1 + 52 files changed, 50 insertions(+), 1 deletion(-) rename cpu/ppc4xx/i2c.c => drivers/i2c/ppc4xx_i2c.c (100%) diff --git a/cpu/ppc4xx/Makefile b/cpu/ppc4xx/Makefile index 365f966fe..88d53fbb1 100644 --- a/cpu/ppc4xx/Makefile +++ b/cpu/ppc4xx/Makefile @@ -52,7 +52,6 @@ COBJS += denali_data_eye.o COBJS += denali_spd_ddr2.o COBJS += ecc.o COBJS += fdt.o -COBJS += i2c.o COBJS += interrupts.o COBJS += iop480_uart.o ifdef CONFIG_CMD_REGINFO diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile index 29bda85db..d2c251546 100644 --- a/drivers/i2c/Makefile +++ b/drivers/i2c/Makefile @@ -34,6 +34,7 @@ COBJS-$(CONFIG_DRIVER_OMAP1510_I2C) += omap1510_i2c.o COBJS-$(CONFIG_DRIVER_OMAP24XX_I2C) += omap24xx_i2c.o COBJS-$(CONFIG_DRIVER_OMAP34XX_I2C) += omap24xx_i2c.o COBJS-$(CONFIG_PCA9564_I2C) += pca9564_i2c.o +COBJS-$(CONFIG_PPC4XX_I2C) += ppc4xx_i2c.o COBJS-$(CONFIG_DRIVER_S3C24X0_I2C) += s3c24x0_i2c.o COBJS-$(CONFIG_S3C44B0_I2C) += s3c44b0_i2c.o COBJS-$(CONFIG_SOFT_I2C) += soft_i2c.o diff --git a/cpu/ppc4xx/i2c.c b/drivers/i2c/ppc4xx_i2c.c similarity index 100% rename from cpu/ppc4xx/i2c.c rename to drivers/i2c/ppc4xx_i2c.c diff --git a/include/configs/ASH405.h b/include/configs/ASH405.h index 5cb0f1e28..4cb805223 100644 --- a/include/configs/ASH405.h +++ b/include/configs/ASH405.h @@ -244,6 +244,7 @@ * I2C EEPROM (CAT24WC16) for environment */ #define CONFIG_HARD_I2C /* I2c with hardware support */ +#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F diff --git a/include/configs/CANBT.h b/include/configs/CANBT.h index e3e6e75e8..cdba81d32 100644 --- a/include/configs/CANBT.h +++ b/include/configs/CANBT.h @@ -173,6 +173,7 @@ * I2C EEPROM (CAT24WC08) for environment */ #define CONFIG_HARD_I2C /* I2C with hardware support */ +#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F diff --git a/include/configs/CMS700.h b/include/configs/CMS700.h index ae8494d57..2b6786b9d 100644 --- a/include/configs/CMS700.h +++ b/include/configs/CMS700.h @@ -224,6 +224,7 @@ * I2C EEPROM (CAT24WC16) for environment */ #define CONFIG_HARD_I2C /* I2c with hardware support */ +#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SYS_I2C_SPEED 100000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F diff --git a/include/configs/CPCI2DP.h b/include/configs/CPCI2DP.h index 5c88c47b5..922121173 100644 --- a/include/configs/CPCI2DP.h +++ b/include/configs/CPCI2DP.h @@ -207,6 +207,7 @@ * I2C EEPROM (CAT24WC16) for environment */ #define CONFIG_HARD_I2C /* I2c with hardware support */ +#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F diff --git a/include/configs/CPCI405.h b/include/configs/CPCI405.h index d131aeaf4..3e7020df8 100644 --- a/include/configs/CPCI405.h +++ b/include/configs/CPCI405.h @@ -256,6 +256,7 @@ * I2C EEPROM (CAT24WC08) for environment */ #define CONFIG_HARD_I2C /* I2c with hardware support */ +#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h index 07c4e3599..d3000f657 100644 --- a/include/configs/CPCI4052.h +++ b/include/configs/CPCI4052.h @@ -283,6 +283,7 @@ * I2C EEPROM (CAT24WC16) for environment */ #define CONFIG_HARD_I2C /* I2c with hardware support */ +#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F diff --git a/include/configs/CPCI405AB.h b/include/configs/CPCI405AB.h index c78552bbd..d3763441e 100644 --- a/include/configs/CPCI405AB.h +++ b/include/configs/CPCI405AB.h @@ -259,6 +259,7 @@ * I2C EEPROM (CAT24WC32) for environment */ #define CONFIG_HARD_I2C /* I2c with hardware support */ +#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SYS_I2C_SPEED 100000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F diff --git a/include/configs/CPCI405DT.h b/include/configs/CPCI405DT.h index 59e0778f6..07acab0c2 100644 --- a/include/configs/CPCI405DT.h +++ b/include/configs/CPCI405DT.h @@ -278,6 +278,7 @@ * I2C EEPROM (CAT24WC16) for environment */ #define CONFIG_HARD_I2C /* I2c with hardware support */ +#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F diff --git a/include/configs/CPCIISER4.h b/include/configs/CPCIISER4.h index b2679e587..5b50bcf33 100644 --- a/include/configs/CPCIISER4.h +++ b/include/configs/CPCIISER4.h @@ -189,6 +189,7 @@ * I2C EEPROM (CAT24WC08) for environment */ #define CONFIG_HARD_I2C /* I2C with hardware support */ +#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F diff --git a/include/configs/CRAYL1.h b/include/configs/CRAYL1.h index 96bf161aa..9ab30ecba 100644 --- a/include/configs/CRAYL1.h +++ b/include/configs/CRAYL1.h @@ -65,6 +65,7 @@ #define CONFIG_ETHADDR 00:40:a6:80:14:5 */ #define CONFIG_HARD_I2C 1 /* hardware support for i2c */ +#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SDRAM_BANK0 1 #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F diff --git a/include/configs/DP405.h b/include/configs/DP405.h index 49ecb6f36..4423f2ab6 100644 --- a/include/configs/DP405.h +++ b/include/configs/DP405.h @@ -174,6 +174,7 @@ * I2C EEPROM (CAT24WC16) for environment */ #define CONFIG_HARD_I2C /* I2c with hardware support */ +#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F diff --git a/include/configs/DU405.h b/include/configs/DU405.h index cfb302331..8f1fc78bc 100644 --- a/include/configs/DU405.h +++ b/include/configs/DU405.h @@ -212,6 +212,7 @@ * I2C EEPROM (CAT24WC08) for environment */ #define CONFIG_HARD_I2C /* I2c with hardware support */ +#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F diff --git a/include/configs/DU440.h b/include/configs/DU440.h index 65dc2359d..830466f7a 100644 --- a/include/configs/DU440.h +++ b/include/configs/DU440.h @@ -169,6 +169,7 @@ */ #define CONFIG_HARD_I2C 1 /* I2C with hardware support */ #undef CONFIG_SOFT_I2C /* I2C bit-banged */ +#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SYS_I2C_SPEED 100000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_I2C_MULTI_BUS 1 diff --git a/include/configs/ERIC.h b/include/configs/ERIC.h index 023f33e1e..e07f9a1dc 100644 --- a/include/configs/ERIC.h +++ b/include/configs/ERIC.h @@ -54,6 +54,7 @@ #endif /* total size of a X1240 is 2048 bytes */ #define CONFIG_HARD_I2C 1 /* I2C with hardware support */ +#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F diff --git a/include/configs/G2000.h b/include/configs/G2000.h index 6819c3e36..d2883eb8d 100644 --- a/include/configs/G2000.h +++ b/include/configs/G2000.h @@ -295,6 +295,7 @@ * I2C EEPROM (CAT24WC16) for environment */ #define CONFIG_HARD_I2C /* I2c with hardware support */ +#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F diff --git a/include/configs/HH405.h b/include/configs/HH405.h index 92335239d..01e0bc65e 100644 --- a/include/configs/HH405.h +++ b/include/configs/HH405.h @@ -331,6 +331,7 @@ * I2C EEPROM (CAT24WC16) for environment */ #define CONFIG_HARD_I2C /* I2c with hardware support */ +#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #if 0 /* test-only */ #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #else diff --git a/include/configs/HUB405.h b/include/configs/HUB405.h index ea502d42c..8c6d5edff 100644 --- a/include/configs/HUB405.h +++ b/include/configs/HUB405.h @@ -244,6 +244,7 @@ * I2C EEPROM (CAT24WC16) for environment */ #define CONFIG_HARD_I2C /* I2c with hardware support */ +#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F diff --git a/include/configs/JSE.h b/include/configs/JSE.h index 80c70e488..98f5661a0 100644 --- a/include/configs/JSE.h +++ b/include/configs/JSE.h @@ -217,6 +217,7 @@ #define CONFIG_HARD_I2C 1 /* I2C with hardware support */ #undef CONFIG_SOFT_I2C /* I2C bit-banged */ +#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F diff --git a/include/configs/KAREF.h b/include/configs/KAREF.h index 4b67c9454..49a7378f2 100644 --- a/include/configs/KAREF.h +++ b/include/configs/KAREF.h @@ -132,6 +132,7 @@ *----------------------------------------------------------------------*/ #define CONFIG_HARD_I2C 1 /* I2C hardware support */ #undef CONFIG_SOFT_I2C /* I2C !bit-banged */ +#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed 400kHz */ #define CONFIG_SYS_I2C_SLAVE 0x7F /* I2C slave address */ #define CONFIG_SYS_I2C_NOPROBES {0x69} /* Don't probe these addrs */ diff --git a/include/configs/METROBOX.h b/include/configs/METROBOX.h index 518173aa5..e7429dd19 100644 --- a/include/configs/METROBOX.h +++ b/include/configs/METROBOX.h @@ -194,6 +194,7 @@ *----------------------------------------------------------------------*/ #define CONFIG_HARD_I2C 1 /* I2C hardware support */ #undef CONFIG_SOFT_I2C /* I2C !bit-banged */ +#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed 400kHz */ #define CONFIG_SYS_I2C_SLAVE 0x7F /* I2C slave address */ #define CONFIG_SYS_I2C_NOPROBES {0x69} /* Don't probe these addrs */ diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h index 7ac934225..7e6484ee9 100644 --- a/include/configs/MIP405.h +++ b/include/configs/MIP405.h @@ -97,6 +97,7 @@ ***************************************************************/ #define CONFIG_HARD_I2C /* I2c with hardware support */ +#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SYS_I2C_SPEED 50000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F diff --git a/include/configs/OCRTC.h b/include/configs/OCRTC.h index 860ec5292..55471af34 100644 --- a/include/configs/OCRTC.h +++ b/include/configs/OCRTC.h @@ -210,6 +210,7 @@ * I2C EEPROM (CAT24WC08) for environment */ #define CONFIG_HARD_I2C /* I2c with hardware support */ +#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F diff --git a/include/configs/ORSG.h b/include/configs/ORSG.h index b2e2d41f2..142471362 100644 --- a/include/configs/ORSG.h +++ b/include/configs/ORSG.h @@ -208,6 +208,7 @@ * I2C EEPROM (CAT24WC08) for environment */ #define CONFIG_HARD_I2C /* I2c with hardware support */ +#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F diff --git a/include/configs/PCI405.h b/include/configs/PCI405.h index 4e397990c..0d443ea2d 100644 --- a/include/configs/PCI405.h +++ b/include/configs/PCI405.h @@ -204,6 +204,7 @@ * I2C EEPROM (CAT24WC16) for environment */ #define CONFIG_HARD_I2C /* I2c with hardware support */ +#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h index 962b29e95..3e57c0b92 100644 --- a/include/configs/PIP405.h +++ b/include/configs/PIP405.h @@ -86,6 +86,7 @@ * The Atmel EEPROM uses 16Bit addressing. ***************************************************************/ #define CONFIG_HARD_I2C /* I2c with hardware support */ +#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SYS_I2C_SPEED 50000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h index 3d59454eb..f917eb5c2 100644 --- a/include/configs/PLU405.h +++ b/include/configs/PLU405.h @@ -278,6 +278,7 @@ * I2C EEPROM (24WC16) for environment */ #define CONFIG_HARD_I2C /* I2c with hardware support */ +#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F diff --git a/include/configs/PMC405.h b/include/configs/PMC405.h index 87ea7b6d4..00a12fb83 100644 --- a/include/configs/PMC405.h +++ b/include/configs/PMC405.h @@ -235,6 +235,7 @@ * I2C EEPROM (CAT24WC16) for environment */ #define CONFIG_HARD_I2C /* I2c with hardware support */ +#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SYS_I2C_SPEED 100000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F diff --git a/include/configs/PMC405DE.h b/include/configs/PMC405DE.h index 7198632c3..2c048dd0d 100644 --- a/include/configs/PMC405DE.h +++ b/include/configs/PMC405DE.h @@ -215,6 +215,7 @@ * I2C EEPROM (24W16) for environment */ #define CONFIG_HARD_I2C /* I2c with hardware support */ +#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h index 89799af3f..c2fb56c6f 100644 --- a/include/configs/PMC440.h +++ b/include/configs/PMC440.h @@ -226,6 +226,7 @@ *----------------------------------------------------------------------*/ #define CONFIG_HARD_I2C 1 /* I2C with hardware support */ #undef CONFIG_SOFT_I2C /* I2C bit-banged */ +#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F diff --git a/include/configs/PPChameleonEVB.h b/include/configs/PPChameleonEVB.h index 8e9d92872..44f03dc39 100644 --- a/include/configs/PPChameleonEVB.h +++ b/include/configs/PPChameleonEVB.h @@ -414,6 +414,7 @@ * I2C EEPROM (CAT24WC16) for environment */ #define CONFIG_HARD_I2C /* I2c with hardware support */ +#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F diff --git a/include/configs/VOH405.h b/include/configs/VOH405.h index 38a1d0dec..9c91fccb1 100644 --- a/include/configs/VOH405.h +++ b/include/configs/VOH405.h @@ -277,6 +277,7 @@ * I2C EEPROM (CAT24WC16) for environment */ #define CONFIG_HARD_I2C /* I2c with hardware support */ +#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SYS_I2C_SPEED 100000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F diff --git a/include/configs/VOM405.h b/include/configs/VOM405.h index 4717869dd..871e4c339 100644 --- a/include/configs/VOM405.h +++ b/include/configs/VOM405.h @@ -203,6 +203,7 @@ * I2C EEPROM (CAT24WC16) for environment */ #define CONFIG_HARD_I2C /* I2c with hardware support */ +#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F diff --git a/include/configs/W7OLMC.h b/include/configs/W7OLMC.h index c0179150c..f06bfe552 100644 --- a/include/configs/W7OLMC.h +++ b/include/configs/W7OLMC.h @@ -273,6 +273,7 @@ * I2C EEPROM (CAT24WC08) for environment */ #define CONFIG_HARD_I2C /* I2c with hardware support */ +#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F diff --git a/include/configs/W7OLMG.h b/include/configs/W7OLMG.h index 1d4ad13ed..be8c9f82e 100644 --- a/include/configs/W7OLMG.h +++ b/include/configs/W7OLMG.h @@ -280,6 +280,7 @@ * I2C EEPROM (ATMEL 24C04N) */ #define CONFIG_HARD_I2C 1 /* Hardware assisted I2C */ +#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F diff --git a/include/configs/WUH405.h b/include/configs/WUH405.h index 5c281a1a6..be9ac6261 100644 --- a/include/configs/WUH405.h +++ b/include/configs/WUH405.h @@ -241,6 +241,7 @@ * I2C EEPROM (CAT24WC16) for environment */ #define CONFIG_HARD_I2C /* I2c with hardware support */ +#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F diff --git a/include/configs/XPEDITE1000.h b/include/configs/XPEDITE1000.h index 658e9473b..cf39aeaaf 100644 --- a/include/configs/XPEDITE1000.h +++ b/include/configs/XPEDITE1000.h @@ -141,6 +141,7 @@ extern void out32(unsigned int, unsigned long); * I2C */ #define CONFIG_HARD_I2C 1 /* I2C with hardware support */ +#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7f #define CONFIG_I2C_MULTI_BUS diff --git a/include/configs/alpr.h b/include/configs/alpr.h index 0fed9ad68..f2392f648 100644 --- a/include/configs/alpr.h +++ b/include/configs/alpr.h @@ -118,6 +118,7 @@ *----------------------------------------------------------------------*/ #define CONFIG_HARD_I2C 1 /* I2C with hardware support */ #undef CONFIG_SOFT_I2C /* I2C bit-banged */ +#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SYS_I2C_SPEED 100000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_I2C_NOPROBES {0x69} /* Don't probe these addrs */ diff --git a/include/configs/amcc-common.h b/include/configs/amcc-common.h index 8cd97b86d..13a941ef6 100644 --- a/include/configs/amcc-common.h +++ b/include/configs/amcc-common.h @@ -40,6 +40,7 @@ * I2C */ #define CONFIG_HARD_I2C /* I2C with hardware support */ +#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SYS_I2C_SLAVE 0x7F /* diff --git a/include/configs/csb272.h b/include/configs/csb272.h index aed6f50f9..9ded33066 100644 --- a/include/configs/csb272.h +++ b/include/configs/csb272.h @@ -171,6 +171,7 @@ * */ #define CONFIG_HARD_I2C 1 /* I2C with hardware support */ +#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SYS_I2C_SPEED 100000 /* I2C speed */ #define CONFIG_SYS_I2C_SLAVE 0x7F /* I2C slave address */ diff --git a/include/configs/csb472.h b/include/configs/csb472.h index 24b961f3e..71eb083e3 100644 --- a/include/configs/csb472.h +++ b/include/configs/csb472.h @@ -170,6 +170,7 @@ * */ #define CONFIG_HARD_I2C 1 /* I2C with hardware support */ +#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SYS_I2C_SPEED 100000 /* I2C speed */ #define CONFIG_SYS_I2C_SLAVE 0x7F /* I2C slave address */ diff --git a/include/configs/korat.h b/include/configs/korat.h index 026dd0854..f95df684e 100644 --- a/include/configs/korat.h +++ b/include/configs/korat.h @@ -153,6 +153,7 @@ */ #define CONFIG_HARD_I2C 1 /* I2C with hardware support */ #undef CONFIG_SOFT_I2C /* I2C bit-banged */ +#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h index 011dd5c81..6461124e5 100644 --- a/include/configs/lwmon5.h +++ b/include/configs/lwmon5.h @@ -258,6 +258,7 @@ *----------------------------------------------------------------------*/ #define CONFIG_HARD_I2C 1 /* I2C with hardware support */ #undef CONFIG_SOFT_I2C /* I2C bit-banged */ +#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SYS_I2C_SPEED 100000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F diff --git a/include/configs/netstal-common.h b/include/configs/netstal-common.h index 4bed7ae26..cb7efe7ab 100644 --- a/include/configs/netstal-common.h +++ b/include/configs/netstal-common.h @@ -42,6 +42,7 @@ * I2C */ #define CONFIG_HARD_I2C 1 /* I2C with hardware support */ +#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F diff --git a/include/configs/p3p440.h b/include/configs/p3p440.h index 729ca6ac7..d6b92070a 100644 --- a/include/configs/p3p440.h +++ b/include/configs/p3p440.h @@ -92,6 +92,7 @@ *----------------------------------------------------------------------*/ #define CONFIG_HARD_I2C 1 /* I2C with hardware support */ #undef CONFIG_SOFT_I2C /* I2C bit-banged */ +#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SYS_I2C_SPEED 100000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_I2C_NOPROBES {0x69} /* Don't probe these addrs */ diff --git a/include/configs/pcs440ep.h b/include/configs/pcs440ep.h index 000ae5cd7..1f744b875 100644 --- a/include/configs/pcs440ep.h +++ b/include/configs/pcs440ep.h @@ -138,6 +138,7 @@ *----------------------------------------------------------------------*/ #define CONFIG_HARD_I2C 1 /* I2C with hardware support */ #undef CONFIG_SOFT_I2C /* I2C bit-banged */ +#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SYS_I2C_SPEED 100000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F diff --git a/include/configs/quad100hd.h b/include/configs/quad100hd.h index b08dcd42d..403837e14 100644 --- a/include/configs/quad100hd.h +++ b/include/configs/quad100hd.h @@ -150,6 +150,7 @@ *----------------------------------------------------------------------*/ #define CONFIG_HARD_I2C 1 /* I2C with hardware support */ #undef CONFIG_SOFT_I2C /* I2C bit-banged */ +#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F diff --git a/include/configs/sbc405.h b/include/configs/sbc405.h index 242f42fdc..429b11c19 100644 --- a/include/configs/sbc405.h +++ b/include/configs/sbc405.h @@ -166,6 +166,7 @@ #define CONFIG_HARD_I2C 1 /* I2C with hardware support */ #undef CONFIG_SOFT_I2C /* I2C bit-banged */ +#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F diff --git a/include/configs/sc3.h b/include/configs/sc3.h index a5eca3989..d00f2480c 100644 --- a/include/configs/sc3.h +++ b/include/configs/sc3.h @@ -251,6 +251,7 @@ */ #define CONFIG_HARD_I2C /* I2C with hardware support */ #undef CONFIG_SOFT_I2C /* I2C bit-banged */ +#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define I2C_INIT #define I2C_ACTIVE 0 diff --git a/include/configs/zeus.h b/include/configs/zeus.h index 1a77c7196..3b2aede4f 100644 --- a/include/configs/zeus.h +++ b/include/configs/zeus.h @@ -167,6 +167,7 @@ *----------------------------------------------------------------------*/ #define CONFIG_HARD_I2C 1 /* I2C with hardware support */ #undef CONFIG_SOFT_I2C /* I2C bit-banged */ +#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F From cc4d1226585fa2544b5116702b02eacbb7aa48a1 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Thu, 18 Mar 2010 15:51:05 -0500 Subject: [PATCH 089/164] fsl_esdhc: Always stop clock before changing frequency We need to stop the clocks on 83xx/85xx as well as imx. No need to make this code conditional to just imx. Signed-off-by: Kumar Gala Acked-by: Stefano Babic --- drivers/mmc/fsl_esdhc.c | 11 +++-------- include/fsl_esdhc.h | 3 +-- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index e665b5ebd..85354e893 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -1,5 +1,5 @@ /* - * Copyright 2007, Freescale Semiconductor, Inc + * Copyright 2007,2010 Freescale Semiconductor, Inc * Andy Fleming * * Based vaguely on the pxa mmc code: @@ -265,18 +265,13 @@ void set_sysctl(struct mmc *mmc, uint clock) clk = (pre_div << 8) | (div << 4); - /* On imx the clock must be stopped before changing frequency */ - if (cfg->clk_enable) - esdhc_clrbits32(®s->sysctl, SYSCTL_CKEN); + esdhc_clrbits32(®s->sysctl, SYSCTL_CKEN); esdhc_clrsetbits32(®s->sysctl, SYSCTL_CLOCK_MASK, clk); udelay(10000); - clk = SYSCTL_PEREN; - /* On imx systems the clock must be explicitely enabled */ - if (cfg->clk_enable) - clk |= SYSCTL_CKEN; + clk = SYSCTL_PEREN | SYSCTL_CKEN; esdhc_setbits32(®s->sysctl, clk); } diff --git a/include/fsl_esdhc.h b/include/fsl_esdhc.h index 01b7dec18..57a08cd4c 100644 --- a/include/fsl_esdhc.h +++ b/include/fsl_esdhc.h @@ -2,7 +2,7 @@ * FSL SD/MMC Defines *------------------------------------------------------------------- * - * Copyright 2007-2008, Freescale Semiconductor, Inc + * Copyright 2007-2008,2010 Freescale Semiconductor, Inc * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -148,7 +148,6 @@ struct fsl_esdhc_cfg { u32 esdhc_base; u32 no_snoop; - u32 clk_enable; }; /* Select the correct accessors depending on endianess */ From 48bb3bb5ac4dd21e931ae157caad6449bcb2d0d4 Mon Sep 17 00:00:00 2001 From: Jerry Huang Date: Thu, 18 Mar 2010 15:57:06 -0500 Subject: [PATCH 090/164] fsl_esdhc: Add function to reset the eSDHC controller To support multiple block read command we must set abort or use auto CMD12. If we booted from eSDHC controller neither of these are used and thus we need to reset the controller to allow multiple block read to function. Signed-off-by: Jerry Huang Signed-off-by: Roy Zang Acked-by: Stefano Babic Signed-off-by: Kumar Gala --- drivers/mmc/fsl_esdhc.c | 17 +++++++++++++++++ include/fsl_esdhc.h | 1 + 2 files changed, 18 insertions(+) diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index 85354e893..999b58103 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -344,6 +344,20 @@ static int esdhc_init(struct mmc *mmc) return ret; } +static void esdhc_reset(struct fsl_esdhc *regs) +{ + unsigned long timeout = 100; /* wait max 100 ms */ + + /* reset the controller */ + esdhc_write32(®s->sysctl, SYSCTL_RSTA); + + /* hardware clears the bit when it is done */ + while ((esdhc_read32(®s->sysctl) & SYSCTL_RSTA) && --timeout) + udelay(1000); + if (!timeout) + printf("MMC/SD: Reset never completed.\n"); +} + int fsl_esdhc_initialize(bd_t *bis, struct fsl_esdhc_cfg *cfg) { struct fsl_esdhc *regs; @@ -358,6 +372,9 @@ int fsl_esdhc_initialize(bd_t *bis, struct fsl_esdhc_cfg *cfg) sprintf(mmc->name, "FSL_ESDHC"); regs = (struct fsl_esdhc *)cfg->esdhc_base; + /* First reset the eSDHC controller */ + esdhc_reset(regs); + mmc->priv = cfg; mmc->send_cmd = esdhc_send_cmd; mmc->set_ios = esdhc_set_ios; diff --git a/include/fsl_esdhc.h b/include/fsl_esdhc.h index 57a08cd4c..5f020187c 100644 --- a/include/fsl_esdhc.h +++ b/include/fsl_esdhc.h @@ -39,6 +39,7 @@ #define SYSCTL_PEREN 0x00000004 #define SYSCTL_HCKEN 0x00000002 #define SYSCTL_IPGEN 0x00000001 +#define SYSCTL_RSTA 0x01000000 #define IRQSTAT 0x0002e030 #define IRQSTAT_DMAE (0x10000000) From ab467c512e79dbd14f02352655f054a4304c457e Mon Sep 17 00:00:00 2001 From: Roy Zang Date: Tue, 9 Feb 2010 18:23:33 +0800 Subject: [PATCH 091/164] fsl_esdhc: Only modify the field we are changing in WML When we set the read or write watermark in WML we should maintain the rest of the register as is, rather than using some hard coded value. Signed-off-by: Roy Zang Acked-by: Stefano Babic Signed-off-by: Kumar Gala --- drivers/mmc/fsl_esdhc.c | 9 ++++----- include/fsl_esdhc.h | 2 ++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index 999b58103..0f6f8b161 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -110,8 +110,7 @@ static int esdhc_setup_data(struct mmc *mmc, struct mmc_data *data) if (wml_value > 0x10) wml_value = 0x10; - wml_value = 0x100000 | wml_value; - + esdhc_clrsetbits32(®s->wml, WML_RD_WML_MASK, wml_value); esdhc_write32(®s->dsaddr, (u32)data->dest); } else { if (wml_value > 0x80) @@ -120,12 +119,12 @@ static int esdhc_setup_data(struct mmc *mmc, struct mmc_data *data) printf("\nThe SD card is locked. Can not write to a locked card.\n\n"); return TIMEOUT; } - wml_value = wml_value << 16 | 0x10; + + esdhc_clrsetbits32(®s->wml, WML_WR_WML_MASK, + wml_value << 16); esdhc_write32(®s->dsaddr, (u32)data->src); } - esdhc_write32(®s->wml, wml_value); - esdhc_write32(®s->blkattr, data->blocks << 16 | data->blocksize); /* Calculate the timeout period for data transactions */ diff --git a/include/fsl_esdhc.h b/include/fsl_esdhc.h index 5f020187c..f9ae15ad4 100644 --- a/include/fsl_esdhc.h +++ b/include/fsl_esdhc.h @@ -133,6 +133,8 @@ #define WML 0x2e044 #define WML_WRITE 0x00010000 +#define WML_RD_WML_MASK 0xff +#define WML_WR_WML_MASK 0xff0000 #define BLKATTR 0x2e004 #define BLKATTR_CNT(x) ((x & 0xffff) << 16) From ec145e87b80f6764d17a6b0aebf521fe758c3fdc Mon Sep 17 00:00:00 2001 From: Dave Liu Date: Fri, 5 Mar 2010 12:22:00 +0800 Subject: [PATCH 092/164] fsl-ddr: Fix the turnaround timing for TIMING_CFG_4 Read-to-read/Write-to-write turnaround for same chip select of DDR3 memory, BL/2+2 cycles is enough for them at BC4 and OTF case, BL/2 cycles is enough for fixed BL8. Cutting down the turnaround from BL/2+4 to BL/2+2 or BL/2 will improve the memory performance. Signed-off-by: Dave Liu --- cpu/mpc8xxx/ddr/ctrl_regs.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/cpu/mpc8xxx/ddr/ctrl_regs.c b/cpu/mpc8xxx/ddr/ctrl_regs.c index adc4f6ee3..03f9c4380 100644 --- a/cpu/mpc8xxx/ddr/ctrl_regs.c +++ b/cpu/mpc8xxx/ddr/ctrl_regs.c @@ -1,9 +1,10 @@ /* - * Copyright 2008-2009 Freescale Semiconductor, Inc. + * Copyright 2008-2010 Freescale Semiconductor, Inc. * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * Version 2 as published by the Free Software Foundation. + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation; either version 2 of the License, or (at your option) + * any later version. */ /* @@ -934,7 +935,8 @@ static void set_ddr_init_ext_addr(fsl_ddr_cfg_regs_t *ddr) } /* DDR SDRAM Timing Configuration 4 (TIMING_CFG_4) */ -static void set_timing_cfg_4(fsl_ddr_cfg_regs_t *ddr) +static void set_timing_cfg_4(fsl_ddr_cfg_regs_t *ddr, + const memctl_options_t *popts) { unsigned int rwt = 0; /* Read-to-write turnaround for same CS */ unsigned int wrt = 0; /* Write-to-read turnaround for same CS */ @@ -943,9 +945,15 @@ static void set_timing_cfg_4(fsl_ddr_cfg_regs_t *ddr) unsigned int dll_lock = 0; /* DDR SDRAM DLL Lock Time */ #if defined(CONFIG_FSL_DDR3) - /* We need set BL/2 + 4 for BC4 or OTF */ - rrt = 4; /* BL/2 + 4 clocks */ - wwt = 4; /* BL/2 + 4 clocks */ + if (popts->burst_length == DDR_BL8) { + /* We set BL/2 for fixed BL8 */ + rrt = 0; /* BL/2 clocks */ + wwt = 0; /* BL/2 clocks */ + } else { + /* We need to set BL/2 + 2 to BC4 and OTF */ + rrt = 2; /* BL/2 + 2 clocks */ + wwt = 2; /* BL/2 + 2 clocks */ + } dll_lock = 1; /* tDLLK = 512 clocks from spec */ #endif ddr->timing_cfg_4 = (0 @@ -1343,7 +1351,7 @@ compute_fsl_memctl_config_regs(const memctl_options_t *popts, set_ddr_sdram_clk_cntl(ddr, popts); set_ddr_init_addr(ddr); set_ddr_init_ext_addr(ddr); - set_timing_cfg_4(ddr); + set_timing_cfg_4(ddr, popts); set_timing_cfg_5(ddr); set_ddr_zq_cntl(ddr, zq_en); From 22c9de064a218ae617bfeea35d2164532df91597 Mon Sep 17 00:00:00 2001 From: Dave Liu Date: Fri, 5 Mar 2010 12:22:00 +0800 Subject: [PATCH 093/164] fsl-ddr: change the default burst mode for DDR3 For 64B cacheline SoC, set the fixed 8-beat burst len, for 32B cacheline SoC, set the On-The-Fly as default. Signed-off-by: Dave Liu --- cpu/mpc8xxx/ddr/options.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/cpu/mpc8xxx/ddr/options.c b/cpu/mpc8xxx/ddr/options.c index 3dcd33ddf..46731c815 100644 --- a/cpu/mpc8xxx/ddr/options.c +++ b/cpu/mpc8xxx/ddr/options.c @@ -1,9 +1,10 @@ /* - * Copyright 2008 Freescale Semiconductor, Inc. + * Copyright 2008, 2010 Freescale Semiconductor, Inc. * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * Version 2 as published by the Free Software Foundation. + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation; either version 2 of the License, or (at your option) + * any later version. */ #include @@ -109,8 +110,13 @@ unsigned int populate_memctl_options(int all_DIMMs_registered, /* Choose burst length. */ #if defined(CONFIG_FSL_DDR3) +#if defined(CONFIG_E500MC) + popts->OTF_burst_chop_en = 0; /* on-the-fly burst chop disable */ + popts->burst_length = DDR_BL8; /* Fixed 8-beat burst len */ +#else popts->OTF_burst_chop_en = 1; /* on-the-fly burst chop */ popts->burst_length = DDR_OTF; /* on-the-fly BC4 and BL8 */ +#endif #else popts->burst_length = DDR_BL4; /* has to be 4 for DDR2 */ #endif From 69bcf5bc80a47acbd62b8cfff932cb12d47997d7 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Mon, 29 Mar 2010 13:50:31 -0500 Subject: [PATCH 094/164] 85xx: Add defines for BUCSR bits to make code more readable Signed-off-by: Kumar Gala --- cpu/mpc85xx/release.S | 5 +++-- cpu/mpc85xx/start.S | 7 ++++--- include/asm-ppc/processor.h | 3 +++ 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/cpu/mpc85xx/release.S b/cpu/mpc85xx/release.S index dab784efa..69fce927a 100644 --- a/cpu/mpc85xx/release.S +++ b/cpu/mpc85xx/release.S @@ -1,5 +1,5 @@ /* - * Copyright 2008-2009 Freescale Semiconductor, Inc. + * Copyright 2008-2010 Freescale Semiconductor, Inc. * Kumar Gala * * See file CREDITS for list of people who contributed to this @@ -61,7 +61,8 @@ __secondary_start_page: #endif /* Enable branch prediction */ - li r3,0x201 + lis r3,BUCSR_ENABLE@h + ori r3,r3,BUCSR_ENABLE@l mtspr SPRN_BUCSR,r3 /* Ensure TB is 0 */ diff --git a/cpu/mpc85xx/start.S b/cpu/mpc85xx/start.S index af18c1c8e..52ea9b341 100644 --- a/cpu/mpc85xx/start.S +++ b/cpu/mpc85xx/start.S @@ -1,5 +1,5 @@ /* - * Copyright 2004, 2007-2009 Freescale Semiconductor, Inc. + * Copyright 2004, 2007-2010 Freescale Semiconductor, Inc. * Copyright (C) 2003 Motorola,Inc. * * See file CREDITS for list of people who contributed to this @@ -213,8 +213,9 @@ _start_e500: /* Enable Branch Prediction */ #if defined(CONFIG_BTB) - li r0,0x201 /* BBFI = 1, BPEN = 1 */ - mtspr BUCSR,r0 + lis r0,BUCSR_ENABLE@h + ori r0,r0,BUCSR_ENABLE@l + mtspr SPRN_BUCSR,r0 #endif #if defined(CONFIG_SYS_INIT_DBCR) diff --git a/include/asm-ppc/processor.h b/include/asm-ppc/processor.h index 9b3d616a6..4134f189a 100644 --- a/include/asm-ppc/processor.h +++ b/include/asm-ppc/processor.h @@ -533,6 +533,9 @@ #define SPRN_MCSRR0 0x23a /* Machine Check Save and Restore Register 0 */ #define SPRN_MCSRR1 0x23b /* Machine Check Save and Restore Register 1 */ #define SPRN_BUCSR 0x3f5 /* Branch Control and Status Register */ +#define BUCSR_BBFI 0x00000200 /* Branch buffer flash invalidate */ +#define BUCSR_BPEN 0x00000001 /* Branch prediction enable */ +#define BUCSR_ENABLE (BUCSR_BBFI|BUCSR_BPEN) #define SPRN_BBEAR 0x201 /* Branch Buffer Entry Address Register */ #define SPRN_BBTAR 0x202 /* Branch Buffer Target Address Register */ #define SPRN_PID1 0x279 /* Process ID Register 1 */ From 459c41a8e1be96edeba1c0afeccacafd93b2c4e6 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 3 Nov 2009 15:53:12 -0500 Subject: [PATCH 095/164] Blackfin: disable NetBSD bootm support by default There is no Blackfin/NetBSD port, so enabling support for it by default doesn't make any sense. Signed-off-by: Mike Frysinger --- include/asm-blackfin/config-pre.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/asm-blackfin/config-pre.h b/include/asm-blackfin/config-pre.h index 1170a2a90..4531519d9 100644 --- a/include/asm-blackfin/config-pre.h +++ b/include/asm-blackfin/config-pre.h @@ -71,6 +71,9 @@ static inline const char *get_bfin_boot_mode(int bfin_boot) # define BFIN_BOOT_SPI_SSEL 1 #endif +/* There is no Blackfin/NetBSD port */ +#undef CONFIG_BOOTM_NETBSD + /* We rarely use interrupts, so favor throughput over latency */ #define CONFIG_BFIN_INS_LOWOVERHEAD From 49b97d9c8ea7b11c4fc9e457cc2cd9fd6ebf0c21 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Tue, 30 Mar 2010 10:19:26 -0500 Subject: [PATCH 096/164] fdt: Add fdt_del_node_and_alias helper Add a helper function that given an alias will delete both the node the alias points to and the alias itself Signed-off-by: Kumar Gala Acked-by: Gerald Van Baren --- common/fdt_support.c | 13 +++++++++++++ include/fdt_support.h | 1 + 2 files changed, 14 insertions(+) diff --git a/common/fdt_support.c b/common/fdt_support.c index b7d4fe506..b6f252a87 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -976,3 +976,16 @@ void fdt_fixup_mtdparts(void *blob, void *node_info, int node_info_size) } } #endif + +void fdt_del_node_and_alias(void *blob, const char *alias) +{ + int off = fdt_path_offset(blob, alias); + + if (off < 0) + return; + + fdt_del_node(blob, off); + + off = fdt_path_offset(blob, "/aliases"); + fdt_delprop(blob, off, alias); +} diff --git a/include/fdt_support.h b/include/fdt_support.h index a3d5f8cbf..9a453af34 100644 --- a/include/fdt_support.h +++ b/include/fdt_support.h @@ -82,6 +82,7 @@ int fdt_resize(void *blob); int fdt_fixup_nor_flash_size(void *blob, int cs, u32 size); void fdt_fixup_mtdparts(void *fdt, void *node_info, int node_info_size); +void fdt_del_node_and_alias(void *blob, const char *alias); #endif /* ifdef CONFIG_OF_LIBFDT */ #endif /* ifndef __FDT_SUPPORT_H */ From 03f7053f70bc55b50c9d23e54f90d772419300a6 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 19 Jan 2010 15:39:07 -0500 Subject: [PATCH 097/164] Blackfin: drop reference to gd->reloc_off The reloc_off member no longer exists, so drop it. Also change this function so that it is always compiled and prevents latent issues like this in the future. Reported-by: Peter Meerwald Signed-off-by: Mike Frysinger --- lib_blackfin/board.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib_blackfin/board.c b/lib_blackfin/board.c index 21fff334a..b0b52b2ba 100644 --- a/lib_blackfin/board.c +++ b/lib_blackfin/board.c @@ -73,8 +73,12 @@ static int init_baudrate(void) static void display_global_data(void) { -#ifdef CONFIG_DEBUG_EARLY_SERIAL bd_t *bd; + +#ifndef CONFIG_DEBUG_EARLY_SERIAL + return; +#endif + bd = gd->bd; printf(" gd: %p\n", gd); printf(" |-flags: %lx\n", gd->flags); @@ -82,7 +86,6 @@ static void display_global_data(void) printf(" |-baudrate: %lu\n", gd->baudrate); printf(" |-have_console: %lx\n", gd->have_console); printf(" |-ram_size: %lx\n", gd->ram_size); - printf(" |-reloc_off: %lx\n", gd->reloc_off); printf(" |-env_addr: %lx\n", gd->env_addr); printf(" |-env_valid: %lx\n", gd->env_valid); printf(" |-jt(%p): %p\n", gd->jt, *(gd->jt)); @@ -95,7 +98,6 @@ static void display_global_data(void) printf(" |-bi_flashstart: %lx\n", bd->bi_flashstart); printf(" |-bi_flashsize: %lx\n", bd->bi_flashsize); printf(" \\-bi_flashoffset: %lx\n", bd->bi_flashoffset); -#endif } #define CPLB_PAGE_SIZE (4 * 1024 * 1024) From 38b9b7446ecd3a728bad3e1913a984628a7363fb Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 19 Jan 2010 21:02:00 -0500 Subject: [PATCH 098/164] Blackfin: relax .data alignment The strictest alignment on Blackfin systems is 32bits (since that is the largest load instruction), so don't force 256byte alignment here. Signed-off-by: Mike Frysinger --- lib_blackfin/u-boot.lds.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_blackfin/u-boot.lds.S b/lib_blackfin/u-boot.lds.S index 3be341fad..9a757c698 100644 --- a/lib_blackfin/u-boot.lds.S +++ b/lib_blackfin/u-boot.lds.S @@ -100,7 +100,7 @@ SECTIONS .data : { - . = ALIGN(256); + . = ALIGN(4); *(.data .data.*) *(.data1) *(.sdata) From 216818c1a2d03b1c0994f00993c99af38c5b1e83 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 21 Jan 2010 23:29:18 -0500 Subject: [PATCH 099/164] Blackfin: bf537-stamp: add board test defines We tweak the configs a little when doing automated hardware tests. Signed-off-by: Mike Frysinger --- include/configs/bf537-stamp.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h index de2add759..d3159e59d 100644 --- a/include/configs/bf537-stamp.h +++ b/include/configs/bf537-stamp.h @@ -277,6 +277,15 @@ #define FLASH_END_POST_BLOCK 71 /* Should < = 71 */ #endif +/* These are for board tests */ +#if 0 +#define CONFIG_BOOTCOMMAND "bootldr 0x203f0100" +#define CONFIG_AUTOBOOT_KEYED +#define CONFIG_AUTOBOOT_PROMPT \ + "autoboot in %d seconds: press space to stop\n", bootdelay +#define CONFIG_AUTOBOOT_STOP_STR " " +#endif + /* * Pull in common ADI header for remaining command/environment setup From 6a0be8f8fe6d72a30e69d08decb72dc3bec5484c Mon Sep 17 00:00:00 2001 From: Harald Krapfenbauer Date: Fri, 22 Jan 2010 17:15:55 -0500 Subject: [PATCH 100/164] Blackfin: cm-bf561: update network/env settings Switch to the SMC911X driver by default now, and fix LDR env settings. Signed-off-by: Harald Krapfenbauer Signed-off-by: Mike Frysinger --- board/cm-bf561/cm-bf561.c | 4 ++-- include/configs/cm-bf561.h | 11 ++++------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/board/cm-bf561/cm-bf561.c b/board/cm-bf561/cm-bf561.c index 80cfff724..5741f6410 100644 --- a/board/cm-bf561/cm-bf561.c +++ b/board/cm-bf561/cm-bf561.c @@ -18,9 +18,9 @@ int checkboard(void) return 0; } -#ifdef CONFIG_SMC91111 +#ifdef CONFIG_SMC911X int board_eth_init(bd_t *bis) { - return smc91111_initialize(0, CONFIG_SMC91111_BASE); + return smc911x_initialize(0, CONFIG_SMC911X_BASE); } #endif diff --git a/include/configs/cm-bf561.h b/include/configs/cm-bf561.h index 1741ed493..c60401c8f 100644 --- a/include/configs/cm-bf561.h +++ b/include/configs/cm-bf561.h @@ -63,14 +63,10 @@ * Network Settings */ #define ADI_CMDS_NETWORK 1 -/* The next 2 lines are for use with DEV-BF5xx */ #define CONFIG_NET_MULTI -#define CONFIG_SMC91111 1 -#define CONFIG_SMC91111_BASE 0x28000300 -/* The next 3 lines are for use with EXT-BF5xx-USB-ETH2 */ -/* #define CONFIG_DRIVER_SMC911X 1 */ -/* #define CONFIG_DRIVER_SMC911X_BASE 0x24080000 /! AMS1 */ -/* #define CONFIG_DRIVER_SMC911X_32_BIT 1 */ +#define CONFIG_SMC911X 1 +#define CONFIG_SMC911X_BASE 0x24008000 /* AMS1 */ +#define CONFIG_SMC911X_16_BIT #define CONFIG_HOSTNAME cm-bf561 /* Uncomment next line to use fixed MAC address */ /* #define CONFIG_ETHADDR 02:80:ad:20:31:cf */ @@ -94,6 +90,7 @@ #define CONFIG_ENV_OFFSET 0x20000 #define CONFIG_ENV_SECT_SIZE 0x20000 #define CONFIG_ENV_SIZE 0x10000 +#define CONFIG_ENV_IS_EMBEDDED_IN_LDR /* From dd97022cbeaae5fd4bce25cf7e86019101a040ef Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 29 Jan 2010 15:48:28 -0500 Subject: [PATCH 101/164] Blackfin: sync ptrace headers with linux Scrub a lot of dead cruft in the process. Signed-off-by: Mike Frysinger --- include/asm-blackfin/ptrace.h | 303 +++++++++++++--------------------- include/asm-blackfin/traps.h | 62 ++----- 2 files changed, 129 insertions(+), 236 deletions(-) diff --git a/include/asm-blackfin/ptrace.h b/include/asm-blackfin/ptrace.h index f1b7d0064..251d5e60c 100644 --- a/include/asm-blackfin/ptrace.h +++ b/include/asm-blackfin/ptrace.h @@ -1,31 +1,11 @@ /* - * U-boot - ptrace.h + * Copyright 2004-2008 Analog Devices Inc. * - * Copyright (c) 2005-2007 Analog Devices Inc. - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - * MA 02110-1301 USA + * Licensed under the GPL-2 or later. */ -#ifndef _BLACKFIN_PTRACE_H -#define _BLACKFIN_PTRACE_H - -#define NEW_PT_REGS +#ifndef _BFIN_PTRACE_H +#define _BFIN_PTRACE_H /* * GCC defines register number like this: @@ -35,128 +15,30 @@ * 16 - 31 dsp registers I/B/L0 -- I/B/L3 & M0--M3 * 32 - 33 A registers A0 & A1 * 34 - status register + * ----------------------------- * * We follows above, except: * 32-33 --- Low 32-bit of A0&1 * 34-35 --- High 8-bit of A0&1 */ -#if defined(NEW_PT_REGS) - -#define PT_IPEND 0 -#define PT_SYSCFG (PT_IPEND+4) -#define PT_SEQSTAT (PT_SYSCFG+4) -#define PT_RETE (PT_SEQSTAT+4) -#define PT_RETN (PT_RETE+4) -#define PT_RETX (PT_RETN+4) -#define PT_RETI (PT_RETX+4) -#define PT_PC PT_RETI -#define PT_RETS (PT_RETI+4) -#define PT_RESERVED (PT_RETS+4) -#define PT_ASTAT (PT_RESERVED+4) -#define PT_LB1 (PT_ASTAT+4) -#define PT_LB0 (PT_LB1+4) -#define PT_LT1 (PT_LB0+4) -#define PT_LT0 (PT_LT1+4) -#define PT_LC1 (PT_LT0+4) -#define PT_LC0 (PT_LC1+4) -#define PT_A1W (PT_LC0+4) -#define PT_A1X (PT_A1W+4) -#define PT_A0W (PT_A1X+4) -#define PT_A0X (PT_A0W+4) -#define PT_B3 (PT_A0X+4) -#define PT_B2 (PT_B3+4) -#define PT_B1 (PT_B2+4) -#define PT_B0 (PT_B1+4) -#define PT_L3 (PT_B0+4) -#define PT_L2 (PT_L3+4) -#define PT_L1 (PT_L2+4) -#define PT_L0 (PT_L1+4) -#define PT_M3 (PT_L0+4) -#define PT_M2 (PT_M3+4) -#define PT_M1 (PT_M2+4) -#define PT_M0 (PT_M1+4) -#define PT_I3 (PT_M0+4) -#define PT_I2 (PT_I3+4) -#define PT_I1 (PT_I2+4) -#define PT_I0 (PT_I1+4) -#define PT_USP (PT_I0+4) -#define PT_FP (PT_USP+4) -#define PT_P5 (PT_FP+4) -#define PT_P4 (PT_P5+4) -#define PT_P3 (PT_P4+4) -#define PT_P2 (PT_P3+4) -#define PT_P1 (PT_P2+4) -#define PT_P0 (PT_P1+4) -#define PT_R7 (PT_P0+4) -#define PT_R6 (PT_R7+4) -#define PT_R5 (PT_R6+4) -#define PT_R4 (PT_R5+4) -#define PT_R3 (PT_R4+4) -#define PT_R2 (PT_R3+4) -#define PT_R1 (PT_R2+4) -#define PT_R0 (PT_R1+4) -#define PT_ORIG_R0 (PT_R0+4) -#define PT_SR PT_SEQSTAT - -#else -/* - * Here utilize blackfin : dpregs = [pregs + imm16s4] - * [pregs + imm16s4] = dpregs - * to access defferent saved reg in stack - */ -#define PT_R3 0 -#define PT_R4 4 -#define PT_R2 8 -#define PT_R1 12 -#define PT_P5 16 -#define PT_P4 20 -#define PT_P3 24 -#define PT_P2 28 -#define PT_P1 32 -#define PT_P0 36 -#define PT_R7 40 -#define PT_R6 44 -#define PT_R5 48 -#define PT_PC 52 -#define PT_SEQSTAT 56 /* so-called SR reg */ -#define PT_SR PT_SEQSTAT -#define PT_ASTAT 60 -#define PT_RETS 64 -#define PT_A1w 68 -#define PT_A0w 72 -#define PT_A1x 76 -#define PT_A0x 80 -#define PT_ORIG_R0 84 -#define PT_R0 88 -#define PT_USP 92 -#define PT_FP 96 -#define PT_SP 100 - -/* Added by HuTao, May26 2003 3:18PM */ -#define PT_IPEND 100 - -/* Add SYSCFG register for single stepping support */ -#define PT_SYSCFG 104 - -#endif - #ifndef __ASSEMBLY__ -#if defined(NEW_PT_REGS) +struct task_struct; + /* this struct defines the way the registers are stored on the - * stack during a system call. - */ + stack during a system call. */ + struct pt_regs { + long orig_pc; long ipend; - long syscfg; long seqstat; long rete; long retn; long retx; - long pc; + long pc; /* PC == RETI */ long rets; - long reserved; + long reserved; /* Used as scratch during system calls */ long astat; long lb1; long lb0; @@ -201,69 +83,116 @@ struct pt_regs { long r1; long r0; long orig_r0; -}; - -#else -/* now we don't know what regs the system call will use */ -struct pt_regs { - long r3; - long r4; - long r2; - long r1; - long p5; - long p4; - long p3; - long p2; - long p1; - long p0; - long r7; - long r6; - long r5; - unsigned long pc; - unsigned long seqstat; - unsigned long astat; - unsigned long rets; - long a1w; - long a0w; - long a1x; - long a0x; - long orig_r0; - long r0; - long usp; - long fp; -/* - * Added for supervisor/user mode switch. - * - * HuTao May26 03 3:23PM - */ - long ipend; + long orig_p0; long syscfg; }; -#endif - /* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */ -#define PTRACE_GETREGS 12 -#define PTRACE_SETREGS 13 /* ptrace signal */ +#define PTRACE_GETREGS 12 +#define PTRACE_SETREGS 13 /* ptrace signal */ + +#define PTRACE_GETFDPIC 31 /* get the ELF fdpic loadmap address */ +#define PTRACE_GETFDPIC_EXEC 0 /* [addr] request the executable loadmap */ +#define PTRACE_GETFDPIC_INTERP 1 /* [addr] request the interpreter loadmap */ + +#define PS_S (0x0002) #ifdef __KERNEL__ -#ifndef PS_S -#define PS_S (0x0c00) - -/* Bit 11:10 of SEQSTAT defines user/supervisor/debug mode - * 00: user - * 01: supervisor - * 1x: debug - */ - -#define PS_M (0x1000) /* I am not sure why this is required here Akbar */ -#endif - -#define user_mode(regs) (!((regs)->seqstat & PS_S)) -#define instruction_pointer(regs) ((regs)->pc) +/* user_mode returns true if only one bit is set in IPEND, other than the + master interrupt enable. */ +#define user_mode(regs) (!(((regs)->ipend & ~0x10) & (((regs)->ipend & ~0x10) - 1))) +#define instruction_pointer(regs) ((regs)->pc) +#define user_stack_pointer(regs) ((regs)->usp) +#define profile_pc(regs) instruction_pointer(regs) extern void show_regs(struct pt_regs *); -#endif -#endif -#endif +#define arch_has_single_step() (1) +extern void user_enable_single_step(struct task_struct *); +/* see arch/blackfin/kernel/ptrace.c about this redirect */ +#define user_disable_single_step(child) ptrace_disable(child) + +/* + * Get the address of the live pt_regs for the specified task. + * These are saved onto the top kernel stack when the process + * is not running. + * + * Note: if a user thread is execve'd from kernel space, the + * kernel stack will not be empty on entry to the kernel, so + * ptracing these tasks will fail. + */ +#define task_pt_regs(task) \ + (struct pt_regs *) \ + ((unsigned long)task_stack_page(task) + \ + (THREAD_SIZE - sizeof(struct pt_regs))) + +#endif /* __KERNEL__ */ + +#endif /* __ASSEMBLY__ */ + +/* + * Offsets used by 'ptrace' system call interface. + */ + +#define PT_R0 204 +#define PT_R1 200 +#define PT_R2 196 +#define PT_R3 192 +#define PT_R4 188 +#define PT_R5 184 +#define PT_R6 180 +#define PT_R7 176 +#define PT_P0 172 +#define PT_P1 168 +#define PT_P2 164 +#define PT_P3 160 +#define PT_P4 156 +#define PT_P5 152 +#define PT_FP 148 +#define PT_USP 144 +#define PT_I0 140 +#define PT_I1 136 +#define PT_I2 132 +#define PT_I3 128 +#define PT_M0 124 +#define PT_M1 120 +#define PT_M2 116 +#define PT_M3 112 +#define PT_L0 108 +#define PT_L1 104 +#define PT_L2 100 +#define PT_L3 96 +#define PT_B0 92 +#define PT_B1 88 +#define PT_B2 84 +#define PT_B3 80 +#define PT_A0X 76 +#define PT_A0W 72 +#define PT_A1X 68 +#define PT_A1W 64 +#define PT_LC0 60 +#define PT_LC1 56 +#define PT_LT0 52 +#define PT_LT1 48 +#define PT_LB0 44 +#define PT_LB1 40 +#define PT_ASTAT 36 +#define PT_RESERVED 32 +#define PT_RETS 28 +#define PT_PC 24 +#define PT_RETX 20 +#define PT_RETN 16 +#define PT_RETE 12 +#define PT_SEQSTAT 8 +#define PT_IPEND 4 + +#define PT_ORIG_R0 208 +#define PT_ORIG_P0 212 +#define PT_SYSCFG 216 +#define PT_TEXT_ADDR 220 +#define PT_TEXT_END_ADDR 224 +#define PT_DATA_ADDR 228 +#define PT_FDPIC_EXEC 232 +#define PT_FDPIC_INTERP 236 + +#endif /* _BFIN_PTRACE_H */ diff --git a/include/asm-blackfin/traps.h b/include/asm-blackfin/traps.h index b90cedacb..7422d3d1b 100644 --- a/include/asm-blackfin/traps.h +++ b/include/asm-blackfin/traps.h @@ -1,42 +1,14 @@ /* - * U-boot - traps.h + * Copyright 2004-2009 Analog Devices Inc. + * 2001 Lineo, Inc + * Tony Kou + * 1993 Hamish Macdonald * - * Copyright (c) 2005-2007 Analog Devices Inc. - * - * This file is based on - * linux/include/asm/traps.h - * Copyright (C) 1993 Hamish Macdonald - * Lineo, Inc Jul 2001 Tony Kou - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - * MA 02110-1301 USA + * Licensed under the GPL-2 */ -/* - */ - -#ifndef _BLACKFIN_TRAPS_H -#define _BLACKFIN_TRAPS_H - -#ifndef __ASSEMBLY__ -typedef void (*e_vector) (void); -extern e_vector vectors[]; -#endif +#ifndef _BFIN_TRAPS_H +#define _BFIN_TRAPS_H #define VEC_SYS (0) #define VEC_EXCPT01 (1) @@ -64,23 +36,15 @@ extern e_vector vectors[]; #define VEC_CPLB_M (38) #define VEC_CPLB_MHIT (39) #define VEC_WATCH (40) -#define VEC_ISTRU_VL (41) +#define VEC_ISTRU_VL (41) /*ADSP-BF535 only (MH) */ #define VEC_MISALI_I (42) #define VEC_CPLB_I_VL (43) #define VEC_CPLB_I_M (44) #define VEC_CPLB_I_MHIT (45) #define VEC_ILL_RES (46) /* including unvalid supervisor mode insn */ +/* The hardware reserves (63) for future use - we use it to tell our + * normal exception handling code we have a hardware error + */ +#define VEC_HWERR (63) -#define VECOFF(vec) ((vec)<<2) - -#ifndef __ASSEMBLY__ - -/* Status register bits */ -#define PS_T (0x8000) -#define PS_S (0x0c00) /* Supervisor mode = 0b01 */ -#define PS_D (0x0c00) /* Debug mode = 0b1x */ -#define PS_M (0x1000) -#define PS_C (0x0001) - -#endif -#endif +#endif /* _BFIN_TRAPS_H */ From b874ed17472de492cfbf58c8e362364bc80e3dcd Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 10 Feb 2010 01:20:44 -0500 Subject: [PATCH 102/164] Blackfin: link with normal ABI target If someone uses the FDPIC toolchain to compile U-Boot, make sure the linker knows to use the normal ABI target rather than the FDPIC one. This wasn't needed with older toolchains, but when we fixed the linker such that the default target changed based on tuple, this broke. Signed-off-by: Mike Frysinger --- lib_blackfin/config.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib_blackfin/config.mk b/lib_blackfin/config.mk index 323d28f06..1b5cbbaf2 100644 --- a/lib_blackfin/config.mk +++ b/lib_blackfin/config.mk @@ -23,7 +23,7 @@ CROSS_COMPILE ?= bfin-uclinux- -STANDALONE_LOAD_ADDR = 0x1000 +STANDALONE_LOAD_ADDR = 0x1000 -m elf32bfin CONFIG_BFIN_CPU := $(strip $(subst ",,$(CONFIG_BFIN_CPU))) CONFIG_BFIN_BOOT_MODE := $(strip $(subst ",,$(CONFIG_BFIN_BOOT_MODE))) @@ -33,7 +33,7 @@ CONFIG_ENV_SIZE := $(strip $(subst ",,$(CONFIG_ENV_SIZE))) PLATFORM_RELFLAGS += -ffixed-P3 -fomit-frame-pointer -mno-fdpic PLATFORM_CPPFLAGS += -DCONFIG_BLACKFIN -LDFLAGS += --gc-sections +LDFLAGS += --gc-sections -m elf32bfin PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections ifneq (,$(CONFIG_BFIN_CPU)) From 0c080aa753eb92e1c0033d3fd33033b2b4813884 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 11 Feb 2010 20:19:10 -0500 Subject: [PATCH 103/164] Blackfin: call watchdog_init() for external watchdogs Signed-off-by: Mike Frysinger --- lib_blackfin/board.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib_blackfin/board.c b/lib_blackfin/board.c index b0b52b2ba..4e9bb1922 100644 --- a/lib_blackfin/board.c +++ b/lib_blackfin/board.c @@ -199,6 +199,7 @@ void init_cplbtables(void) * "continue" and != 0 means "fatal error, hang the system". */ +extern int watchdog_init(void); extern int exception_init(void); extern int irq_init(void); extern int timer_init(void); @@ -229,6 +230,11 @@ void board_init_f(ulong bootflag) dcache_enable(); #endif +#ifdef CONFIG_WATCHDOG + serial_early_puts("Setting up external watchdog\n"); + watchdog_init(); +#endif + #ifdef DEBUG if (CONFIG_SYS_GBL_DATA_SIZE < sizeof(*gd)) hang(); From a3c08363b927b84dee911bfcb29ab45d53c98f62 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 23 Mar 2010 16:23:39 -0400 Subject: [PATCH 104/164] Blackfin: drop bfin #undef in linker script Now that the linker script is preprocessed with -ansi, there is no need to manually undef the bfin define. Signed-off-by: Mike Frysinger --- lib_blackfin/u-boot.lds.S | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib_blackfin/u-boot.lds.S b/lib_blackfin/u-boot.lds.S index 9a757c698..2b23d8ba6 100644 --- a/lib_blackfin/u-boot.lds.S +++ b/lib_blackfin/u-boot.lds.S @@ -1,7 +1,7 @@ /* * U-boot - u-boot.lds.S * - * Copyright (c) 2005-2008 Analog Device Inc. + * Copyright (c) 2005-2010 Analog Device Inc. * * (C) Copyright 2000-2004 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. @@ -29,7 +29,6 @@ #include #undef ALIGN #undef ENTRY -#undef bfin #ifndef LDS_BOARD_TEXT # define LDS_BOARD_TEXT From 3f1a5c1655d32b7ab8ae74c79934ce100ebcd2bf Mon Sep 17 00:00:00 2001 From: Brent Kandetzki Date: Wed, 24 Mar 2010 17:41:33 -0400 Subject: [PATCH 105/164] Blackfin: IP04: new board port A low cost 4 port IP-PBX board. Signed-off-by: Brent Kandetzki Signed-off-by: Mike Frysinger --- MAINTAINERS | 4 ++ MAKEALL | 1 + Makefile | 2 +- board/ip04/Makefile | 54 ++++++++++++++ board/ip04/config.mk | 35 +++++++++ board/ip04/ip04.c | 42 +++++++++++ include/configs/ip04.h | 157 +++++++++++++++++++++++++++++++++++++++++ 7 files changed, 294 insertions(+), 1 deletion(-) create mode 100644 board/ip04/Makefile create mode 100644 board/ip04/config.mk create mode 100644 board/ip04/ip04.c create mode 100644 include/configs/ip04.h diff --git a/MAINTAINERS b/MAINTAINERS index bb03f1778..b61795360 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1008,6 +1008,10 @@ Anton Shurpin BF561-ACVILON BF561 +Brent Kandetzki + + IP04 BF532 + ######################################################################### # End of MAINTAINERS list # ######################################################################### diff --git a/MAKEALL b/MAKEALL index a88c31eff..3e64748d6 100755 --- a/MAKEALL +++ b/MAKEALL @@ -905,6 +905,7 @@ LIST_blackfin=" \ cm-bf548 \ cm-bf561 \ ibf-dsp561 \ + ip04 \ tcm-bf518 \ tcm-bf537 \ " diff --git a/Makefile b/Makefile index 45325504f..0ab67bbbf 100644 --- a/Makefile +++ b/Makefile @@ -3554,7 +3554,7 @@ BFIN_BOARDS += cm-bf527 cm-bf533 cm-bf537e cm-bf537u cm-bf548 cm-bf561 \ tcm-bf518 tcm-bf537 # Misc third party boards -BFIN_BOARDS += bf537-minotaur bf537-srv1 bf561-acvilon blackstamp +BFIN_BOARDS += bf537-minotaur bf537-srv1 bf561-acvilon blackstamp ip04 # I-SYST Micromodule BFIN_BOARDS += ibf-dsp561 diff --git a/board/ip04/Makefile b/board/ip04/Makefile new file mode 100644 index 000000000..e7ce304f1 --- /dev/null +++ b/board/ip04/Makefile @@ -0,0 +1,54 @@ +# +# U-boot - Makefile +# +# Copyright (c) 2005-2010 Analog Device Inc. +# +# (C) Copyright 2000-2006 +# Wolfgang Denk, DENX Software Engineering, wd@denx.de. +# +# See file CREDITS for list of people who contributed to this +# project. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +# + +include $(TOPDIR)/config.mk + +LIB = $(obj)lib$(BOARD).a + +COBJS-y := $(BOARD).o + +SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS-y)) +SOBJS := $(addprefix $(obj),$(SOBJS-y)) + +$(LIB): $(obj).depend $(OBJS) $(SOBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) + +clean: + rm -f $(SOBJS) $(OBJS) + +distclean: clean + rm -f $(LIB) core *.bak $(obj).depend + +######################################################################### + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +######################################################################### diff --git a/board/ip04/config.mk b/board/ip04/config.mk new file mode 100644 index 000000000..bc1425748 --- /dev/null +++ b/board/ip04/config.mk @@ -0,0 +1,35 @@ +# +# Copyright (c) 2005-2008 Analog Device Inc. +# +# (C) Copyright 2001 +# Wolfgang Denk, DENX Software Engineering, wd@denx.de. +# +# See file CREDITS for list of people who contributed to this +# project. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +# + +# This is not actually used for Blackfin boards so do not change it +#TEXT_BASE = do-not-use-me + +CFLAGS_lib_generic += -O2 +CFLAGS_lzma += -O2 + +# Set some default LDR flags based on boot mode. +LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 +LDR_FLAGS-BFIN_BOOT_UART := --port g --gpio 6 +LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE)) diff --git a/board/ip04/ip04.c b/board/ip04/ip04.c new file mode 100644 index 000000000..c8ae5128b --- /dev/null +++ b/board/ip04/ip04.c @@ -0,0 +1,42 @@ +/* + * U-boot - main board file + * + * Copyright (c) 2007 David Rowe, + * (c) 2006 Ivan Danov + * + * (C) Copyright 2000-2004 + * Wolfgang Denk, DENX Software Engineering, wd@denx.de. + * + * Licensed under the GPL-2 or later. + */ + +#include +#include +#include +#include + +int checkboard(void) +{ + printf("Board: IP04 IP-PBX\n"); + printf(" http://www.rowetel.com/ucasterisk/ip04.html\n"); + return 0; +} + +#ifdef CONFIG_DRIVER_DM9000 +int board_eth_init(bd_t *bis) +{ + return dm9000_initialize(bis); +} + +int misc_init_r(void) +{ + uchar enetaddr[6]; + if (!eth_getenv_enetaddr("ethaddr", enetaddr)) { + puts("Warning: Generating 'random' MAC address\n"); + bfin_gen_rand_mac(enetaddr); + eth_setenv_enetaddr("ethaddr", enetaddr); + } + + return 0; +} +#endif diff --git a/include/configs/ip04.h b/include/configs/ip04.h new file mode 100644 index 000000000..425a74540 --- /dev/null +++ b/include/configs/ip04.h @@ -0,0 +1,157 @@ +/* + * U-boot - Configuration file for IP04 board (having BF532 processor) + * + * Copyright (c) 2006 Intratrade Ltd., Ivan Danov, idanov@gmail.com + * + * Copyright (c) 2005-2010 Analog Devices Inc. + * + * (C) Copyright 2000-2004 + * Wolfgang Denk, DENX Software Engineering, wd@denx.de. + * + * Licensed under the GPL-2 or later. + */ + +#ifndef __CONFIG_IP04_H__ +#define __CONFIG_IP04_H__ + +#include + + +/* + * Processor Settings + */ +#define CONFIG_BFIN_CPU bf532-0.5 +#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_NAND + + +/* + * Clock Settings + * CCLK = (CLKIN * VCO_MULT) / CCLK_DIV + * SCLK = (CLKIN * VCO_MULT) / SCLK_DIV + */ +/* CONFIG_CLKIN_HZ is any value in Hz */ +#define CONFIG_CLKIN_HZ 10000000 +/* CLKIN_HALF controls the DF bit in PLL_CTL 0 = CLKIN */ +/* 1 = CLKIN / 2 */ +#define CONFIG_CLKIN_HALF 0 +/* PLL_BYPASS controls the BYPASS bit in PLL_CTL 0 = do not bypass */ +/* 1 = bypass PLL */ +#define CONFIG_PLL_BYPASS 0 +/* VCO_MULT controls the MSEL (multiplier) bits in PLL_CTL */ +/* Values can range from 0-63 (where 0 means 64) */ +#define CONFIG_VCO_MULT 40 +/* CCLK_DIV controls the core clock divider */ +/* Values can be 1, 2, 4, or 8 ONLY */ +#define CONFIG_CCLK_DIV 1 +/* SCLK_DIV controls the system clock divider */ +/* Values can range from 1-15 */ +#define CONFIG_SCLK_DIV 3 + + +/* + * Memory Settings + */ +#define CONFIG_MEM_ADD_WDTH 10 +#define CONFIG_MEM_SIZE 64 + +#define CONFIG_EBIU_SDRRC_VAL 0x408 +#define CONFIG_EBIU_SDGCTL_VAL 0x9111cd + +#define CONFIG_EBIU_AMGCTL_VAL 0xFF +#define CONFIG_EBIU_AMBCTL0_VAL 0xffc2ffc2 +#define CONFIG_EBIU_AMBCTL1_VAL 0xffc2ffc2 + +#define CONFIG_SYS_MONITOR_LEN (256 * 1024) +#define CONFIG_SYS_MALLOC_LEN (128 * 1024) + + +/* + * Network Settings + */ +#define ADI_CMDS_NETWORK 1 +#define CONFIG_NET_MULTI 1 +#define CONFIG_HOSTNAME IP04 + +#define CONFIG_DRIVER_DM9000 1 +#define CONFIG_DM9000_NO_SROM +#define CONFIG_DM9000_BASE 0x20100000 +#define DM9000_IO CONFIG_DM9000_BASE +#define DM9000_DATA (CONFIG_DM9000_BASE + 2) + + +/* + * Flash Settings + */ +#define CONFIG_ENV_OVERWRITE 1 +#define CONFIG_SYS_NO_FLASH /* we have only NAND */ + + +/* + * SPI Settings + */ +#define CONFIG_BFIN_SPI +#define CONFIG_ENV_SPI_MAX_HZ 30000000 +#define CONFIG_SF_DEFAULT_SPEED 30000000 +#define CONFIG_SPI_FLASH +#define CONFIG_SPI_FLASH_STMICRO +#define CONFIG_SPI_FLASH_WINBOND + + +/* + * Env Storage Settings + */ +#define CONFIG_ENV_IS_IN_SPI_FLASH +#define CONFIG_PREBOOT "echo starting from spi flash" +#define CONFIG_ENV_OFFSET 0x30000 +#define CONFIG_ENV_SIZE 0x10000 +#define CONFIG_ENV_SECT_SIZE 0x10000 + + +/* + * NAND Settings + */ +#define CONFIG_NAND_PLAT +#define CONFIG_SYS_NAND_BASE 0x20000000 +#define CONFIG_SYS_MAX_NAND_DEVICE 1 + +#define BFIN_NAND_CLE(chip) ((unsigned long)(chip)->IO_ADDR_W | (1 << 2)) +#define BFIN_NAND_ALE(chip) ((unsigned long)(chip)->IO_ADDR_W | (1 << 1)) +#define BFIN_NAND_READY PF10 +#define BFIN_NAND_WRITE(addr, cmd) \ + do { \ + bfin_write8(addr, cmd); \ + SSYNC(); \ + } while (0) + +#define NAND_PLAT_WRITE_CMD(chip, cmd) BFIN_NAND_WRITE(BFIN_NAND_CLE(chip), cmd) +#define NAND_PLAT_WRITE_ADR(chip, cmd) BFIN_NAND_WRITE(BFIN_NAND_ALE(chip), cmd) +#define NAND_PLAT_DEV_READY(chip) (bfin_read_FIO_FLAG_D() & BFIN_NAND_READY) +#define NAND_PLAT_INIT() \ + do { \ + bfin_write_FIO_DIR(bfin_read_FIO_DIR() & ~BFIN_NAND_READY); \ + bfin_write_FIO_INEN(bfin_read_FIO_INEN() | BFIN_NAND_READY); \ + bfin_write_FIO_EDGE(bfin_read_FIO_EDGE() & ~BFIN_NAND_READY); \ + bfin_write_FIO_POLAR(bfin_read_FIO_POLAR() & ~BFIN_NAND_READY); \ + } while (0) + + +/* + * Misc Settings + */ +#define CONFIG_BAUDRATE 115200 +#define CONFIG_MISC_INIT_R /* needed for MAC address */ +#define CONFIG_UART_CONSOLE 0 + +#undef CONFIG_SHOW_BOOT_PROGRESS +/* Enable this if bootretry required; currently it's disabled */ +#define CONFIG_BOOT_RETRY_TIME -1 +#define CONFIG_BOOTCOMMAND "run nandboot" +#define CONFIG_AUTOBOOT_PROMPT "autoboot in %d seconds\n" + + +/* + * Pull in common ADI header for remaining command/environment setup + */ +#include + +#endif From 5a85a3096940b0a0cd016c8acf4944421c64f8c7 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Tue, 30 Mar 2010 10:07:12 -0500 Subject: [PATCH 106/164] ppc/8xxx: Delete PCI nodes from device tree if not configured If the PCI controller wasn't configured or enabled delete from the device tree (include its alias). For the case that we didn't even configure u-boot with knowledge of the controller we can use the fact that the pci_controller pointer is NULL to delete the node in the device tree. We determine that a controller was not setup (because of HW config) based on the fact that cfg_addr wasn't setup. Signed-off-by: Kumar Gala --- drivers/pci/fsl_pci_init.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/pci/fsl_pci_init.c b/drivers/pci/fsl_pci_init.c index fe57926d7..5a63fa216 100644 --- a/drivers/pci/fsl_pci_init.c +++ b/drivers/pci/fsl_pci_init.c @@ -1,9 +1,10 @@ /* - * Copyright 2007-2009 Freescale Semiconductor, Inc. + * Copyright 2007-2010 Freescale Semiconductor, Inc. * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * Version 2 as published by the Free Software Foundation. + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation; either version 2 of the License, or (at your option) + * any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -513,10 +514,15 @@ void ft_fsl_pci_setup(void *blob, const char *pci_alias, struct pci_controller *hose) { int off = fdt_path_offset(blob, pci_alias); + u32 bus_range[2]; - if (off >= 0) { - u32 bus_range[2]; + if (off < 0) + return; + /* We assume a cfg_addr not being set means we didn't setup the controller */ + if ((hose == NULL) || (hose->cfg_addr == NULL)) { + fdt_del_node_and_alias(blob, pci_alias); + } else { bus_range[0] = 0; bus_range[1] = hose->last_busno - hose->first_busno; fdt_setprop(blob, off, "bus-range", &bus_range[0], 2*4); From 216082754f6da5359ea0db9b0cc03ad531ac6e45 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Tue, 30 Mar 2010 23:06:53 -0500 Subject: [PATCH 107/164] 85xx: Added various P1012/P1013/P1021/P1022 defines There are various locations that we have chip specific info: * Makefile for which ddr code to build * Added P1012/P1013/P1021/P1022 to cpu_type_list and SVR list * Added number of LAWs for P1012/P1013/P1021/P1022 * Set CONFIG_MAX_CPUS to 2 for P1021/P1022 * PCI port config Signed-off-by: Haiying Wang Signed-off-by: Srikanth Srinivasan Signed-off-by: Kumar Gala --- cpu/mpc85xx/Makefile | 4 ++++ cpu/mpc8xxx/cpu.c | 10 +++++++++- cpu/mpc8xxx/pci_cfg.c | 30 +++++++++++++++++++++++++++--- drivers/misc/fsl_law.c | 4 +++- include/asm-ppc/config.h | 3 ++- include/asm-ppc/processor.h | 8 ++++++++ 6 files changed, 53 insertions(+), 6 deletions(-) diff --git a/cpu/mpc85xx/Makefile b/cpu/mpc85xx/Makefile index 56de7eb38..f064fee26 100644 --- a/cpu/mpc85xx/Makefile +++ b/cpu/mpc85xx/Makefile @@ -50,7 +50,11 @@ COBJS-$(CONFIG_MPC8572) += ddr-gen3.o COBJS-$(CONFIG_MPC8536) += ddr-gen3.o COBJS-$(CONFIG_MPC8569) += ddr-gen3.o COBJS-$(CONFIG_P1011) += ddr-gen3.o +COBJS-$(CONFIG_P1012) += ddr-gen3.o +COBJS-$(CONFIG_P1013) += ddr-gen3.o COBJS-$(CONFIG_P1020) += ddr-gen3.o +COBJS-$(CONFIG_P1021) += ddr-gen3.o +COBJS-$(CONFIG_P1022) += ddr-gen3.o COBJS-$(CONFIG_P2010) += ddr-gen3.o COBJS-$(CONFIG_P2020) += ddr-gen3.o COBJS-$(CONFIG_PPC_P4080) += ddr-gen3.o diff --git a/cpu/mpc8xxx/cpu.c b/cpu/mpc8xxx/cpu.c index d191263f5..47842e98d 100644 --- a/cpu/mpc8xxx/cpu.c +++ b/cpu/mpc8xxx/cpu.c @@ -1,5 +1,5 @@ /* - * Copyright 2009 Freescale Semiconductor, Inc. + * Copyright 2009-2010 Freescale Semiconductor, Inc. * * This file is derived from cpu/mpc85xx/cpu.c and cpu/mpc86xx/cpu.c. * Basically this file contains cpu specific common code for 85xx/86xx @@ -66,8 +66,16 @@ struct cpu_type cpu_type_list [] = { CPU_TYPE_ENTRY(8572, 8572_E, 2), CPU_TYPE_ENTRY(P1011, P1011, 1), CPU_TYPE_ENTRY(P1011, P1011_E, 1), + CPU_TYPE_ENTRY(P1012, P1012, 1), + CPU_TYPE_ENTRY(P1012, P1012_E, 1), + CPU_TYPE_ENTRY(P1013, P1013, 1), + CPU_TYPE_ENTRY(P1013, P1013_E, 1), CPU_TYPE_ENTRY(P1020, P1020, 2), CPU_TYPE_ENTRY(P1020, P1020_E, 2), + CPU_TYPE_ENTRY(P1021, P1021, 2), + CPU_TYPE_ENTRY(P1021, P1021_E, 2), + CPU_TYPE_ENTRY(P1022, P1022, 2), + CPU_TYPE_ENTRY(P1022, P1022_E, 2), CPU_TYPE_ENTRY(P2010, P2010, 1), CPU_TYPE_ENTRY(P2010, P2010_E, 1), CPU_TYPE_ENTRY(P2020, P2020, 2), diff --git a/cpu/mpc8xxx/pci_cfg.c b/cpu/mpc8xxx/pci_cfg.c index d53781b62..9b7181d5b 100644 --- a/cpu/mpc8xxx/pci_cfg.c +++ b/cpu/mpc8xxx/pci_cfg.c @@ -1,5 +1,5 @@ /* - * Copyright 2009 Freescale Semiconductor, Inc. + * Copyright 2009-2010 Freescale Semiconductor, Inc. * * See file CREDITS for list of people who contributed to this * project. @@ -25,7 +25,7 @@ #include struct pci_info { - u16 cfg; + u32 cfg; }; /* The cfg field is a bit mask in which each bit represents the value of @@ -153,7 +153,8 @@ static struct pci_info pci_config_info[] = (1 << 7) | (1 << 0xe) | (1 << 0xf), }, }; -#elif defined(CONFIG_P1011) || defined(CONFIG_P1020) +#elif defined(CONFIG_P1011) || defined(CONFIG_P1020) || \ + defined(CONFIG_P1012) || defined(CONFIG_P1021) static struct pci_info pci_config_info[] = { [LAW_TRGT_IF_PCIE_1] = { @@ -163,6 +164,29 @@ static struct pci_info pci_config_info[] = .cfg = (1 << 0xe), }, }; +#elif defined(CONFIG_P1013) || defined(CONFIG_P1022) +static struct pci_info pci_config_info[] = +{ + [LAW_TRGT_IF_PCIE_1] = { + .cfg = (1 << 6) | (1 << 7) | (1 << 9) | (1 << 0xa) | + (1 << 0xb) | (1 << 0xd) | (1 << 0xe) | + (1 << 0xf) | (1 << 0x15) | (1 << 0x16) | + (1 << 0x17) | (1 << 0x18) | (1 << 0x19) | + (1 << 0x1a) | (1 << 0x1b) | (1 << 0x1c) | + (1 << 0x1d) | (1 << 0x1e) | (1 << 0x1f), + }, + [LAW_TRGT_IF_PCIE_2] = { + .cfg = (1 << 0) | (1 << 1) | (1 << 6) | (1 << 7) | + (1 << 9) | (1 << 0xa) | (1 << 0xb) | (1 << 0xd) | + (1 << 0x15) | (1 << 0x16) | (1 << 0x17) | + (1 << 0x18) | (1 << 0x1c), + }, + [LAW_TRGT_IF_PCIE_3] = { + .cfg = (1 << 6) | (1 << 7) | (1 << 9) | (1 << 0xd) | + (1 << 0x15) | (1 << 0x16) | (1 << 0x17) | (1 << 0x18) | + (1 << 0x19) | (1 << 0x1a) | (1 << 0x1b), + }, +}; #elif defined(CONFIG_P2010) || defined(CONFIG_P2020) static struct pci_info pci_config_info[] = { diff --git a/drivers/misc/fsl_law.c b/drivers/misc/fsl_law.c index 287e55590..8255175d2 100644 --- a/drivers/misc/fsl_law.c +++ b/drivers/misc/fsl_law.c @@ -1,5 +1,5 @@ /* - * Copyright 2008-2009 Freescale Semiconductor, Inc. + * Copyright 2008-2010 Freescale Semiconductor, Inc. * * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. @@ -39,6 +39,8 @@ DECLARE_GLOBAL_DATA_PTR; #define FSL_HW_NUM_LAWS 10 #elif defined(CONFIG_MPC8536) || defined(CONFIG_MPC8572) || \ defined(CONFIG_P1011) || defined(CONFIG_P1020) || \ + defined(CONFIG_P1012) || defined(CONFIG_P1021) || \ + defined(CONFIG_P1013) || defined(CONFIG_P1022) || \ defined(CONFIG_P2010) || defined(CONFIG_P2020) #define FSL_HW_NUM_LAWS 12 #elif defined(CONFIG_PPC_P4080) diff --git a/include/asm-ppc/config.h b/include/asm-ppc/config.h index 0d78aa400..fc3facb30 100644 --- a/include/asm-ppc/config.h +++ b/include/asm-ppc/config.h @@ -1,5 +1,5 @@ /* - * Copyright 2009 Freescale Semiconductor, Inc. + * Copyright 2009-2010 Freescale Semiconductor, Inc. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -41,6 +41,7 @@ #endif #if defined(CONFIG_MPC8572) || defined(CONFIG_P1020) || \ + defined(CONFIG_P1021) || defined(CONFIG_P1022) || \ defined(CONFIG_P2020) || defined(CONFIG_MPC8641) #define CONFIG_MAX_CPUS 2 #elif defined(CONFIG_PPC_P4080) diff --git a/include/asm-ppc/processor.h b/include/asm-ppc/processor.h index 4134f189a..2b0277471 100644 --- a/include/asm-ppc/processor.h +++ b/include/asm-ppc/processor.h @@ -1035,8 +1035,16 @@ #define SVR_8572_E 0x80E800 #define SVR_P1011 0x80E500 #define SVR_P1011_E 0x80ED00 +#define SVR_P1012 0x80E501 +#define SVR_P1012_E 0x80ED01 +#define SVR_P1013 0x80E700 +#define SVR_P1013_E 0x80EF00 #define SVR_P1020 0x80E400 #define SVR_P1020_E 0x80EC00 +#define SVR_P1021 0x80E401 +#define SVR_P1021_E 0x80EC01 +#define SVR_P1022 0x80E600 +#define SVR_P1022_E 0x80EE00 #define SVR_P2010 0x80E300 #define SVR_P2010_E 0x80EB00 #define SVR_P2020 0x80E200 From ff8473e90a018c2bb19a196176c1f2e9602d6354 Mon Sep 17 00:00:00 2001 From: Sandeep Gopalpet Date: Fri, 12 Mar 2010 10:45:02 +0530 Subject: [PATCH 108/164] 85xx: Set HID1[mbdd] on e500v2 rev5.0 or greater The HID1[MBDD] bit is new on rev5.0 or greater cores and will optimize the performance of mbar/eieio instructions. Signed-off-by: Sandeep Gopalpet --- cpu/mpc85xx/release.S | 7 +++++++ cpu/mpc85xx/start.S | 7 +++++++ include/asm-ppc/processor.h | 1 + 3 files changed, 15 insertions(+) diff --git a/cpu/mpc85xx/release.S b/cpu/mpc85xx/release.S index 69fce927a..0b5b9da03 100644 --- a/cpu/mpc85xx/release.S +++ b/cpu/mpc85xx/release.S @@ -57,6 +57,13 @@ __secondary_start_page: #ifndef CONFIG_E500MC li r3,(HID1_ASTME|HID1_ABE)@l /* Addr streaming & broadcast */ + mfspr r0,PVR + andi. r0,r0,0xff + cmpwi r0,0x50@l /* if we are rev 5.0 or greater set MBDD */ + blt 1f + /* Set MBDD bit also */ + ori r3, r3, HID1_MBDD@l +1: mtspr SPRN_HID1,r3 #endif diff --git a/cpu/mpc85xx/start.S b/cpu/mpc85xx/start.S index 52ea9b341..b3cb56a5b 100644 --- a/cpu/mpc85xx/start.S +++ b/cpu/mpc85xx/start.S @@ -208,6 +208,13 @@ _start_e500: #ifndef CONFIG_E500MC li r0,(HID1_ASTME|HID1_ABE)@l /* Addr streaming & broadcast */ + mfspr r3,PVR + andi. r3,r3, 0xff + cmpwi r3,0x50@l /* if we are rev 5.0 or greater set MBDD */ + blt 1f + /* Set MBDD bit also */ + ori r0, r0, HID1_MBDD@l +1: mtspr HID1,r0 #endif diff --git a/include/asm-ppc/processor.h b/include/asm-ppc/processor.h index 2b0277471..9ec319ae1 100644 --- a/include/asm-ppc/processor.h +++ b/include/asm-ppc/processor.h @@ -265,6 +265,7 @@ #define HID1_RFXE (1<<17) /* Read Fault Exception Enable */ #define HID1_ASTME (1<<13) /* Address bus streaming mode */ #define HID1_ABE (1<<12) /* Address broadcast enable */ +#define HID1_MBDD (1<<6) /* optimized sync instruction */ #define SPRN_IABR 0x3F2 /* Instruction Address Breakpoint Register */ #ifndef CONFIG_BOOKE #define SPRN_IAC1 0x3F4 /* Instruction Address Compare 1 */ From 2feb4af001a0be5ccad6e6a6eb072207cbef6e3f Mon Sep 17 00:00:00 2001 From: Timur Tabi Date: Wed, 31 Mar 2010 17:44:13 -0500 Subject: [PATCH 109/164] fsl: improve the PIXIS code and fix a few bugs Refactor and document the Freescale PIXIS code, used on most 85xx and 86xx boards. This makes the code easier to read and more flexible. Delete pixis.h, because none of the exported functions were actually being used by any other file. Make all of the functions in pixis.c 'static'. Remove "#include pixis.h" from every file that has it. Remove some unnecessary #includes. Make 'pixis_base' into a macro, so that we don't need to define it in every function. Add "while(1);" loops at the end of functions that reset the board, so that execution doesn't continue while the reset is in progress. Replace in_8/out_8 calls with clrbits_8, setbits_8, or clrsetbits_8, where appropriate. Replace ulong/uint with their spelled-out equivalents. Remove unnecessary typecasts, changing the types of some variables if necessary. Add CONFIG_SYS_PIXIS_VCFGEN0_ENABLE and CONFIG_SYS_PIXIS_VBOOT_ENABLE to make it easier for specific boards to support variations in the PIXIS registers sets. No current boards appears to need this feature. Fix the definition of CONFIG_SYS_PIXIS_VBOOT_MASK for the MPC8610 HPCD. Apparently, "pixis_reset altbank" has never worked on this board. Signed-off-by: Timur Tabi Signed-off-by: Kumar Gala --- board/freescale/common/pixis.c | 254 +++++++++--------- board/freescale/common/pixis.h | 31 --- board/freescale/mpc8536ds/mpc8536ds.c | 1 - board/freescale/mpc8544ds/mpc8544ds.c | 1 - board/freescale/mpc8572ds/mpc8572ds.c | 1 - board/freescale/mpc8610hpcd/mpc8610hpcd.c | 2 - board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c | 1 - board/freescale/mpc8641hpcn/mpc8641hpcn.c | 2 - board/freescale/p2020ds/p2020ds.c | 1 - cpu/mpc512x/diu.c | 1 - include/configs/MPC8610HPCD.h | 2 +- 11 files changed, 127 insertions(+), 170 deletions(-) delete mode 100644 board/freescale/common/pixis.h diff --git a/board/freescale/common/pixis.c b/board/freescale/common/pixis.c index 7210512bf..119eaf95a 100644 --- a/board/freescale/common/pixis.c +++ b/board/freescale/common/pixis.c @@ -1,5 +1,5 @@ /* - * Copyright 2006 Freescale Semiconductor + * Copyright 2006,2010 Freescale Semiconductor * Jeff Brown * Srikanth Srinivasan (srikanth.srinivasan@freescale.com) * @@ -24,33 +24,26 @@ #include #include -#include -#include #include -#include "pixis.h" - - -static ulong strfractoint(uchar *strptr); - +#define pixis_base (u8 *)PIXIS_BASE /* * Simple board reset. */ void pixis_reset(void) { - u8 *pixis_base = (u8 *)PIXIS_BASE; out_8(pixis_base + PIXIS_RST, 0); -} + while (1); +} /* * Per table 27, page 58 of MPC8641HPCN spec. */ -int set_px_sysclk(ulong sysclk) +static int set_px_sysclk(unsigned long sysclk) { u8 sysclk_s, sysclk_r, sysclk_v, vclkh, vclkl, sysclk_aux; - u8 *pixis_base = (u8 *)PIXIS_BASE; switch (sysclk) { case 33: @@ -117,13 +110,13 @@ int set_px_sysclk(ulong sysclk) return 1; } - -int set_px_mpxpll(ulong mpxpll) +/* Set the CFG_SYSPLL bits + * + * This only has effect if PX_VCFGEN0[SYSPLL]=1, which is true if + * read_from_px_regs() is called. + */ +static int set_px_mpxpll(unsigned long mpxpll) { - u8 tmp; - u8 val; - u8 *pixis_base = (u8 *)PIXIS_BASE; - switch (mpxpll) { case 2: case 4: @@ -133,28 +126,19 @@ int set_px_mpxpll(ulong mpxpll) case 12: case 14: case 16: - val = (u8) mpxpll; - break; - default: - printf("Unsupported MPXPLL ratio.\n"); - return 0; + clrsetbits_8(pixis_base + PIXIS_VSPEED1, 0x1F, mpxpll); + return 1; } - tmp = in_8(pixis_base + PIXIS_VSPEED1); - tmp = (tmp & 0xF0) | (val & 0x0F); - out_8(pixis_base + PIXIS_VSPEED1, tmp); - - return 1; + printf("Unsupported MPXPLL ratio.\n"); + return 0; } - -int set_px_corepll(ulong corepll) +static int set_px_corepll(unsigned long corepll) { - u8 tmp; u8 val; - u8 *pixis_base = (u8 *)PIXIS_BASE; - switch ((int)corepll) { + switch (corepll) { case 20: val = 0x08; break; @@ -178,113 +162,132 @@ int set_px_corepll(ulong corepll) return 0; } - tmp = in_8(pixis_base + PIXIS_VSPEED0); - tmp = (tmp & 0xE0) | (val & 0x1F); - out_8(pixis_base + PIXIS_VSPEED0, tmp); - + clrsetbits_8(pixis_base + PIXIS_VSPEED0, 0x1F, val); return 1; } +#ifndef CONFIG_SYS_PIXIS_VCFGEN0_ENABLE +#define CONFIG_SYS_PIXIS_VCFGEN0_ENABLE 0x1C +#endif -void read_from_px_regs(int set) +/* Tell the PIXIS where to find the COREPLL, MPXPLL, SYSCLK values + * + * The PIXIS can be programmed to look at either the on-board dip switches + * or various other PIXIS registers to determine the values for COREPLL, + * MPXPLL, and SYSCLK. + * + * CONFIG_SYS_PIXIS_VCFGEN0_ENABLE is the value to write to the PIXIS_VCFGEN0 + * register that tells the pixis to use the various PIXIS register. + */ +static void read_from_px_regs(int set) { - u8 *pixis_base = (u8 *)PIXIS_BASE; - u8 mask = 0x1C; /* COREPLL, MPXPLL, SYSCLK controlled by PIXIS */ u8 tmp = in_8(pixis_base + PIXIS_VCFGEN0); if (set) - tmp = tmp | mask; + tmp = tmp | CONFIG_SYS_PIXIS_VCFGEN0_ENABLE; else - tmp = tmp & ~mask; + tmp = tmp & ~CONFIG_SYS_PIXIS_VCFGEN0_ENABLE; + out_8(pixis_base + PIXIS_VCFGEN0, tmp); } +/* CONFIG_SYS_PIXIS_VBOOT_ENABLE is the value to write to the PX_VCFGEN1 + * register that tells the pixis to use the PX_VBOOT[LBMAP] register. + */ +#ifndef CONFIG_SYS_PIXIS_VBOOT_ENABLE +#define CONFIG_SYS_PIXIS_VBOOT_ENABLE 0x04 +#endif -void read_from_px_regs_altbank(int set) +/* Configure the source of the boot location + * + * The PIXIS can be programmed to look at either the on-board dip switches + * or the PX_VBOOT[LBMAP] register to determine where we should boot. + * + * If we want to boot from the alternate boot bank, we need to tell the PIXIS + * to ignore the on-board dip switches and use the PX_VBOOT[LBMAP] instead. + */ +static void read_from_px_regs_altbank(int set) { - u8 *pixis_base = (u8 *)PIXIS_BASE; - u8 mask = 0x04; /* FLASHBANK and FLASHMAP controlled by PIXIS */ u8 tmp = in_8(pixis_base + PIXIS_VCFGEN1); if (set) - tmp = tmp | mask; + tmp = tmp | CONFIG_SYS_PIXIS_VBOOT_ENABLE; else - tmp = tmp & ~mask; + tmp = tmp & ~CONFIG_SYS_PIXIS_VBOOT_ENABLE; + out_8(pixis_base + PIXIS_VCFGEN1, tmp); } +/* CONFIG_SYS_PIXIS_VBOOT_MASK contains the bits to set in VBOOT register that + * tells the PIXIS what the alternate flash bank is. + * + * Note that it's not really a mask. It contains the actual LBMAP bits that + * must be set to select the alternate bank. This code assumes that the + * primary bank has these bits set to 0, and the alternate bank has these + * bits set to 1. + */ #ifndef CONFIG_SYS_PIXIS_VBOOT_MASK #define CONFIG_SYS_PIXIS_VBOOT_MASK (0x40) #endif -void clear_altbank(void) +/* Tell the PIXIS to boot from the default flash bank + * + * Program the default flash bank into the VBOOT register. This register is + * used only if PX_VCFGEN1[FLASH]=1. + */ +static void clear_altbank(void) { - u8 tmp; - u8 *pixis_base = (u8 *)PIXIS_BASE; - - tmp = in_8(pixis_base + PIXIS_VBOOT); - tmp &= ~CONFIG_SYS_PIXIS_VBOOT_MASK; - - out_8(pixis_base + PIXIS_VBOOT, tmp); + clrbits_8(pixis_base + PIXIS_VBOOT, CONFIG_SYS_PIXIS_VBOOT_MASK); } - -void set_altbank(void) +/* Tell the PIXIS to boot from the alternate flash bank + * + * Program the alternate flash bank into the VBOOT register. This register is + * used only if PX_VCFGEN1[FLASH]=1. + */ +static void set_altbank(void) { - u8 tmp; - u8 *pixis_base = (u8 *)PIXIS_BASE; - - tmp = in_8(pixis_base + PIXIS_VBOOT); - tmp |= CONFIG_SYS_PIXIS_VBOOT_MASK; - - out_8(pixis_base + PIXIS_VBOOT, tmp); + setbits_8(pixis_base + PIXIS_VBOOT, CONFIG_SYS_PIXIS_VBOOT_MASK); } - -void set_px_go(void) +/* Reset the board with watchdog disabled. + * + * This respects the altbank setting. + */ +static void set_px_go(void) { - u8 tmp; - u8 *pixis_base = (u8 *)PIXIS_BASE; + /* Disable the VELA sequencer and watchdog */ + clrbits_8(pixis_base + PIXIS_VCTL, 9); - tmp = in_8(pixis_base + PIXIS_VCTL); - tmp = tmp & 0x1E; /* clear GO bit */ - out_8(pixis_base + PIXIS_VCTL, tmp); + /* Reboot by starting the VELA sequencer */ + setbits_8(pixis_base + PIXIS_VCTL, 0x1); - tmp = in_8(pixis_base + PIXIS_VCTL); - tmp = tmp | 0x01; /* set GO bit - start reset sequencer */ - out_8(pixis_base + PIXIS_VCTL, tmp); + while (1); } - -void set_px_go_with_watchdog(void) +/* Reset the board with watchdog enabled. + * + * This respects the altbank setting. + */ +static void set_px_go_with_watchdog(void) { - u8 tmp; - u8 *pixis_base = (u8 *)PIXIS_BASE; + /* Disable the VELA sequencer */ + clrbits_8(pixis_base + PIXIS_VCTL, 1); - tmp = in_8(pixis_base + PIXIS_VCTL); - tmp = tmp & 0x1E; - out_8(pixis_base + PIXIS_VCTL, tmp); + /* Enable the watchdog and reboot by starting the VELA sequencer */ + setbits_8(pixis_base + PIXIS_VCTL, 0x9); - tmp = in_8(pixis_base + PIXIS_VCTL); - tmp = tmp | 0x09; - out_8(pixis_base + PIXIS_VCTL, tmp); + while (1); } - -int pixis_disable_watchdog_cmd(cmd_tbl_t *cmdtp, - int flag, int argc, char *argv[]) +/* Disable the watchdog + * + */ +static int pixis_disable_watchdog_cmd(cmd_tbl_t *cmdtp, int flag, int argc, + char *argv[]) { - u8 tmp; - u8 *pixis_base = (u8 *)PIXIS_BASE; - - tmp = in_8(pixis_base + PIXIS_VCTL); - tmp = tmp & 0x1E; - out_8(pixis_base + PIXIS_VCTL, tmp); - - /* setting VCTL[WDEN] to 0 to disable watch dog */ - tmp = in_8(pixis_base + PIXIS_VCTL); - tmp &= ~0x08; - out_8(pixis_base + PIXIS_VCTL, tmp); + /* Disable the VELA sequencer and the watchdog */ + clrbits_8(pixis_base + PIXIS_VCTL, 9); return 0; } @@ -296,16 +299,17 @@ U_BOOT_CMD( ); #ifdef CONFIG_PIXIS_SGMII_CMD -int pixis_set_sgmii(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) + +/* Enable or disable SGMII mode for a TSEC + */ +static int pixis_set_sgmii(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { int which_tsec = -1; - u8 *pixis_base = (u8 *)PIXIS_BASE; - uchar mask; - uchar switch_mask; + unsigned char mask; + unsigned char switch_mask; - if (argc > 2) - if (strcmp(argv[1], "all") != 0) - which_tsec = simple_strtoul(argv[1], NULL, 0); + if ((argc > 2) && (strcmp(argv[1], "all") != 0)) + which_tsec = simple_strtoul(argv[1], NULL, 0); switch (which_tsec) { #ifdef CONFIG_TSEC1 @@ -363,6 +367,7 @@ U_BOOT_CMD( " off - disables SGMII\n" " switch - use switch settings" ); + #endif /* @@ -371,14 +376,13 @@ U_BOOT_CMD( * FPGA register values. * input: strptr i.e. argv[2] */ - -static ulong strfractoint(uchar *strptr) +static unsigned long strfractoint(char *strptr) { - int i, j, retval; + int i, j; int mulconst; - int intarr_len = 0, decarr_len = 0, no_dec = 0; - ulong intval = 0, decval = 0; - uchar intarr[3], decarr[3]; + int intarr_len, no_dec = 0; + unsigned long intval = 0, decval = 0; + char intarr[3], decarr[3]; /* Assign the integer part to intarr[] * If there is no decimal point i.e. @@ -412,26 +416,21 @@ static ulong strfractoint(uchar *strptr) j++; } - decarr_len = j; decarr[j] = '\0'; mulconst = 1; - for (i = 0; i < decarr_len; i++) + for (i = 0; i < j; i++) mulconst *= 10; - decval = simple_strtoul((char *)decarr, NULL, 10); + decval = simple_strtoul(decarr, NULL, 10); } - intval = simple_strtoul((char *)intarr, NULL, 10); + intval = simple_strtoul(intarr, NULL, 10); intval = intval * mulconst; - retval = intval + decval; - - return retval; + return intval + decval; } - -int -pixis_reset_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +static int pixis_reset_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { unsigned int i; char *p_cf = NULL; @@ -440,7 +439,7 @@ pixis_reset_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) char *p_cf_mpxpll = NULL; char *p_altbank = NULL; char *p_wd = NULL; - unsigned int unknown_param = 0; + int unknown_param = 0; /* * No args is a simple reset request. @@ -493,9 +492,9 @@ pixis_reset_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) */ read_from_px_regs(0); - if (p_altbank) { + if (p_altbank) read_from_px_regs_altbank(0); - } + clear_altbank(); /* @@ -507,7 +506,7 @@ pixis_reset_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) unsigned long mpxpll; sysclk = simple_strtoul(p_cf_sysclk, NULL, 10); - corepll = strfractoint((uchar *) p_cf_corepll); + corepll = strfractoint(p_cf_corepll); mpxpll = simple_strtoul(p_cf_mpxpll, NULL, 10); if (!(set_px_sysclk(sysclk) @@ -536,11 +535,10 @@ pixis_reset_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) /* * Reset with watchdog specified. */ - if (p_wd) { + if (p_wd) set_px_go_with_watchdog(); - } else { + else set_px_go(); - } /* * Shouldn't be reached. diff --git a/board/freescale/common/pixis.h b/board/freescale/common/pixis.h deleted file mode 100644 index ff62a62c7..000000000 --- a/board/freescale/common/pixis.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2006 Freescale Semiconductor - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - -extern void pixis_reset(void); -extern int set_px_sysclk(ulong sysclk); -extern int set_px_mpxpll(ulong mpxpll); -extern int set_px_corepll(ulong corepll); -extern void read_from_px_regs(int set); -extern void read_from_px_regs_altbank(int set); -extern void set_altbank(void); -extern void set_px_go(void); -extern void set_px_go_with_watchdog(void); diff --git a/board/freescale/mpc8536ds/mpc8536ds.c b/board/freescale/mpc8536ds/mpc8536ds.c index 81a56b55e..253ed181f 100644 --- a/board/freescale/mpc8536ds/mpc8536ds.c +++ b/board/freescale/mpc8536ds/mpc8536ds.c @@ -39,7 +39,6 @@ #include #include -#include "../common/pixis.h" #include "../common/sgmii_riser.h" phys_size_t fixed_sdram(void); diff --git a/board/freescale/mpc8544ds/mpc8544ds.c b/board/freescale/mpc8544ds/mpc8544ds.c index b35e02f68..0be2d892d 100644 --- a/board/freescale/mpc8544ds/mpc8544ds.c +++ b/board/freescale/mpc8544ds/mpc8544ds.c @@ -35,7 +35,6 @@ #include #include -#include "../common/pixis.h" #include "../common/sgmii_riser.h" int checkboard (void) diff --git a/board/freescale/mpc8572ds/mpc8572ds.c b/board/freescale/mpc8572ds/mpc8572ds.c index 74085c326..6029a5185 100644 --- a/board/freescale/mpc8572ds/mpc8572ds.c +++ b/board/freescale/mpc8572ds/mpc8572ds.c @@ -36,7 +36,6 @@ #include #include -#include "../common/pixis.h" #include "../common/sgmii_riser.h" long int fixed_sdram(void); diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd.c b/board/freescale/mpc8610hpcd/mpc8610hpcd.c index ab5f80045..2ef7b2323 100644 --- a/board/freescale/mpc8610hpcd/mpc8610hpcd.c +++ b/board/freescale/mpc8610hpcd/mpc8610hpcd.c @@ -34,8 +34,6 @@ #include #include -#include "../common/pixis.h" - void sdram_init(void); phys_size_t fixed_sdram(void); void mpc8610hpcd_diu_init(void); diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c b/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c index 4186a2ecd..94fb1ebf8 100644 --- a/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c +++ b/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c @@ -29,7 +29,6 @@ #ifdef CONFIG_FSL_DIU_FB -#include "../common/pixis.h" #include "../common/fsl_diu_fb.h" #if defined(CONFIG_VIDEO) || defined(CONFIG_CFB_CONSOLE) diff --git a/board/freescale/mpc8641hpcn/mpc8641hpcn.c b/board/freescale/mpc8641hpcn/mpc8641hpcn.c index 443c9fd8e..b352c334c 100644 --- a/board/freescale/mpc8641hpcn/mpc8641hpcn.c +++ b/board/freescale/mpc8641hpcn/mpc8641hpcn.c @@ -31,8 +31,6 @@ #include #include -#include "../common/pixis.h" - phys_size_t fixed_sdram(void); int board_early_init_f(void) diff --git a/board/freescale/p2020ds/p2020ds.c b/board/freescale/p2020ds/p2020ds.c index f6eae55d1..664135cf7 100644 --- a/board/freescale/p2020ds/p2020ds.c +++ b/board/freescale/p2020ds/p2020ds.c @@ -38,7 +38,6 @@ #include #include -#include "../common/pixis.h" #include "../common/sgmii_riser.h" DECLARE_GLOBAL_DATA_PTR; diff --git a/cpu/mpc512x/diu.c b/cpu/mpc512x/diu.c index ca459a101..c2453c68d 100644 --- a/cpu/mpc512x/diu.c +++ b/cpu/mpc512x/diu.c @@ -27,7 +27,6 @@ #include #include -#include "../../board/freescale/common/pixis.h" #include "../../board/freescale/common/fsl_diu_fb.h" #if defined(CONFIG_VIDEO) || defined(CONFIG_CFB_CONSOLE) diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index fed441eb3..8382e3ca8 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -177,7 +177,7 @@ #define PIXIS_VSPEED1 0x18 /* VELA VSpeed 1 */ #define PIXIS_VCLKH 0x19 /* VELA VCLKH register */ #define PIXIS_VCLKL 0x1A /* VELA VCLKL register */ -#define CONFIG_SYS_PIXIS_VBOOT_MASK 0x0C /* Reset altbank mask*/ +#define CONFIG_SYS_PIXIS_VBOOT_MASK 0xC0 /* Reset altbank mask */ #define CONFIG_SYS_MAX_FLASH_BANKS 2 /* number of banks */ #define CONFIG_SYS_MAX_FLASH_SECT 1024 /* sectors per device */ From 5a4696088376fff82629e7e4a2444294dc589c96 Mon Sep 17 00:00:00 2001 From: Timur Tabi Date: Thu, 1 Apr 2010 10:49:42 -0500 Subject: [PATCH 110/164] p2020ds: add alternate boot bank support using the ngPIXIS FPGA The Freescale P2020DS board uses a new type of PIXIS FPGA, called the ngPIXIS. The ngPIXIS has one distinct new feature: the values of the on-board switches can be selectively overridden with shadow registers. This feature is used to boot from a different NOR flash bank, instead of having a register dedicated for this purpose. Because the ngPIXIS is so different from the previous PIXIS, a new file is introduced: ngpixis.c. Also update the P2020DS checkboard() function to use the new macros defined in the header file. Signed-off-by: Timur Tabi Signed-off-by: Kumar Gala --- board/freescale/common/Makefile | 1 + board/freescale/common/ngpixis.c | 136 ++++++++++++++++++++++++++++++ board/freescale/common/ngpixis.h | 57 +++++++++++++ board/freescale/p2020ds/p2020ds.c | 55 +++++------- include/configs/P2020DS.h | 62 ++------------ 5 files changed, 222 insertions(+), 89 deletions(-) create mode 100644 board/freescale/common/ngpixis.c create mode 100644 board/freescale/common/ngpixis.h diff --git a/board/freescale/common/Makefile b/board/freescale/common/Makefile index 02a824d9f..620eb16d4 100644 --- a/board/freescale/common/Makefile +++ b/board/freescale/common/Makefile @@ -33,6 +33,7 @@ COBJS-${CONFIG_FSL_CADMUS} += cadmus.o COBJS-${CONFIG_FSL_VIA} += cds_via.o COBJS-${CONFIG_FSL_DIU_FB} += fsl_diu_fb.o fsl_logo_bmp.o COBJS-${CONFIG_FSL_PIXIS} += pixis.o +COBJS-${CONFIG_FSL_NGPIXIS} += ngpixis.o COBJS-${CONFIG_PQ_MDS_PIB} += pq-mds-pib.o COBJS-${CONFIG_ID_EEPROM} += sys_eeprom.o COBJS-${CONFIG_FSL_SGMII_RISER} += sgmii_riser.o diff --git a/board/freescale/common/ngpixis.c b/board/freescale/common/ngpixis.c new file mode 100644 index 000000000..bb6794e85 --- /dev/null +++ b/board/freescale/common/ngpixis.c @@ -0,0 +1,136 @@ +/** + * Copyright 2010 Freescale Semiconductor + * Author: Timur Tabi + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation; either version 2 of the License, or (at your option) + * any later version. + * + * This file provides support for the ngPIXIS, a board-specific FPGA used on + * some Freescale reference boards. + * + * A "switch" is black rectangular block on the motherboard. It contains + * eight "bits". The ngPIXIS has a set of memory-mapped registers (SWx) that + * shadow the actual physical switches. There is also another set of + * registers (ENx) that tell the ngPIXIS which bits of SWx should actually be + * used to override the values of the bits in the physical switches. + * + * The following macros need to be defined: + * + * PIXIS_BASE - The virtual address of the base of the PIXIS register map + * + * PIXIS_LBMAP_SWITCH - The switch number (i.e. the "x" in "SWx"). This value + * is used in the PIXIS_SW() macro to determine which offset in + * the PIXIS register map corresponds to the physical switch that controls + * the boot bank. + * + * PIXIS_LBMAP_MASK - A bit mask the defines which bits in SWx to use. + * + * PIXIS_LBMAP_SHIFT - The shift value that corresponds to PIXIS_LBMAP_MASK. + * + * PIXIS_LBMAP_ALTBANK - The value to program into SWx to tell the ngPIXIS to + * boot from the alternate bank. + */ + +#include +#include +#include +#include +#include + +#include "ngpixis.h" + +/* + * Reset the board. This ignores the ENx registers. + */ +void pixis_reset(void) +{ + out_8(&pixis->rst, 0); + + while (1); +} + +/* + * Reset the board. Like pixis_reset(), but it honors the ENx registers. + */ +void pixis_bank_reset(void) +{ + out_8(&pixis->vctl, 0); + out_8(&pixis->vctl, 1); + + while (1); +} + +/** + * Set the boot bank to the power-on default bank + */ +void clear_altbank(void) +{ + /* Tell the ngPIXIS to use this the bits in the physical switch for the + * boot bank value, instead of the SWx register. We need to be careful + * only to set the bits in SWx that correspond to the boot bank. + */ + clrbits_8(&PIXIS_EN(PIXIS_LBMAP_SWITCH), PIXIS_LBMAP_MASK); +} + +/** + * Set the boot bank to the alternate bank + */ +void set_altbank(void) +{ + /* Program the alternate bank number into the SWx register. + */ + clrsetbits_8(&PIXIS_SW(PIXIS_LBMAP_SWITCH), PIXIS_LBMAP_MASK, + PIXIS_LBMAP_ALTBANK); + + /* Tell the ngPIXIS to use this the bits in the SWx register for the + * boot bank value, instead of the physical switch. We need to be + * careful only to set the bits in SWx that correspond to the boot bank. + */ + setbits_8(&PIXIS_EN(PIXIS_LBMAP_SWITCH), PIXIS_LBMAP_MASK); +} + + +int pixis_reset_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +{ + unsigned int i; + char *p_altbank = NULL; + char *unknown_param = NULL; + + /* No args is a simple reset request. + */ + if (argc <= 1) + pixis_reset(); + + for (i = 1; i < argc; i++) { + if (strcmp(argv[i], "altbank") == 0) { + p_altbank = argv[i]; + continue; + } + + unknown_param = argv[i]; + } + + if (unknown_param) { + printf("Invalid option: %s\n", unknown_param); + return 1; + } + + if (p_altbank) + set_altbank(); + else + clear_altbank(); + + pixis_bank_reset(); + + /* Shouldn't be reached. */ + return 0; +} + +U_BOOT_CMD( + pixis_reset, CONFIG_SYS_MAXARGS, 1, pixis_reset_cmd, + "Reset the board using the FPGA sequencer", + "- hard reset to default bank\n" + "pixis_reset altbank - reset to alternate bank\n" + ); diff --git a/board/freescale/common/ngpixis.h b/board/freescale/common/ngpixis.h new file mode 100644 index 000000000..284d044c8 --- /dev/null +++ b/board/freescale/common/ngpixis.h @@ -0,0 +1,57 @@ +/** + * Copyright 2010 Freescale Semiconductor + * Author: Timur Tabi + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation; either version 2 of the License, or (at your option) + * any later version. + * + * This file provides support for the ngPIXIS, a board-specific FPGA used on + * some Freescale reference boards. + */ + +/* ngPIXIS register set. Hopefully, this won't change too much over time. + * Feel free to add board-specific #ifdefs where necessary. + */ +typedef struct ngpixis { + u8 id; + u8 arch; + u8 scver; + u8 csr; + u8 rst; + u8 res1; + u8 aux; + u8 spd; + u8 brdcfg0; + u8 dma; + u8 addr; + u8 res2[2]; + u8 data; + u8 led; + u8 res3; + u8 vctl; + u8 vstat; + u8 vcfgen0; + u8 res4; + u8 ocmcsr; + u8 ocmmsg; + u8 gmdbg; + u8 res5[2]; + u8 sclk[3]; + u8 dclk[3]; + u8 watch; + struct { + u8 sw; + u8 en; + } s[8]; +} ngpixis_t __attribute__ ((aligned(1))); + +/* Pointer to the PIXIS register set */ +#define pixis ((ngpixis_t *)PIXIS_BASE) + +/* The PIXIS SW register that corresponds to board switch X, where x >= 1 */ +#define PIXIS_SW(x) (pixis->s[(x) - 1].sw) + +/* The PIXIS EN register that corresponds to board switch X, where x >= 1 */ +#define PIXIS_EN(x) (pixis->s[(x) - 1].en) diff --git a/board/freescale/p2020ds/p2020ds.c b/board/freescale/p2020ds/p2020ds.c index 664135cf7..f0ff209c0 100644 --- a/board/freescale/p2020ds/p2020ds.c +++ b/board/freescale/p2020ds/p2020ds.c @@ -38,6 +38,7 @@ #include #include +#include "../common/ngpixis.h" #include "../common/sgmii_riser.h" DECLARE_GLOBAL_DATA_PTR; @@ -46,30 +47,24 @@ phys_size_t fixed_sdram(void); int checkboard(void) { - u8 sw7; - u8 *pixis_base = (u8 *)PIXIS_BASE; + u8 sw; puts("Board: P2020DS "); #ifdef CONFIG_PHYS_64BIT puts("(36-bit addrmap) "); #endif - printf("Sys ID: 0x%02x, " - "Sys Ver: 0x%02x, FPGA Ver: 0x%02x, ", - in_8(pixis_base + PIXIS_ID), in_8(pixis_base + PIXIS_VER), - in_8(pixis_base + PIXIS_PVER)); + printf("Sys ID: 0x%02x, Sys Ver: 0x%02x, FPGA Ver: 0x%02x, ", + in_8(&pixis->id), in_8(&pixis->arch), in_8(&pixis->scver)); - sw7 = in_8(pixis_base + PIXIS_SW(7)); - switch ((sw7 & PIXIS_SW7_LBMAP) >> 6) { - case 0: - case 1: - printf ("vBank: %d\n", ((sw7 & PIXIS_SW7_VBANK) >> 4)); - break; - case 2: - case 3: - puts ("Promjet\n"); - break; - } + sw = in_8(&PIXIS_SW(PIXIS_LBMAP_SWITCH)); + sw = (sw & PIXIS_LBMAP_MASK) >> PIXIS_LBMAP_SHIFT; + + if (sw < 0x8) + /* The lower two bits are the actual vbank number */ + printf("vBank: %d\n", sw & 3); + else + puts("Promjet\n"); return 0; } @@ -370,30 +365,22 @@ unsigned long get_board_ddr_clk(ulong dummy) return gd->mem_clk; } -unsigned long -calculate_board_sys_clk(ulong dummy) +unsigned long calculate_board_sys_clk(ulong dummy) { ulong val; - u8 *pixis_base = (u8 *)PIXIS_BASE; - val = ics307_clk_freq( - in_8(pixis_base + PIXIS_VSYSCLK0), - in_8(pixis_base + PIXIS_VSYSCLK1), - in_8(pixis_base + PIXIS_VSYSCLK2)); + val = ics307_clk_freq(in_8(&pixis->sclk[0]), in_8(&pixis->sclk[1]), + in_8(&pixis->sclk[2])); debug("sysclk val = %lu\n", val); return val; } -unsigned long -calculate_board_ddr_clk(ulong dummy) +unsigned long calculate_board_ddr_clk(ulong dummy) { ulong val; - u8 *pixis_base = (u8 *)PIXIS_BASE; - val = ics307_clk_freq( - in_8(pixis_base + PIXIS_VDDRCLK0), - in_8(pixis_base + PIXIS_VDDRCLK1), - in_8(pixis_base + PIXIS_VDDRCLK2)); + val = ics307_clk_freq(in_8(&pixis->dclk[0]), in_8(&pixis->dclk[1]), + in_8(&pixis->dclk[2])); debug("ddrclk val = %lu\n", val); return val; } @@ -402,9 +389,8 @@ unsigned long get_board_sys_clk(ulong dummy) { u8 i; ulong val = 0; - u8 *pixis_base = (u8 *)PIXIS_BASE; - i = in_8(pixis_base + PIXIS_SPD); + i = in_8(&pixis->spd); i &= 0x07; switch (i) { @@ -441,9 +427,8 @@ unsigned long get_board_ddr_clk(ulong dummy) { u8 i; ulong val = 0; - u8 *pixis_base = (u8 *)PIXIS_BASE; - i = in_8(pixis_base + PIXIS_SPD); + i = in_8(&pixis->spd); i &= 0x38; i >>= 3; diff --git a/include/configs/P2020DS.h b/include/configs/P2020DS.h index 30a5a319b..66be725c8 100644 --- a/include/configs/P2020DS.h +++ b/include/configs/P2020DS.h @@ -238,7 +238,9 @@ extern unsigned long calculate_board_ddr_clk(unsigned long dummy); #define CONFIG_BOARD_EARLY_INIT_R /* call board_early_init_r function */ -#define CONFIG_FSL_PIXIS 1 /* use common PIXIS code */ +#define CONFIG_FSL_NGPIXIS /* use common ngPIXIS code */ + +#ifdef CONFIG_FSL_NGPIXIS #define PIXIS_BASE 0xffdf0000 /* PIXIS registers */ #ifdef CONFIG_PHYS_64BIT #define PIXIS_BASE_PHYS 0xfffdf0000ull @@ -249,59 +251,11 @@ extern unsigned long calculate_board_ddr_clk(unsigned long dummy); #define CONFIG_SYS_BR3_PRELIM (BR_PHYS_ADDR(PIXIS_BASE_PHYS) | BR_PS_8 | BR_V) #define CONFIG_SYS_OR3_PRELIM 0xffffeff7 /* 32KB but only 4k mapped */ -#define PIXIS_ID 0x0 /* Board ID at offset 0 */ -#define PIXIS_VER 0x1 /* Board version at offset 1 */ -#define PIXIS_PVER 0x2 /* PIXIS FPGA version at offset 2 */ -#define PIXIS_CSR 0x3 /* PIXIS General control/status register */ -#define PIXIS_RST 0x4 /* PIXIS Reset Control register */ -#define PIXIS_PWR 0x5 /* PIXIS Power status register */ -#define PIXIS_AUX 0x6 /* Auxiliary 1 register */ -#define PIXIS_SPD 0x7 /* Register for SYSCLK speed */ -#define PIXIS_AUX2 0x8 /* Auxiliary 2 register */ -#define PIXIS_VCTL 0x10 /* VELA Control Register */ -#define PIXIS_VSTAT 0x11 /* VELA Status Register */ -#define PIXIS_VCFGEN0 0x12 /* VELA Config Enable 0 */ -#define PIXIS_VCFGEN1 0x13 /* VELA Config Enable 1 */ -#define PIXIS_VCORE0 0x14 /* VELA VCORE0 Register */ -#define PIXIS_VBOOT 0x16 /* VELA VBOOT Register */ -#define PIXIS_VSPEED0 0x17 /* VELA VSpeed 0 */ -#define PIXIS_VSPEED1 0x18 /* VELA VSpeed 1 */ -#define PIXIS_VSPEED2 0x19 /* VELA VSpeed 2 */ -#define PIXIS_VSYSCLK0 0x19 /* VELA SYSCLK0 Register */ -#define PIXIS_VSYSCLK1 0x1A /* VELA SYSCLK1 Register */ -#define PIXIS_VSYSCLK2 0x1B /* VELA SYSCLK2 Register */ -#define PIXIS_VDDRCLK0 0x1C /* VELA DDRCLK0 Register */ -#define PIXIS_VDDRCLK1 0x1D /* VELA DDRCLK1 Register */ -#define PIXIS_VDDRCLK2 0x1E /* VELA DDRCLK2 Register */ - -#define PIXIS_VWATCH 0x24 /* Watchdog Register */ -#define PIXIS_LED 0x25 /* LED Register */ - -#define PIXIS_SW(x) 0x20 + (x - 1) * 2 -#define PIXIS_EN(x) 0x21 + (x - 1) * 2 -#define PIXIS_SW7_LBMAP 0xc0 /* SW7 - cfg_lbmap */ -#define PIXIS_SW7_VBANK 0x30 /* SW7 - cfg_vbank */ - -/* old pixis referenced names */ -#define PIXIS_VCLKH 0x19 /* VELA VCLKH register */ -#define PIXIS_VCLKL 0x1A /* VELA VCLKL register */ -#define CONFIG_SYS_PIXIS_VBOOT_MASK 0xc0 -#define PIXIS_VSPEED2_TSEC1SER 0x8 -#define PIXIS_VSPEED2_TSEC2SER 0x4 -#define PIXIS_VSPEED2_TSEC3SER 0x2 -#define PIXIS_VSPEED2_TSEC4SER 0x1 -#define PIXIS_VCFGEN1_TSEC1SER 0x20 -#define PIXIS_VCFGEN1_TSEC2SER 0x20 -#define PIXIS_VCFGEN1_TSEC3SER 0x20 -#define PIXIS_VCFGEN1_TSEC4SER 0x20 -#define PIXIS_VSPEED2_MASK (PIXIS_VSPEED2_TSEC1SER \ - | PIXIS_VSPEED2_TSEC2SER \ - | PIXIS_VSPEED2_TSEC3SER \ - | PIXIS_VSPEED2_TSEC4SER) -#define PIXIS_VCFGEN1_MASK (PIXIS_VCFGEN1_TSEC1SER \ - | PIXIS_VCFGEN1_TSEC2SER \ - | PIXIS_VCFGEN1_TSEC3SER \ - | PIXIS_VCFGEN1_TSEC4SER) +#define PIXIS_LBMAP_SWITCH 7 +#define PIXIS_LBMAP_MASK 0xf0 +#define PIXIS_LBMAP_SHIFT 4 +#define PIXIS_LBMAP_ALTBANK 0x20 +#endif #define CONFIG_SYS_INIT_RAM_LOCK 1 #define CONFIG_SYS_INIT_RAM_ADDR 0xffd00000 /* Initial L1 address */ From 933419096e857275b8b01f1ae577162231b143ff Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Wed, 7 Apr 2010 01:34:11 -0500 Subject: [PATCH 111/164] ppc/85xx: Use CONFIG_NS16550_MIN_FUNCTIONS to reduce NAND_SPL size The MPC8536DS_NAND SPL build was failing due to code size increase introduced by commit: commit 33f57bd553edf29dffef5a6c7d76e169c79a6049 Author: Kumar Gala Date: Fri Mar 26 15:14:43 2010 -0500 85xx: Fix enabling of L1 cache parity on secondary cores We built in some NS16550 functions that we dont need and can get rid of them via CONFIG_NS16550_MIN_FUNCTIONS. Signed-off-by: Kumar Gala --- include/configs/MPC8536DS.h | 3 +++ include/configs/MPC8569MDS.h | 3 +++ include/configs/P1_P2_RDB.h | 3 +++ 3 files changed, 9 insertions(+) diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index 87901b3af..da4313ac3 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -413,6 +413,9 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) +#ifdef CONFIG_NAND_SPL +#define CONFIG_NS16550_MIN_FUNCTIONS +#endif #define CONFIG_SYS_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400,115200} diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h index 9b8170374..0c43b2b0c 100644 --- a/include/configs/MPC8569MDS.h +++ b/include/configs/MPC8569MDS.h @@ -284,6 +284,9 @@ extern unsigned long get_clock_freq(void); #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) +#ifdef CONFIG_NAND_SPL +#define CONFIG_NS16550_MIN_FUNCTIONS +#endif #define CONFIG_SYS_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400,115200} diff --git a/include/configs/P1_P2_RDB.h b/include/configs/P1_P2_RDB.h index 405e6d504..a9b4004c3 100644 --- a/include/configs/P1_P2_RDB.h +++ b/include/configs/P1_P2_RDB.h @@ -286,6 +286,9 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_bus_freq(0) +#ifdef CONFIG_NAND_SPL +#define CONFIG_NS16550_MIN_FUNCTIONS +#endif #define CONFIG_SERIAL_MULTI 1 /* Enable both serial ports */ #define CONFIG_SYS_CONSOLE_IS_IN_ENV /* determine from environment */ From 22d6c8faac4e9fa43232b0cf4da427ec14d72ad3 Mon Sep 17 00:00:00 2001 From: Thomas Chou Date: Thu, 1 Apr 2010 11:15:05 +0800 Subject: [PATCH 112/164] cfi_flash: reset timer in flash status check This patch adds reset_timer() before the flash status check waiting loop. Since the timer is basically running asynchronous to the cfi code, it is possible to call get_timer(0), then only a few _SYSCLK_ cycles later an interrupt is generated. This causes timeout even though much less time has elapsed. So the timer period registers should be reset before get_timer(0) is called. There is similar usage in nand_base.c. Signed-off-by: Thomas Chou Signed-off-by: Stefan Roese --- drivers/mtd/cfi_flash.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index d0240f55d..3267c5de3 100644 --- a/drivers/mtd/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c @@ -544,6 +544,7 @@ static int flash_status_check (flash_info_t * info, flash_sect_t sector, #endif /* Wait for command completion */ + reset_timer(); start = get_timer (0); while (flash_is_busy (info, sector)) { if (get_timer (start) > tout) { @@ -630,6 +631,7 @@ static int flash_status_poll(flash_info_t *info, void *src, void *dst, #endif /* Wait for command completion */ + reset_timer(); start = get_timer(0); while (1) { switch (info->portwidth) { From d5011762f53ada9cc7cdf1f89f3a722f887af577 Mon Sep 17 00:00:00 2001 From: Anatolij Gustschin Date: Mon, 15 Mar 2010 14:50:25 +0100 Subject: [PATCH 113/164] video: cfb_console.c: add support for RLE8 bitmaps Allow displaying 8-bit RLE BMP images. Signed-off-by: Anatolij Gustschin --- README | 6 ++ drivers/video/cfb_console.c | 200 +++++++++++++++++++++++++++++++++++- 2 files changed, 204 insertions(+), 2 deletions(-) diff --git a/README b/README index 940b50794..bb13bc62a 100644 --- a/README +++ b/README @@ -1133,6 +1133,12 @@ The following options need to be configured: images, gzipped BMP images can be displayed via the splashscreen support or the bmp command. +- Run length encoded BMP image (RLE8) support: CONFIG_VIDEO_BMP_RLE8 + + If this option is set, 8-bit RLE compressed BMP images + can be displayed via the splashscreen support or the + bmp command. + - Compression support: CONFIG_BZIP2 diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c index 49f0a2e04..d1f47c915 100644 --- a/drivers/video/cfb_console.c +++ b/drivers/video/cfb_console.c @@ -802,9 +802,194 @@ static void inline fill_555rgb_pswap(uchar *fb, int x, } #endif +/* + * RLE8 bitmap support + */ + +#ifdef CONFIG_VIDEO_BMP_RLE8 +/* Pre-calculated color table entry */ +struct palette { + union { + unsigned short w; /* word */ + unsigned int dw; /* double word */ + } ce; /* color entry */ +}; + +/* + * Helper to draw encoded/unencoded run. + */ +static void draw_bitmap (uchar **fb, uchar *bm, struct palette *p, + int cnt, int enc) +{ + ulong addr = (ulong)*fb; + int *off; + int enc_off = 1; + int i; + + /* + * Setup offset of the color index in the bitmap. + * Color index of encoded run is at offset 1. + */ + off = enc ? &enc_off : &i; + + switch (VIDEO_DATA_FORMAT) { + case GDF__8BIT_INDEX: + for (i = 0; i < cnt; i++) + *(unsigned char *)addr++ = bm[*off]; + break; + case GDF_15BIT_555RGB: + case GDF_16BIT_565RGB: + /* differences handled while pre-calculating palette */ + for (i = 0; i < cnt; i++) { + *(unsigned short *)addr = p[bm[*off]].ce.w; + addr += 2; + } + break; + case GDF_32BIT_X888RGB: + for (i = 0; i < cnt; i++) { + *(unsigned long *)addr = p[bm[*off]].ce.dw; + addr += 4; + } + break; + } + *fb = (uchar *)addr; /* return modified address */ +} + +static int display_rle8_bitmap (bmp_image_t *img, int xoff, int yoff, + int width, int height) +{ + unsigned char *bm; + unsigned char *fbp; + unsigned int cnt, runlen; + int decode = 1; + int x, y, bpp, i, ncolors; + struct palette p[256]; + bmp_color_table_entry_t cte; + int green_shift, red_off; + + x = 0; + y = __le32_to_cpu(img->header.height) - 1; + ncolors = __le32_to_cpu(img->header.colors_used); + bpp = VIDEO_PIXEL_SIZE; + fbp = (unsigned char *)((unsigned int)video_fb_address + + (((y + yoff) * VIDEO_COLS) + xoff) * bpp); + + bm = (uchar *)img + __le32_to_cpu(img->header.data_offset); + + /* pre-calculate and setup palette */ + switch (VIDEO_DATA_FORMAT) { + case GDF__8BIT_INDEX: + for (i = 0; i < ncolors; i++) { + cte = img->color_table[i]; + video_set_lut (i, cte.red, cte.green, cte.blue); + } + break; + case GDF_15BIT_555RGB: + case GDF_16BIT_565RGB: + if (VIDEO_DATA_FORMAT == GDF_15BIT_555RGB) { + green_shift = 3; + red_off = 10; + } else { + green_shift = 2; + red_off = 11; + } + for (i = 0; i < ncolors; i++) { + cte = img->color_table[i]; + p[i].ce.w = SWAP16((unsigned short) + (((cte.red >> 3) << red_off) | + ((cte.green >> green_shift) << 5) | + cte.blue >> 3)); + } + break; + case GDF_32BIT_X888RGB: + for (i = 0; i < ncolors; i++) { + cte = img->color_table[i]; + p[i].ce.dw = SWAP32((cte.red << 16) | (cte.green << 8) | + cte.blue); + } + break; + default: + printf("RLE Bitmap unsupported in video mode 0x%x\n", + VIDEO_DATA_FORMAT); + return -1; + } + + while (decode) { + switch (bm[0]) { + case 0: + switch (bm[1]) { + case 0: + /* scan line end marker */ + bm += 2; + x = 0; + y--; + fbp = (unsigned char *) + ((unsigned int)video_fb_address + + (((y + yoff) * VIDEO_COLS) + + xoff) * bpp); + continue; + case 1: + /* end of bitmap data marker */ + decode = 0; + break; + case 2: + /* run offset marker */ + x += bm[2]; + y -= bm[3]; + fbp = (unsigned char *) + ((unsigned int)video_fb_address + + (((y + yoff) * VIDEO_COLS) + + x + xoff) * bpp); + bm += 4; + break; + default: + /* unencoded run */ + cnt = bm[1]; + runlen = cnt; + bm += 2; + if (y < height) { + if (x >= width) { + x += runlen; + goto next_run; + } + if (x + runlen > width) + cnt = width - x; + + draw_bitmap (&fbp, bm, p, cnt, 0); + x += runlen; + } +next_run: + bm += runlen; + if (runlen & 1) + bm++; /* 0 padding if length is odd */ + } + break; + default: + /* encoded run */ + if (y < height) { /* only draw into visible area */ + cnt = bm[0]; + runlen = cnt; + if (x >= width) { + x += runlen; + bm += 2; + continue; + } + if (x + runlen > width) + cnt = width - x; + + draw_bitmap (&fbp, bm, p, cnt, 1); + x += runlen; + } + bm += 2; + break; + } + } + return 0; +} +#endif + /* * Display the BMP file located at address bmp_image. - * Only uncompressed */ int video_display_bitmap (ulong bmp_image, int x, int y) { @@ -872,7 +1057,11 @@ int video_display_bitmap (ulong bmp_image, int x, int y) debug ("Display-bmp: %d x %d with %d colors\n", width, height, colors); - if (compression != BMP_BI_RGB) { + if (compression != BMP_BI_RGB +#ifdef CONFIG_VIDEO_BMP_RLE8 + && compression != BMP_BI_RLE8 +#endif + ) { printf ("Error: compression type %ld not supported\n", compression); #ifdef CONFIG_VIDEO_BMP_GZIP @@ -906,6 +1095,13 @@ int video_display_bitmap (ulong bmp_image, int x, int y) ((y + height - 1) * VIDEO_COLS * VIDEO_PIXEL_SIZE) + x * VIDEO_PIXEL_SIZE); +#ifdef CONFIG_VIDEO_BMP_RLE8 + if (compression == BMP_BI_RLE8) { + return display_rle8_bitmap(bmp, + x, y, width, height); + } +#endif + /* We handle only 8bpp or 24 bpp bitmap */ switch (le16_to_cpu (bmp->header.bit_count)) { case 8: From 9624f6d9eb4b7223e97a27844ec4489ab953a2e2 Mon Sep 17 00:00:00 2001 From: Ed Swarthout Date: Wed, 31 Mar 2010 09:54:28 -0500 Subject: [PATCH 114/164] ati_radeon: return with error when emulator fails Console was being switched to video even if emulator fails and causing this hang: Scanning PCI bus 04 04 00 1095 3132 0104 00 PCIE3 on bus 03 - 04 Video: ATI Radeon video card (1002, 5b60) found @(2:0:0) videoboot: Booting PCI video card bus 2, function 0, device 0 videoboot: Video ROM failed to map! 640x480x8 31kHz 59Hz radeonfb: FIFO Timeout ! Signed-off-by: Ed Swarthout Tested-by: Anatolij Gustschin --- drivers/bios_emulator/atibios.c | 3 ++- drivers/video/ati_radeon_fb.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/bios_emulator/atibios.c b/drivers/bios_emulator/atibios.c index 5f9bd101d..2881449d9 100644 --- a/drivers/bios_emulator/atibios.c +++ b/drivers/bios_emulator/atibios.c @@ -315,7 +315,8 @@ int BootVideoCardBIOS(pci_dev_t pcidev, BE_VGAInfo ** pVGAInfo, int cleanUp) BE_init(0, 65536, VGAInfo, 0); /*Post all the display controller BIOS'es*/ - PCI_postController(pcidev, VGAInfo); + if (!PCI_postController(pcidev, VGAInfo)) + return false; /*Cleanup and exit the emulator if requested. If the BIOS emulator is needed after booting the card, we will not call BE_exit and diff --git a/drivers/video/ati_radeon_fb.c b/drivers/video/ati_radeon_fb.c index 9ebb0b0c9..529ddae83 100644 --- a/drivers/video/ati_radeon_fb.c +++ b/drivers/video/ati_radeon_fb.c @@ -597,7 +597,8 @@ int radeon_probe(struct radeonfb_info *rinfo) rinfo->fb_local_base = INREG(MC_FB_LOCATION) << 16; DPRINT("rinfo->fb_local_base = 0x%x\n",rinfo->fb_local_base); /* PostBIOS with x86 emulater */ - BootVideoCardBIOS(pdev, NULL, 0); + if (!BootVideoCardBIOS(pdev, NULL, 0)) + return -1; /* * Check for errata From f6a7a2e88854666e6a9ede50891fe415e803ace2 Mon Sep 17 00:00:00 2001 From: Ed Swarthout Date: Wed, 31 Mar 2010 15:52:40 -0500 Subject: [PATCH 115/164] ati_radeon: Support PCI virtual not eq bus mapping. Use pci_bus_to_virt() to convert the bus address from the BARs to virtual address' to eliminate the direct mapping requirement. Rename variables to better match usage (_phys -> _bus or no-suffix) This fixes the mpc8572ds CONFIG_PHYS_64BIT mode failure: "videoboot: Video ROM failed to map!" Tested on mpc8572ds with and without CONFIG_PHYS_64BIT. Signed-off-by: Ed Swarthout --- drivers/bios_emulator/atibios.c | 10 +++++--- drivers/video/ati_radeon_fb.c | 45 ++++++++++++++++++--------------- drivers/video/ati_radeon_fb.h | 4 +-- 3 files changed, 32 insertions(+), 27 deletions(-) diff --git a/drivers/bios_emulator/atibios.c b/drivers/bios_emulator/atibios.c index 2881449d9..dbb5e8cce 100644 --- a/drivers/bios_emulator/atibios.c +++ b/drivers/bios_emulator/atibios.c @@ -173,7 +173,7 @@ Maps a pointer to the BIOS image on the graphics card on the PCI bus. ****************************************************************************/ void *PCI_mapBIOSImage(pci_dev_t pcidev) { - u32 BIOSImagePhys; + u32 BIOSImageBus; int BIOSImageBAR; u8 *BIOSImage; @@ -195,16 +195,18 @@ void *PCI_mapBIOSImage(pci_dev_t pcidev) specific programming for different cards to solve this problem. */ - if ((BIOSImagePhys = PCI_findBIOSAddr(pcidev, &BIOSImageBAR)) == 0) { + BIOSImageBus = PCI_findBIOSAddr(pcidev, &BIOSImageBAR); + if (BIOSImageBus == 0) { printf("Find bios addr error\n"); return NULL; } - BIOSImage = (u8 *) BIOSImagePhys; + BIOSImage = pci_bus_to_virt(pcidev, BIOSImageBus, + PCI_REGION_MEM, 0, MAP_NOCACHE); /*Change the PCI BAR registers to map it onto the bus.*/ pci_write_config_dword(pcidev, BIOSImageBAR, 0); - pci_write_config_dword(pcidev, PCI_ROM_ADDRESS, BIOSImagePhys | 0x1); + pci_write_config_dword(pcidev, PCI_ROM_ADDRESS, BIOSImageBus | 0x1); udelay(1); diff --git a/drivers/video/ati_radeon_fb.c b/drivers/video/ati_radeon_fb.c index 529ddae83..f79710428 100644 --- a/drivers/video/ati_radeon_fb.c +++ b/drivers/video/ati_radeon_fb.c @@ -210,7 +210,7 @@ static void radeon_identify_vram(struct radeonfb_info *rinfo) * ToDo: identify these cases */ - DPRINT("radeonfb: Found %ldk of %s %d bits wide videoram\n", + DPRINT("radeonfb: Found %dk of %s %d bits wide videoram\n", rinfo->video_ram / 1024, rinfo->vram_ddr ? "DDR" : "SDRAM", rinfo->vram_width); @@ -586,14 +586,16 @@ int radeon_probe(struct radeonfb_info *rinfo) rinfo->pdev.device = did; rinfo->family = get_radeon_id_family(rinfo->pdev.device); pci_read_config_dword(pdev, PCI_BASE_ADDRESS_0, - &rinfo->fb_base_phys); + &rinfo->fb_base_bus); pci_read_config_dword(pdev, PCI_BASE_ADDRESS_2, - &rinfo->mmio_base_phys); - rinfo->fb_base_phys &= 0xfffff000; - rinfo->mmio_base_phys &= ~0x04; + &rinfo->mmio_base_bus); + rinfo->fb_base_bus &= 0xfffff000; + rinfo->mmio_base_bus &= ~0x04; - rinfo->mmio_base = (void *)rinfo->mmio_base_phys; - DPRINT("rinfo->mmio_base = 0x%x\n",rinfo->mmio_base); + rinfo->mmio_base = pci_bus_to_virt(pdev, rinfo->mmio_base_bus, + PCI_REGION_MEM, 0, MAP_NOCACHE); + DPRINT("rinfo->mmio_base = 0x%x bus=0x%x\n", + rinfo->mmio_base, rinfo->mmio_base_bus); rinfo->fb_local_base = INREG(MC_FB_LOCATION) << 16; DPRINT("rinfo->fb_local_base = 0x%x\n",rinfo->fb_local_base); /* PostBIOS with x86 emulater */ @@ -611,14 +613,15 @@ int radeon_probe(struct radeonfb_info *rinfo) rinfo->mapped_vram = min_t(unsigned long, MAX_MAPPED_VRAM, rinfo->video_ram); - rinfo->fb_base = (void *)rinfo->fb_base_phys; - - DPRINT("Radeon: framebuffer base phy address 0x%08x," \ - "MMIO base phy address 0x%08x," \ - "framebuffer local base 0x%08x.\n ", - rinfo->fb_base_phys, rinfo->mmio_base_phys, - rinfo->fb_local_base); - + rinfo->fb_base = pci_bus_to_virt(pdev, rinfo->fb_base_bus, + PCI_REGION_MEM, 0, MAP_NOCACHE); + DPRINT("Radeon: framebuffer base address 0x%08x, " + "bus address 0x%08x\n" + "MMIO base address 0x%08x, bus address 0x%08x, " + "framebuffer local base 0x%08x.\n ", + (u32)rinfo->fb_base, rinfo->fb_base_bus, + (u32)rinfo->mmio_base, rinfo->mmio_base_bus, + rinfo->fb_local_base); return 0; } return -1; @@ -734,13 +737,13 @@ void *video_hw_init(void) } pGD->isaBase = CONFIG_SYS_ISA_IO_BASE_ADDRESS; - pGD->pciBase = rinfo->fb_base_phys; - pGD->frameAdrs = rinfo->fb_base_phys; + pGD->pciBase = (unsigned int)rinfo->fb_base; + pGD->frameAdrs = (unsigned int)rinfo->fb_base; pGD->memSize = 64 * 1024 * 1024; /* Cursor Start Address */ - pGD->dprBase = - (pGD->winSizeX * pGD->winSizeY * pGD->gdfBytesPP) + rinfo->fb_base_phys; + pGD->dprBase = (pGD->winSizeX * pGD->winSizeY * pGD->gdfBytesPP) + + (unsigned int)rinfo->fb_base; if ((pGD->dprBase & 0x0fff) != 0) { /* allign it */ pGD->dprBase &= 0xfffff000; @@ -748,8 +751,8 @@ void *video_hw_init(void) } DPRINT ("Cursor Start %x Pattern Start %x\n", pGD->dprBase, PATTERN_ADR); - pGD->vprBase = rinfo->fb_base_phys; /* Dummy */ - pGD->cprBase = rinfo->fb_base_phys; /* Dummy */ + pGD->vprBase = (unsigned int)rinfo->fb_base; /* Dummy */ + pGD->cprBase = (unsigned int)rinfo->fb_base; /* Dummy */ /* set up Hardware */ /* Clear video memory (only visible screen area) */ diff --git a/drivers/video/ati_radeon_fb.h b/drivers/video/ati_radeon_fb.h index e981f9524..065904555 100644 --- a/drivers/video/ati_radeon_fb.h +++ b/drivers/video/ati_radeon_fb.h @@ -49,8 +49,8 @@ struct radeonfb_info { struct pci_device_id pdev; u16 family; - u32 fb_base_phys; - u32 mmio_base_phys; + u32 fb_base_bus; + u32 mmio_base_bus; void *mmio_base; void *fb_base; From 760bce07f182f678d42f2a85a0e47b59e831ba25 Mon Sep 17 00:00:00 2001 From: Anatolij Gustschin Date: Thu, 8 Apr 2010 15:50:55 +0200 Subject: [PATCH 116/164] video: ati_radeon_fb.c: fix warning while compiling with DEBUG Fixes this warning: ati_radeon_fb.c: In function 'radeon_probe': ati_radeon_fb.c:598: warning: format '%x' expects type 'unsigned int', but argument 2 has type 'void *' Signed-off-by: Anatolij Gustschin --- drivers/video/ati_radeon_fb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/ati_radeon_fb.c b/drivers/video/ati_radeon_fb.c index f79710428..4a9bd07e0 100644 --- a/drivers/video/ati_radeon_fb.c +++ b/drivers/video/ati_radeon_fb.c @@ -594,7 +594,7 @@ int radeon_probe(struct radeonfb_info *rinfo) rinfo->mmio_base = pci_bus_to_virt(pdev, rinfo->mmio_base_bus, PCI_REGION_MEM, 0, MAP_NOCACHE); - DPRINT("rinfo->mmio_base = 0x%x bus=0x%x\n", + DPRINT("rinfo->mmio_base = 0x%p bus=0x%x\n", rinfo->mmio_base, rinfo->mmio_base_bus); rinfo->fb_local_base = INREG(MC_FB_LOCATION) << 16; DPRINT("rinfo->fb_local_base = 0x%x\n",rinfo->fb_local_base); From 6d313c84ded168427240e62d108b6ba9afdcf535 Mon Sep 17 00:00:00 2001 From: Sergei Shtylyov Date: Sat, 27 Feb 2010 21:29:42 +0300 Subject: [PATCH 117/164] EHCI: fix root hub device descriptor On little endian machines, EHCI root hub's USB revision is reported as 0.2 -- cpu_to_le16() was missed in the initializer for the 'bcdUSB' descriptor field. The same should be done for the 'bcdDevice' field. Signed-off-by: Sergei Shtylyov --- drivers/usb/host/ehci-hcd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 9ebeb4f23..e48819f32 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -55,14 +55,14 @@ static struct descriptor { { 0x12, /* bLength */ 1, /* bDescriptorType: UDESC_DEVICE */ - 0x0002, /* bcdUSB: v2.0 */ + cpu_to_le16(0x0200), /* bcdUSB: v2.0 */ 9, /* bDeviceClass: UDCLASS_HUB */ 0, /* bDeviceSubClass: UDSUBCLASS_HUB */ 1, /* bDeviceProtocol: UDPROTO_HSHUBSTT */ 64, /* bMaxPacketSize: 64 bytes */ 0x0000, /* idVendor */ 0x0000, /* idProduct */ - 0x0001, /* bcdDevice */ + cpu_to_le16(0x0100), /* bcdDevice */ 1, /* iManufacturer */ 2, /* iProduct */ 0, /* iSerialNumber */ From e06a055bcd966adf62a5653c84db781915392e41 Mon Sep 17 00:00:00 2001 From: Sergei Shtylyov Date: Sat, 27 Feb 2010 21:32:17 +0300 Subject: [PATCH 118/164] EHCI: fix off-by-one error in ehci_submit_root() USB devices on the 2nd port are not detected and I get the following message: The request port(1) is not configured That's with default CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS value of 2. 'req->index' is 1-based, so the comparison in ehci_submit_root() can't be correct. Signed-off-by: Sergei Shtylyov --- drivers/usb/host/ehci-hcd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index e48819f32..d90a23a1f 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -536,7 +536,7 @@ ehci_submit_root(struct usb_device *dev, unsigned long pipe, void *buffer, uint32_t reg; uint32_t *status_reg; - if (le16_to_cpu(req->index) >= CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS) { + if (le16_to_cpu(req->index) > CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS) { printf("The request port(%d) is not configured\n", le16_to_cpu(req->index) - 1); return -1; From c8b2d1dc0f1667029f42c3fa21f70906414af325 Mon Sep 17 00:00:00 2001 From: Sergei Shtylyov Date: Sat, 27 Feb 2010 21:33:21 +0300 Subject: [PATCH 119/164] EHCI: fix port reset reporting Commit b416191a14770c6bcc6fd67be7decf8159b2baee (Fix EHCI port reset.) didn't move the code that checked for successful clearing of the port reset bit from ehci_submit_root(), relying on wait_ms() call instead. The mentioned code also erroneously reported port reset state when the reset was already completed. Signed-off-by: Sergei Shtylyov --- drivers/usb/host/ehci-hcd.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index d90a23a1f..7784d92b6 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -630,19 +630,8 @@ ehci_submit_root(struct usb_device *dev, unsigned long pipe, void *buffer, tmpbuf[0] |= USB_PORT_STAT_SUSPEND; if (reg & EHCI_PS_OCA) tmpbuf[0] |= USB_PORT_STAT_OVERCURRENT; - if (reg & EHCI_PS_PR && - (portreset & (1 << le16_to_cpu(req->index)))) { - int ret; - /* force reset to complete */ - reg = reg & ~(EHCI_PS_PR | EHCI_PS_CLEAR); - ehci_writel(status_reg, reg); - ret = handshake(status_reg, EHCI_PS_PR, 0, 2 * 1000); - if (!ret) - tmpbuf[0] |= USB_PORT_STAT_RESET; - else - printf("port(%d) reset error\n", - le16_to_cpu(req->index) - 1); - } + if (reg & EHCI_PS_PR) + tmpbuf[0] |= USB_PORT_STAT_RESET; if (reg & EHCI_PS_PP) tmpbuf[1] |= USB_PORT_STAT_POWER >> 8; @@ -699,6 +688,8 @@ ehci_submit_root(struct usb_device *dev, unsigned long pipe, void *buffer, ehci_writel(status_reg, reg); break; } else { + int ret; + reg |= EHCI_PS_PR; reg &= ~EHCI_PS_PE; ehci_writel(status_reg, reg); @@ -710,8 +701,19 @@ ehci_submit_root(struct usb_device *dev, unsigned long pipe, void *buffer, wait_ms(50); /* terminate the reset */ ehci_writel(status_reg, reg & ~EHCI_PS_PR); - wait_ms(2); - portreset |= 1 << le16_to_cpu(req->index); + /* + * A host controller must terminate the reset + * and stabilize the state of the port within + * 2 milliseconds + */ + ret = handshake(status_reg, EHCI_PS_PR, 0, + 2 * 1000); + if (!ret) + portreset |= + 1 << le16_to_cpu(req->index); + else + printf("port(%d) reset error\n", + le16_to_cpu(req->index) - 1); } break; default: From d7a22a364ceea97133c1fb7aff073953c7a61228 Mon Sep 17 00:00:00 2001 From: Sergei Shtylyov Date: Sat, 27 Feb 2010 21:34:41 +0300 Subject: [PATCH 120/164] EHCI: add NEC PCI ID Add NEC EHCI controller to the list of the supported devices. Signed-off-by: Sergei Shtylyov drivers/usb/host/ehci-pci.c | 1 + 1 file changed, 1 insertion(+) --- drivers/usb/host/ehci-pci.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c index 441b1a271..047902a0c 100644 --- a/drivers/usb/host/ehci-pci.c +++ b/drivers/usb/host/ehci-pci.c @@ -28,6 +28,7 @@ #ifdef CONFIG_PCI_EHCI_DEVICE static struct pci_device_id ehci_pci_ids[] = { /* Please add supported PCI EHCI controller ids here */ + {0x1033, 0x00E0}, {0, 0} }; #endif From aaad108b889c6980a2d05262a2f7febb14f94d68 Mon Sep 17 00:00:00 2001 From: "Kim B. Heino" Date: Fri, 12 Mar 2010 15:46:56 +0200 Subject: [PATCH 121/164] USB storage count Here's another USB storage patch. Currently U-Boot handles storage devices #0 - #4 as valid devices, even if there is none connected. This patch fixes usb_stor_get_dev() to check detected device count instead of MAX-define. This is very important for ill behaving devices. usb_dev_desc[] can be partially initialized if device probe fails. After fixing get_dev() it was easy to fix "usb part" etc commands. Previously it outputed "Unknown partition table" five times, now it's "no USB devices available". Signed-off-by: Kim B. Heino --- common/cmd_usb.c | 13 ++++++++----- common/usb_storage.c | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/common/cmd_usb.c b/common/cmd_usb.c index 6b5c58255..ee3755c12 100644 --- a/common/cmd_usb.c +++ b/common/cmd_usb.c @@ -387,7 +387,7 @@ int do_usbboot(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) dev = simple_strtoul(boot_device, &ep, 16); stor_dev = usb_stor_get_dev(dev); - if (stor_dev->type == DEV_TYPE_UNKNOWN) { + if (stor_dev == NULL || stor_dev->type == DEV_TYPE_UNKNOWN) { printf("\n** Device %d not available\n", dev); return 1; } @@ -595,8 +595,10 @@ int do_usb(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) if (strncmp(argv[1], "part", 4) == 0) { int devno, ok = 0; if (argc == 2) { - for (devno = 0; devno < USB_MAX_STOR_DEV; ++devno) { + for (devno = 0; ; ++devno) { stor_dev = usb_stor_get_dev(devno); + if (stor_dev == NULL) + break; if (stor_dev->type != DEV_TYPE_UNKNOWN) { ok++; if (devno) @@ -608,7 +610,8 @@ int do_usb(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) } else { devno = simple_strtoul(argv[2], NULL, 16); stor_dev = usb_stor_get_dev(devno); - if (stor_dev->type != DEV_TYPE_UNKNOWN) { + if (stor_dev != NULL && + stor_dev->type != DEV_TYPE_UNKNOWN) { ok++; debug("print_part of %x\n", devno); print_part(stor_dev); @@ -668,12 +671,12 @@ int do_usb(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) if (argc == 3) { int dev = (int)simple_strtoul(argv[2], NULL, 10); printf("\nUSB device %d: ", dev); - if (dev >= USB_MAX_STOR_DEV) { + stor_dev = usb_stor_get_dev(dev); + if (stor_dev == NULL) { printf("unknown device\n"); return 1; } printf("\n Device %d: ", dev); - stor_dev = usb_stor_get_dev(dev); dev_print(stor_dev); if (stor_dev->type == DEV_TYPE_UNKNOWN) return 1; diff --git a/common/usb_storage.c b/common/usb_storage.c index a8642c9cc..239bddc51 100644 --- a/common/usb_storage.c +++ b/common/usb_storage.c @@ -175,7 +175,7 @@ void uhci_show_temp_int_td(void); block_dev_desc_t *usb_stor_get_dev(int index) { - return (index < USB_MAX_STOR_DEV) ? &usb_dev_desc[index] : NULL; + return (index < usb_max_devs) ? &usb_dev_desc[index] : NULL; } From fac71cc49f93db7d460dbc957dfbbadefa2ca0e9 Mon Sep 17 00:00:00 2001 From: "Kim B. Heino" Date: Fri, 12 Mar 2010 10:07:00 +0200 Subject: [PATCH 122/164] USB storage probe While debugging one ill behaving USB device I found two bugs in USB storage probe. usb_stor_get_info() returns -1 (error), 0 (skip) or 1 (ok). First part of this patch fixes error case. Second part fixes usb_inquiry()'s retry counter handling. Original code had retry = -1 on error case, not retry = 0 as checked in the next line. Signed-off-by: Kim B. Heino --- common/usb_storage.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/usb_storage.c b/common/usb_storage.c index 239bddc51..4fc01a22b 100644 --- a/common/usb_storage.c +++ b/common/usb_storage.c @@ -244,7 +244,7 @@ int usb_stor_scan(int mode) * get info and fill it in */ if (usb_stor_get_info(dev, &usb_stor[usb_max_devs], - &usb_dev_desc[usb_max_devs])) + &usb_dev_desc[usb_max_devs]) == 1) usb_max_devs++; } /* if storage device */ @@ -888,7 +888,7 @@ static int usb_inquiry(ccb *srb, struct us_data *ss) USB_STOR_PRINTF("inquiry returns %d\n", i); if (i == 0) break; - } while (retry--); + } while (--retry); if (!retry) { printf("error in inquiry\n"); From 3b653fdb322028b27c5ae3d60ecb0eea2d58837f Mon Sep 17 00:00:00 2001 From: Peter Tyser Date: Sun, 4 Apr 2010 22:40:50 -0500 Subject: [PATCH 123/164] cmd_ubi: Fix uninitialized variable warning gcc 3.4.6 previously reported the following error on many MIPS boards which utilize UBI: cmd_ubi.c:193: warning: 'vol' might be used uninitialized in this function The current code is structured such that 'vol' will never be used when it is NULL anyway, but gcc isn't smart enough to figure this out. Signed-off-by: Peter Tyser Signed-off-by: Stefan Roese --- common/cmd_ubi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/cmd_ubi.c b/common/cmd_ubi.c index 54faac1c9..2484b4049 100644 --- a/common/cmd_ubi.c +++ b/common/cmd_ubi.c @@ -190,7 +190,7 @@ static int ubi_remove_vol(char *volume) { int i, err, reserved_pebs; int found = 0, vol_id = 0; - struct ubi_volume *vol; + struct ubi_volume *vol = NULL; for (i = 0; i < ubi->vtbl_slots; i++) { vol = ubi->volumes[i]; From f852a0c3bfe0b30b4816135b9a0d2aaae7e5de6a Mon Sep 17 00:00:00 2001 From: Albin Tonnerre Date: Sun, 14 Mar 2010 18:47:23 +0100 Subject: [PATCH 124/164] drivers/mtd/spi/eeprom_m95xxx.c: add missing error checking Signed-off-by: Albin Tonnerre --- drivers/mtd/spi/eeprom_m95xxx.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/mtd/spi/eeprom_m95xxx.c b/drivers/mtd/spi/eeprom_m95xxx.c index 0148d005e..632db4e9e 100644 --- a/drivers/mtd/spi/eeprom_m95xxx.c +++ b/drivers/mtd/spi/eeprom_m95xxx.c @@ -44,6 +44,9 @@ ssize_t spi_read (uchar *addr, int alen, uchar *buffer, int len) slave = spi_setup_slave(CONFIG_DEFAULT_SPI_BUS, 1, 1000000, CONFIG_DEFAULT_SPI_MODE); + if(!slave) + return 0; + spi_claim_bus(slave); /* command */ @@ -75,6 +78,9 @@ ssize_t spi_write (uchar *addr, int alen, uchar *buffer, int len) slave = spi_setup_slave(CONFIG_DEFAULT_SPI_BUS, 1, 1000000, CONFIG_DEFAULT_SPI_MODE); + if (!slave) + return 0; + spi_claim_bus(slave); buf[0] = SPI_EEPROM_WREN; From 9acd4f0e914913796e4e56f550726d216f7b16e5 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Sat, 27 Mar 2010 11:16:10 +0100 Subject: [PATCH 125/164] cmd_bmp.c: add standard subcommand handling Signed-off-by: Frans Meulenbroeks Acked-by: Detlev Zundel --- common/cmd_bmp.c | 83 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 57 insertions(+), 26 deletions(-) diff --git a/common/cmd_bmp.c b/common/cmd_bmp.c index 74ab24ca9..583b0090c 100644 --- a/common/cmd_bmp.c +++ b/common/cmd_bmp.c @@ -90,6 +90,54 @@ bmp_image_t *gunzip_bmp(unsigned long addr, unsigned long *lenp) } #endif +static int do_bmp_info(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) +{ + ulong addr; + + switch (argc) { + case 1: /* use load_addr as default address */ + addr = load_addr; + break; + case 2: /* use argument */ + addr = simple_strtoul(argv[1], NULL, 16); + break; + default: + cmd_usage(cmdtp); + return 1; + } + + return (bmp_info(addr)); +} + +static int do_bmp_display(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) +{ + ulong addr; + int x = 0, y = 0; + + switch (argc) { + case 1: /* use load_addr as default address */ + addr = load_addr; + break; + case 2: /* use argument */ + addr = simple_strtoul(argv[1], NULL, 16); + break; + case 4: + addr = simple_strtoul(argv[1], NULL, 16); + x = simple_strtoul(argv[2], NULL, 10); + y = simple_strtoul(argv[3], NULL, 10); + break; + default: + cmd_usage(cmdtp); + return 1; + } + + return (bmp_display(addr, x, y)); +} + +static cmd_tbl_t cmd_bmp_sub[] = { + U_BOOT_CMD_MKENT(info, 3, 0, do_bmp_info, "", ""), + U_BOOT_CMD_MKENT(display, 5, 0, do_bmp_display, "", ""), +}; /* * Subroutine: do_bmp @@ -101,35 +149,18 @@ bmp_image_t *gunzip_bmp(unsigned long addr, unsigned long *lenp) * Return: None * */ -int do_bmp(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +static int do_bmp(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { - ulong addr; - int x = 0, y = 0; + cmd_tbl_t *c; - switch (argc) { - case 2: /* use load_addr as default address */ - addr = load_addr; - break; - case 3: /* use argument */ - addr = simple_strtoul(argv[2], NULL, 16); - break; - case 5: - addr = simple_strtoul(argv[2], NULL, 16); - x = simple_strtoul(argv[3], NULL, 10); - y = simple_strtoul(argv[4], NULL, 10); - break; - default: - cmd_usage(cmdtp); - return 1; - } + /* Strip off leading 'bmp' command argument */ + argc--; + argv++; - /* Allow for short names - * Adjust length if more sub-commands get added - */ - if (strncmp(argv[1],"info",1) == 0) { - return (bmp_info(addr)); - } else if (strncmp(argv[1],"display",1) == 0) { - return (bmp_display(addr, x, y)); + c = find_cmd_tbl(argv[0], &cmd_bmp_sub[0], ARRAY_SIZE(cmd_bmp_sub)); + + if (c) { + return c->cmd(cmdtp, flag, argc, argv); } else { cmd_usage(cmdtp); return 1; From 1f2463d7642c582339c9f9d96471d5d2a169b9bb Mon Sep 17 00:00:00 2001 From: Andre Schwarz Date: Thu, 1 Apr 2010 21:26:55 +0200 Subject: [PATCH 126/164] Add initial support for Matrix Vision mvSMR board based on MPC5200B. Signed-off-by: Andre Schwarz --- CREDITS | 2 +- MAINTAINERS | 1 + MAKEALL | 1 + Makefile | 5 + board/matrix_vision/mvsmr/Makefile | 51 +++++ board/matrix_vision/mvsmr/bootscript | 42 ++++ board/matrix_vision/mvsmr/config.mk | 31 +++ board/matrix_vision/mvsmr/fpga.c | 129 ++++++++++++ board/matrix_vision/mvsmr/fpga.h | 32 +++ board/matrix_vision/mvsmr/mvsmr.c | 264 ++++++++++++++++++++++++ board/matrix_vision/mvsmr/mvsmr.h | 43 ++++ board/matrix_vision/mvsmr/u-boot.lds | 138 +++++++++++++ doc/README.mvsmr | 55 +++++ include/configs/MVSMR.h | 295 +++++++++++++++++++++++++++ 14 files changed, 1088 insertions(+), 1 deletion(-) create mode 100644 board/matrix_vision/mvsmr/Makefile create mode 100644 board/matrix_vision/mvsmr/bootscript create mode 100644 board/matrix_vision/mvsmr/config.mk create mode 100644 board/matrix_vision/mvsmr/fpga.c create mode 100644 board/matrix_vision/mvsmr/fpga.h create mode 100644 board/matrix_vision/mvsmr/mvsmr.c create mode 100644 board/matrix_vision/mvsmr/mvsmr.h create mode 100644 board/matrix_vision/mvsmr/u-boot.lds create mode 100644 doc/README.mvsmr create mode 100644 include/configs/MVSMR.h diff --git a/CREDITS b/CREDITS index 043ba6e13..4f3cdbb23 100644 --- a/CREDITS +++ b/CREDITS @@ -437,7 +437,7 @@ D: FADS823 configuration, MPC823 video support, I2C, wireless keyboard, lots mor N: Andre Schwarz E: andre.schwarz@matrix-vision.de -D: Support for Matrix Vision boards (MVBLM7/MVBC_P) +D: Support for Matrix Vision boards (MVBLM7/MVBC_P/MVSMR) N: Robert Schwebel E: r.schwebel@pengutronix.de diff --git a/MAINTAINERS b/MAINTAINERS index 0658bc327..94839ce4e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -422,6 +422,7 @@ Andre Schwarz mvbc_p MPC5200 mvblm7 MPC8343 + mvsmr MPC5200 Jon Smirl diff --git a/MAKEALL b/MAKEALL index a88c31eff..dc17dbac4 100755 --- a/MAKEALL +++ b/MAKEALL @@ -70,6 +70,7 @@ LIST_5xxx=" \ motionpro \ munices \ MVBC_P \ + MVSMR \ o2dnt \ pcm030 \ pf5200 \ diff --git a/Makefile b/Makefile index 45325504f..412e35911 100644 --- a/Makefile +++ b/Makefile @@ -664,6 +664,11 @@ MVBC_P_config: unconfig { echo "#define CONFIG_MVBC_P" >>$(obj)include/config.h; } @$(MKCONFIG) -n $@ -a MVBC_P ppc mpc5xxx mvbc_p matrix_vision +MVSMR_config: unconfig + @mkdir -p $(obj)include + @mkdir -p $(obj)board/matrix_vision/mvsmr + @$(MKCONFIG) $(@:_config=) ppc mpc5xxx mvsmr matrix_vision + o2dnt_config: unconfig @$(MKCONFIG) o2dnt ppc mpc5xxx o2dnt diff --git a/board/matrix_vision/mvsmr/Makefile b/board/matrix_vision/mvsmr/Makefile new file mode 100644 index 000000000..b179e6d78 --- /dev/null +++ b/board/matrix_vision/mvsmr/Makefile @@ -0,0 +1,51 @@ +# +# (C) Copyright 2003 +# Wolfgang Denk, DENX Software Engineering, wd@denx.de. +# +# (C) Copyright 2004-2008 +# Matrix-Vision GmbH, info@matrix-vision.de +# +# See file CREDITS for list of people who contributed to this +# project. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +# + +include $(TOPDIR)/config.mk + +LIB = $(obj)lib$(BOARD).a + +COBJS := $(BOARD).o fpga.o + +SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) +SOBJS := $(addprefix $(obj),$(SOBJS)) + +$(LIB): $(obj).depend $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) + @mkimage -T script -C none -n mvSMR_Script -d bootscript bootscript.img + +clean: + rm -f $(SOBJS) $(OBJS) + +distclean: clean + rm -f $(LIB) core *.bak $(obj).depend + +######################################################################### + +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend diff --git a/board/matrix_vision/mvsmr/bootscript b/board/matrix_vision/mvsmr/bootscript new file mode 100644 index 000000000..02c802c8c --- /dev/null +++ b/board/matrix_vision/mvsmr/bootscript @@ -0,0 +1,42 @@ +echo +echo "==== running autoscript ====" +echo +setenv boot24 'bootm ${kernel_boot} ${mv_initrd_addr_ram}' +setenv ramkernel 'setenv kernel_boot ${loadaddr}' +setenv flashkernel 'setenv kernel_boot ${mv_kernel_addr}' +setenv cpird 'cp ${mv_initrd_addr} ${mv_initrd_addr_ram} ${mv_initrd_length}' +setenv bootfromflash run flashkernel cpird addcons boot24 +setenv bootfromnet 'tftp ${mv_initrd_addr_ram} ${initrd_name};run ramkernel' +if test ${console} = yes; +then +setenv addcons 'setenv bootargs ${bootargs} console=ttyS${console_nr},${baudrate}N8' +else +setenv addcons 'setenv bootargs ${bootargs} console=tty0' +fi +setenv set_static_ip 'setenv ipaddr ${static_ipaddr}' +setenv set_static_nm 'setenv netmask ${static_netmask}' +setenv set_static_gw 'setenv gatewayip ${static_gateway}' +setenv set_ip 'setenv ip ${ipaddr}::${gatewayip}:${netmask}' +if test ${servicemode} != yes; +then + echo "=== forced flash mode ===" + run set_static_ip set_static_nm set_static_gw set_ip bootfromflash +fi +if test ${autoscript_boot} != no; +then + if test ${netboot} = yes; + then + bootp + if test $? = 0; + then + echo "=== bootp succeeded -> netboot ===" + run set_ip bootfromnet addcons boot24 + else + echo "=== netboot failed ===" + fi + fi + echo "=== bootfromflash ===" + run set_static_ip set_static_nm set_static_gw set_ip bootfromflash +else + echo "=== boot stopped with autoscript_boot no ===" +fi diff --git a/board/matrix_vision/mvsmr/config.mk b/board/matrix_vision/mvsmr/config.mk new file mode 100644 index 000000000..b1da812c4 --- /dev/null +++ b/board/matrix_vision/mvsmr/config.mk @@ -0,0 +1,31 @@ +# +# (C) Copyright 2003 +# Wolfgang Denk, DENX Software Engineering, wd@denx.de. +# +# See file CREDITS for list of people who contributed to this +# project. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +# + +sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp + +ifndef TEXT_BASE +TEXT_BASE = 0xFF800000 +endif + +PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board +LDSCRIPT := $(SRCTREE)/board/matrix_vision/mvsmr/u-boot.lds diff --git a/board/matrix_vision/mvsmr/fpga.c b/board/matrix_vision/mvsmr/fpga.c new file mode 100644 index 000000000..6320a6903 --- /dev/null +++ b/board/matrix_vision/mvsmr/fpga.c @@ -0,0 +1,129 @@ +/* + * (C) Copyright 2002 + * Rich Ireland, Enterasys Networks, rireland@enterasys.com. + * Keith Outwater, keith_outwater@mvis.com. + * + * (C) Copyright 2010 + * Andre Schwarz, Matrix Vision GmbH, andre.schwarz@matrix-vision.de + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + */ + +#include +#include +#include +#include +#include "fpga.h" +#include "mvsmr.h" + +Xilinx_Spartan3_Slave_Serial_fns fpga_fns = { + fpga_pre_config_fn, + fpga_pgm_fn, + fpga_clk_fn, + fpga_init_fn, + fpga_done_fn, + fpga_wr_fn, + 0 +}; + +Xilinx_desc spartan3 = { + Xilinx_Spartan2, + slave_serial, + XILINX_XC3S200_SIZE, + (void *) &fpga_fns, + 0, +}; + +DECLARE_GLOBAL_DATA_PTR; + +int mvsmr_init_fpga(void) +{ + fpga_init(); + fpga_add(fpga_xilinx, &spartan3); + + return 1; +} + +int fpga_init_fn(int cookie) +{ + struct mpc5xxx_gpio *gpio = (struct mpc5xxx_gpio *)MPC5XXX_GPIO; + + if (in_be32(&gpio->simple_ival) & FPGA_CONFIG) + return 0; + + return 1; +} + +int fpga_done_fn(int cookie) +{ + struct mpc5xxx_gpio *gpio = (struct mpc5xxx_gpio *)MPC5XXX_GPIO; + int result = 0; + + udelay(10); + if (in_be32(&gpio->simple_ival) & FPGA_DONE) + result = 1; + + return result; +} + +int fpga_pgm_fn(int assert, int flush, int cookie) +{ + struct mpc5xxx_gpio *gpio = (struct mpc5xxx_gpio *)MPC5XXX_GPIO; + + if (!assert) + setbits_8(&gpio->sint_dvo, FPGA_STATUS); + else + clrbits_8(&gpio->sint_dvo, FPGA_STATUS); + + return assert; +} + +int fpga_clk_fn(int assert_clk, int flush, int cookie) +{ + struct mpc5xxx_gpio *gpio = (struct mpc5xxx_gpio *)MPC5XXX_GPIO; + + if (assert_clk) + setbits_be32(&gpio->simple_dvo, FPGA_CCLK); + else + clrbits_be32(&gpio->simple_dvo, FPGA_CCLK); + + return assert_clk; +} + +int fpga_wr_fn(int assert_write, int flush, int cookie) +{ + struct mpc5xxx_gpio *gpio = (struct mpc5xxx_gpio *)MPC5XXX_GPIO; + + if (assert_write) + setbits_be32(&gpio->simple_dvo, FPGA_DIN); + else + clrbits_be32(&gpio->simple_dvo, FPGA_DIN); + + return assert_write; +} + +int fpga_pre_config_fn(int cookie) +{ + struct mpc5xxx_gpio *gpio = (struct mpc5xxx_gpio *)MPC5XXX_GPIO; + + setbits_8(&gpio->sint_dvo, FPGA_STATUS); + + return 0; +} diff --git a/board/matrix_vision/mvsmr/fpga.h b/board/matrix_vision/mvsmr/fpga.h new file mode 100644 index 000000000..ee690e681 --- /dev/null +++ b/board/matrix_vision/mvsmr/fpga.h @@ -0,0 +1,32 @@ +/* + * (C) Copyright 2008 + * Andre Schwarz, Matrix Vision GmbH, andre.schwarz@matrix-vision.de + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + */ + +extern int mvsmr_init_fpga(void); + +extern int fpga_pgm_fn(int assert_pgm, int flush, int cookie); +extern int fpga_init_fn(int cookie); +extern int fpga_clk_fn(int assert_clk, int flush, int cookie); +extern int fpga_wr_fn(int assert_write, int flush, int cookie); +extern int fpga_done_fn(int cookie); +extern int fpga_pre_config_fn(int cookie); diff --git a/board/matrix_vision/mvsmr/mvsmr.c b/board/matrix_vision/mvsmr/mvsmr.c new file mode 100644 index 000000000..69655c4cf --- /dev/null +++ b/board/matrix_vision/mvsmr/mvsmr.c @@ -0,0 +1,264 @@ +/* + * (C) Copyright 2003 + * Wolfgang Denk, DENX Software Engineering, wd@denx.de. + * + * (C) Copyright 2004 + * Mark Jonas, Freescale Semiconductor, mark.jonas@motorola.com. + * + * (C) Copyright 2005-2010 + * Andre Schwarz, Matrix Vision GmbH, andre.schwarz@matrix-vision.de + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "fpga.h" +#include "mvsmr.h" +#include "../common/mv_common.h" + +#define SDRAM_DDR 1 +#define SDRAM_MODE 0x018D0000 +#define SDRAM_EMODE 0x40090000 +#define SDRAM_CONTROL 0x715f0f00 +#define SDRAM_CONFIG1 0xd3722930 +#define SDRAM_CONFIG2 0x46770000 + +DECLARE_GLOBAL_DATA_PTR; + +static void sdram_start(int hi_addr) +{ + long hi_bit = hi_addr ? 0x01000000 : 0; + + /* unlock mode register */ + out_be32((u32 *)MPC5XXX_SDRAM_CTRL, SDRAM_CONTROL | 0x80000000 | + hi_bit); + + /* precharge all banks */ + out_be32((u32 *)MPC5XXX_SDRAM_CTRL, SDRAM_CONTROL | 0x80000002 | + hi_bit); + + /* set mode register: extended mode */ + out_be32((u32 *)MPC5XXX_SDRAM_MODE, SDRAM_EMODE); + + /* set mode register: reset DLL */ + out_be32((u32 *)MPC5XXX_SDRAM_MODE, SDRAM_MODE | 0x04000000); + + /* precharge all banks */ + out_be32((u32 *)MPC5XXX_SDRAM_CTRL, SDRAM_CONTROL | 0x80000002 | + hi_bit); + + /* auto refresh */ + out_be32((u32 *)MPC5XXX_SDRAM_CTRL, SDRAM_CONTROL | 0x80000004 | + hi_bit); + + /* set mode register */ + out_be32((u32 *)MPC5XXX_SDRAM_MODE, SDRAM_MODE); + + /* normal operation */ + out_be32((u32 *)MPC5XXX_SDRAM_CTRL, SDRAM_CONTROL | hi_bit); +} + +phys_addr_t initdram(int board_type) +{ + ulong dramsize = 0; + ulong test1, + test2; + + /* setup SDRAM chip selects */ + out_be32((u32 *)MPC5XXX_SDRAM_CS0CFG, 0x0000001e); + + /* setup config registers */ + out_be32((u32 *)MPC5XXX_SDRAM_CONFIG1, SDRAM_CONFIG1); + out_be32((u32 *)MPC5XXX_SDRAM_CONFIG2, SDRAM_CONFIG2); + + /* find RAM size using SDRAM CS0 only */ + sdram_start(0); + test1 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x80000000); + sdram_start(1); + test2 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x80000000); + if (test1 > test2) { + sdram_start(0); + dramsize = test1; + } else + dramsize = test2; + + if (dramsize < (1 << 20)) + dramsize = 0; + + if (dramsize > 0) + out_be32((u32 *)MPC5XXX_SDRAM_CS0CFG, 0x13 + + __builtin_ffs(dramsize >> 20) - 1); + else + out_be32((u32 *)MPC5XXX_SDRAM_CS0CFG, 0); + + return dramsize; +} + +void mvsmr_init_gpio(void) +{ + struct mpc5xxx_gpio *gpio = (struct mpc5xxx_gpio *)MPC5XXX_GPIO; + struct mpc5xxx_wu_gpio *wu_gpio = + (struct mpc5xxx_wu_gpio *)MPC5XXX_WU_GPIO; + struct mpc5xxx_gpt_0_7 *timers = (struct mpc5xxx_gpt_0_7 *)MPC5XXX_GPT; + + printf("Ports : 0x%08x\n", gpio->port_config); + printf("PORCFG: 0x%08x\n", in_be32((unsigned *)MPC5XXX_CDM_PORCFG)); + + out_be32(&gpio->simple_ddr, SIMPLE_DDR); + out_be32(&gpio->simple_dvo, SIMPLE_DVO); + out_be32(&gpio->simple_ode, SIMPLE_ODE); + out_be32(&gpio->simple_gpioe, SIMPLE_GPIOEN); + + out_8(&gpio->sint_ode, SINT_ODE); + out_8(&gpio->sint_ddr, SINT_DDR); + out_8(&gpio->sint_dvo, SINT_DVO); + out_8(&gpio->sint_inten, SINT_INTEN); + out_be16(&gpio->sint_itype, SINT_ITYPE); + out_8(&gpio->sint_gpioe, SINT_GPIOEN); + + out_8(&wu_gpio->ode, WKUP_ODE); + out_8(&wu_gpio->ddr, WKUP_DIR); + out_8(&wu_gpio->dvo, WKUP_DO); + out_8(&wu_gpio->enable, WKUP_EN); + + out_be32(&timers->gpt0.emsr, 0x00000234); /* OD output high */ + out_be32(&timers->gpt1.emsr, 0x00000234); + out_be32(&timers->gpt2.emsr, 0x00000234); + out_be32(&timers->gpt3.emsr, 0x00000234); + out_be32(&timers->gpt4.emsr, 0x00000234); + out_be32(&timers->gpt5.emsr, 0x00000234); + out_be32(&timers->gpt6.emsr, 0x00000024); /* push-pull output low */ + out_be32(&timers->gpt7.emsr, 0x00000024); +} + +int misc_init_r(void) +{ + char *s = getenv("reset_env"); + + if (s) { + printf(" === FACTORY RESET ===\n"); + mv_reset_environment(); + saveenv(); + } + + return -1; +} + +void mvsmr_get_dbg_present(void) +{ + struct mpc5xxx_gpio *gpio = (struct mpc5xxx_gpio *)MPC5XXX_GPIO; + struct mpc5xxx_psc *psc = (struct mpc5xxx_psc *)MPC5XXX_PSC1; + + if (in_be32(&gpio->simple_ival) & COP_PRESENT) { + setenv("dbg_present", "no\0"); + setenv("bootstopkey", "abcdefghijklmnopqrstuvwxyz\0"); + } else { + setenv("dbg_present", "yes\0"); + setenv("bootstopkey", "s\0"); + setbits_8(&psc->command, PSC_RX_ENABLE); + } +} + +void mvsmr_get_service_mode(void) +{ + struct mpc5xxx_wu_gpio *wu_gpio = + (struct mpc5xxx_wu_gpio *)MPC5XXX_WU_GPIO; + + if (in_8(&wu_gpio->ival) & SERVICE_MODE) + setenv("servicemode", "no\0"); + else + setenv("servicemode", "yes\0"); +} + +int mvsmr_get_mac(void) +{ + unsigned char mac[6]; + struct mpc5xxx_wu_gpio *wu_gpio = + (struct mpc5xxx_wu_gpio *)MPC5XXX_WU_GPIO; + + if (in_8(&wu_gpio->ival) & LAN_PRSNT) { + setenv("lan_present", "no\0"); + return -1; + } else + setenv("lan_present", "yes\0"); + + i2c_read(0x50, 0, 1, mac, 6); + + eth_setenv_enetaddr("ethaddr", mac); + + return 0; +} + +int checkboard(void) +{ + mvsmr_init_gpio(); + printf("Board: Matrix Vision mvSMR\n"); + + return 0; +} + +void flash_preinit(void) +{ + /* + * Now, when we are in RAM, enable flash write + * access for detection process. + * Note that CS_BOOT cannot be cleared when + * executing in flash. + */ + clrbits_be32((u32 *)MPC5XXX_BOOTCS_CFG, 0x1); +} + +void flash_afterinit(ulong size) +{ + out_be32((u32 *)MPC5XXX_BOOTCS_START, + START_REG(CONFIG_SYS_BOOTCS_START | size)); + out_be32((u32 *)MPC5XXX_CS0_START, + START_REG(CONFIG_SYS_BOOTCS_START | size)); + out_be32((u32 *)MPC5XXX_BOOTCS_STOP, + STOP_REG(CONFIG_SYS_BOOTCS_START | size, size)); + out_be32((u32 *)MPC5XXX_CS0_STOP, + STOP_REG(CONFIG_SYS_BOOTCS_START | size, size)); +} + +struct pci_controller hose; + +void pci_init_board(void) +{ + mvsmr_get_dbg_present(); + mvsmr_get_service_mode(); + mvsmr_init_fpga(); + mv_load_fpga(); + pci_mpc5xxx_init(&hose); +} + +int board_eth_init(bd_t *bis) +{ + if (!mvsmr_get_mac()) + return cpu_eth_init(bis); + + return pci_eth_init(bis); +} diff --git a/board/matrix_vision/mvsmr/mvsmr.h b/board/matrix_vision/mvsmr/mvsmr.h new file mode 100644 index 000000000..b8320f1e6 --- /dev/null +++ b/board/matrix_vision/mvsmr/mvsmr.h @@ -0,0 +1,43 @@ +#include + +extern void pci_mpc5xxx_init(struct pci_controller *); + +#define FPGA_DIN MPC5XXX_GPIO_SIMPLE_PSC3_0 +#define FPGA_CCLK MPC5XXX_GPIO_SIMPLE_PSC3_1 +#define FPGA_DONE MPC5XXX_GPIO_SIMPLE_PSC3_2 +#define FPGA_CONFIG MPC5XXX_GPIO_SIMPLE_PSC3_3 +#define FPGA_STATUS MPC5XXX_GPIO_SINT_PSC3_4 +#define S_FPGA_DIN MPC5XXX_GPIO_SINT_PSC3_5 +#define S_FPGA_CCLK MPC5XXX_GPIO_SIMPLE_PSC3_6 +#define S_FPGA_DONE MPC5XXX_GPIO_SIMPLE_PSC3_7 +#define S_FPGA_CONFIG MPC5XXX_GPIO_SINT_PSC3_8 +#define S_FPGA_STATUS MPC5XXX_GPIO_WKUP_PSC3_9 + +#define MAN_RST MPC5XXX_GPIO_WKUP_PSC6_0 +#define WD_TS MPC5XXX_GPIO_WKUP_PSC6_1 +#define WD_WDI MPC5XXX_GPIO_SIMPLE_PSC6_2 +#define COP_PRESENT MPC5XXX_GPIO_SIMPLE_PSC6_3 +#define SERVICE_MODE MPC5XXX_GPIO_WKUP_6 +#define FLASH_RBY MPC5XXX_GPIO_WKUP_7 +#define UART_EN1 MPC5XXX_GPIO_WKUP_PSC1_4 +#define LAN_PRSNT MPC5XXX_GPIO_WKUP_PSC2_4 + +#define SIMPLE_DDR (FPGA_DIN | FPGA_CCLK | FPGA_CONFIG | WD_WDI |\ + S_FPGA_CCLK) +#define SIMPLE_DVO (FPGA_CONFIG) +#define SIMPLE_ODE (FPGA_CONFIG) +#define SIMPLE_GPIOEN (FPGA_DIN | FPGA_CCLK | FPGA_DONE | FPGA_CONFIG |\ + S_FPGA_CCLK | S_FPGA_DONE | WD_WDI | COP_PRESENT) + +#define SINT_ODE 0x1 +#define SINT_DDR 0x3 +#define SINT_DVO 0x1 +#define SINT_INTEN 0 +#define SINT_ITYPE 0 +#define SINT_GPIOEN (FPGA_STATUS | S_FPGA_DIN | S_FPGA_CONFIG) + +#define WKUP_ODE (MAN_RST | S_FPGA_STATUS) +#define WKUP_DIR (MAN_RST | WD_TS | S_FPGA_STATUS) +#define WKUP_DO (MAN_RST | WD_TS | S_FPGA_STATUS) +#define WKUP_EN (MAN_RST | WD_TS | S_FPGA_STATUS | SERVICE_MODE |\ + FLASH_RBY | UART_EN1 | LAN_PRSNT) diff --git a/board/matrix_vision/mvsmr/u-boot.lds b/board/matrix_vision/mvsmr/u-boot.lds new file mode 100644 index 000000000..cfbb6ef39 --- /dev/null +++ b/board/matrix_vision/mvsmr/u-boot.lds @@ -0,0 +1,138 @@ +/* + * (C) Copyright 2003-2004 + * Wolfgang Denk, DENX Software Engineering, wd@denx.de. + * (C) Copyright 2010 + * André Schwarz, Matrix Vision GmbH, as@matrix-vision.de + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +OUTPUT_ARCH(powerpc) + +SECTIONS +{ + /* Read-only sections, merged into text segment: */ + . = + SIZEOF_HEADERS; + .interp : { *(.interp) } + .hash : { *(.hash) } + .dynsym : { *(.dynsym) } + .dynstr : { *(.dynstr) } + .rel.text : { *(.rel.text) } + .rela.text : { *(.rela.text) } + .rel.data : { *(.rel.data) } + .rela.data : { *(.rela.data) } + .rel.rodata : { *(.rel.rodata) } + .rela.rodata : { *(.rela.rodata) } + .rel.got : { *(.rel.got) } + .rela.got : { *(.rela.got) } + .rel.ctors : { *(.rel.ctors) } + .rela.ctors : { *(.rela.ctors) } + .rel.dtors : { *(.rel.dtors) } + .rela.dtors : { *(.rela.dtors) } + .rel.bss : { *(.rel.bss) } + .rela.bss : { *(.rela.bss) } + .rel.plt : { *(.rel.plt) } + .rela.plt : { *(.rela.plt) } + .init : { *(.init) } + .plt : { *(.plt) } + .text : + { + /* WARNING - the following is hand-optimized to fit within */ + /* the first two sectors (=8KB) of our S29GL flash chip */ + cpu/mpc5xxx/start.o (.text) + cpu/mpc5xxx/traps.o (.text) + lib_generic/crc32.o (.text) + lib_ppc/cache.o (.text) + lib_ppc/time.o (.text) + + /* This is only needed to force failure if size of above code will ever */ + /* increase and grow into reserved space. */ + . = ALIGN(0x2000); /* location counter has to be 0x4000 now */ + . += 0x4000; /* ->0x8000, i.e. move to env_offset */ + + . = env_offset; /* ld error as soon as above ALIGN misplaces lc */ + common/env_embedded.o (.ppcenv) + + *(.text) + *(.got1) + . = ALIGN(16); + *(.eh_frame) + *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) + } + .fini : { *(.fini) } =0 + .ctors : { *(.ctors) } + .dtors : { *(.dtors) } + + /* Read-write section, merged into data segment: */ + . = (. + 0x0FFF) & 0xFFFFF000; + _erotext = .; + PROVIDE (erotext = .); + .reloc : + { + *(.got) + _GOT2_TABLE_ = .; + *(.got2) + _FIXUP_TABLE_ = .; + *(.fixup) + } + __got2_entries = (_FIXUP_TABLE_ - _GOT2_TABLE_) >> 2; + __fixup_entries = (. - _FIXUP_TABLE_) >> 2; + + .data : + { + *(.data) + *(.data1) + *(.sdata) + *(.sdata2) + *(.dynamic) + CONSTRUCTORS + } + _edata = .; + PROVIDE (edata = .); + + . = .; + __u_boot_cmd_start = .; + .u_boot_cmd : { *(.u_boot_cmd) } + __u_boot_cmd_end = .; + + + . = .; + __start___ex_table = .; + __ex_table : { *(__ex_table) } + __stop___ex_table = .; + + . = ALIGN(4096); + __init_begin = .; + .text.init : { *(.text.init) } + .data.init : { *(.data.init) } + . = ALIGN(4096); + __init_end = .; + + __bss_start = .; + .bss (NOLOAD) : + { + *(.sbss) *(.scommon) + *(.dynbss) + *(.bss) + *(COMMON) + . = ALIGN(4); + } + _end = . ; + PROVIDE (end = .); +} diff --git a/doc/README.mvsmr b/doc/README.mvsmr new file mode 100644 index 000000000..d729ea6fb --- /dev/null +++ b/doc/README.mvsmr @@ -0,0 +1,55 @@ +Matrix Vision mvSMR +------------------- + +1. Board Description + + The mvSMR is a 75x130mm single image processing board used + in automation. Power Supply is 24VDC. + +2 System Components + +2.1 CPU + Freescale MPC5200B CPU running at 400MHz core and 133MHz XLB/IPB. + 64MB DDR-I @ 133MHz. + 8 MByte Nor Flash on local bus. + 2 serial ports. Console running on ttyS0 @ 115200 8N1. + +2.2 PCI + PCI clock fixed at 33MHz due to old'n'slow Xilinx PCI core. + +2.3 FPGA + Xilinx Spartan-3 XC3S200 with PCI DMA engine. + Connects to Matrix Vision specific CCD/CMOS sensor interface. + +2.4 I2C + EEPROM @ 0xA0 for vendor specifics. + image sensor interface (slave adresses depend on sensor) + +3 Flash layout. + + reset vector is 0x00000100, i.e. "LOWBOOT". + + FF800000 u-boot + FF806000 u-boot script image + FF808000 u-boot environment + FF840000 FPGA raw bit file + FF880000 root FS + FFF00000 kernel + +4 Booting + + On startup the bootscript @ FF806000 is executed. This script can be + exchanged easily. Default boot mode is "boot from flash", i.e. system + works stand-alone. + + This behaviour depends on some environment variables : + + "netboot" : yes ->try dhcp/bootp and boot from network. + A "dhcp_client_id" and "dhcp_vendor-class-identifier" can be used for + DHCP server configuration, e.g. to provide different images to + different devices. + + During netboot the system tries to get 3 image files: + 1. Kernel - name + data is given during BOOTP. + 2. Initrd - name is stored in "initrd_name" + Fallback files are the flash versions. diff --git a/include/configs/MVSMR.h b/include/configs/MVSMR.h new file mode 100644 index 000000000..6492068c2 --- /dev/null +++ b/include/configs/MVSMR.h @@ -0,0 +1,295 @@ +/* + * (C) Copyright 2003-2004 + * Wolfgang Denk, DENX Software Engineering, wd@denx.de. + * + * (C) Copyright 2004-2010 + * Matrix-Vision GmbH, andre.schwarz@matrix-vision.de + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#ifndef __CONFIG_H +#define __CONFIG_H + +#include + +#define CONFIG_MPC5xxx 1 +#define CONFIG_MPC5200 1 + +#define CONFIG_SYS_MPC5XXX_CLKIN 33000000 + +#define BOOTFLAG_COLD 0x01 +#define BOOTFLAG_WARM 0x02 + +#define CONFIG_MISC_INIT_R 1 + +#define CONFIG_SYS_CACHELINE_SIZE 32 +#ifdef CONFIG_CMD_KGDB +#define CONFIG_SYS_CACHELINE_SHIFT 5 +#endif + +#define CONFIG_PSC_CONSOLE 1 +#define CONFIG_BAUDRATE 115200 +#define CONFIG_SYS_BAUDRATE_TABLE {9600, 19200, 38400, 57600, 115200,\ + 230400} + +#define CONFIG_PCI 1 +#define CONFIG_PCI_PNP 1 +#undef CONFIG_PCI_SCAN_SHOW +#define CONFIG_PCIAUTO_SKIP_HOST_BRIDGE 1 + +#define CONFIG_PCI_MEM_BUS 0x40000000 +#define CONFIG_PCI_MEM_PHYS CONFIG_PCI_MEM_BUS +#define CONFIG_PCI_MEM_SIZE 0x10000000 + +#define CONFIG_PCI_IO_BUS 0x50000000 +#define CONFIG_PCI_IO_PHYS CONFIG_PCI_IO_BUS +#define CONFIG_PCI_IO_SIZE 0x01000000 + +#define CONFIG_SYS_XLB_PIPELINING 1 +#define CONFIG_HIGH_BATS 1 + +#define MV_CI mvSMR +#define MV_VCI mvSMR +#define MV_FPGA_DATA 0xff840000 +#define MV_FPGA_SIZE 0x1ff88 +#define MV_KERNEL_ADDR 0xfff00000 +#define MV_SCRIPT_ADDR 0xff806000 +#define MV_INITRD_ADDR 0xff880000 +#define MV_INITRD_LENGTH 0x00240000 +#define MV_SCRATCH_ADDR 0xffcc0000 +#define MV_SCRATCH_LENGTH MV_INITRD_LENGTH + +#define CONFIG_SHOW_BOOT_PROGRESS 1 + +#define MV_KERNEL_ADDR_RAM 0x00100000 +#define MV_INITRD_ADDR_RAM 0x00400000 + +/* + * Supported commands + */ +#include + +#define CONFIG_CMD_CACHE +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_FPGA +#define CONFIG_CMD_I2C +#define CONFIG_CMD_MII +#define CONFIG_CMD_NET +#define CONFIG_CMD_PCI +#define CONFIG_CMD_PING +#define CONFIG_CMD_SDRAM + +#define CONFIG_BOOTP_BOOTFILESIZE +#define CONFIG_BOOTP_BOOTPATH +#define CONFIG_BOOTP_DNS +#define CONFIG_BOOTP_DNS2 +#define CONFIG_BOOTP_GATEWAY +#define CONFIG_BOOTP_HOSTNAME +#define CONFIG_BOOTP_NTPSERVER +#define CONFIG_BOOTP_RANDOM_DELAY +#define CONFIG_BOOTP_SEND_HOSTNAME +#define CONFIG_BOOTP_SUBNETMASK +#define CONFIG_BOOTP_VENDOREX + +/* + * Autoboot + */ +#define CONFIG_BOOTDELAY 1 +#define CONFIG_AUTOBOOT_KEYED +#define CONFIG_AUTOBOOT_STOP_STR "abcdefg" +#define CONFIG_ZERO_BOOTDELAY_CHECK + +#define CONFIG_BOOTCOMMAND "source ${script_addr}" +#define CONFIG_BOOTARGS "root=/dev/ram ro rootfstype=squashfs" \ + " allocate=6M" + +#define XMK_STR(x) #x +#define MK_STR(x) XMK_STR(x) + +#define CONFIG_EXTRA_ENV_SETTINGS \ + "console_nr=0\0" \ + "console=no\0" \ + "stdin=serial\0" \ + "stdout=serial\0" \ + "stderr=serial\0" \ + "fpga=0\0" \ + "fpgadata=" MK_STR(MV_FPGA_DATA) "\0" \ + "fpgadatasize=" MK_STR(MV_FPGA_SIZE) "\0" \ + "mv_kernel_addr=" MK_STR(MV_KERNEL_ADDR) "\0" \ + "mv_kernel_addr_ram=" MK_STR(MV_KERNEL_ADDR_RAM) "\0" \ + "script_addr=" MK_STR(MV_SCRIPT_ADDR) "\0" \ + "mv_initrd_addr=" MK_STR(MV_INITRD_ADDR) "\0" \ + "mv_initrd_addr_ram=" MK_STR(MV_INITRD_ADDR_RAM) "\0" \ + "mv_initrd_length=" MK_STR(MV_INITRD_LENGTH) "\0" \ + "mv_scratch_addr=" MK_STR(MV_SCRATCH_ADDR) "\0" \ + "mv_scratch_length=" MK_STR(MV_SCRATCH_LENGTH) "\0" \ + "mv_version=" U_BOOT_VERSION "\0" \ + "dhcp_client_id=" MK_STR(MV_CI) "\0" \ + "dhcp_vendor-class-identifier=" MK_STR(MV_VCI) "\0" \ + "netretry=no\0" \ + "use_static_ipaddr=no\0" \ + "static_ipaddr=192.168.0.101\0" \ + "static_netmask=255.255.255.0\0" \ + "static_gateway=0.0.0.0\0" \ + "initrd_name=uInitrd.mvsmr-rfs\0" \ + "zcip=yes\0" \ + "netboot=no\0" \ + "" + +#undef XMK_STR +#undef MK_STR + +/* + * IPB Bus clocking configuration. + */ +#define CONFIG_SYS_IPBCLK_EQUALS_XLBCLK + +/* + * Flash configuration + */ +#undef CONFIG_FLASH_16BIT +#define CONFIG_SYS_FLASH_CFI +#define CONFIG_FLASH_CFI_DRIVER +#define CONFIG_SYS_FLASH_CFI_AMD_RESET 1 +#define CONFIG_SYS_FLASH_EMPTY_INFO + +#define CONFIG_SYS_FLASH_ERASE_TOUT 50000 +#define CONFIG_SYS_FLASH_WRITE_TOUT 1000 + +#define CONFIG_SYS_MAX_FLASH_BANKS 1 +#define CONFIG_SYS_MAX_FLASH_SECT 256 + +#define CONFIG_SYS_LOWBOOT +#define CONFIG_SYS_FLASH_BASE TEXT_BASE +#define CONFIG_SYS_FLASH_SIZE 0x00800000 + +/* + * Environment settings + */ +#define CONFIG_ENV_IS_IN_FLASH +#undef CONFIG_SYS_FLASH_PROTECTION +#define CONFIG_HAS_UID +#define CONFIG_OVERWRITE_ETHADDR_ONCE + +#define CONFIG_ENV_OFFSET 0x8000 +#define CONFIG_ENV_SIZE 0x2000 +#define CONFIG_ENV_SECT_SIZE 0x2000 + +/* used by linker script to wrap code around */ +#define CONFIG_SCRIPT_OFFSET 0x6000 +#define CONFIG_SCRIPT_SECT_SIZE 0x2000 + +/* + * Memory map + */ +#define CONFIG_SYS_MBAR 0xF0000000 +#define CONFIG_SYS_SDRAM_BASE 0x00000000 +#define CONFIG_SYS_DEFAULT_MBAR 0x80000000 + +#define CONFIG_SYS_INIT_RAM_ADDR MPC5XXX_SRAM +#define CONFIG_SYS_INIT_RAM_END MPC5XXX_SRAM_SIZE + +#define CONFIG_SYS_GBL_DATA_SIZE 128 +#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - \ + CONFIG_SYS_GBL_DATA_SIZE) +#define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET + +#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE) +#define CONFIG_SYS_RAMBOOT 1 +#endif + +/* CONFIG_SYS_MONITOR_LEN must be a multiple of CONFIG_ENV_SECT_SIZE */ +#define CONFIG_SYS_MONITOR_LEN (512 << 10) +#define CONFIG_SYS_MALLOC_LEN (512 << 10) +#define CONFIG_SYS_BOOTMAPSZ (8 << 20) + +/* + * I2C configuration + */ +#define CONFIG_HARD_I2C 1 +#define CONFIG_SYS_I2C_MODULE 1 +#define CONFIG_SYS_I2C_SPEED 86000 +#define CONFIG_SYS_I2C_SLAVE 0x7F + +/* + * Ethernet configuration + */ +#define CONFIG_NET_RETRY_COUNT 5 + +#define CONFIG_MPC5xxx_FEC +#define CONFIG_MPC5xxx_FEC_MII100 +#define CONFIG_PHY_ADDR 0x00 +#define CONFIG_NETDEV eth0 + +/* + * Miscellaneous configurable options + */ +#define CONFIG_SYS_HUSH_PARSER +#define CONFIG_CMDLINE_EDITING +#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " +#undef CONFIG_SYS_LONGHELP +#define CONFIG_SYS_PROMPT "=> " +#ifdef CONFIG_CMD_KGDB +#define CONFIG_SYS_CBSIZE 1024 +#else +#define CONFIG_SYS_CBSIZE 256 +#endif +#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) +#define CONFIG_SYS_MAXARGS 16 +#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE + +#define CONFIG_SYS_MEMTEST_START 0x00800000 +#define CONFIG_SYS_MEMTEST_END 0x02f00000 + +#define CONFIG_SYS_HZ 1000 + +/* default load address */ +#define CONFIG_SYS_LOAD_ADDR 0x02000000 +/* default location for tftp and bootm */ +#define CONFIG_LOADADDR 0x00200000 + +/* + * Various low-level settings + */ +#define CONFIG_SYS_GPS_PORT_CONFIG 0x00050044 + +#define CONFIG_SYS_HID0_INIT (HID0_ICE | HID0_ICFI) +#define CONFIG_SYS_HID0_FINAL HID0_ICE + +#define CONFIG_SYS_BOOTCS_START CONFIG_SYS_FLASH_BASE +#define CONFIG_SYS_BOOTCS_SIZE CONFIG_SYS_FLASH_SIZE +#define CONFIG_SYS_BOOTCS_CFG 0x00047800 +#define CONFIG_SYS_CS0_START CONFIG_SYS_FLASH_BASE +#define CONFIG_SYS_CS0_SIZE CONFIG_SYS_FLASH_SIZE + +#define CONFIG_SYS_CS_BURST 0x000000f0 +#define CONFIG_SYS_CS_DEADCYCLE 0x33333303 + +#define CONFIG_SYS_RESET_ADDRESS 0x00000100 + +#undef FPGA_DEBUG +#undef CONFIG_SYS_FPGA_PROG_FEEDBACK +#define CONFIG_FPGA CONFIG_SYS_XILINX_SPARTAN2 +#define CONFIG_FPGA_XILINX 1 +#define CONFIG_FPGA_SPARTAN2 1 +#define CONFIG_FPGA_COUNT 1 + +#endif From a2513e27e8df2b7bf481d03e7719f91ce19e89d5 Mon Sep 17 00:00:00 2001 From: Peter Tyser Date: Sun, 4 Apr 2010 22:36:03 -0500 Subject: [PATCH 127/164] mkimage: Fix strict-aliasing compiler warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Version 4.2.4 of gcc produces the following warnings without this change: mkimage.c: In function ‘main’: mkimage.c:204: warning: dereferencing type-punned pointer will break strict-aliasing rules mkimage.c:222: warning: dereferencing type-punned pointer will break strict-aliasing rules Signed-off-by: Peter Tyser --- tools/mkimage.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tools/mkimage.c b/tools/mkimage.c index 5c3e87290..f5859d776 100644 --- a/tools/mkimage.c +++ b/tools/mkimage.c @@ -145,7 +145,7 @@ main (int argc, char **argv) { int ifd = -1; struct stat sbuf; - unsigned char *ptr; + char *ptr; int retval = 0; struct image_type_params *tparams = NULL; @@ -201,8 +201,7 @@ main (int argc, char **argv) case 'a': if (--argc <= 0) usage (); - params.addr = strtoul (*++argv, - (char **)&ptr, 16); + params.addr = strtoul (*++argv, &ptr, 16); if (*ptr) { fprintf (stderr, "%s: invalid load address %s\n", @@ -219,8 +218,7 @@ main (int argc, char **argv) case 'e': if (--argc <= 0) usage (); - params.ep = strtoul (*++argv, - (char **)&ptr, 16); + params.ep = strtoul (*++argv, &ptr, 16); if (*ptr) { fprintf (stderr, "%s: invalid entry point %s\n", From ae30b8c200dc071d719ad649d0bf5635d61754f3 Mon Sep 17 00:00:00 2001 From: "karl.beldan@gmail.com" Date: Tue, 6 Apr 2010 22:18:08 +0200 Subject: [PATCH 128/164] malloc: sbrk() should return MORECORE_FAILURE instead of NULL on failure Signed-off-by: Karl Beldan --- common/dlmalloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/dlmalloc.c b/common/dlmalloc.c index 205fc40ac..2276532da 100644 --- a/common/dlmalloc.c +++ b/common/dlmalloc.c @@ -1515,7 +1515,7 @@ void *sbrk(ptrdiff_t increment) ulong new = old + increment; if ((new < mem_malloc_start) || (new > mem_malloc_end)) - return NULL; + return (void *)MORECORE_FAILURE; mem_malloc_brk = new; From 9157e9c40ab3a942bdd0679bb433cd9ed485f434 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Thu, 8 Apr 2010 17:55:47 +0200 Subject: [PATCH 129/164] config_cmd_all.h: added missing CONFIG_CMD_UBI and CONFIG_CMD_UBIFS Signed-off-by: Frans Meulenbroeks --- include/config_cmd_all.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index 058fdf14f..1cb70670e 100644 --- a/include/config_cmd_all.h +++ b/include/config_cmd_all.h @@ -79,6 +79,8 @@ #define CONFIG_CMD_SOURCE /* "source" command support */ #define CONFIG_CMD_SPI /* SPI utility */ #define CONFIG_CMD_TERMINAL /* built-in Serial Terminal */ +#define CONFIG_CMD_UBI /* UBI Support */ +#define CONFIG_CMD_UBIFS /* UBIFS Support */ #define CONFIG_CMD_UNIVERSE /* Tundra Universe Support */ #define CONFIG_CMD_UNZIP /* unzip from memory to memory */ #define CONFIG_CMD_USB /* USB Support */ From 8178110bc28249f3ff1c22b15d7dcdee50be69eb Mon Sep 17 00:00:00 2001 From: Detlev Zundel Date: Thu, 8 Apr 2010 17:55:48 +0200 Subject: [PATCH 130/164] config_cmd_all.h: Sort entries alphabetically Signed-off-by: Detlev Zundel --- include/config_cmd_all.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index 1cb70670e..746bf18f0 100644 --- a/include/config_cmd_all.h +++ b/include/config_cmd_all.h @@ -15,6 +15,7 @@ #define CONFIG_CMD_AMBAPP /* AMBA Plug & Play Bus print utility */ #define CONFIG_CMD_ASKENV /* ask for env variable */ +#define CONFIG_CMD_AT91_SPIMUX /* AT91 MMC/SPI Mux Support */ #define CONFIG_CMD_BDI /* bdinfo */ #define CONFIG_CMD_BEDBUG /* Include BedBug Debugger */ #define CONFIG_CMD_BMP /* BMP support */ @@ -33,7 +34,6 @@ #define CONFIG_CMD_EDITENV /* editenv */ #define CONFIG_CMD_EEPROM /* EEPROM read/write support */ #define CONFIG_CMD_ELF /* ELF (VxWorks) load/boot cmd */ -#define CONFIG_CMD_SAVEENV /* saveenv */ #define CONFIG_CMD_EXT2 /* EXT2 Support */ #define CONFIG_CMD_FAT /* FAT support */ #define CONFIG_CMD_FDC /* Floppy Disk Support */ @@ -55,6 +55,7 @@ #define CONFIG_CMD_LOADS /* loads */ #define CONFIG_CMD_MEMORY /* md mm nm mw cp cmp crc base loop mtest */ #define CONFIG_CMD_MFSL /* FSL support for Microblaze */ +#define CONFIG_CMD_MG_DISK /* mGine m(g)flash IO node support */ #define CONFIG_CMD_MII /* MII support */ #define CONFIG_CMD_MISC /* Misc functions like sleep etc*/ #define CONFIG_CMD_MMC /* MMC support */ @@ -70,6 +71,7 @@ #define CONFIG_CMD_REGINFO /* Register dump */ #define CONFIG_CMD_REISER /* Reiserfs support */ #define CONFIG_CMD_RUN /* run command in env variable */ +#define CONFIG_CMD_SAVEENV /* saveenv */ #define CONFIG_CMD_SAVES /* save S record dump */ #define CONFIG_CMD_SCSI /* SCSI Support */ #define CONFIG_CMD_SDRAM /* SDRAM DIMM SPD info printout */ @@ -86,7 +88,5 @@ #define CONFIG_CMD_USB /* USB Support */ #define CONFIG_CMD_VFD /* VFD support (TRAB) */ #define CONFIG_CMD_XIMG /* Load part of Multi Image */ -#define CONFIG_CMD_AT91_SPIMUX /* AT91 MMC/SPI Mux Support */ -#define CONFIG_CMD_MG_DISK /* mGine m(g)flash IO node support */ #endif /* _CONFIG_CMD_ALL_H */ From 30dc165a76b5165af77219189bc05d0fa4229d8b Mon Sep 17 00:00:00 2001 From: Jens Scharsig Date: Fri, 9 Apr 2010 19:02:38 +0200 Subject: [PATCH 131/164] FIX: watchdog timeout, while waiting for input * add WATCHDOG_RESET to !tstc() loops * prevents watchdog timeout, while waiting for input, if CONFIG_BOOT_RETRY_TIME or CONFIG_SHOW_ACTIVITY defined Signed-off-by: Jens Scharsig --- common/main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/main.c b/common/main.c index 3949a5bb2..f7e7c1c32 100644 --- a/common/main.c +++ b/common/main.c @@ -730,6 +730,7 @@ static int cread_line(const char *const prompt, char *buf, unsigned int *len) while (!tstc()) { /* while no incoming data */ if (retry_time >= 0 && get_ticks() > endtime) return (-2); /* timed out */ + WATCHDOG_RESET(); } #endif @@ -997,6 +998,7 @@ int readline_into_buffer (const char *const prompt, char * buffer) while (!tstc()) { /* while no incoming data */ if (retry_time >= 0 && get_ticks() > endtime) return (-2); /* timed out */ + WATCHDOG_RESET(); } #endif WATCHDOG_RESET(); /* Trigger watchdog, if needed */ @@ -1005,6 +1007,7 @@ int readline_into_buffer (const char *const prompt, char * buffer) while (!tstc()) { extern void show_activity(int arg); show_activity(0); + WATCHDOG_RESET(); } #endif c = getc(); From 03b7004ddafc70d83904d790abaa50843868130e Mon Sep 17 00:00:00 2001 From: Peter Tyser Date: Mon, 12 Apr 2010 22:28:02 -0500 Subject: [PATCH 132/164] Create CPUDIR variable The CPUDIR variable points to the location of a target's CPU directory. Currently, it is set to cpu/$CPU. However, using $CPUDIR will allow for more flexibility in the future. It lays the groundwork for reorganizing U-Boot's directory structure to support a layout such as: arch/$ARCH/cpu/$CPU/* (architecture with multiple CPU types) arch/$ARCH/cpu/* (architecture with one CPU type) Signed-off-by: Peter Tyser --- Makefile | 18 +++++++++--------- board/freescale/mpc8536ds/config.mk | 2 +- board/freescale/mpc8569mds/config.mk | 2 +- board/freescale/mx51evk/config.mk | 2 +- board/freescale/p1_p2_rdb/config.mk | 2 +- config.mk | 13 +++++++------ doc/README.ARM-SoC | 6 +++--- lib_arm/config.mk | 2 +- lib_blackfin/config.mk | 2 +- lib_sh/config.mk | 2 +- nand_spl/board/freescale/mpc8536ds/Makefile | 4 ++-- nand_spl/board/freescale/mpc8569mds/Makefile | 4 ++-- nand_spl/board/freescale/p1_p2_rdb/Makefile | 4 ++-- onenand_ipl/board/apollon/Makefile | 2 +- 14 files changed, 33 insertions(+), 32 deletions(-) diff --git a/Makefile b/Makefile index 5d314c62a..8e3eb9938 100644 --- a/Makefile +++ b/Makefile @@ -169,16 +169,16 @@ include $(TOPDIR)/config.mk ######################################################################### # U-Boot objects....order is important (i.e. start must be first) -OBJS = cpu/$(CPU)/start.o +OBJS = $(CPUDIR)/start.o ifeq ($(CPU),i386) -OBJS += cpu/$(CPU)/start16.o -OBJS += cpu/$(CPU)/resetvec.o +OBJS += $(CPUDIR)/start16.o +OBJS += $(CPUDIR)/resetvec.o endif ifeq ($(CPU),ppc4xx) -OBJS += cpu/$(CPU)/resetvec.o +OBJS += $(CPUDIR)/resetvec.o endif ifeq ($(CPU),mpc85xx) -OBJS += cpu/$(CPU)/resetvec.o +OBJS += $(CPUDIR)/resetvec.o endif OBJS := $(addprefix $(obj),$(OBJS)) @@ -188,9 +188,9 @@ LIBS += lib_generic/lzma/liblzma.a LIBS += lib_generic/lzo/liblzo.a LIBS += $(shell if [ -f board/$(VENDOR)/common/Makefile ]; then echo \ "board/$(VENDOR)/common/lib$(VENDOR).a"; fi) -LIBS += cpu/$(CPU)/lib$(CPU).a +LIBS += $(CPUDIR)/lib$(CPU).a ifdef SOC -LIBS += cpu/$(CPU)/$(SOC)/lib$(SOC).a +LIBS += $(CPUDIR)/$(SOC)/lib$(SOC).a endif ifeq ($(CPU),ixp) LIBS += cpu/ixp/npe/libnpe.a @@ -354,7 +354,7 @@ ifeq ($(CONFIG_KALLSYMS),y) endif $(OBJS): depend - $(MAKE) -C cpu/$(CPU) $(if $(REMOTE_BUILD),$@,$(notdir $@)) + $(MAKE) -C $(CPUDIR) $(if $(REMOTE_BUILD),$@,$(notdir $@)) $(LIBS): depend $(SUBDIRS) $(MAKE) -C $(dir $(subst $(obj),,$@)) @@ -404,7 +404,7 @@ env: # Explicitly make _depend in subdirs containing multiple targets to prevent # parallel sub-makes creating .depend files simultaneously. depend dep: $(TIMESTAMP_FILE) $(VERSION_FILE) $(obj)include/autoconf.mk - for dir in $(SUBDIRS) cpu/$(CPU) $(dir $(LDSCRIPT)) ; do \ + for dir in $(SUBDIRS) $(CPUDIR) $(dir $(LDSCRIPT)) ; do \ $(MAKE) -C $$dir _depend ; done TAG_SUBDIRS = $(SUBDIRS) diff --git a/board/freescale/mpc8536ds/config.mk b/board/freescale/mpc8536ds/config.mk index e38af731b..3f5447a43 100644 --- a/board/freescale/mpc8536ds/config.mk +++ b/board/freescale/mpc8536ds/config.mk @@ -26,7 +26,7 @@ ifndef NAND_SPL ifeq ($(CONFIG_MK_NAND), y) TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE) -LDSCRIPT := $(TOPDIR)/cpu/$(CPU)/u-boot-nand.lds +LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds endif endif diff --git a/board/freescale/mpc8569mds/config.mk b/board/freescale/mpc8569mds/config.mk index 7de0f7cf7..86f138c19 100644 --- a/board/freescale/mpc8569mds/config.mk +++ b/board/freescale/mpc8569mds/config.mk @@ -26,7 +26,7 @@ ifndef NAND_SPL ifeq ($(CONFIG_MK_NAND), y) TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE) -LDSCRIPT := $(TOPDIR)/cpu/$(CPU)/u-boot-nand.lds +LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds endif endif diff --git a/board/freescale/mx51evk/config.mk b/board/freescale/mx51evk/config.mk index c8279ec8c..af70ec250 100644 --- a/board/freescale/mx51evk/config.mk +++ b/board/freescale/mx51evk/config.mk @@ -20,6 +20,6 @@ # MA 02111-1307 USA # -LDSCRIPT = cpu/$(CPU)/$(SOC)/u-boot.lds +LDSCRIPT = $(CPUDIR)/$(SOC)/u-boot.lds TEXT_BASE = 0x97800000 IMX_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/imximage.cfg diff --git a/board/freescale/p1_p2_rdb/config.mk b/board/freescale/p1_p2_rdb/config.mk index 0f7a0487e..1f9f7b68a 100644 --- a/board/freescale/p1_p2_rdb/config.mk +++ b/board/freescale/p1_p2_rdb/config.mk @@ -27,7 +27,7 @@ ifndef NAND_SPL ifeq ($(CONFIG_MK_NAND), y) TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE) -LDSCRIPT := $(TOPDIR)/cpu/$(CPU)/u-boot-nand.lds +LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds endif endif diff --git a/config.mk b/config.mk index cb1c4af97..c82cb63d2 100644 --- a/config.mk +++ b/config.mk @@ -110,14 +110,15 @@ RANLIB = $(CROSS_COMPILE)RANLIB # Load generated board configuration sinclude $(OBJTREE)/include/autoconf.mk -ifdef ARCH +# Some architecture config.mk files need to know what CPUDIR is set to, +# so calculate CPUDIR before including ARCH/SOC/CPU config.mk files. +CPUDIR=cpu/$(CPU) + sinclude $(TOPDIR)/lib_$(ARCH)/config.mk # include architecture dependend rules -endif -ifdef CPU -sinclude $(TOPDIR)/cpu/$(CPU)/config.mk # include CPU specific rules -endif +sinclude $(TOPDIR)/$(CPUDIR)/config.mk # include CPU specific rules + ifdef SOC -sinclude $(TOPDIR)/cpu/$(CPU)/$(SOC)/config.mk # include SoC specific rules +sinclude $(TOPDIR)/$(CPUDIR)/$(SOC)/config.mk # include SoC specific rules endif ifdef VENDOR BOARDDIR = $(VENDOR)/$(BOARD) diff --git a/doc/README.ARM-SoC b/doc/README.ARM-SoC index 0f2677f88..15f065dfb 100644 --- a/doc/README.ARM-SoC +++ b/doc/README.ARM-SoC @@ -7,14 +7,14 @@ I introduced the concept of Soc (system on a chip) into the ./cpu directory. That means that code that is cpu (i.e. core) specific resides in - cpu/$(CPU)/ + $(CPUDIR)/ and code that is specific to some SoC (i.e. vendor specific peripherals around the core) is moved into - cpu/$(CPU)/$(SOC)/ + $(CPUDIR)/$(SOC)/ -Thus a library/archive "cpu/$(CPU)/$(SOC)/lib$(SOC).a" will be build +Thus a library/archive "$(CPUDIR)/$(SOC)/lib$(SOC).a" will be build and linked. Examples will be cpu/arm920t/imx/ diff --git a/lib_arm/config.mk b/lib_arm/config.mk index 3c078df3c..8dd4dccf3 100644 --- a/lib_arm/config.mk +++ b/lib_arm/config.mk @@ -63,4 +63,4 @@ ifeq (,$(findstring lib_arm/eabi_compat.o,$(PLATFORM_LIBS))) PLATFORM_LIBS += $(OBJTREE)/lib_arm/eabi_compat.o endif endif -LDSCRIPT := $(SRCTREE)/cpu/$(CPU)/u-boot.lds +LDSCRIPT := $(SRCTREE)/$(CPUDIR)/u-boot.lds diff --git a/lib_blackfin/config.mk b/lib_blackfin/config.mk index 1b5cbbaf2..3ecade9aa 100644 --- a/lib_blackfin/config.mk +++ b/lib_blackfin/config.mk @@ -56,7 +56,7 @@ LDR_FLAGS-$(CONFIG_BFIN_BOOTROM_USES_EVT1) += -J LDR_FLAGS += --bmode $(subst BFIN_BOOT_,,$(CONFIG_BFIN_BOOT_MODE)) LDR_FLAGS += --use-vmas -LDR_FLAGS += --initcode $(obj)cpu/$(CPU)/initcode.o +LDR_FLAGS += --initcode $(obj)$(CPUDIR)/initcode.o ifneq ($(CONFIG_BFIN_BOOT_MODE),BFIN_BOOT_UART) LDR_FLAGS-$(CONFIG_ENV_IS_EMBEDDED_IN_LDR) += \ --punchit $$(($(CONFIG_ENV_OFFSET))):$$(($(CONFIG_ENV_SIZE))):$(obj)env-ldr.o diff --git a/lib_sh/config.mk b/lib_sh/config.mk index fa5369fd0..797bf4c22 100644 --- a/lib_sh/config.mk +++ b/lib_sh/config.mk @@ -31,4 +31,4 @@ endif PLATFORM_CPPFLAGS += -DCONFIG_SH -D__SH__ PLATFORM_LDFLAGS += -e $(TEXT_BASE) --defsym reloc_dst=$(TEXT_BASE) -LDSCRIPT := $(SRCTREE)/cpu/$(CPU)/u-boot.lds +LDSCRIPT := $(SRCTREE)/$(CPUDIR)/u-boot.lds diff --git a/nand_spl/board/freescale/mpc8536ds/Makefile b/nand_spl/board/freescale/mpc8536ds/Makefile index 7ed9d619d..be0caaa7b 100644 --- a/nand_spl/board/freescale/mpc8536ds/Makefile +++ b/nand_spl/board/freescale/mpc8536ds/Makefile @@ -29,7 +29,7 @@ PAD_TO := 0xfff01000 include $(TOPDIR)/config.mk -LDSCRIPT= $(TOPDIR)/cpu/$(CPU)/u-boot-nand_spl.lds +LDSCRIPT= $(TOPDIR)/$(CPUDIR)/u-boot-nand_spl.lds LDFLAGS = -Bstatic -T $(LDSCRIPT) -Ttext $(TEXT_BASE) $(PLATFORM_LDFLAGS) AFLAGS += -DCONFIG_NAND_SPL CFLAGS += -DCONFIG_NAND_SPL @@ -93,7 +93,7 @@ $(obj)ns16550.c: $(obj)resetvec.S: @rm -f $(obj)resetvec.S - ln -s $(SRCTREE)/cpu/$(CPU)/resetvec.S $(obj)resetvec.S + ln -s $(SRCTREE)/$(CPUDIR)/resetvec.S $(obj)resetvec.S $(obj)fixed_ivor.S: @rm -f $(obj)fixed_ivor.S diff --git a/nand_spl/board/freescale/mpc8569mds/Makefile b/nand_spl/board/freescale/mpc8569mds/Makefile index 7ed9d619d..be0caaa7b 100644 --- a/nand_spl/board/freescale/mpc8569mds/Makefile +++ b/nand_spl/board/freescale/mpc8569mds/Makefile @@ -29,7 +29,7 @@ PAD_TO := 0xfff01000 include $(TOPDIR)/config.mk -LDSCRIPT= $(TOPDIR)/cpu/$(CPU)/u-boot-nand_spl.lds +LDSCRIPT= $(TOPDIR)/$(CPUDIR)/u-boot-nand_spl.lds LDFLAGS = -Bstatic -T $(LDSCRIPT) -Ttext $(TEXT_BASE) $(PLATFORM_LDFLAGS) AFLAGS += -DCONFIG_NAND_SPL CFLAGS += -DCONFIG_NAND_SPL @@ -93,7 +93,7 @@ $(obj)ns16550.c: $(obj)resetvec.S: @rm -f $(obj)resetvec.S - ln -s $(SRCTREE)/cpu/$(CPU)/resetvec.S $(obj)resetvec.S + ln -s $(SRCTREE)/$(CPUDIR)/resetvec.S $(obj)resetvec.S $(obj)fixed_ivor.S: @rm -f $(obj)fixed_ivor.S diff --git a/nand_spl/board/freescale/p1_p2_rdb/Makefile b/nand_spl/board/freescale/p1_p2_rdb/Makefile index 7ed9d619d..be0caaa7b 100644 --- a/nand_spl/board/freescale/p1_p2_rdb/Makefile +++ b/nand_spl/board/freescale/p1_p2_rdb/Makefile @@ -29,7 +29,7 @@ PAD_TO := 0xfff01000 include $(TOPDIR)/config.mk -LDSCRIPT= $(TOPDIR)/cpu/$(CPU)/u-boot-nand_spl.lds +LDSCRIPT= $(TOPDIR)/$(CPUDIR)/u-boot-nand_spl.lds LDFLAGS = -Bstatic -T $(LDSCRIPT) -Ttext $(TEXT_BASE) $(PLATFORM_LDFLAGS) AFLAGS += -DCONFIG_NAND_SPL CFLAGS += -DCONFIG_NAND_SPL @@ -93,7 +93,7 @@ $(obj)ns16550.c: $(obj)resetvec.S: @rm -f $(obj)resetvec.S - ln -s $(SRCTREE)/cpu/$(CPU)/resetvec.S $(obj)resetvec.S + ln -s $(SRCTREE)/$(CPUDIR)/resetvec.S $(obj)resetvec.S $(obj)fixed_ivor.S: @rm -f $(obj)fixed_ivor.S diff --git a/onenand_ipl/board/apollon/Makefile b/onenand_ipl/board/apollon/Makefile index 193efffb5..6f1df0113 100644 --- a/onenand_ipl/board/apollon/Makefile +++ b/onenand_ipl/board/apollon/Makefile @@ -46,7 +46,7 @@ $(onenandobj)u-boot.lds: $(LDSCRIPT) # from cpu directory $(obj)start.S: @rm -f $@ - ln -s $(SRCTREE)/cpu/$(CPU)/start.S $@ + ln -s $(SRCTREE)/$(CPUDIR)/start.S $@ # from onenand_ipl directory $(obj)onenand_ipl.h: From 89f39e177e7b0152aa1d3152baa25d986e36cdcf Mon Sep 17 00:00:00 2001 From: Peter Tyser Date: Mon, 12 Apr 2010 22:28:03 -0500 Subject: [PATCH 133/164] Change directory-specific CFLAGS to use full path Previously, a specific file or directory could be compiled with custom CFLAGS by adding a Makefile variable such as: CFLAGS_dlmalloc.o = or CFLAGS_lib = This method breaks down once multiple files or directories share the same path. Eg FLAGS_fileA = would incorrectly result in both dir1/fileA.c and dir2/fileA.c being compiled with . This change allows finer grained control which we need once we move lib_$ARCH to arch/$ARCH/lib/ and lib_generic/ to lib/. Without this change all lib/ directories would share the same custom CFLAGS. Signed-off-by: Peter Tyser --- board/bf518f-ezbrd/config.mk | 2 +- board/bf526-ezbrd/config.mk | 2 +- board/bf527-ezkit/config.mk | 2 +- board/bf533-ezkit/config.mk | 2 +- board/bf533-stamp/config.mk | 2 +- board/bf537-stamp/config.mk | 2 +- board/bf538f-ezkit/config.mk | 2 +- board/bf548-ezkit/config.mk | 2 +- board/bf561-acvilon/config.mk | 2 +- board/bf561-ezkit/config.mk | 2 +- board/cm-bf527/config.mk | 2 +- board/cm-bf533/config.mk | 2 +- board/cm-bf537e/config.mk | 2 +- board/cm-bf537u/config.mk | 2 +- board/cm-bf548/config.mk | 2 +- board/cm-bf561/config.mk | 2 +- board/eNET/config.mk | 2 +- board/tcm-bf518/config.mk | 2 +- board/tcm-bf537/config.mk | 2 +- config.mk | 17 +++++++++++------ 20 files changed, 30 insertions(+), 25 deletions(-) diff --git a/board/bf518f-ezbrd/config.mk b/board/bf518f-ezbrd/config.mk index f85bef5e2..fb93531f7 100644 --- a/board/bf518f-ezbrd/config.mk +++ b/board/bf518f-ezbrd/config.mk @@ -27,7 +27,7 @@ #TEXT_BASE = do-not-use-me CFLAGS_lib_generic += -O2 -CFLAGS_lzma += -O2 +CFLAGS_lib_generic/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE)) diff --git a/board/bf526-ezbrd/config.mk b/board/bf526-ezbrd/config.mk index f85bef5e2..fb93531f7 100644 --- a/board/bf526-ezbrd/config.mk +++ b/board/bf526-ezbrd/config.mk @@ -27,7 +27,7 @@ #TEXT_BASE = do-not-use-me CFLAGS_lib_generic += -O2 -CFLAGS_lzma += -O2 +CFLAGS_lib_generic/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE)) diff --git a/board/bf527-ezkit/config.mk b/board/bf527-ezkit/config.mk index f85bef5e2..fb93531f7 100644 --- a/board/bf527-ezkit/config.mk +++ b/board/bf527-ezkit/config.mk @@ -27,7 +27,7 @@ #TEXT_BASE = do-not-use-me CFLAGS_lib_generic += -O2 -CFLAGS_lzma += -O2 +CFLAGS_lib_generic/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE)) diff --git a/board/bf533-ezkit/config.mk b/board/bf533-ezkit/config.mk index 3c0b46f72..b50e1f2c8 100644 --- a/board/bf533-ezkit/config.mk +++ b/board/bf533-ezkit/config.mk @@ -27,7 +27,7 @@ #TEXT_BASE = do-not-use-me CFLAGS_lib_generic += -O2 -CFLAGS_lzma += -O2 +CFLAGS_lib_generic/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 diff --git a/board/bf533-stamp/config.mk b/board/bf533-stamp/config.mk index 3c0b46f72..b50e1f2c8 100644 --- a/board/bf533-stamp/config.mk +++ b/board/bf533-stamp/config.mk @@ -27,7 +27,7 @@ #TEXT_BASE = do-not-use-me CFLAGS_lib_generic += -O2 -CFLAGS_lzma += -O2 +CFLAGS_lib_generic/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 diff --git a/board/bf537-stamp/config.mk b/board/bf537-stamp/config.mk index bc1425748..95d0fcc08 100644 --- a/board/bf537-stamp/config.mk +++ b/board/bf537-stamp/config.mk @@ -27,7 +27,7 @@ #TEXT_BASE = do-not-use-me CFLAGS_lib_generic += -O2 -CFLAGS_lzma += -O2 +CFLAGS_lib_generic/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 diff --git a/board/bf538f-ezkit/config.mk b/board/bf538f-ezkit/config.mk index 3c0b46f72..b50e1f2c8 100644 --- a/board/bf538f-ezkit/config.mk +++ b/board/bf538f-ezkit/config.mk @@ -27,7 +27,7 @@ #TEXT_BASE = do-not-use-me CFLAGS_lib_generic += -O2 -CFLAGS_lzma += -O2 +CFLAGS_lib_generic/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 diff --git a/board/bf548-ezkit/config.mk b/board/bf548-ezkit/config.mk index 42ff94667..aff12e9dc 100644 --- a/board/bf548-ezkit/config.mk +++ b/board/bf548-ezkit/config.mk @@ -27,7 +27,7 @@ #TEXT_BASE = do-not-use-me CFLAGS_lib_generic += -O2 -CFLAGS_lzma += -O2 +CFLAGS_lib_generic/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --dma 6 diff --git a/board/bf561-acvilon/config.mk b/board/bf561-acvilon/config.mk index cfad21a2a..b5170259b 100644 --- a/board/bf561-acvilon/config.mk +++ b/board/bf561-acvilon/config.mk @@ -27,7 +27,7 @@ #TEXT_BASE = do-not-use-me CFLAGS_lib_generic += -O2 -CFLAGS_lzma += -O2 +CFLAGS_lib_generic/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 diff --git a/board/bf561-ezkit/config.mk b/board/bf561-ezkit/config.mk index cfad21a2a..b5170259b 100644 --- a/board/bf561-ezkit/config.mk +++ b/board/bf561-ezkit/config.mk @@ -27,7 +27,7 @@ #TEXT_BASE = do-not-use-me CFLAGS_lib_generic += -O2 -CFLAGS_lzma += -O2 +CFLAGS_lib_generic/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 diff --git a/board/cm-bf527/config.mk b/board/cm-bf527/config.mk index f85bef5e2..fb93531f7 100644 --- a/board/cm-bf527/config.mk +++ b/board/cm-bf527/config.mk @@ -27,7 +27,7 @@ #TEXT_BASE = do-not-use-me CFLAGS_lib_generic += -O2 -CFLAGS_lzma += -O2 +CFLAGS_lib_generic/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE)) diff --git a/board/cm-bf533/config.mk b/board/cm-bf533/config.mk index 3c0b46f72..b50e1f2c8 100644 --- a/board/cm-bf533/config.mk +++ b/board/cm-bf533/config.mk @@ -27,7 +27,7 @@ #TEXT_BASE = do-not-use-me CFLAGS_lib_generic += -O2 -CFLAGS_lzma += -O2 +CFLAGS_lib_generic/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 diff --git a/board/cm-bf537e/config.mk b/board/cm-bf537e/config.mk index 3c0b46f72..b50e1f2c8 100644 --- a/board/cm-bf537e/config.mk +++ b/board/cm-bf537e/config.mk @@ -27,7 +27,7 @@ #TEXT_BASE = do-not-use-me CFLAGS_lib_generic += -O2 -CFLAGS_lzma += -O2 +CFLAGS_lib_generic/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 diff --git a/board/cm-bf537u/config.mk b/board/cm-bf537u/config.mk index 3c0b46f72..b50e1f2c8 100644 --- a/board/cm-bf537u/config.mk +++ b/board/cm-bf537u/config.mk @@ -27,7 +27,7 @@ #TEXT_BASE = do-not-use-me CFLAGS_lib_generic += -O2 -CFLAGS_lzma += -O2 +CFLAGS_lib_generic/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 diff --git a/board/cm-bf548/config.mk b/board/cm-bf548/config.mk index 0c95b3962..66c7368f7 100644 --- a/board/cm-bf548/config.mk +++ b/board/cm-bf548/config.mk @@ -27,7 +27,7 @@ #TEXT_BASE = do-not-use-me CFLAGS_lib_generic += -O2 -CFLAGS_lzma += -O2 +CFLAGS_lib_generic/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --dma 6 diff --git a/board/cm-bf561/config.mk b/board/cm-bf561/config.mk index cfad21a2a..b5170259b 100644 --- a/board/cm-bf561/config.mk +++ b/board/cm-bf561/config.mk @@ -27,7 +27,7 @@ #TEXT_BASE = do-not-use-me CFLAGS_lib_generic += -O2 -CFLAGS_lzma += -O2 +CFLAGS_lib_generic/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 diff --git a/board/eNET/config.mk b/board/eNET/config.mk index 5c64804fb..dcde7fced 100644 --- a/board/eNET/config.mk +++ b/board/eNET/config.mk @@ -22,7 +22,7 @@ # TEXT_BASE = 0x38040000 -CFLAGS_dlmalloc.o += -Wa,--no-warn -fno-strict-aliasing +CFLAGS_common/dlmalloc.o += -Wa,--no-warn -fno-strict-aliasing PLATFORM_RELFLAGS += -fvisibility=hidden PLATFORM_CPPFLAGS += -fno-dwarf2-cfi-asm PLATFORM_LDFLAGS += -pic --emit-relocs -Bsymbolic -Bsymbolic-functions diff --git a/board/tcm-bf518/config.mk b/board/tcm-bf518/config.mk index f85bef5e2..fb93531f7 100644 --- a/board/tcm-bf518/config.mk +++ b/board/tcm-bf518/config.mk @@ -27,7 +27,7 @@ #TEXT_BASE = do-not-use-me CFLAGS_lib_generic += -O2 -CFLAGS_lzma += -O2 +CFLAGS_lib_generic/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE)) diff --git a/board/tcm-bf537/config.mk b/board/tcm-bf537/config.mk index 3c0b46f72..b50e1f2c8 100644 --- a/board/tcm-bf537/config.mk +++ b/board/tcm-bf537/config.mk @@ -27,7 +27,7 @@ #TEXT_BASE = do-not-use-me CFLAGS_lib_generic += -O2 -CFLAGS_lzma += -O2 +CFLAGS_lib_generic/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 diff --git a/config.mk b/config.mk index c82cb63d2..1a61dbb7f 100644 --- a/config.mk +++ b/config.mk @@ -236,16 +236,21 @@ export TEXT_BASE PLATFORM_CPPFLAGS PLATFORM_RELFLAGS CPPFLAGS CFLAGS AFLAGS ######################################################################### # Allow boards to use custom optimize flags on a per dir/file basis -BCURDIR := $(notdir $(CURDIR)) +BCURDIR = $(subst $(SRCTREE)/,,$(CURDIR:$(obj)%=%)) $(obj)%.s: %.S - $(CPP) $(AFLAGS) $(AFLAGS_$(@F)) $(AFLAGS_$(BCURDIR)) -o $@ $< + $(CPP) $(AFLAGS) $(AFLAGS_$(BCURDIR)/$(@F)) $(AFLAGS_$(BCURDIR)) \ + -o $@ $< $(obj)%.o: %.S - $(CC) $(AFLAGS) $(AFLAGS_$(@F)) $(AFLAGS_$(BCURDIR)) -o $@ $< -c + $(CC) $(AFLAGS) $(AFLAGS_$(BCURDIR)/$(@F)) $(AFLAGS_$(BCURDIR)) \ + -o $@ $< -c $(obj)%.o: %.c - $(CC) $(CFLAGS) $(CFLAGS_$(@F)) $(CFLAGS_$(BCURDIR)) -o $@ $< -c + $(CC) $(CFLAGS) $(CFLAGS_$(BCURDIR)/$(@F)) $(CFLAGS_$(BCURDIR)) \ + -o $@ $< -c $(obj)%.i: %.c - $(CPP) $(CFLAGS) $(CFLAGS_$(@F)) $(CFLAGS_$(BCURDIR)) -o $@ $< -c + $(CPP) $(CFLAGS) $(CFLAGS_$(BCURDIR)/$(@F)) $(CFLAGS_$(BCURDIR)) \ + -o $@ $< -c $(obj)%.s: %.c - $(CC) $(CFLAGS) $(CFLAGS_$(@F)) $(CFLAGS_$(BCURDIR)) -o $@ $< -c -S + $(CC) $(CFLAGS) $(CFLAGS_$(BCURDIR)/$(@F)) $(CFLAGS_$(BCURDIR)) \ + -o $@ $< -c -S ######################################################################### From ea0364f1bbfed1e3ea711147420875cf338fe77a Mon Sep 17 00:00:00 2001 From: Peter Tyser Date: Mon, 12 Apr 2010 22:28:04 -0500 Subject: [PATCH 134/164] Move lib_$ARCH directories to arch/$ARCH/lib Also move lib_$ARCH/config.mk to arch/$ARCH/config.mk This change is intended to clean up the top-level directory structure and more closely mimic Linux's directory organization. Signed-off-by: Peter Tyser --- Makefile | 6 ++-- README | 28 +++++++++---------- {lib_arm => arch/arm}/config.mk | 4 +-- {lib_arm => arch/arm/lib}/Makefile | 0 {lib_arm => arch/arm/lib}/_ashldi3.S | 0 {lib_arm => arch/arm/lib}/_ashrdi3.S | 0 {lib_arm => arch/arm/lib}/_divsi3.S | 0 {lib_arm => arch/arm/lib}/_lshrdi3.S | 0 {lib_arm => arch/arm/lib}/_modsi3.S | 0 {lib_arm => arch/arm/lib}/_udivsi3.S | 0 {lib_arm => arch/arm/lib}/_umodsi3.S | 0 {lib_arm => arch/arm/lib}/board.c | 0 {lib_arm => arch/arm/lib}/bootm.c | 0 {lib_arm => arch/arm/lib}/cache-cp15.c | 0 {lib_arm => arch/arm/lib}/cache.c | 0 {lib_arm => arch/arm/lib}/div0.c | 0 {lib_arm => arch/arm/lib}/eabi_compat.c | 0 {lib_arm => arch/arm/lib}/interrupts.c | 0 {lib_arm => arch/arm/lib}/reset.c | 0 {lib_avr32 => arch/avr32}/config.mk | 0 {lib_avr32 => arch/avr32/lib}/Makefile | 0 {lib_avr32 => arch/avr32/lib}/board.c | 0 {lib_avr32 => arch/avr32/lib}/bootm.c | 0 {lib_avr32 => arch/avr32/lib}/interrupts.c | 0 {lib_avr32 => arch/avr32/lib}/memset.S | 0 {lib_blackfin => arch/blackfin}/config.mk | 2 +- .../blackfin/lib}/.gitignore | 0 {lib_blackfin => arch/blackfin/lib}/Makefile | 0 {lib_blackfin => arch/blackfin/lib}/__kgdb.S | 0 {lib_blackfin => arch/blackfin/lib}/board.c | 0 {lib_blackfin => arch/blackfin/lib}/boot.c | 0 {lib_blackfin => arch/blackfin/lib}/cache.c | 0 {lib_blackfin => arch/blackfin/lib}/clocks.c | 0 .../blackfin/lib}/cmd_cache_dump.c | 0 {lib_blackfin => arch/blackfin/lib}/ins.S | 0 {lib_blackfin => arch/blackfin/lib}/kgdb.c | 0 {lib_blackfin => arch/blackfin/lib}/kgdb.h | 0 {lib_blackfin => arch/blackfin/lib}/memcmp.S | 0 {lib_blackfin => arch/blackfin/lib}/memcpy.S | 0 {lib_blackfin => arch/blackfin/lib}/memmove.S | 0 {lib_blackfin => arch/blackfin/lib}/memset.S | 0 {lib_blackfin => arch/blackfin/lib}/muldi3.c | 0 {lib_blackfin => arch/blackfin/lib}/outs.S | 0 {lib_blackfin => arch/blackfin/lib}/post.c | 0 {lib_blackfin => arch/blackfin/lib}/string.c | 0 {lib_blackfin => arch/blackfin/lib}/tests.c | 0 .../blackfin/lib}/u-boot.lds.S | 0 {lib_i386 => arch/i386}/config.mk | 0 {lib_i386 => arch/i386/lib}/Makefile | 0 {lib_i386 => arch/i386/lib}/bios.S | 0 {lib_i386 => arch/i386/lib}/bios.h | 0 {lib_i386 => arch/i386/lib}/bios_pci.S | 0 {lib_i386 => arch/i386/lib}/bios_setup.c | 0 {lib_i386 => arch/i386/lib}/board.c | 0 {lib_i386 => arch/i386/lib}/bootm.c | 0 {lib_i386 => arch/i386/lib}/interrupts.c | 0 {lib_i386 => arch/i386/lib}/pcat_interrupts.c | 0 {lib_i386 => arch/i386/lib}/pcat_timer.c | 0 {lib_i386 => arch/i386/lib}/pci.c | 0 {lib_i386 => arch/i386/lib}/pci_type1.c | 0 {lib_i386 => arch/i386/lib}/realmode.c | 0 {lib_i386 => arch/i386/lib}/realmode_switch.S | 0 {lib_i386 => arch/i386/lib}/timer.c | 0 {lib_i386 => arch/i386/lib}/video.c | 0 {lib_i386 => arch/i386/lib}/video_bios.c | 0 {lib_i386 => arch/i386/lib}/zimage.c | 0 {lib_m68k => arch/m68k}/config.mk | 0 {lib_m68k => arch/m68k/lib}/Makefile | 0 {lib_m68k => arch/m68k/lib}/board.c | 0 {lib_m68k => arch/m68k/lib}/bootm.c | 0 {lib_m68k => arch/m68k/lib}/cache.c | 0 {lib_m68k => arch/m68k/lib}/interrupts.c | 0 {lib_m68k => arch/m68k/lib}/time.c | 0 {lib_m68k => arch/m68k/lib}/traps.c | 0 {lib_microblaze => arch/microblaze}/config.mk | 0 .../microblaze/lib}/Makefile | 0 .../microblaze/lib}/board.c | 0 .../microblaze/lib}/bootm.c | 0 .../microblaze/lib}/cache.c | 0 .../microblaze/lib}/time.c | 0 {lib_mips => arch/mips}/config.mk | 0 {lib_mips => arch/mips/lib}/Makefile | 0 {lib_mips => arch/mips/lib}/board.c | 0 {lib_mips => arch/mips/lib}/bootm.c | 0 {lib_mips => arch/mips/lib}/bootm_qemu_mips.c | 0 {lib_mips => arch/mips/lib}/time.c | 0 {lib_nios => arch/nios}/config.mk | 0 {lib_nios => arch/nios/lib}/Makefile | 0 {lib_nios => arch/nios/lib}/board.c | 0 {lib_nios => arch/nios/lib}/bootm.c | 0 {lib_nios => arch/nios/lib}/cache.c | 0 {lib_nios => arch/nios/lib}/divmod.c | 0 {lib_nios => arch/nios/lib}/math.h | 0 {lib_nios => arch/nios/lib}/mult.c | 0 {lib_nios => arch/nios/lib}/time.c | 0 {lib_nios2 => arch/nios2}/config.mk | 0 {lib_nios2 => arch/nios2/lib}/Makefile | 0 {lib_nios2 => arch/nios2/lib}/board.c | 0 {lib_nios2 => arch/nios2/lib}/bootm.c | 0 {lib_nios2 => arch/nios2/lib}/cache.S | 0 {lib_nios2 => arch/nios2/lib}/divmod.c | 0 {lib_nios2 => arch/nios2/lib}/math.h | 0 {lib_nios2 => arch/nios2/lib}/mult.c | 0 {lib_nios2 => arch/nios2/lib}/time.c | 0 {lib_ppc => arch/ppc}/config.mk | 0 {lib_ppc => arch/ppc/lib}/Makefile | 0 {lib_ppc => arch/ppc/lib}/bat_rw.c | 0 {lib_ppc => arch/ppc/lib}/board.c | 0 {lib_ppc => arch/ppc/lib}/bootm.c | 0 {lib_ppc => arch/ppc/lib}/cache.c | 0 {lib_ppc => arch/ppc/lib}/extable.c | 0 {lib_ppc => arch/ppc/lib}/interrupts.c | 0 {lib_ppc => arch/ppc/lib}/kgdb.c | 0 {lib_ppc => arch/ppc/lib}/ppccache.S | 0 {lib_ppc => arch/ppc/lib}/ppcstring.S | 0 {lib_ppc => arch/ppc/lib}/reloc.S | 0 {lib_ppc => arch/ppc/lib}/ticks.S | 0 {lib_ppc => arch/ppc/lib}/time.c | 0 {lib_sh => arch/sh}/config.mk | 0 {lib_sh => arch/sh/lib}/Makefile | 0 {lib_sh => arch/sh/lib}/board.c | 0 {lib_sh => arch/sh/lib}/bootm.c | 0 {lib_sh => arch/sh/lib}/time.c | 0 {lib_sh => arch/sh/lib}/time_sh2.c | 0 {lib_sparc => arch/sparc}/config.mk | 0 {lib_sparc => arch/sparc/lib}/Makefile | 0 {lib_sparc => arch/sparc/lib}/board.c | 0 {lib_sparc => arch/sparc/lib}/bootm.c | 0 {lib_sparc => arch/sparc/lib}/cache.c | 0 {lib_sparc => arch/sparc/lib}/interrupts.c | 0 {lib_sparc => arch/sparc/lib}/time.c | 0 board/LEOX/elpt860/u-boot.lds | 10 +++---- board/RPXClassic/u-boot.lds | 2 +- board/RPXlite/u-boot.lds | 2 +- board/RPXlite_dw/u-boot.lds | 2 +- board/RRvision/u-boot.lds | 6 ++-- board/actux1/u-boot.lds | 2 +- board/actux2/u-boot.lds | 2 +- board/actux3/u-boot.lds | 2 +- board/amirix/ap1000/u-boot.lds | 2 +- board/astro/mcf5373l/u-boot.lds | 4 +-- board/c2mon/u-boot.lds | 2 +- board/cobra5272/u-boot.lds | 2 +- board/cray/L1/u-boot.lds.debug | 2 +- board/emk/top860/u-boot.lds.debug | 2 +- board/esd/tasreg/u-boot.lds | 2 +- board/esteem192e/u-boot.lds | 2 +- board/etx094/u-boot.lds.debug | 4 +-- board/fads/u-boot.lds.debug | 2 +- board/freescale/m5208evbe/u-boot.lds | 2 +- board/freescale/m52277evb/u-boot.spa | 2 +- board/freescale/m5235evb/u-boot.16 | 4 +-- board/freescale/m5235evb/u-boot.32 | 2 +- board/freescale/m5249evb/u-boot.lds | 2 +- board/freescale/m5253demo/u-boot.lds | 2 +- board/freescale/m5253evbe/u-boot.lds | 2 +- board/freescale/m5271evb/u-boot.lds | 2 +- board/freescale/m5272c3/u-boot.lds | 2 +- board/freescale/m53017evb/u-boot.lds | 2 +- board/freescale/m5329evb/u-boot.lds | 4 +-- board/freescale/m5373evb/u-boot.lds | 4 +-- board/freescale/m54451evb/u-boot.spa | 2 +- board/freescale/m54451evb/u-boot.stm | 2 +- board/freescale/m54455evb/u-boot.atm | 4 +-- board/freescale/m54455evb/u-boot.int | 4 +-- board/freescale/m547xevb/u-boot.lds | 4 +-- board/freescale/m548xevb/u-boot.lds | 4 +-- board/freescale/mpc7448hpc2/tsi108_init.c | 2 +- board/freescale/mpc8610hpcd/u-boot.lds | 2 +- board/freescale/mpc8641hpcn/u-boot.lds | 2 +- board/freescale/mx31ads/u-boot.lds | 2 +- board/genietv/u-boot.lds | 2 +- board/genietv/u-boot.lds.debug | 2 +- board/hermes/u-boot.lds | 6 ++-- board/hermes/u-boot.lds.debug | 6 ++-- board/hymod/u-boot.lds | 2 +- board/icu862/u-boot.lds | 2 +- board/icu862/u-boot.lds.debug | 2 +- board/idmr/u-boot.lds | 2 +- board/ip860/u-boot.lds | 6 ++-- board/ip860/u-boot.lds.debug | 6 ++-- board/ivm/u-boot.lds.debug | 2 +- board/jse/jse.c | 6 ++-- board/jse/sdram.c | 2 +- board/keymile/km8xx/u-boot.lds | 6 ++-- board/kup/kup4k/u-boot.lds | 2 +- board/kup/kup4x/u-boot.lds | 2 +- board/lantec/u-boot.lds | 2 +- board/lwmon/u-boot.lds.debug | 2 +- board/mbx8xx/u-boot.lds.debug | 2 +- board/ml2/u-boot.lds | 2 +- board/ml2/u-boot.lds.debug | 2 +- board/mousse/u-boot.lds | 4 +-- board/mousse/u-boot.lds.rom | 2 +- board/mpl/pip405/u-boot.lds.debug | 2 +- board/netphone/u-boot.lds | 6 ++-- board/netstal/hcu4/hcu4.c | 2 +- board/netstal/hcu5/README.txt | 6 ++-- board/netstal/hcu5/hcu5.c | 2 +- board/netstal/mcu25/mcu25.c | 2 +- board/netta/u-boot.lds | 6 ++-- board/netta2/u-boot.lds | 6 ++-- board/netvia/u-boot.lds | 6 ++-- board/quantum/u-boot.lds | 2 +- board/rbc823/u-boot.lds | 2 +- board/rmu/u-boot.lds | 2 +- board/sandburst/karef/u-boot.lds.debug | 2 +- board/sandburst/metrobox/u-boot.lds.debug | 2 +- board/sbc8641d/u-boot.lds | 2 +- board/sc3/u-boot.lds | 2 +- board/siemens/CCM/u-boot.lds | 2 +- board/siemens/IAD210/u-boot.lds | 4 +-- board/siemens/pcu_e/u-boot.lds.debug | 2 +- board/snmc/qs850/u-boot.lds | 6 ++-- board/snmc/qs860t/u-boot.lds | 6 ++-- board/spc1920/u-boot.lds | 6 ++-- board/spd8xx/u-boot.lds.debug | 2 +- board/stx/stxssa/stxssa.c | 2 +- board/stx/stxxtc/u-boot.lds | 6 ++-- board/svm_sc8xx/u-boot.lds | 6 ++-- board/tqc/tqm8xx/u-boot.lds | 4 +-- board/uc100/u-boot.lds | 6 ++-- board/v37/u-boot.lds | 6 ++-- board/w7o/u-boot.lds.debug | 2 +- board/westel/amx860/u-boot.lds | 2 +- board/westel/amx860/u-boot.lds.debug | 2 +- board/xes/xpedite1000/u-boot.lds.debug | 2 +- board/xes/xpedite5170/u-boot.lds | 2 +- config.mk | 2 +- cpu/mpc5xxx/u-boot-customlayout.lds | 4 +-- doc/README.LED | 2 +- doc/README.alaska8220 | 2 +- doc/README.m52277evb | 12 ++++---- doc/README.m53017evb | 12 ++++---- doc/README.m5373evb | 12 ++++---- doc/README.m54455evb | 12 ++++---- doc/README.m5475evb | 10 +++---- doc/README.mpc5xx | 6 ++-- doc/README.nios | 2 +- doc/TODO-i386 | 2 +- examples/api/Makefile | 4 +-- include/asm-i386/interrupt.h | 2 +- include/asm-i386/u-boot-i386.h | 4 +-- include/common.h | 8 +++--- include/configs/B2.h | 2 +- nand_spl/board/freescale/mpc8313erdb/Makefile | 6 ++-- nand_spl/board/freescale/mpc8315erdb/Makefile | 6 ++-- nand_spl/board/freescale/mpc8536ds/Makefile | 2 +- nand_spl/board/freescale/mpc8569mds/Makefile | 2 +- nand_spl/board/freescale/p1_p2_rdb/Makefile | 2 +- nand_spl/board/sheldon/simpc8313/Makefile | 6 ++-- 251 files changed, 232 insertions(+), 232 deletions(-) rename {lib_arm => arch/arm}/config.mk (94%) rename {lib_arm => arch/arm/lib}/Makefile (100%) rename {lib_arm => arch/arm/lib}/_ashldi3.S (100%) rename {lib_arm => arch/arm/lib}/_ashrdi3.S (100%) rename {lib_arm => arch/arm/lib}/_divsi3.S (100%) rename {lib_arm => arch/arm/lib}/_lshrdi3.S (100%) rename {lib_arm => arch/arm/lib}/_modsi3.S (100%) rename {lib_arm => arch/arm/lib}/_udivsi3.S (100%) rename {lib_arm => arch/arm/lib}/_umodsi3.S (100%) rename {lib_arm => arch/arm/lib}/board.c (100%) rename {lib_arm => arch/arm/lib}/bootm.c (100%) rename {lib_arm => arch/arm/lib}/cache-cp15.c (100%) rename {lib_arm => arch/arm/lib}/cache.c (100%) rename {lib_arm => arch/arm/lib}/div0.c (100%) rename {lib_arm => arch/arm/lib}/eabi_compat.c (100%) rename {lib_arm => arch/arm/lib}/interrupts.c (100%) rename {lib_arm => arch/arm/lib}/reset.c (100%) rename {lib_avr32 => arch/avr32}/config.mk (100%) rename {lib_avr32 => arch/avr32/lib}/Makefile (100%) rename {lib_avr32 => arch/avr32/lib}/board.c (100%) rename {lib_avr32 => arch/avr32/lib}/bootm.c (100%) rename {lib_avr32 => arch/avr32/lib}/interrupts.c (100%) rename {lib_avr32 => arch/avr32/lib}/memset.S (100%) rename {lib_blackfin => arch/blackfin}/config.mk (97%) rename {lib_blackfin => arch/blackfin/lib}/.gitignore (100%) rename {lib_blackfin => arch/blackfin/lib}/Makefile (100%) rename {lib_blackfin => arch/blackfin/lib}/__kgdb.S (100%) rename {lib_blackfin => arch/blackfin/lib}/board.c (100%) rename {lib_blackfin => arch/blackfin/lib}/boot.c (100%) rename {lib_blackfin => arch/blackfin/lib}/cache.c (100%) rename {lib_blackfin => arch/blackfin/lib}/clocks.c (100%) rename {lib_blackfin => arch/blackfin/lib}/cmd_cache_dump.c (100%) rename {lib_blackfin => arch/blackfin/lib}/ins.S (100%) rename {lib_blackfin => arch/blackfin/lib}/kgdb.c (100%) rename {lib_blackfin => arch/blackfin/lib}/kgdb.h (100%) rename {lib_blackfin => arch/blackfin/lib}/memcmp.S (100%) rename {lib_blackfin => arch/blackfin/lib}/memcpy.S (100%) rename {lib_blackfin => arch/blackfin/lib}/memmove.S (100%) rename {lib_blackfin => arch/blackfin/lib}/memset.S (100%) rename {lib_blackfin => arch/blackfin/lib}/muldi3.c (100%) rename {lib_blackfin => arch/blackfin/lib}/outs.S (100%) rename {lib_blackfin => arch/blackfin/lib}/post.c (100%) rename {lib_blackfin => arch/blackfin/lib}/string.c (100%) rename {lib_blackfin => arch/blackfin/lib}/tests.c (100%) rename {lib_blackfin => arch/blackfin/lib}/u-boot.lds.S (100%) rename {lib_i386 => arch/i386}/config.mk (100%) rename {lib_i386 => arch/i386/lib}/Makefile (100%) rename {lib_i386 => arch/i386/lib}/bios.S (100%) rename {lib_i386 => arch/i386/lib}/bios.h (100%) rename {lib_i386 => arch/i386/lib}/bios_pci.S (100%) rename {lib_i386 => arch/i386/lib}/bios_setup.c (100%) rename {lib_i386 => arch/i386/lib}/board.c (100%) rename {lib_i386 => arch/i386/lib}/bootm.c (100%) rename {lib_i386 => arch/i386/lib}/interrupts.c (100%) rename {lib_i386 => arch/i386/lib}/pcat_interrupts.c (100%) rename {lib_i386 => arch/i386/lib}/pcat_timer.c (100%) rename {lib_i386 => arch/i386/lib}/pci.c (100%) rename {lib_i386 => arch/i386/lib}/pci_type1.c (100%) rename {lib_i386 => arch/i386/lib}/realmode.c (100%) rename {lib_i386 => arch/i386/lib}/realmode_switch.S (100%) rename {lib_i386 => arch/i386/lib}/timer.c (100%) rename {lib_i386 => arch/i386/lib}/video.c (100%) rename {lib_i386 => arch/i386/lib}/video_bios.c (100%) rename {lib_i386 => arch/i386/lib}/zimage.c (100%) rename {lib_m68k => arch/m68k}/config.mk (100%) rename {lib_m68k => arch/m68k/lib}/Makefile (100%) rename {lib_m68k => arch/m68k/lib}/board.c (100%) rename {lib_m68k => arch/m68k/lib}/bootm.c (100%) rename {lib_m68k => arch/m68k/lib}/cache.c (100%) rename {lib_m68k => arch/m68k/lib}/interrupts.c (100%) rename {lib_m68k => arch/m68k/lib}/time.c (100%) rename {lib_m68k => arch/m68k/lib}/traps.c (100%) rename {lib_microblaze => arch/microblaze}/config.mk (100%) rename {lib_microblaze => arch/microblaze/lib}/Makefile (100%) rename {lib_microblaze => arch/microblaze/lib}/board.c (100%) rename {lib_microblaze => arch/microblaze/lib}/bootm.c (100%) rename {lib_microblaze => arch/microblaze/lib}/cache.c (100%) rename {lib_microblaze => arch/microblaze/lib}/time.c (100%) rename {lib_mips => arch/mips}/config.mk (100%) rename {lib_mips => arch/mips/lib}/Makefile (100%) rename {lib_mips => arch/mips/lib}/board.c (100%) rename {lib_mips => arch/mips/lib}/bootm.c (100%) rename {lib_mips => arch/mips/lib}/bootm_qemu_mips.c (100%) rename {lib_mips => arch/mips/lib}/time.c (100%) rename {lib_nios => arch/nios}/config.mk (100%) rename {lib_nios => arch/nios/lib}/Makefile (100%) rename {lib_nios => arch/nios/lib}/board.c (100%) rename {lib_nios => arch/nios/lib}/bootm.c (100%) rename {lib_nios => arch/nios/lib}/cache.c (100%) rename {lib_nios => arch/nios/lib}/divmod.c (100%) rename {lib_nios => arch/nios/lib}/math.h (100%) rename {lib_nios => arch/nios/lib}/mult.c (100%) rename {lib_nios => arch/nios/lib}/time.c (100%) rename {lib_nios2 => arch/nios2}/config.mk (100%) rename {lib_nios2 => arch/nios2/lib}/Makefile (100%) rename {lib_nios2 => arch/nios2/lib}/board.c (100%) rename {lib_nios2 => arch/nios2/lib}/bootm.c (100%) rename {lib_nios2 => arch/nios2/lib}/cache.S (100%) rename {lib_nios2 => arch/nios2/lib}/divmod.c (100%) rename {lib_nios2 => arch/nios2/lib}/math.h (100%) rename {lib_nios2 => arch/nios2/lib}/mult.c (100%) rename {lib_nios2 => arch/nios2/lib}/time.c (100%) rename {lib_ppc => arch/ppc}/config.mk (100%) rename {lib_ppc => arch/ppc/lib}/Makefile (100%) rename {lib_ppc => arch/ppc/lib}/bat_rw.c (100%) rename {lib_ppc => arch/ppc/lib}/board.c (100%) rename {lib_ppc => arch/ppc/lib}/bootm.c (100%) rename {lib_ppc => arch/ppc/lib}/cache.c (100%) rename {lib_ppc => arch/ppc/lib}/extable.c (100%) rename {lib_ppc => arch/ppc/lib}/interrupts.c (100%) rename {lib_ppc => arch/ppc/lib}/kgdb.c (100%) rename {lib_ppc => arch/ppc/lib}/ppccache.S (100%) rename {lib_ppc => arch/ppc/lib}/ppcstring.S (100%) rename {lib_ppc => arch/ppc/lib}/reloc.S (100%) rename {lib_ppc => arch/ppc/lib}/ticks.S (100%) rename {lib_ppc => arch/ppc/lib}/time.c (100%) rename {lib_sh => arch/sh}/config.mk (100%) rename {lib_sh => arch/sh/lib}/Makefile (100%) rename {lib_sh => arch/sh/lib}/board.c (100%) rename {lib_sh => arch/sh/lib}/bootm.c (100%) rename {lib_sh => arch/sh/lib}/time.c (100%) rename {lib_sh => arch/sh/lib}/time_sh2.c (100%) rename {lib_sparc => arch/sparc}/config.mk (100%) rename {lib_sparc => arch/sparc/lib}/Makefile (100%) rename {lib_sparc => arch/sparc/lib}/board.c (100%) rename {lib_sparc => arch/sparc/lib}/bootm.c (100%) rename {lib_sparc => arch/sparc/lib}/cache.c (100%) rename {lib_sparc => arch/sparc/lib}/interrupts.c (100%) rename {lib_sparc => arch/sparc/lib}/time.c (100%) diff --git a/Makefile b/Makefile index 8e3eb9938..de8a4cdba 100644 --- a/Makefile +++ b/Makefile @@ -195,7 +195,7 @@ endif ifeq ($(CPU),ixp) LIBS += cpu/ixp/npe/libnpe.a endif -LIBS += lib_$(ARCH)/lib$(ARCH).a +LIBS += arch/$(ARCH)/lib/lib$(ARCH).a LIBS += fs/cramfs/libcramfs.a fs/fat/libfat.a fs/fdos/libfdos.a fs/jffs2/libjffs2.a \ fs/reiserfs/libreiserfs.a fs/ext2/libext2fs.a fs/yaffs2/libyaffs2.a \ fs/ubifs/libubifs.a @@ -257,7 +257,7 @@ LIBBOARD := $(addprefix $(obj),$(LIBBOARD)) # Add GCC lib ifdef USE_PRIVATE_LIBGCC ifeq ("$(USE_PRIVATE_LIBGCC)", "yes") -PLATFORM_LIBGCC = -L $(OBJTREE)/lib_$(ARCH) -lgcc +PLATFORM_LIBGCC = -L $(OBJTREE)/arch/$(ARCH)/lib -lgcc else PLATFORM_LIBGCC = -L $(USE_PRIVATE_LIBGCC) -lgcc endif @@ -3743,7 +3743,7 @@ clean: $(obj)board/netstar/{eeprom,crcek,crcit,*.srec,*.bin} \ $(obj)board/trab/trab_fkt $(obj)board/voiceblue/eeprom \ $(obj)board/armltd/{integratorap,integratorcp}/u-boot.lds \ - $(obj)lib_blackfin/u-boot.lds \ + $(obj)arch/blackfin/lib/u-boot.lds \ $(obj)u-boot.lds \ $(obj)cpu/blackfin/bootrom-asm-offsets.[chs] @rm -f $(obj)include/bmp_logo.h diff --git a/README b/README index bb13bc62a..dc2103fd4 100644 --- a/README +++ b/README @@ -182,19 +182,19 @@ Directory Hierarchy: - examples Example code for standalone applications, etc. - fs Filesystem code (cramfs, ext2, jffs2, etc.) - include Header Files -- lib_arm Files generic to ARM architecture -- lib_avr32 Files generic to AVR32 architecture -- lib_blackfin Files generic to Blackfin architecture +- arch/arm/lib Files generic to ARM architecture +- arch/avr32/lib Files generic to AVR32 architecture +- arch/blackfin/lib Files generic to Blackfin architecture - lib_generic Files generic to all architectures -- lib_i386 Files generic to i386 architecture -- lib_m68k Files generic to m68k architecture -- lib_microblaze Files generic to microblaze architecture -- lib_mips Files generic to MIPS architecture -- lib_nios Files generic to NIOS architecture -- lib_nios2 Files generic to NIOS2 architecture -- lib_ppc Files generic to PowerPC architecture -- lib_sh Files generic to SH architecture -- lib_sparc Files generic to SPARC architecture +- arch/i386/lib Files generic to i386 architecture +- arch/m68k/lib Files generic to m68k architecture +- arch/microblaze/lib Files generic to microblaze architecture +- arch/mips/lib Files generic to MIPS architecture +- arch/nios/lib Files generic to NIOS architecture +- arch/nios/lib2 Files generic to NIOS2 architecture +- arch/ppc/lib Files generic to PowerPC architecture +- arch/sh/lib Files generic to SH architecture +- arch/sparc/lib Files generic to SPARC architecture - libfdt Library files to support flattened device trees - net Networking code - post Power On Self Test @@ -1940,9 +1940,9 @@ Legacy uImage format: 13 common/image.c Start multifile image verification 14 common/image.c No initial ramdisk, no multifile, continue. - 15 lib_/bootm.c All preparation done, transferring control to OS + 15 arch//lib/bootm.c All preparation done, transferring control to OS - -30 lib_ppc/board.c Fatal error, hang the system + -30 arch/ppc/lib/board.c Fatal error, hang the system -31 post/post.c POST test failed, detected by post_output_backlog() -32 post/post.c POST test failed, detected by post_run_single() diff --git a/lib_arm/config.mk b/arch/arm/config.mk similarity index 94% rename from lib_arm/config.mk rename to arch/arm/config.mk index 8dd4dccf3..e10dafca5 100644 --- a/lib_arm/config.mk +++ b/arch/arm/config.mk @@ -59,8 +59,8 @@ PLATFORM_CPPFLAGS += $(call cc-option,\ # For EABI, make sure to provide raise() ifneq (,$(findstring -mabi=aapcs-linux,$(PLATFORM_CPPFLAGS))) # This file is parsed several times; make sure to add only once. -ifeq (,$(findstring lib_arm/eabi_compat.o,$(PLATFORM_LIBS))) -PLATFORM_LIBS += $(OBJTREE)/lib_arm/eabi_compat.o +ifeq (,$(findstring arch/arm/lib/eabi_compat.o,$(PLATFORM_LIBS))) +PLATFORM_LIBS += $(OBJTREE)/arch/arm/lib/eabi_compat.o endif endif LDSCRIPT := $(SRCTREE)/$(CPUDIR)/u-boot.lds diff --git a/lib_arm/Makefile b/arch/arm/lib/Makefile similarity index 100% rename from lib_arm/Makefile rename to arch/arm/lib/Makefile diff --git a/lib_arm/_ashldi3.S b/arch/arm/lib/_ashldi3.S similarity index 100% rename from lib_arm/_ashldi3.S rename to arch/arm/lib/_ashldi3.S diff --git a/lib_arm/_ashrdi3.S b/arch/arm/lib/_ashrdi3.S similarity index 100% rename from lib_arm/_ashrdi3.S rename to arch/arm/lib/_ashrdi3.S diff --git a/lib_arm/_divsi3.S b/arch/arm/lib/_divsi3.S similarity index 100% rename from lib_arm/_divsi3.S rename to arch/arm/lib/_divsi3.S diff --git a/lib_arm/_lshrdi3.S b/arch/arm/lib/_lshrdi3.S similarity index 100% rename from lib_arm/_lshrdi3.S rename to arch/arm/lib/_lshrdi3.S diff --git a/lib_arm/_modsi3.S b/arch/arm/lib/_modsi3.S similarity index 100% rename from lib_arm/_modsi3.S rename to arch/arm/lib/_modsi3.S diff --git a/lib_arm/_udivsi3.S b/arch/arm/lib/_udivsi3.S similarity index 100% rename from lib_arm/_udivsi3.S rename to arch/arm/lib/_udivsi3.S diff --git a/lib_arm/_umodsi3.S b/arch/arm/lib/_umodsi3.S similarity index 100% rename from lib_arm/_umodsi3.S rename to arch/arm/lib/_umodsi3.S diff --git a/lib_arm/board.c b/arch/arm/lib/board.c similarity index 100% rename from lib_arm/board.c rename to arch/arm/lib/board.c diff --git a/lib_arm/bootm.c b/arch/arm/lib/bootm.c similarity index 100% rename from lib_arm/bootm.c rename to arch/arm/lib/bootm.c diff --git a/lib_arm/cache-cp15.c b/arch/arm/lib/cache-cp15.c similarity index 100% rename from lib_arm/cache-cp15.c rename to arch/arm/lib/cache-cp15.c diff --git a/lib_arm/cache.c b/arch/arm/lib/cache.c similarity index 100% rename from lib_arm/cache.c rename to arch/arm/lib/cache.c diff --git a/lib_arm/div0.c b/arch/arm/lib/div0.c similarity index 100% rename from lib_arm/div0.c rename to arch/arm/lib/div0.c diff --git a/lib_arm/eabi_compat.c b/arch/arm/lib/eabi_compat.c similarity index 100% rename from lib_arm/eabi_compat.c rename to arch/arm/lib/eabi_compat.c diff --git a/lib_arm/interrupts.c b/arch/arm/lib/interrupts.c similarity index 100% rename from lib_arm/interrupts.c rename to arch/arm/lib/interrupts.c diff --git a/lib_arm/reset.c b/arch/arm/lib/reset.c similarity index 100% rename from lib_arm/reset.c rename to arch/arm/lib/reset.c diff --git a/lib_avr32/config.mk b/arch/avr32/config.mk similarity index 100% rename from lib_avr32/config.mk rename to arch/avr32/config.mk diff --git a/lib_avr32/Makefile b/arch/avr32/lib/Makefile similarity index 100% rename from lib_avr32/Makefile rename to arch/avr32/lib/Makefile diff --git a/lib_avr32/board.c b/arch/avr32/lib/board.c similarity index 100% rename from lib_avr32/board.c rename to arch/avr32/lib/board.c diff --git a/lib_avr32/bootm.c b/arch/avr32/lib/bootm.c similarity index 100% rename from lib_avr32/bootm.c rename to arch/avr32/lib/bootm.c diff --git a/lib_avr32/interrupts.c b/arch/avr32/lib/interrupts.c similarity index 100% rename from lib_avr32/interrupts.c rename to arch/avr32/lib/interrupts.c diff --git a/lib_avr32/memset.S b/arch/avr32/lib/memset.S similarity index 100% rename from lib_avr32/memset.S rename to arch/avr32/lib/memset.S diff --git a/lib_blackfin/config.mk b/arch/blackfin/config.mk similarity index 97% rename from lib_blackfin/config.mk rename to arch/blackfin/config.mk index 3ecade9aa..137834e7e 100644 --- a/lib_blackfin/config.mk +++ b/arch/blackfin/config.mk @@ -68,5 +68,5 @@ endif LDR_FLAGS += $(LDR_FLAGS-y) ifeq ($(wildcard $(TOPDIR)/board/$(BOARD)/u-boot.lds*),) -LDSCRIPT = $(obj)lib_$(ARCH)/u-boot.lds.S +LDSCRIPT = $(obj)arch/$(ARCH)/lib/u-boot.lds.S endif diff --git a/lib_blackfin/.gitignore b/arch/blackfin/lib/.gitignore similarity index 100% rename from lib_blackfin/.gitignore rename to arch/blackfin/lib/.gitignore diff --git a/lib_blackfin/Makefile b/arch/blackfin/lib/Makefile similarity index 100% rename from lib_blackfin/Makefile rename to arch/blackfin/lib/Makefile diff --git a/lib_blackfin/__kgdb.S b/arch/blackfin/lib/__kgdb.S similarity index 100% rename from lib_blackfin/__kgdb.S rename to arch/blackfin/lib/__kgdb.S diff --git a/lib_blackfin/board.c b/arch/blackfin/lib/board.c similarity index 100% rename from lib_blackfin/board.c rename to arch/blackfin/lib/board.c diff --git a/lib_blackfin/boot.c b/arch/blackfin/lib/boot.c similarity index 100% rename from lib_blackfin/boot.c rename to arch/blackfin/lib/boot.c diff --git a/lib_blackfin/cache.c b/arch/blackfin/lib/cache.c similarity index 100% rename from lib_blackfin/cache.c rename to arch/blackfin/lib/cache.c diff --git a/lib_blackfin/clocks.c b/arch/blackfin/lib/clocks.c similarity index 100% rename from lib_blackfin/clocks.c rename to arch/blackfin/lib/clocks.c diff --git a/lib_blackfin/cmd_cache_dump.c b/arch/blackfin/lib/cmd_cache_dump.c similarity index 100% rename from lib_blackfin/cmd_cache_dump.c rename to arch/blackfin/lib/cmd_cache_dump.c diff --git a/lib_blackfin/ins.S b/arch/blackfin/lib/ins.S similarity index 100% rename from lib_blackfin/ins.S rename to arch/blackfin/lib/ins.S diff --git a/lib_blackfin/kgdb.c b/arch/blackfin/lib/kgdb.c similarity index 100% rename from lib_blackfin/kgdb.c rename to arch/blackfin/lib/kgdb.c diff --git a/lib_blackfin/kgdb.h b/arch/blackfin/lib/kgdb.h similarity index 100% rename from lib_blackfin/kgdb.h rename to arch/blackfin/lib/kgdb.h diff --git a/lib_blackfin/memcmp.S b/arch/blackfin/lib/memcmp.S similarity index 100% rename from lib_blackfin/memcmp.S rename to arch/blackfin/lib/memcmp.S diff --git a/lib_blackfin/memcpy.S b/arch/blackfin/lib/memcpy.S similarity index 100% rename from lib_blackfin/memcpy.S rename to arch/blackfin/lib/memcpy.S diff --git a/lib_blackfin/memmove.S b/arch/blackfin/lib/memmove.S similarity index 100% rename from lib_blackfin/memmove.S rename to arch/blackfin/lib/memmove.S diff --git a/lib_blackfin/memset.S b/arch/blackfin/lib/memset.S similarity index 100% rename from lib_blackfin/memset.S rename to arch/blackfin/lib/memset.S diff --git a/lib_blackfin/muldi3.c b/arch/blackfin/lib/muldi3.c similarity index 100% rename from lib_blackfin/muldi3.c rename to arch/blackfin/lib/muldi3.c diff --git a/lib_blackfin/outs.S b/arch/blackfin/lib/outs.S similarity index 100% rename from lib_blackfin/outs.S rename to arch/blackfin/lib/outs.S diff --git a/lib_blackfin/post.c b/arch/blackfin/lib/post.c similarity index 100% rename from lib_blackfin/post.c rename to arch/blackfin/lib/post.c diff --git a/lib_blackfin/string.c b/arch/blackfin/lib/string.c similarity index 100% rename from lib_blackfin/string.c rename to arch/blackfin/lib/string.c diff --git a/lib_blackfin/tests.c b/arch/blackfin/lib/tests.c similarity index 100% rename from lib_blackfin/tests.c rename to arch/blackfin/lib/tests.c diff --git a/lib_blackfin/u-boot.lds.S b/arch/blackfin/lib/u-boot.lds.S similarity index 100% rename from lib_blackfin/u-boot.lds.S rename to arch/blackfin/lib/u-boot.lds.S diff --git a/lib_i386/config.mk b/arch/i386/config.mk similarity index 100% rename from lib_i386/config.mk rename to arch/i386/config.mk diff --git a/lib_i386/Makefile b/arch/i386/lib/Makefile similarity index 100% rename from lib_i386/Makefile rename to arch/i386/lib/Makefile diff --git a/lib_i386/bios.S b/arch/i386/lib/bios.S similarity index 100% rename from lib_i386/bios.S rename to arch/i386/lib/bios.S diff --git a/lib_i386/bios.h b/arch/i386/lib/bios.h similarity index 100% rename from lib_i386/bios.h rename to arch/i386/lib/bios.h diff --git a/lib_i386/bios_pci.S b/arch/i386/lib/bios_pci.S similarity index 100% rename from lib_i386/bios_pci.S rename to arch/i386/lib/bios_pci.S diff --git a/lib_i386/bios_setup.c b/arch/i386/lib/bios_setup.c similarity index 100% rename from lib_i386/bios_setup.c rename to arch/i386/lib/bios_setup.c diff --git a/lib_i386/board.c b/arch/i386/lib/board.c similarity index 100% rename from lib_i386/board.c rename to arch/i386/lib/board.c diff --git a/lib_i386/bootm.c b/arch/i386/lib/bootm.c similarity index 100% rename from lib_i386/bootm.c rename to arch/i386/lib/bootm.c diff --git a/lib_i386/interrupts.c b/arch/i386/lib/interrupts.c similarity index 100% rename from lib_i386/interrupts.c rename to arch/i386/lib/interrupts.c diff --git a/lib_i386/pcat_interrupts.c b/arch/i386/lib/pcat_interrupts.c similarity index 100% rename from lib_i386/pcat_interrupts.c rename to arch/i386/lib/pcat_interrupts.c diff --git a/lib_i386/pcat_timer.c b/arch/i386/lib/pcat_timer.c similarity index 100% rename from lib_i386/pcat_timer.c rename to arch/i386/lib/pcat_timer.c diff --git a/lib_i386/pci.c b/arch/i386/lib/pci.c similarity index 100% rename from lib_i386/pci.c rename to arch/i386/lib/pci.c diff --git a/lib_i386/pci_type1.c b/arch/i386/lib/pci_type1.c similarity index 100% rename from lib_i386/pci_type1.c rename to arch/i386/lib/pci_type1.c diff --git a/lib_i386/realmode.c b/arch/i386/lib/realmode.c similarity index 100% rename from lib_i386/realmode.c rename to arch/i386/lib/realmode.c diff --git a/lib_i386/realmode_switch.S b/arch/i386/lib/realmode_switch.S similarity index 100% rename from lib_i386/realmode_switch.S rename to arch/i386/lib/realmode_switch.S diff --git a/lib_i386/timer.c b/arch/i386/lib/timer.c similarity index 100% rename from lib_i386/timer.c rename to arch/i386/lib/timer.c diff --git a/lib_i386/video.c b/arch/i386/lib/video.c similarity index 100% rename from lib_i386/video.c rename to arch/i386/lib/video.c diff --git a/lib_i386/video_bios.c b/arch/i386/lib/video_bios.c similarity index 100% rename from lib_i386/video_bios.c rename to arch/i386/lib/video_bios.c diff --git a/lib_i386/zimage.c b/arch/i386/lib/zimage.c similarity index 100% rename from lib_i386/zimage.c rename to arch/i386/lib/zimage.c diff --git a/lib_m68k/config.mk b/arch/m68k/config.mk similarity index 100% rename from lib_m68k/config.mk rename to arch/m68k/config.mk diff --git a/lib_m68k/Makefile b/arch/m68k/lib/Makefile similarity index 100% rename from lib_m68k/Makefile rename to arch/m68k/lib/Makefile diff --git a/lib_m68k/board.c b/arch/m68k/lib/board.c similarity index 100% rename from lib_m68k/board.c rename to arch/m68k/lib/board.c diff --git a/lib_m68k/bootm.c b/arch/m68k/lib/bootm.c similarity index 100% rename from lib_m68k/bootm.c rename to arch/m68k/lib/bootm.c diff --git a/lib_m68k/cache.c b/arch/m68k/lib/cache.c similarity index 100% rename from lib_m68k/cache.c rename to arch/m68k/lib/cache.c diff --git a/lib_m68k/interrupts.c b/arch/m68k/lib/interrupts.c similarity index 100% rename from lib_m68k/interrupts.c rename to arch/m68k/lib/interrupts.c diff --git a/lib_m68k/time.c b/arch/m68k/lib/time.c similarity index 100% rename from lib_m68k/time.c rename to arch/m68k/lib/time.c diff --git a/lib_m68k/traps.c b/arch/m68k/lib/traps.c similarity index 100% rename from lib_m68k/traps.c rename to arch/m68k/lib/traps.c diff --git a/lib_microblaze/config.mk b/arch/microblaze/config.mk similarity index 100% rename from lib_microblaze/config.mk rename to arch/microblaze/config.mk diff --git a/lib_microblaze/Makefile b/arch/microblaze/lib/Makefile similarity index 100% rename from lib_microblaze/Makefile rename to arch/microblaze/lib/Makefile diff --git a/lib_microblaze/board.c b/arch/microblaze/lib/board.c similarity index 100% rename from lib_microblaze/board.c rename to arch/microblaze/lib/board.c diff --git a/lib_microblaze/bootm.c b/arch/microblaze/lib/bootm.c similarity index 100% rename from lib_microblaze/bootm.c rename to arch/microblaze/lib/bootm.c diff --git a/lib_microblaze/cache.c b/arch/microblaze/lib/cache.c similarity index 100% rename from lib_microblaze/cache.c rename to arch/microblaze/lib/cache.c diff --git a/lib_microblaze/time.c b/arch/microblaze/lib/time.c similarity index 100% rename from lib_microblaze/time.c rename to arch/microblaze/lib/time.c diff --git a/lib_mips/config.mk b/arch/mips/config.mk similarity index 100% rename from lib_mips/config.mk rename to arch/mips/config.mk diff --git a/lib_mips/Makefile b/arch/mips/lib/Makefile similarity index 100% rename from lib_mips/Makefile rename to arch/mips/lib/Makefile diff --git a/lib_mips/board.c b/arch/mips/lib/board.c similarity index 100% rename from lib_mips/board.c rename to arch/mips/lib/board.c diff --git a/lib_mips/bootm.c b/arch/mips/lib/bootm.c similarity index 100% rename from lib_mips/bootm.c rename to arch/mips/lib/bootm.c diff --git a/lib_mips/bootm_qemu_mips.c b/arch/mips/lib/bootm_qemu_mips.c similarity index 100% rename from lib_mips/bootm_qemu_mips.c rename to arch/mips/lib/bootm_qemu_mips.c diff --git a/lib_mips/time.c b/arch/mips/lib/time.c similarity index 100% rename from lib_mips/time.c rename to arch/mips/lib/time.c diff --git a/lib_nios/config.mk b/arch/nios/config.mk similarity index 100% rename from lib_nios/config.mk rename to arch/nios/config.mk diff --git a/lib_nios/Makefile b/arch/nios/lib/Makefile similarity index 100% rename from lib_nios/Makefile rename to arch/nios/lib/Makefile diff --git a/lib_nios/board.c b/arch/nios/lib/board.c similarity index 100% rename from lib_nios/board.c rename to arch/nios/lib/board.c diff --git a/lib_nios/bootm.c b/arch/nios/lib/bootm.c similarity index 100% rename from lib_nios/bootm.c rename to arch/nios/lib/bootm.c diff --git a/lib_nios/cache.c b/arch/nios/lib/cache.c similarity index 100% rename from lib_nios/cache.c rename to arch/nios/lib/cache.c diff --git a/lib_nios/divmod.c b/arch/nios/lib/divmod.c similarity index 100% rename from lib_nios/divmod.c rename to arch/nios/lib/divmod.c diff --git a/lib_nios/math.h b/arch/nios/lib/math.h similarity index 100% rename from lib_nios/math.h rename to arch/nios/lib/math.h diff --git a/lib_nios/mult.c b/arch/nios/lib/mult.c similarity index 100% rename from lib_nios/mult.c rename to arch/nios/lib/mult.c diff --git a/lib_nios/time.c b/arch/nios/lib/time.c similarity index 100% rename from lib_nios/time.c rename to arch/nios/lib/time.c diff --git a/lib_nios2/config.mk b/arch/nios2/config.mk similarity index 100% rename from lib_nios2/config.mk rename to arch/nios2/config.mk diff --git a/lib_nios2/Makefile b/arch/nios2/lib/Makefile similarity index 100% rename from lib_nios2/Makefile rename to arch/nios2/lib/Makefile diff --git a/lib_nios2/board.c b/arch/nios2/lib/board.c similarity index 100% rename from lib_nios2/board.c rename to arch/nios2/lib/board.c diff --git a/lib_nios2/bootm.c b/arch/nios2/lib/bootm.c similarity index 100% rename from lib_nios2/bootm.c rename to arch/nios2/lib/bootm.c diff --git a/lib_nios2/cache.S b/arch/nios2/lib/cache.S similarity index 100% rename from lib_nios2/cache.S rename to arch/nios2/lib/cache.S diff --git a/lib_nios2/divmod.c b/arch/nios2/lib/divmod.c similarity index 100% rename from lib_nios2/divmod.c rename to arch/nios2/lib/divmod.c diff --git a/lib_nios2/math.h b/arch/nios2/lib/math.h similarity index 100% rename from lib_nios2/math.h rename to arch/nios2/lib/math.h diff --git a/lib_nios2/mult.c b/arch/nios2/lib/mult.c similarity index 100% rename from lib_nios2/mult.c rename to arch/nios2/lib/mult.c diff --git a/lib_nios2/time.c b/arch/nios2/lib/time.c similarity index 100% rename from lib_nios2/time.c rename to arch/nios2/lib/time.c diff --git a/lib_ppc/config.mk b/arch/ppc/config.mk similarity index 100% rename from lib_ppc/config.mk rename to arch/ppc/config.mk diff --git a/lib_ppc/Makefile b/arch/ppc/lib/Makefile similarity index 100% rename from lib_ppc/Makefile rename to arch/ppc/lib/Makefile diff --git a/lib_ppc/bat_rw.c b/arch/ppc/lib/bat_rw.c similarity index 100% rename from lib_ppc/bat_rw.c rename to arch/ppc/lib/bat_rw.c diff --git a/lib_ppc/board.c b/arch/ppc/lib/board.c similarity index 100% rename from lib_ppc/board.c rename to arch/ppc/lib/board.c diff --git a/lib_ppc/bootm.c b/arch/ppc/lib/bootm.c similarity index 100% rename from lib_ppc/bootm.c rename to arch/ppc/lib/bootm.c diff --git a/lib_ppc/cache.c b/arch/ppc/lib/cache.c similarity index 100% rename from lib_ppc/cache.c rename to arch/ppc/lib/cache.c diff --git a/lib_ppc/extable.c b/arch/ppc/lib/extable.c similarity index 100% rename from lib_ppc/extable.c rename to arch/ppc/lib/extable.c diff --git a/lib_ppc/interrupts.c b/arch/ppc/lib/interrupts.c similarity index 100% rename from lib_ppc/interrupts.c rename to arch/ppc/lib/interrupts.c diff --git a/lib_ppc/kgdb.c b/arch/ppc/lib/kgdb.c similarity index 100% rename from lib_ppc/kgdb.c rename to arch/ppc/lib/kgdb.c diff --git a/lib_ppc/ppccache.S b/arch/ppc/lib/ppccache.S similarity index 100% rename from lib_ppc/ppccache.S rename to arch/ppc/lib/ppccache.S diff --git a/lib_ppc/ppcstring.S b/arch/ppc/lib/ppcstring.S similarity index 100% rename from lib_ppc/ppcstring.S rename to arch/ppc/lib/ppcstring.S diff --git a/lib_ppc/reloc.S b/arch/ppc/lib/reloc.S similarity index 100% rename from lib_ppc/reloc.S rename to arch/ppc/lib/reloc.S diff --git a/lib_ppc/ticks.S b/arch/ppc/lib/ticks.S similarity index 100% rename from lib_ppc/ticks.S rename to arch/ppc/lib/ticks.S diff --git a/lib_ppc/time.c b/arch/ppc/lib/time.c similarity index 100% rename from lib_ppc/time.c rename to arch/ppc/lib/time.c diff --git a/lib_sh/config.mk b/arch/sh/config.mk similarity index 100% rename from lib_sh/config.mk rename to arch/sh/config.mk diff --git a/lib_sh/Makefile b/arch/sh/lib/Makefile similarity index 100% rename from lib_sh/Makefile rename to arch/sh/lib/Makefile diff --git a/lib_sh/board.c b/arch/sh/lib/board.c similarity index 100% rename from lib_sh/board.c rename to arch/sh/lib/board.c diff --git a/lib_sh/bootm.c b/arch/sh/lib/bootm.c similarity index 100% rename from lib_sh/bootm.c rename to arch/sh/lib/bootm.c diff --git a/lib_sh/time.c b/arch/sh/lib/time.c similarity index 100% rename from lib_sh/time.c rename to arch/sh/lib/time.c diff --git a/lib_sh/time_sh2.c b/arch/sh/lib/time_sh2.c similarity index 100% rename from lib_sh/time_sh2.c rename to arch/sh/lib/time_sh2.c diff --git a/lib_sparc/config.mk b/arch/sparc/config.mk similarity index 100% rename from lib_sparc/config.mk rename to arch/sparc/config.mk diff --git a/lib_sparc/Makefile b/arch/sparc/lib/Makefile similarity index 100% rename from lib_sparc/Makefile rename to arch/sparc/lib/Makefile diff --git a/lib_sparc/board.c b/arch/sparc/lib/board.c similarity index 100% rename from lib_sparc/board.c rename to arch/sparc/lib/board.c diff --git a/lib_sparc/bootm.c b/arch/sparc/lib/bootm.c similarity index 100% rename from lib_sparc/bootm.c rename to arch/sparc/lib/bootm.c diff --git a/lib_sparc/cache.c b/arch/sparc/lib/cache.c similarity index 100% rename from lib_sparc/cache.c rename to arch/sparc/lib/cache.c diff --git a/lib_sparc/interrupts.c b/arch/sparc/lib/interrupts.c similarity index 100% rename from lib_sparc/interrupts.c rename to arch/sparc/lib/interrupts.c diff --git a/lib_sparc/time.c b/arch/sparc/lib/time.c similarity index 100% rename from lib_sparc/time.c rename to arch/sparc/lib/time.c diff --git a/board/LEOX/elpt860/u-boot.lds b/board/LEOX/elpt860/u-boot.lds index 3c44b3ef2..32778cacd 100644 --- a/board/LEOX/elpt860/u-boot.lds +++ b/board/LEOX/elpt860/u-boot.lds @@ -66,15 +66,15 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) lib_generic/string.o (.text) - lib_ppc/cache.o (.text) - lib_ppc/extable.o (.text) - lib_ppc/time.o (.text) - lib_ppc/ticks.o (.text) + arch/ppc/lib/cache.o (.text) + arch/ppc/lib/extable.o (.text) + arch/ppc/lib/time.o (.text) + arch/ppc/lib/ticks.o (.text) . = env_offset; common/env_embedded.o (.text) diff --git a/board/RPXClassic/u-boot.lds b/board/RPXClassic/u-boot.lds index 47247ec81..c354ff828 100644 --- a/board/RPXClassic/u-boot.lds +++ b/board/RPXClassic/u-boot.lds @@ -57,7 +57,7 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) diff --git a/board/RPXlite/u-boot.lds b/board/RPXlite/u-boot.lds index 47247ec81..c354ff828 100644 --- a/board/RPXlite/u-boot.lds +++ b/board/RPXlite/u-boot.lds @@ -57,7 +57,7 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) diff --git a/board/RPXlite_dw/u-boot.lds b/board/RPXlite_dw/u-boot.lds index 7ae7be0c0..89aaffff3 100644 --- a/board/RPXlite_dw/u-boot.lds +++ b/board/RPXlite_dw/u-boot.lds @@ -57,7 +57,7 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) diff --git a/board/RRvision/u-boot.lds b/board/RRvision/u-boot.lds index f22b25fc3..88644a459 100644 --- a/board/RRvision/u-boot.lds +++ b/board/RRvision/u-boot.lds @@ -58,12 +58,12 @@ SECTIONS cpu/mpc8xx/start.o (.text) cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) - lib_ppc/cache.o (.text) - lib_ppc/time.o (.text) + arch/ppc/lib/cache.o (.text) + arch/ppc/lib/time.o (.text) . = env_offset; common/env_embedded.o (.ppcenv) diff --git a/board/actux1/u-boot.lds b/board/actux1/u-boot.lds index 836775f0f..1087167ba 100644 --- a/board/actux1/u-boot.lds +++ b/board/actux1/u-boot.lds @@ -33,7 +33,7 @@ SECTIONS cpu/ixp/start.o(.text) lib_generic/string.o(.text) lib_generic/vsprintf.o(.text) - lib_arm/board.o(.text) + arch/arm/lib/board.o(.text) common/dlmalloc.o(.text) cpu/ixp/cpu.o(.text) . = env_offset; diff --git a/board/actux2/u-boot.lds b/board/actux2/u-boot.lds index 0752656b5..543af3050 100644 --- a/board/actux2/u-boot.lds +++ b/board/actux2/u-boot.lds @@ -33,7 +33,7 @@ SECTIONS cpu/ixp/start.o(.text) lib_generic/string.o(.text) lib_generic/vsprintf.o(.text) - lib_arm/board.o(.text) + arch/arm/lib/board.o(.text) common/dlmalloc.o(.text) cpu/ixp/cpu.o(.text) diff --git a/board/actux3/u-boot.lds b/board/actux3/u-boot.lds index a69e7db9c..f63251dd9 100644 --- a/board/actux3/u-boot.lds +++ b/board/actux3/u-boot.lds @@ -33,7 +33,7 @@ SECTIONS cpu/ixp/start.o (.text) lib_generic/string.o (.text) lib_generic/vsprintf.o (.text) - lib_arm/board.o (.text) + arch/arm/lib/board.o (.text) common/dlmalloc.o (.text) cpu/ixp/cpu.o (.text) diff --git a/board/amirix/ap1000/u-boot.lds b/board/amirix/ap1000/u-boot.lds index 707203d60..10308d598 100644 --- a/board/amirix/ap1000/u-boot.lds +++ b/board/amirix/ap1000/u-boot.lds @@ -65,7 +65,7 @@ SECTIONS cpu/ppc4xx/speed.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + arch/ppc/lib/extable.o (.text) lib_generic/zlib.o (.text) /* . = env_offset;*/ diff --git a/board/astro/mcf5373l/u-boot.lds b/board/astro/mcf5373l/u-boot.lds index a9a4e0a23..7fbe16f34 100644 --- a/board/astro/mcf5373l/u-boot.lds +++ b/board/astro/mcf5373l/u-boot.lds @@ -56,8 +56,8 @@ SECTIONS /* the sector layout of our flash chips! XXX FIXME XXX */ cpu/mcf532x/start.o (.text) - lib_m68k/traps.o (.text) - lib_m68k/interrupts.o (.text) + arch/m68k/lib/traps.o (.text) + arch/m68k/lib/interrupts.o (.text) common/dlmalloc.o (.text) lib_generic/zlib.o (.text) diff --git a/board/c2mon/u-boot.lds b/board/c2mon/u-boot.lds index 2d0efb316..0571f025a 100644 --- a/board/c2mon/u-boot.lds +++ b/board/c2mon/u-boot.lds @@ -57,7 +57,7 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) diff --git a/board/cobra5272/u-boot.lds b/board/cobra5272/u-boot.lds index 7e716bb09..898988020 100644 --- a/board/cobra5272/u-boot.lds +++ b/board/cobra5272/u-boot.lds @@ -56,7 +56,7 @@ SECTIONS /* the sector layout of our flash chips! XXX FIXME XXX */ cpu/mcf52x2/start.o (.text) cpu/mcf52x2/cpu_init.o (.text) - lib_m68k/traps.o (.text) + arch/m68k/lib/traps.o (.text) cpu/mcf52x2/interrupts.o (.text) common/dlmalloc.o (.text) lib_generic/zlib.o (.text) diff --git a/board/cray/L1/u-boot.lds.debug b/board/cray/L1/u-boot.lds.debug index 970628d55..40d2f78ea 100644 --- a/board/cray/L1/u-boot.lds.debug +++ b/board/cray/L1/u-boot.lds.debug @@ -59,7 +59,7 @@ SECTIONS common/dlmalloc.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + arch/ppc/lib/extable.o (.text) common/env_embedded.o(.text) diff --git a/board/emk/top860/u-boot.lds.debug b/board/emk/top860/u-boot.lds.debug index bfe85134e..4e4943fe6 100644 --- a/board/emk/top860/u-boot.lds.debug +++ b/board/emk/top860/u-boot.lds.debug @@ -59,7 +59,7 @@ SECTIONS common/dlmalloc.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + arch/ppc/lib/extable.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/esd/tasreg/u-boot.lds b/board/esd/tasreg/u-boot.lds index e3230b9f2..54e016953 100644 --- a/board/esd/tasreg/u-boot.lds +++ b/board/esd/tasreg/u-boot.lds @@ -56,7 +56,7 @@ SECTIONS /* the sector layout of our flash chips! XXX FIXME XXX */ cpu/mcf52x2/start.o (.text) - lib_m68k/traps.o (.text) + arch/m68k/lib/traps.o (.text) cpu/mcf52x2/interrupts.o (.text) common/dlmalloc.o (.text) lib_generic/zlib.o (.text) diff --git a/board/esteem192e/u-boot.lds b/board/esteem192e/u-boot.lds index 3e4490ec4..215a2c49e 100644 --- a/board/esteem192e/u-boot.lds +++ b/board/esteem192e/u-boot.lds @@ -57,7 +57,7 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) diff --git a/board/etx094/u-boot.lds.debug b/board/etx094/u-boot.lds.debug index 1af61fb2b..dd4dbfaa3 100644 --- a/board/etx094/u-boot.lds.debug +++ b/board/etx094/u-boot.lds.debug @@ -62,8 +62,8 @@ SECTIONS cpu/mpc8xx/cpu_init.o (.text) cpu/mpc8xx/speed.o (.text) cpu/mpc8xx/serial.o (.text) - lib_ppc/extable.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/extable.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/string.o (.text) lib_generic/crc32.o (.text) common/dlmalloc.o (.text) diff --git a/board/fads/u-boot.lds.debug b/board/fads/u-boot.lds.debug index 0a3b958fa..8d91aed3f 100644 --- a/board/fads/u-boot.lds.debug +++ b/board/fads/u-boot.lds.debug @@ -59,7 +59,7 @@ SECTIONS common/dlmalloc.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + arch/ppc/lib/extable.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/freescale/m5208evbe/u-boot.lds b/board/freescale/m5208evbe/u-boot.lds index bc9d5cd0d..3877527d8 100644 --- a/board/freescale/m5208evbe/u-boot.lds +++ b/board/freescale/m5208evbe/u-boot.lds @@ -57,7 +57,7 @@ SECTIONS cpu/mcf52x2/start.o (.text) cpu/mcf52x2/libmcf52x2.a (.text) - lib_m68k/libm68k.a (.text) + arch/m68k/lib/libm68k.a (.text) common/dlmalloc.o (.text) . = DEFINED(env_offset) ? env_offset : .; diff --git a/board/freescale/m52277evb/u-boot.spa b/board/freescale/m52277evb/u-boot.spa index 7ae70d455..23d57107e 100644 --- a/board/freescale/m52277evb/u-boot.spa +++ b/board/freescale/m52277evb/u-boot.spa @@ -57,7 +57,7 @@ SECTIONS cpu/mcf5227x/start.o (.text) cpu/mcf5227x/libmcf5227x.a (.text) - lib_m68k/libm68k.a (.text) + arch/m68k/lib/libm68k.a (.text) lib_generic/libgeneric.a (.text) common/cmd_mem.o (.text) common/main.o (.text) diff --git a/board/freescale/m5235evb/u-boot.16 b/board/freescale/m5235evb/u-boot.16 index c13488437..940da1467 100644 --- a/board/freescale/m5235evb/u-boot.16 +++ b/board/freescale/m5235evb/u-boot.16 @@ -57,8 +57,8 @@ SECTIONS cpu/mcf523x/start.o (.text) cpu/mcf523x/cpu_init.o (.text) - lib_m68k/traps.o (.text) - lib_m68k/interrupts.o (.text) + arch/m68k/lib/traps.o (.text) + arch/m68k/lib/interrupts.o (.text) common/dlmalloc.o (.text) lib_generic/zlib.o (.text) diff --git a/board/freescale/m5235evb/u-boot.32 b/board/freescale/m5235evb/u-boot.32 index 53c337df8..50045e1a4 100644 --- a/board/freescale/m5235evb/u-boot.32 +++ b/board/freescale/m5235evb/u-boot.32 @@ -60,7 +60,7 @@ SECTIONS cpu/mcf523x/cpu_init.o (.text) cpu/mcf523x/interrupts.o (.text) cpu/mcf523x/speed.o (.text) - lib_m68k/libm68k.a (.text) + arch/m68k/lib/libm68k.a (.text) common/dlmalloc.o (.text) common/cmd_bootm.o (.text) common/cmd_flash.o (.text) diff --git a/board/freescale/m5249evb/u-boot.lds b/board/freescale/m5249evb/u-boot.lds index e3230b9f2..54e016953 100644 --- a/board/freescale/m5249evb/u-boot.lds +++ b/board/freescale/m5249evb/u-boot.lds @@ -56,7 +56,7 @@ SECTIONS /* the sector layout of our flash chips! XXX FIXME XXX */ cpu/mcf52x2/start.o (.text) - lib_m68k/traps.o (.text) + arch/m68k/lib/traps.o (.text) cpu/mcf52x2/interrupts.o (.text) common/dlmalloc.o (.text) lib_generic/zlib.o (.text) diff --git a/board/freescale/m5253demo/u-boot.lds b/board/freescale/m5253demo/u-boot.lds index 6cb5ee05f..e53e67de9 100644 --- a/board/freescale/m5253demo/u-boot.lds +++ b/board/freescale/m5253demo/u-boot.lds @@ -56,7 +56,7 @@ SECTIONS /* the sector layout of our flash chips! XXX FIXME XXX */ cpu/mcf52x2/start.o (.text) - lib_m68k/traps.o (.text) + arch/m68k/lib/traps.o (.text) cpu/mcf52x2/interrupts.o (.text) common/dlmalloc.o (.text) lib_generic/zlib.o (.text) diff --git a/board/freescale/m5253evbe/u-boot.lds b/board/freescale/m5253evbe/u-boot.lds index 132fccf10..7f4dc2714 100644 --- a/board/freescale/m5253evbe/u-boot.lds +++ b/board/freescale/m5253evbe/u-boot.lds @@ -56,7 +56,7 @@ SECTIONS /* the sector layout of our flash chips! XXX FIXME XXX */ cpu/mcf52x2/start.o (.text) - lib_m68k/traps.o (.text) + arch/m68k/lib/traps.o (.text) cpu/mcf52x2/interrupts.o (.text) common/dlmalloc.o (.text) lib_generic/zlib.o (.text) diff --git a/board/freescale/m5271evb/u-boot.lds b/board/freescale/m5271evb/u-boot.lds index 00c1f2a52..713b18a95 100644 --- a/board/freescale/m5271evb/u-boot.lds +++ b/board/freescale/m5271evb/u-boot.lds @@ -57,7 +57,7 @@ SECTIONS /* the sector layout of our flash chips! XXX FIXME XXX */ cpu/mcf52x2/start.o (.text) - lib_m68k/traps.o (.text) + arch/m68k/lib/traps.o (.text) cpu/mcf52x2/interrupts.o (.text) common/dlmalloc.o (.text) lib_generic/zlib.o (.text) diff --git a/board/freescale/m5272c3/u-boot.lds b/board/freescale/m5272c3/u-boot.lds index 9d20b228c..446ec1be4 100644 --- a/board/freescale/m5272c3/u-boot.lds +++ b/board/freescale/m5272c3/u-boot.lds @@ -56,7 +56,7 @@ SECTIONS /* the sector layout of our flash chips! XXX FIXME XXX */ cpu/mcf52x2/start.o (.text) - lib_m68k/traps.o (.text) + arch/m68k/lib/traps.o (.text) cpu/mcf52x2/interrupts.o (.text) common/dlmalloc.o (.text) lib_generic/zlib.o (.text) diff --git a/board/freescale/m53017evb/u-boot.lds b/board/freescale/m53017evb/u-boot.lds index c79d06c64..fe0e3141f 100644 --- a/board/freescale/m53017evb/u-boot.lds +++ b/board/freescale/m53017evb/u-boot.lds @@ -57,7 +57,7 @@ SECTIONS cpu/mcf532x/start.o (.text) cpu/mcf532x/libmcf532x.a (.text) - lib_m68k/libm68k.a (.text) + arch/m68k/lib/libm68k.a (.text) common/dlmalloc.o (.text) lib_generic/zlib.o (.text) diff --git a/board/freescale/m5329evb/u-boot.lds b/board/freescale/m5329evb/u-boot.lds index af310988f..0ed87ff30 100644 --- a/board/freescale/m5329evb/u-boot.lds +++ b/board/freescale/m5329evb/u-boot.lds @@ -56,8 +56,8 @@ SECTIONS /* the sector layout of our flash chips! XXX FIXME XXX */ cpu/mcf532x/start.o (.text) - lib_m68k/traps.o (.text) - lib_m68k/interrupts.o (.text) + arch/m68k/lib/traps.o (.text) + arch/m68k/lib/interrupts.o (.text) common/dlmalloc.o (.text) lib_generic/zlib.o (.text) diff --git a/board/freescale/m5373evb/u-boot.lds b/board/freescale/m5373evb/u-boot.lds index dff74b654..605452b70 100644 --- a/board/freescale/m5373evb/u-boot.lds +++ b/board/freescale/m5373evb/u-boot.lds @@ -56,8 +56,8 @@ SECTIONS /* the sector layout of our flash chips! XXX FIXME XXX */ cpu/mcf532x/start.o (.text) - lib_m68k/traps.o (.text) - lib_m68k/interrupts.o (.text) + arch/m68k/lib/traps.o (.text) + arch/m68k/lib/interrupts.o (.text) common/dlmalloc.o (.text) lib_generic/zlib.o (.text) diff --git a/board/freescale/m54451evb/u-boot.spa b/board/freescale/m54451evb/u-boot.spa index d8caefad6..569518b89 100644 --- a/board/freescale/m54451evb/u-boot.spa +++ b/board/freescale/m54451evb/u-boot.spa @@ -57,7 +57,7 @@ SECTIONS cpu/mcf5445x/start.o (.text) cpu/mcf5445x/libmcf5445x.a (.text) - lib_m68k/libm68k.a (.text) + arch/m68k/lib/libm68k.a (.text) common/cmd_flash.o (.text) common/dlmalloc.o (.text) common/main.o (.text) diff --git a/board/freescale/m54451evb/u-boot.stm b/board/freescale/m54451evb/u-boot.stm index e9eac67b9..1b06b12b9 100644 --- a/board/freescale/m54451evb/u-boot.stm +++ b/board/freescale/m54451evb/u-boot.stm @@ -61,7 +61,7 @@ SECTIONS cpu/mcf5445x/dspi.o (.text) cpu/mcf5445x/interrupt.o (.text) cpu/mcf5445x/speed.o (.text) - lib_m68k/board.o (.text) + arch/m68k/lib/board.o (.text) common/serial.o (.text) common/console.o (.text) lib_generic/display_options.o (.text) diff --git a/board/freescale/m54455evb/u-boot.atm b/board/freescale/m54455evb/u-boot.atm index 08e184c1e..c48dd7522 100644 --- a/board/freescale/m54455evb/u-boot.atm +++ b/board/freescale/m54455evb/u-boot.atm @@ -56,8 +56,8 @@ SECTIONS /* the sector layout of our flash chips! XXX FIXME XXX */ cpu/mcf5445x/start.o (.text) - lib_m68k/traps.o (.text) - lib_m68k/interrupts.o (.text) + arch/m68k/lib/traps.o (.text) + arch/m68k/lib/interrupts.o (.text) common/dlmalloc.o (.text) lib_generic/zlib.o (.text) diff --git a/board/freescale/m54455evb/u-boot.int b/board/freescale/m54455evb/u-boot.int index 4d504a22f..ef0717426 100644 --- a/board/freescale/m54455evb/u-boot.int +++ b/board/freescale/m54455evb/u-boot.int @@ -56,8 +56,8 @@ SECTIONS /* the sector layout of our flash chips! XXX FIXME XXX */ cpu/mcf5445x/start.o (.text) - lib_m68k/traps.o (.text) - lib_m68k/interrupts.o (.text) + arch/m68k/lib/traps.o (.text) + arch/m68k/lib/interrupts.o (.text) common/dlmalloc.o (.text) lib_generic/zlib.o (.text) diff --git a/board/freescale/m547xevb/u-boot.lds b/board/freescale/m547xevb/u-boot.lds index a3014bd10..5f28a10ba 100644 --- a/board/freescale/m547xevb/u-boot.lds +++ b/board/freescale/m547xevb/u-boot.lds @@ -56,8 +56,8 @@ SECTIONS /* the sector layout of our flash chips! XXX FIXME XXX */ cpu/mcf547x_8x/start.o (.text) - lib_m68k/traps.o (.text) - lib_m68k/interrupts.o (.text) + arch/m68k/lib/traps.o (.text) + arch/m68k/lib/interrupts.o (.text) common/dlmalloc.o (.text) . = DEFINED(env_offset) ? env_offset : .; diff --git a/board/freescale/m548xevb/u-boot.lds b/board/freescale/m548xevb/u-boot.lds index a3014bd10..5f28a10ba 100644 --- a/board/freescale/m548xevb/u-boot.lds +++ b/board/freescale/m548xevb/u-boot.lds @@ -56,8 +56,8 @@ SECTIONS /* the sector layout of our flash chips! XXX FIXME XXX */ cpu/mcf547x_8x/start.o (.text) - lib_m68k/traps.o (.text) - lib_m68k/interrupts.o (.text) + arch/m68k/lib/traps.o (.text) + arch/m68k/lib/interrupts.o (.text) common/dlmalloc.o (.text) . = DEFINED(env_offset) ? env_offset : .; diff --git a/board/freescale/mpc7448hpc2/tsi108_init.c b/board/freescale/mpc7448hpc2/tsi108_init.c index 74bb564ed..c6a3ade2c 100644 --- a/board/freescale/mpc7448hpc2/tsi108_init.c +++ b/board/freescale/mpc7448hpc2/tsi108_init.c @@ -323,7 +323,7 @@ int board_early_init_r (void) * We will over-ride the env_init called in board_init_f * This is really a work-around because, the HLP bank 1 * where NVRAM resides is not visible during board_init_f - * (lib_ppc/board.c) + * (arch/ppc/lib/board.c) * Alternatively, we could use the I2C EEPROM at start-up to configure * and enable all HLP banks and not just HLP 0 as is being done for * Taiga Rev. 2. diff --git a/board/freescale/mpc8610hpcd/u-boot.lds b/board/freescale/mpc8610hpcd/u-boot.lds index b573807fe..2ad0f0e6a 100644 --- a/board/freescale/mpc8610hpcd/u-boot.lds +++ b/board/freescale/mpc8610hpcd/u-boot.lds @@ -58,7 +58,7 @@ SECTIONS cpu/mpc86xx/speed.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + arch/ppc/lib/extable.o (.text) lib_generic/zlib.o (.text) *(.text) *(.got1) diff --git a/board/freescale/mpc8641hpcn/u-boot.lds b/board/freescale/mpc8641hpcn/u-boot.lds index 2b98b5a9c..796828a37 100644 --- a/board/freescale/mpc8641hpcn/u-boot.lds +++ b/board/freescale/mpc8641hpcn/u-boot.lds @@ -58,7 +58,7 @@ SECTIONS cpu/mpc86xx/speed.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + arch/ppc/lib/extable.o (.text) lib_generic/zlib.o (.text) drivers/bios_emulator/atibios.o (.text) *(.text) diff --git a/board/freescale/mx31ads/u-boot.lds b/board/freescale/mx31ads/u-boot.lds index 3182aa675..6f5bda457 100644 --- a/board/freescale/mx31ads/u-boot.lds +++ b/board/freescale/mx31ads/u-boot.lds @@ -39,7 +39,7 @@ SECTIONS cpu/arm1136/start.o (.text) board/freescale/mx31ads/libmx31ads.a (.text) - lib_arm/libarm.a (.text) + arch/arm/lib/libarm.a (.text) net/libnet.a (.text) drivers/mtd/libmtd.a (.text) diff --git a/board/genietv/u-boot.lds b/board/genietv/u-boot.lds index 716efcdd0..9fc71a2c5 100644 --- a/board/genietv/u-boot.lds +++ b/board/genietv/u-boot.lds @@ -57,7 +57,7 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) diff --git a/board/genietv/u-boot.lds.debug b/board/genietv/u-boot.lds.debug index 3568e6de6..9bb2c58f7 100644 --- a/board/genietv/u-boot.lds.debug +++ b/board/genietv/u-boot.lds.debug @@ -57,7 +57,7 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) diff --git a/board/hermes/u-boot.lds b/board/hermes/u-boot.lds index 7b74cb7d5..1252baf41 100644 --- a/board/hermes/u-boot.lds +++ b/board/hermes/u-boot.lds @@ -58,9 +58,9 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) cpu/mpc8xx/interrupts.o (.text) - lib_ppc/time.o (.text) - lib_ppc/ticks.o (.text) - lib_ppc/cache.o (.text) + arch/ppc/lib/time.o (.text) + arch/ppc/lib/ticks.o (.text) + arch/ppc/lib/cache.o (.text) lib_generic/crc32.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/hermes/u-boot.lds.debug b/board/hermes/u-boot.lds.debug index 380120693..dc810beae 100644 --- a/board/hermes/u-boot.lds.debug +++ b/board/hermes/u-boot.lds.debug @@ -56,10 +56,10 @@ SECTIONS /* the sector layout of our flash chips! XXX FIXME XXX */ cpu/mpc8xx/start.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) cpu/mpc8xx/interrupts.o (.text) - lib_ppc/time.o (.text) - lib_ppc/ticks.o (.text) + arch/ppc/lib/time.o (.text) + arch/ppc/lib/ticks.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/hymod/u-boot.lds b/board/hymod/u-boot.lds index 52d66a2df..cc32b4462 100644 --- a/board/hymod/u-boot.lds +++ b/board/hymod/u-boot.lds @@ -58,7 +58,7 @@ SECTIONS cpu/mpc8260/start.o (.text) /* common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) diff --git a/board/icu862/u-boot.lds b/board/icu862/u-boot.lds index b43be81b6..b614262b8 100644 --- a/board/icu862/u-boot.lds +++ b/board/icu862/u-boot.lds @@ -59,7 +59,7 @@ SECTIONS /* cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) diff --git a/board/icu862/u-boot.lds.debug b/board/icu862/u-boot.lds.debug index 653e0be45..919eb2194 100644 --- a/board/icu862/u-boot.lds.debug +++ b/board/icu862/u-boot.lds.debug @@ -59,7 +59,7 @@ SECTIONS common/dlmalloc.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + arch/ppc/lib/extable.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/idmr/u-boot.lds b/board/idmr/u-boot.lds index 00c1f2a52..713b18a95 100644 --- a/board/idmr/u-boot.lds +++ b/board/idmr/u-boot.lds @@ -57,7 +57,7 @@ SECTIONS /* the sector layout of our flash chips! XXX FIXME XXX */ cpu/mcf52x2/start.o (.text) - lib_m68k/traps.o (.text) + arch/m68k/lib/traps.o (.text) cpu/mcf52x2/interrupts.o (.text) common/dlmalloc.o (.text) lib_generic/zlib.o (.text) diff --git a/board/ip860/u-boot.lds b/board/ip860/u-boot.lds index a786bf23e..bbc7139e5 100644 --- a/board/ip860/u-boot.lds +++ b/board/ip860/u-boot.lds @@ -57,10 +57,10 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) cpu/mpc8xx/interrupts.o (.text) - lib_ppc/time.o (.text) - lib_ppc/ticks.o (.text) + arch/ppc/lib/time.o (.text) + arch/ppc/lib/ticks.o (.text) /** . = env_offset; common/env_embedded.o(.text) diff --git a/board/ip860/u-boot.lds.debug b/board/ip860/u-boot.lds.debug index dc2f6e12f..fc8fe6cec 100644 --- a/board/ip860/u-boot.lds.debug +++ b/board/ip860/u-boot.lds.debug @@ -56,10 +56,10 @@ SECTIONS /* the sector layout of our flash chips! XXX FIXME XXX */ cpu/mpc8xx/start.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) cpu/mpc8xx/interrupts.o (.text) - lib_ppc/time.o (.text) - lib_ppc/ticks.o (.text) + arch/ppc/lib/time.o (.text) + arch/ppc/lib/ticks.o (.text) /** . = env_offset; common/env_embedded.o(.text) diff --git a/board/ivm/u-boot.lds.debug b/board/ivm/u-boot.lds.debug index b5206c50f..17965a05c 100644 --- a/board/ivm/u-boot.lds.debug +++ b/board/ivm/u-boot.lds.debug @@ -59,7 +59,7 @@ SECTIONS common/dlmalloc.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + arch/ppc/lib/extable.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/jse/jse.c b/board/jse/jse.c index 1849ca47d..e4c7b9dd9 100644 --- a/board/jse/jse.c +++ b/board/jse/jse.c @@ -26,7 +26,7 @@ /* * This function is run very early, out of flash, and before devices are - * initialized. It is called by lib_ppc/board.c:board_init_f by virtue + * initialized. It is called by arch/ppc/lib/board.c:board_init_f by virtue * of being in the init_sequence array. * * The SDRAM has been initialized already -- start.S:start called @@ -85,7 +85,7 @@ int board_pre_init (void) #endif /* - * This function is also called by lib_ppc/board.c:board_init_f (it is + * This function is also called by arch/ppc/lib/board.c:board_init_f (it is * also in the init_sequence array) but later. Many more things are * configured, but we are still running from flash. */ @@ -149,7 +149,7 @@ int checkboard (void) /* **** No more functions called by board_init_f. **** */ /* - * This function is called by lib_ppc/board.c:board_init_r. At this + * This function is called by arch/ppc/lib/board.c:board_init_r. At this * point, basic setup is done, U-Boot has been moved into SDRAM and * PCI has been set up. From here we done late setup. */ diff --git a/board/jse/sdram.c b/board/jse/sdram.c index 88fdd8413..a12ebde23 100644 --- a/board/jse/sdram.c +++ b/board/jse/sdram.c @@ -27,7 +27,7 @@ /* * this is even after checkboard. It returns the size of the SDRAM * that we have installed. This function is called by board_init_f - * in lib_ppc/board.c to initialize the memory and return what I + * in arch/ppc/lib/board.c to initialize the memory and return what I * found. */ phys_size_t initdram (int board_type) diff --git a/board/keymile/km8xx/u-boot.lds b/board/keymile/km8xx/u-boot.lds index a8057f225..8b6305a55 100644 --- a/board/keymile/km8xx/u-boot.lds +++ b/board/keymile/km8xx/u-boot.lds @@ -58,12 +58,12 @@ SECTIONS cpu/mpc8xx/start.o (.text) cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) - lib_ppc/cache.o (.text) - lib_ppc/time.o (.text) + arch/ppc/lib/cache.o (.text) + arch/ppc/lib/time.o (.text) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.ppcenv) diff --git a/board/kup/kup4k/u-boot.lds b/board/kup/kup4k/u-boot.lds index 79b886af2..8e4faa15b 100644 --- a/board/kup/kup4k/u-boot.lds +++ b/board/kup/kup4k/u-boot.lds @@ -59,7 +59,7 @@ SECTIONS /* cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) diff --git a/board/kup/kup4x/u-boot.lds b/board/kup/kup4x/u-boot.lds index 79b886af2..8e4faa15b 100644 --- a/board/kup/kup4x/u-boot.lds +++ b/board/kup/kup4x/u-boot.lds @@ -59,7 +59,7 @@ SECTIONS /* cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) diff --git a/board/lantec/u-boot.lds b/board/lantec/u-boot.lds index 854ed6893..814a7a69d 100644 --- a/board/lantec/u-boot.lds +++ b/board/lantec/u-boot.lds @@ -57,7 +57,7 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) diff --git a/board/lwmon/u-boot.lds.debug b/board/lwmon/u-boot.lds.debug index 987c4ddb9..49f897213 100644 --- a/board/lwmon/u-boot.lds.debug +++ b/board/lwmon/u-boot.lds.debug @@ -59,7 +59,7 @@ SECTIONS common/dlmalloc.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + arch/ppc/lib/extable.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/mbx8xx/u-boot.lds.debug b/board/mbx8xx/u-boot.lds.debug index 0a3b958fa..8d91aed3f 100644 --- a/board/mbx8xx/u-boot.lds.debug +++ b/board/mbx8xx/u-boot.lds.debug @@ -59,7 +59,7 @@ SECTIONS common/dlmalloc.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + arch/ppc/lib/extable.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/ml2/u-boot.lds b/board/ml2/u-boot.lds index 8fea3be41..0083a211d 100644 --- a/board/ml2/u-boot.lds +++ b/board/ml2/u-boot.lds @@ -65,7 +65,7 @@ SECTIONS cpu/ppc4xx/speed.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + arch/ppc/lib/extable.o (.text) lib_generic/zlib.o (.text) /* . = env_offset;*/ diff --git a/board/ml2/u-boot.lds.debug b/board/ml2/u-boot.lds.debug index 970628d55..40d2f78ea 100644 --- a/board/ml2/u-boot.lds.debug +++ b/board/ml2/u-boot.lds.debug @@ -59,7 +59,7 @@ SECTIONS common/dlmalloc.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + arch/ppc/lib/extable.o (.text) common/env_embedded.o(.text) diff --git a/board/mousse/u-boot.lds b/board/mousse/u-boot.lds index 5100542e7..c92a2abe2 100644 --- a/board/mousse/u-boot.lds +++ b/board/mousse/u-boot.lds @@ -53,8 +53,8 @@ SECTIONS .text : { cpu/mpc824x/start.o (.text) - lib_ppc/board.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/board.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) diff --git a/board/mousse/u-boot.lds.rom b/board/mousse/u-boot.lds.rom index f79c39f71..9750fc5f1 100644 --- a/board/mousse/u-boot.lds.rom +++ b/board/mousse/u-boot.lds.rom @@ -54,7 +54,7 @@ SECTIONS { cpu/mpc824x/start.o (.text) common/board.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) diff --git a/board/mpl/pip405/u-boot.lds.debug b/board/mpl/pip405/u-boot.lds.debug index 970628d55..40d2f78ea 100644 --- a/board/mpl/pip405/u-boot.lds.debug +++ b/board/mpl/pip405/u-boot.lds.debug @@ -59,7 +59,7 @@ SECTIONS common/dlmalloc.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + arch/ppc/lib/extable.o (.text) common/env_embedded.o(.text) diff --git a/board/netphone/u-boot.lds b/board/netphone/u-boot.lds index d64274b68..4b17a1f76 100644 --- a/board/netphone/u-boot.lds +++ b/board/netphone/u-boot.lds @@ -55,12 +55,12 @@ SECTIONS cpu/mpc8xx/start.o (.text) cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) - lib_ppc/cache.o (.text) - lib_ppc/time.o (.text) + arch/ppc/lib/cache.o (.text) + arch/ppc/lib/time.o (.text) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.text) diff --git a/board/netstal/hcu4/hcu4.c b/board/netstal/hcu4/hcu4.c index 8efbc23c8..3f07ff126 100644 --- a/board/netstal/hcu4/hcu4.c +++ b/board/netstal/hcu4/hcu4.c @@ -34,7 +34,7 @@ DECLARE_GLOBAL_DATA_PTR; /* * This function is run very early, out of flash, and before devices are - * initialized. It is called by lib_ppc/board.c:board_init_f by virtue + * initialized. It is called by arch/ppc/lib/board.c:board_init_f by virtue * of being in the init_sequence array. * * The SDRAM has been initialized already -- start.S:start called diff --git a/board/netstal/hcu5/README.txt b/board/netstal/hcu5/README.txt index f64987637..0a54f9aee 100644 --- a/board/netstal/hcu5/README.txt +++ b/board/netstal/hcu5/README.txt @@ -109,7 +109,7 @@ _start: call cpu_init_f /* run low-level CPU init code (from Flash) */ call cpu_init_f - board_init_f: (lib_ppc\board.c) + board_init_f: (arch/ppc/lib\board.c) init_sequence defines a list of function to be called board_early_init_f: (board/netstal/hcu5/hcu5.c) We are using Bootstrap-Option A @@ -141,7 +141,7 @@ _start: From now on our copy is in RAM and we will run from there, starting with board_init_r ------------------------------------------------------- - board_init_r: (lib_ppc\board.c) + board_init_r: (arch/ppc/lib\board.c) setup bd function pointers trap_init flash_init: (board/netstal/hcu5/flash.c) @@ -162,7 +162,7 @@ Most of the HW specific code for the HCU5 may be found in include/configs/hcu5.h board/netstal/hcu5/* cpu/ppc4xx/* -lib_ppc/* +arch/ppc/lib/* include/ppc440.h Drivers for serial etc are found under drivers/ diff --git a/board/netstal/hcu5/hcu5.c b/board/netstal/hcu5/hcu5.c index c545cc01e..90433fe82 100644 --- a/board/netstal/hcu5/hcu5.c +++ b/board/netstal/hcu5/hcu5.c @@ -49,7 +49,7 @@ extern flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS]; /* * This function is run very early, out of flash, and before devices are - * initialized. It is called by lib_ppc/board.c:board_init_f by virtue + * initialized. It is called by arch/ppc/lib/board.c:board_init_f by virtue * of being in the init_sequence array. * * The SDRAM has been initialized already -- start.S:start called diff --git a/board/netstal/mcu25/mcu25.c b/board/netstal/mcu25/mcu25.c index c66ab97ac..cc2f99874 100644 --- a/board/netstal/mcu25/mcu25.c +++ b/board/netstal/mcu25/mcu25.c @@ -39,7 +39,7 @@ DECLARE_GLOBAL_DATA_PTR; /* * This function is run very early, out of flash, and before devices are - * initialized. It is called by lib_ppc/board.c:board_init_f by virtue + * initialized. It is called by arch/ppc/lib/board.c:board_init_f by virtue * of being in the init_sequence array. * * The SDRAM has been initialized already -- start.S:start called diff --git a/board/netta/u-boot.lds b/board/netta/u-boot.lds index 860c887c2..991d7a1a9 100644 --- a/board/netta/u-boot.lds +++ b/board/netta/u-boot.lds @@ -55,12 +55,12 @@ SECTIONS cpu/mpc8xx/start.o (.text) cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) - lib_ppc/cache.o (.text) - lib_ppc/time.o (.text) + arch/ppc/lib/cache.o (.text) + arch/ppc/lib/time.o (.text) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.text) diff --git a/board/netta2/u-boot.lds b/board/netta2/u-boot.lds index 860c887c2..991d7a1a9 100644 --- a/board/netta2/u-boot.lds +++ b/board/netta2/u-boot.lds @@ -55,12 +55,12 @@ SECTIONS cpu/mpc8xx/start.o (.text) cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) - lib_ppc/cache.o (.text) - lib_ppc/time.o (.text) + arch/ppc/lib/cache.o (.text) + arch/ppc/lib/time.o (.text) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.text) diff --git a/board/netvia/u-boot.lds b/board/netvia/u-boot.lds index a7d290ae8..7eb01ee72 100644 --- a/board/netvia/u-boot.lds +++ b/board/netvia/u-boot.lds @@ -55,12 +55,12 @@ SECTIONS cpu/mpc8xx/start.o (.text) cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) - lib_ppc/cache.o (.text) - lib_ppc/time.o (.text) + arch/ppc/lib/cache.o (.text) + arch/ppc/lib/time.o (.text) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.text) diff --git a/board/quantum/u-boot.lds b/board/quantum/u-boot.lds index 47247ec81..c354ff828 100644 --- a/board/quantum/u-boot.lds +++ b/board/quantum/u-boot.lds @@ -57,7 +57,7 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) diff --git a/board/rbc823/u-boot.lds b/board/rbc823/u-boot.lds index e0ea600d2..6074c14ba 100644 --- a/board/rbc823/u-boot.lds +++ b/board/rbc823/u-boot.lds @@ -57,7 +57,7 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) diff --git a/board/rmu/u-boot.lds b/board/rmu/u-boot.lds index 47247ec81..c354ff828 100644 --- a/board/rmu/u-boot.lds +++ b/board/rmu/u-boot.lds @@ -57,7 +57,7 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) diff --git a/board/sandburst/karef/u-boot.lds.debug b/board/sandburst/karef/u-boot.lds.debug index 48fd57916..1d8ce105e 100644 --- a/board/sandburst/karef/u-boot.lds.debug +++ b/board/sandburst/karef/u-boot.lds.debug @@ -67,7 +67,7 @@ SECTIONS drivers/net/4xx_enet.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + arch/ppc/lib/extable.o (.text) lib_generic/zlib.o (.text) /* common/env_embedded.o(.text) */ diff --git a/board/sandburst/metrobox/u-boot.lds.debug b/board/sandburst/metrobox/u-boot.lds.debug index 4bc5ceac0..bbfea131e 100644 --- a/board/sandburst/metrobox/u-boot.lds.debug +++ b/board/sandburst/metrobox/u-boot.lds.debug @@ -67,7 +67,7 @@ SECTIONS drivers/net/4xx_enet.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + arch/ppc/lib/extable.o (.text) lib_generic/zlib.o (.text) /* common/env_embedded.o(.text) */ diff --git a/board/sbc8641d/u-boot.lds b/board/sbc8641d/u-boot.lds index b71a7d6e5..648efa285 100644 --- a/board/sbc8641d/u-boot.lds +++ b/board/sbc8641d/u-boot.lds @@ -58,7 +58,7 @@ SECTIONS cpu/mpc86xx/speed.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + arch/ppc/lib/extable.o (.text) lib_generic/zlib.o (.text) *(.text) *(.got1) diff --git a/board/sc3/u-boot.lds b/board/sc3/u-boot.lds index 16dc38401..04b350aab 100644 --- a/board/sc3/u-boot.lds +++ b/board/sc3/u-boot.lds @@ -70,7 +70,7 @@ SECTIONS cpu/ppc4xx/speed.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + arch/ppc/lib/extable.o (.text) lib_generic/zlib.o (.text) /* . = env_offset;*/ diff --git a/board/siemens/CCM/u-boot.lds b/board/siemens/CCM/u-boot.lds index 2d0efb316..0571f025a 100644 --- a/board/siemens/CCM/u-boot.lds +++ b/board/siemens/CCM/u-boot.lds @@ -57,7 +57,7 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) diff --git a/board/siemens/IAD210/u-boot.lds b/board/siemens/IAD210/u-boot.lds index 104b44ccf..877cf9ae0 100644 --- a/board/siemens/IAD210/u-boot.lds +++ b/board/siemens/IAD210/u-boot.lds @@ -57,9 +57,9 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) cpu/mpc8xx/interrupts.o (.text) - lib_ppc/time.o (.text) + arch/ppc/lib/time.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/siemens/pcu_e/u-boot.lds.debug b/board/siemens/pcu_e/u-boot.lds.debug index 987c4ddb9..49f897213 100644 --- a/board/siemens/pcu_e/u-boot.lds.debug +++ b/board/siemens/pcu_e/u-boot.lds.debug @@ -59,7 +59,7 @@ SECTIONS common/dlmalloc.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + arch/ppc/lib/extable.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/snmc/qs850/u-boot.lds b/board/snmc/qs850/u-boot.lds index 9ef2c201a..ce115f59e 100644 --- a/board/snmc/qs850/u-boot.lds +++ b/board/snmc/qs850/u-boot.lds @@ -58,12 +58,12 @@ SECTIONS cpu/mpc8xx/start.o (.text) cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) - lib_ppc/cache.o (.text) - lib_ppc/time.o (.text) + arch/ppc/lib/cache.o (.text) + arch/ppc/lib/time.o (.text) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.ppcenv) diff --git a/board/snmc/qs860t/u-boot.lds b/board/snmc/qs860t/u-boot.lds index 9ef2c201a..ce115f59e 100644 --- a/board/snmc/qs860t/u-boot.lds +++ b/board/snmc/qs860t/u-boot.lds @@ -58,12 +58,12 @@ SECTIONS cpu/mpc8xx/start.o (.text) cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) - lib_ppc/cache.o (.text) - lib_ppc/time.o (.text) + arch/ppc/lib/cache.o (.text) + arch/ppc/lib/time.o (.text) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.ppcenv) diff --git a/board/spc1920/u-boot.lds b/board/spc1920/u-boot.lds index d6711b5bf..172cfbbc8 100644 --- a/board/spc1920/u-boot.lds +++ b/board/spc1920/u-boot.lds @@ -58,12 +58,12 @@ SECTIONS cpu/mpc8xx/start.o (.text) cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) - lib_ppc/cache.o (.text) - lib_ppc/time.o (.text) + arch/ppc/lib/cache.o (.text) + arch/ppc/lib/time.o (.text) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.ppcenv) diff --git a/board/spd8xx/u-boot.lds.debug b/board/spd8xx/u-boot.lds.debug index 0a3b958fa..8d91aed3f 100644 --- a/board/spd8xx/u-boot.lds.debug +++ b/board/spd8xx/u-boot.lds.debug @@ -59,7 +59,7 @@ SECTIONS common/dlmalloc.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + arch/ppc/lib/extable.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/stx/stxssa/stxssa.c b/board/stx/stxssa/stxssa.c index 73dddf3e0..678ec5850 100644 --- a/board/stx/stxssa/stxssa.c +++ b/board/stx/stxssa/stxssa.c @@ -259,7 +259,7 @@ board_early_init_f(void) #endif /* Why is the phy reset done _after_ the ethernet - * initialization in lib_ppc/board.c? + * initialization in arch/ppc/lib/board.c? * Do it here so it's done before the TSECs are used. */ reset_phy(); diff --git a/board/stx/stxxtc/u-boot.lds b/board/stx/stxxtc/u-boot.lds index 860c887c2..991d7a1a9 100644 --- a/board/stx/stxxtc/u-boot.lds +++ b/board/stx/stxxtc/u-boot.lds @@ -55,12 +55,12 @@ SECTIONS cpu/mpc8xx/start.o (.text) cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) - lib_ppc/cache.o (.text) - lib_ppc/time.o (.text) + arch/ppc/lib/cache.o (.text) + arch/ppc/lib/time.o (.text) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.text) diff --git a/board/svm_sc8xx/u-boot.lds b/board/svm_sc8xx/u-boot.lds index 02aa9dd98..cf7820001 100644 --- a/board/svm_sc8xx/u-boot.lds +++ b/board/svm_sc8xx/u-boot.lds @@ -58,12 +58,12 @@ SECTIONS cpu/mpc8xx/start.o (.text) cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) - lib_ppc/cache.o (.text) - lib_ppc/time.o (.text) + arch/ppc/lib/cache.o (.text) + arch/ppc/lib/time.o (.text) . = env_offset; common/env_embedded.o (.ppcenv) diff --git a/board/tqc/tqm8xx/u-boot.lds b/board/tqc/tqm8xx/u-boot.lds index 2df8d8459..9f452c1c8 100644 --- a/board/tqc/tqm8xx/u-boot.lds +++ b/board/tqc/tqm8xx/u-boot.lds @@ -58,11 +58,11 @@ SECTIONS cpu/mpc8xx/start.o (.text) cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) - lib_ppc/cache.o (.text) + arch/ppc/lib/cache.o (.text) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.ppcenv) diff --git a/board/uc100/u-boot.lds b/board/uc100/u-boot.lds index e3ea52aed..967e4322c 100644 --- a/board/uc100/u-boot.lds +++ b/board/uc100/u-boot.lds @@ -58,12 +58,12 @@ SECTIONS cpu/mpc8xx/start.o (.text) cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) - lib_ppc/cache.o (.text) - lib_ppc/time.o (.text) + arch/ppc/lib/cache.o (.text) + arch/ppc/lib/time.o (.text) common/env_embedded.o (.text) diff --git a/board/v37/u-boot.lds b/board/v37/u-boot.lds index 6f2ea9a61..c3dd8c7ab 100644 --- a/board/v37/u-boot.lds +++ b/board/v37/u-boot.lds @@ -58,12 +58,12 @@ SECTIONS cpu/mpc8xx/start.o (.text) cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) - lib_ppc/cache.o (.text) - lib_ppc/time.o (.text) + arch/ppc/lib/cache.o (.text) + arch/ppc/lib/time.o (.text) /* . = env_offset; diff --git a/board/w7o/u-boot.lds.debug b/board/w7o/u-boot.lds.debug index 8bb4929a4..85b1cd69d 100644 --- a/board/w7o/u-boot.lds.debug +++ b/board/w7o/u-boot.lds.debug @@ -59,7 +59,7 @@ SECTIONS common/dlmalloc.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + arch/ppc/lib/extable.o (.text) common/env_embedded.o(.text) diff --git a/board/westel/amx860/u-boot.lds b/board/westel/amx860/u-boot.lds index 2d0efb316..0571f025a 100644 --- a/board/westel/amx860/u-boot.lds +++ b/board/westel/amx860/u-boot.lds @@ -57,7 +57,7 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + arch/ppc/lib/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) diff --git a/board/westel/amx860/u-boot.lds.debug b/board/westel/amx860/u-boot.lds.debug index 653e0be45..919eb2194 100644 --- a/board/westel/amx860/u-boot.lds.debug +++ b/board/westel/amx860/u-boot.lds.debug @@ -59,7 +59,7 @@ SECTIONS common/dlmalloc.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + arch/ppc/lib/extable.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/xes/xpedite1000/u-boot.lds.debug b/board/xes/xpedite1000/u-boot.lds.debug index d00834eef..0830d0aa1 100644 --- a/board/xes/xpedite1000/u-boot.lds.debug +++ b/board/xes/xpedite1000/u-boot.lds.debug @@ -65,7 +65,7 @@ SECTIONS cpu/ppc4xx/speed.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + arch/ppc/lib/extable.o (.text) lib_generic/zlib.o (.text) /* common/env_embedded.o(.text) */ diff --git a/board/xes/xpedite5170/u-boot.lds b/board/xes/xpedite5170/u-boot.lds index b71a7d6e5..648efa285 100644 --- a/board/xes/xpedite5170/u-boot.lds +++ b/board/xes/xpedite5170/u-boot.lds @@ -58,7 +58,7 @@ SECTIONS cpu/mpc86xx/speed.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + arch/ppc/lib/extable.o (.text) lib_generic/zlib.o (.text) *(.text) *(.got1) diff --git a/config.mk b/config.mk index 1a61dbb7f..85b524ead 100644 --- a/config.mk +++ b/config.mk @@ -114,7 +114,7 @@ sinclude $(OBJTREE)/include/autoconf.mk # so calculate CPUDIR before including ARCH/SOC/CPU config.mk files. CPUDIR=cpu/$(CPU) -sinclude $(TOPDIR)/lib_$(ARCH)/config.mk # include architecture dependend rules +sinclude $(TOPDIR)/arch/$(ARCH)/config.mk # include architecture dependend rules sinclude $(TOPDIR)/$(CPUDIR)/config.mk # include CPU specific rules ifdef SOC diff --git a/cpu/mpc5xxx/u-boot-customlayout.lds b/cpu/mpc5xxx/u-boot-customlayout.lds index c34008661..c08c9c923 100644 --- a/cpu/mpc5xxx/u-boot-customlayout.lds +++ b/cpu/mpc5xxx/u-boot-customlayout.lds @@ -58,8 +58,8 @@ SECTIONS cpu/mpc5xxx/start.o (.text) cpu/mpc5xxx/traps.o (.text) lib_generic/crc32.o (.text) - lib_ppc/cache.o (.text) - lib_ppc/time.o (.text) + arch/ppc/lib/cache.o (.text) + arch/ppc/lib/time.o (.text) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.ppcenv) diff --git a/doc/README.LED b/doc/README.LED index 94e552aa0..c3bcb3ac8 100644 --- a/doc/README.LED +++ b/doc/README.LED @@ -69,7 +69,7 @@ yellow_LED_off blue_LED_on blue_LED_off -These are weakly defined in lib_arm/board.c to noops. Where applicable, define +These are weakly defined in arch/arm/lib/board.c to noops. Where applicable, define these functions in the board specific source. TBD : Describe older board dependent macros similar to what is done for diff --git a/doc/README.alaska8220 b/doc/README.alaska8220 index 0bd68d962..279dac69f 100644 --- a/doc/README.alaska8220 +++ b/doc/README.alaska8220 @@ -22,7 +22,7 @@ Changed files: - include/asm-ppc/global_data.h added global variables - inp_clk, pci_clk, vco_clk, pev_clk, flb_clk, and bExtUart -- lib_ppc/board.c added CONFIG_MPC8220 support +- arch/ppc/lib/board.c added CONFIG_MPC8220 support - net/eth.c added FEC support for MPC8220 diff --git a/doc/README.m52277evb b/doc/README.m52277evb index 40f9028c6..f30b45e1c 100644 --- a/doc/README.m52277evb +++ b/doc/README.m52277evb @@ -53,12 +53,12 @@ Changed files: - include/configs/M52277EVB.h Board specific configuration file -- lib_m68k/board.c board init function -- lib_m68k/cache.c -- lib_m68k/interrupts Coldfire common interrupt functions -- lib_m68k/m68k_linux.c -- lib_m68k/time.c Timer functions (Dma timer and PIT) -- lib_m68k/traps.c Exception init code +- arch/m68k/lib/board.c board init function +- arch/m68k/lib/cache.c +- arch/m68k/lib/interrupts Coldfire common interrupt functions +- arch/m68k/lib/m68k_linux.c +- arch/m68k/lib/time.c Timer functions (Dma timer and PIT) +- arch/m68k/lib/traps.c Exception init code 1 MCF52277 specific Options/Settings ==================================== diff --git a/doc/README.m53017evb b/doc/README.m53017evb index 60cfa95af..780a8038a 100644 --- a/doc/README.m53017evb +++ b/doc/README.m53017evb @@ -51,12 +51,12 @@ Changed files: - include/configs/M53017EVB.h Board specific configuration file -- lib_m68k/board.c board init function -- lib_m68k/cache.c -- lib_m68k/interrupts Coldfire common interrupt functions -- lib_m68k/m68k_linux.c -- lib_m68k/time.c Timer functions (Dma timer and PIT) -- lib_m68k/traps.c Exception init code +- arch/m68k/lib/board.c board init function +- arch/m68k/lib/cache.c +- arch/m68k/lib/interrupts Coldfire common interrupt functions +- arch/m68k/lib/m68k_linux.c +- arch/m68k/lib/time.c Timer functions (Dma timer and PIT) +- arch/m68k/lib/traps.c Exception init code 1 MCF5301x specific Options/Settings ==================================== diff --git a/doc/README.m5373evb b/doc/README.m5373evb index 559174893..24a659b18 100644 --- a/doc/README.m5373evb +++ b/doc/README.m5373evb @@ -50,12 +50,12 @@ Changed files: - include/configs/M5373EVB.h Board specific configuration file -- lib_m68k/board.c board init function -- lib_m68k/cache.c -- lib_m68k/interrupts Coldfire common interrupt functions -- lib_m68k/m68k_linux.c -- lib_m68k/time.c Timer functions (Dma timer and PIT) -- lib_m68k/traps.c Exception init code +- arch/m68k/lib/board.c board init function +- arch/m68k/lib/cache.c +- arch/m68k/lib/interrupts Coldfire common interrupt functions +- arch/m68k/lib/m68k_linux.c +- arch/m68k/lib/time.c Timer functions (Dma timer and PIT) +- arch/m68k/lib/traps.c Exception init code 1 MCF5373 specific Options/Settings ==================================== diff --git a/doc/README.m54455evb b/doc/README.m54455evb index 1888e1662..257bcd5a1 100644 --- a/doc/README.m54455evb +++ b/doc/README.m54455evb @@ -52,12 +52,12 @@ Changed files: - include/configs/M54455EVB.h Board specific configuration file -- lib_m68k/board.c board init function -- lib_m68k/cache.c -- lib_m68k/interrupts Coldfire common interrupt functions -- lib_m68k/m68k_linux.c -- lib_m68k/time.c Timer functions (Dma timer and PIT) -- lib_m68k/traps.c Exception init code +- arch/m68k/lib/board.c board init function +- arch/m68k/lib/cache.c +- arch/m68k/lib/interrupts Coldfire common interrupt functions +- arch/m68k/lib/m68k_linux.c +- arch/m68k/lib/time.c Timer functions (Dma timer and PIT) +- arch/m68k/lib/traps.c Exception init code - rtc/mcfrtc.c Realtime clock Driver diff --git a/doc/README.m5475evb b/doc/README.m5475evb index f3a1d7b28..b61dfba3c 100644 --- a/doc/README.m5475evb +++ b/doc/README.m5475evb @@ -58,11 +58,11 @@ Changed files: - include/configs/M5475EVB.h Board specific configuration file -- lib_m68k/board.c board init function -- lib_m68k/cache.c -- lib_m68k/interrupts Coldfire common interrupt functions -- lib_m68k/m68k_linux.c -- lib_m68k/traps.c Exception init code +- arch/m68k/lib/board.c board init function +- arch/m68k/lib/cache.c +- arch/m68k/lib/interrupts Coldfire common interrupt functions +- arch/m68k/lib/m68k_linux.c +- arch/m68k/lib/traps.c Exception init code 1 MCF547x specific Options/Settings ==================================== diff --git a/doc/README.mpc5xx b/doc/README.mpc5xx index 07be8637f..2e121746d 100644 --- a/doc/README.mpc5xx +++ b/doc/README.mpc5xx @@ -34,9 +34,9 @@ u-boot-0.2.0/include/mpc5xx.h u-boot-0.2.0/include/status_led.h u-boot-0.2.0/include/asm-ppc/u-boot.h u-boot-0.2.0/include/asm-ppc/5xx_immap.h -u-boot-0.2.0/lib_ppc/board.c -u-boot-0.2.0/lib_ppc/cache.c -u-boot-0.2.0/lib_ppc/time.c +u-boot-0.2.0/arch/ppc/lib/board.c +u-boot-0.2.0/arch/ppc/lib/cache.c +u-boot-0.2.0/arch/ppc/lib/time.c u-boot-0.2.0/Makefile u-boot-0.2.0/CREDITS u-boot-0.2.0/doc/README.mpc5xx diff --git a/doc/README.nios b/doc/README.nios index 7f3493808..da30ff5ae 100644 --- a/doc/README.nios +++ b/doc/README.nios @@ -244,7 +244,7 @@ cover most of the individual functions to get you started. (gdb) directory common (gdb) directory cpu/nios - (gdb) directory lib_nios + (gdb) directory arch/nios/lib (gdb) directory board/altera/dk1c20 Note that the last command is for the DK1C20 board only. If you diff --git a/doc/TODO-i386 b/doc/TODO-i386 index 84113f811..2261f4a1f 100644 --- a/doc/TODO-i386 +++ b/doc/TODO-i386 @@ -8,7 +8,7 @@ i386 port missing features: * re-entry of protected mode from real mode, should be added to realmode_switch.S (and used by INT 10h and INT 16h handlers for console I/O during early linux boot...) -* missing functions in lib_i386 and cpu/i386 +* missing functions in arch/i386/lib and cpu/i386 * speaker beep interface diff --git a/examples/api/Makefile b/examples/api/Makefile index d4c5ca255..62751ece9 100644 --- a/examples/api/Makefile +++ b/examples/api/Makefile @@ -47,7 +47,7 @@ EXT_COBJ_FILES-$(CONFIG_API) += lib_generic/string.o EXT_COBJ_FILES-$(CONFIG_API) += lib_generic/time.o EXT_COBJ_FILES-$(CONFIG_API) += lib_generic/vsprintf.o ifeq ($(ARCH),ppc) -EXT_SOBJ_FILES-$(CONFIG_API) += lib_ppc/ppcstring.o +EXT_SOBJ_FILES-$(CONFIG_API) += arch/ppc/lib/ppcstring.o endif # Create a list of source files so their dependencies can be auto-generated @@ -79,7 +79,7 @@ $(obj)%.o: $(SRCTREE)/lib_generic/%.c $(CC) -g $(CFLAGS) -c -o $@ $< # Rule to build architecture-specific library assembly files -$(obj)%.o: $(SRCTREE)/lib_$(ARCH)/%.S +$(obj)%.o: $(SRCTREE)/arch/$(ARCH)/lib/%.S $(CC) -g $(CFLAGS) -c -o $@ $< ######################################################################### diff --git a/include/asm-i386/interrupt.h b/include/asm-i386/interrupt.h index 3e2674af6..8d324d9f3 100644 --- a/include/asm-i386/interrupt.h +++ b/include/asm-i386/interrupt.h @@ -30,7 +30,7 @@ /* cpu/i386/interrupts.c */ void set_vector(u8 intnum, void *routine); -/* lib_i386/interupts.c */ +/* arch/i386/lib/interupts.c */ void disable_irq(int irq); void enable_irq(int irq); diff --git a/include/asm-i386/u-boot-i386.h b/include/asm-i386/u-boot-i386.h index 7c99c8c57..a08632d2d 100644 --- a/include/asm-i386/u-boot-i386.h +++ b/include/asm-i386/u-boot-i386.h @@ -33,7 +33,7 @@ void timer_isr(void *); typedef void (timer_fnc_t) (void); int register_timer_isr (timer_fnc_t *isr_func); -/* Architecture specific - can be in cpu/i386/, lib_i386/, or $(BOARD)/ */ +/* Architecture specific - can be in cpu/i386/, arch/i386/lib/, or $(BOARD)/ */ int timer_init(void); /* cpu/.../interrupts.c */ @@ -46,7 +46,7 @@ int dram_init(void); void isa_unmap_rom(u32 addr); u32 isa_map_rom(u32 bus_addr, int size); -/* lib_i386/... */ +/* arch/i386/lib/... */ int video_bios_init(void); int video_init(void); diff --git a/include/common.h b/include/common.h index a133e3479..7aa910dc9 100644 --- a/include/common.h +++ b/include/common.h @@ -230,7 +230,7 @@ int parse_line (char *, char *[]); void init_cmd_timeout(void); void reset_cmd_timeout(void); -/* lib_$(ARCH)/board.c */ +/* arch/$(ARCH)/lib/board.c */ void board_init_f (ulong) __attribute__ ((noreturn)); void board_init_r (gd_t *, ulong) __attribute__ ((noreturn)); int checkboard (void); @@ -604,17 +604,17 @@ ulong vfd_setmem (ulong); /* $(CPU)/.../video.c */ ulong video_setmem (ulong); -/* lib_$(ARCH)/cache.c */ +/* arch/$(ARCH)/lib/cache.c */ void flush_cache (unsigned long, unsigned long); void flush_dcache_range(unsigned long start, unsigned long stop); void invalidate_dcache_range(unsigned long start, unsigned long stop); -/* lib_$(ARCH)/ticks.S */ +/* arch/$(ARCH)/lib/ticks.S */ unsigned long long get_ticks(void); void wait_ticks (unsigned long); -/* lib_$(ARCH)/time.c */ +/* arch/$(ARCH)/lib/time.c */ void __udelay (unsigned long); ulong usec2ticks (unsigned long usec); ulong ticks2usec (unsigned long ticks); diff --git a/include/configs/B2.h b/include/configs/B2.h index f51a26115..ca7350dc4 100644 --- a/include/configs/B2.h +++ b/include/configs/B2.h @@ -207,7 +207,7 @@ */ /* - Linux TAGs (see lib_arm/armlinux.c) + Linux TAGs (see arch/arm/lib/armlinux.c) */ #define CONFIG_CMDLINE_TAG #undef CONFIG_SETUP_MEMORY_TAGS diff --git a/nand_spl/board/freescale/mpc8313erdb/Makefile b/nand_spl/board/freescale/mpc8313erdb/Makefile index a13e7e2f1..ee1dc4b29 100644 --- a/nand_spl/board/freescale/mpc8313erdb/Makefile +++ b/nand_spl/board/freescale/mpc8313erdb/Makefile @@ -84,13 +84,13 @@ $(obj)nand_init.c: ln -sf $(SRCTREE)/cpu/mpc83xx/nand_init.c $(obj)nand_init.c $(obj)cache.c: - ln -sf $(SRCTREE)/lib_ppc/cache.c $(obj)cache.c + ln -sf $(SRCTREE)/arch/ppc/lib/cache.c $(obj)cache.c $(obj)time.c: - ln -sf $(SRCTREE)/lib_ppc/time.c $(obj)time.c + ln -sf $(SRCTREE)/arch/ppc/lib/time.c $(obj)time.c $(obj)ticks.S: - ln -sf $(SRCTREE)/lib_ppc/ticks.S $(obj)ticks.S + ln -sf $(SRCTREE)/arch/ppc/lib/ticks.S $(obj)ticks.S ######################################################################### diff --git a/nand_spl/board/freescale/mpc8315erdb/Makefile b/nand_spl/board/freescale/mpc8315erdb/Makefile index a13e7e2f1..ee1dc4b29 100644 --- a/nand_spl/board/freescale/mpc8315erdb/Makefile +++ b/nand_spl/board/freescale/mpc8315erdb/Makefile @@ -84,13 +84,13 @@ $(obj)nand_init.c: ln -sf $(SRCTREE)/cpu/mpc83xx/nand_init.c $(obj)nand_init.c $(obj)cache.c: - ln -sf $(SRCTREE)/lib_ppc/cache.c $(obj)cache.c + ln -sf $(SRCTREE)/arch/ppc/lib/cache.c $(obj)cache.c $(obj)time.c: - ln -sf $(SRCTREE)/lib_ppc/time.c $(obj)time.c + ln -sf $(SRCTREE)/arch/ppc/lib/time.c $(obj)time.c $(obj)ticks.S: - ln -sf $(SRCTREE)/lib_ppc/ticks.S $(obj)ticks.S + ln -sf $(SRCTREE)/arch/ppc/lib/ticks.S $(obj)ticks.S ######################################################################### diff --git a/nand_spl/board/freescale/mpc8536ds/Makefile b/nand_spl/board/freescale/mpc8536ds/Makefile index be0caaa7b..ff8b8be6a 100644 --- a/nand_spl/board/freescale/mpc8536ds/Makefile +++ b/nand_spl/board/freescale/mpc8536ds/Makefile @@ -64,7 +64,7 @@ $(nandobj)u-boot-spl: $(OBJS) $(obj)cache.c: @rm -f $(obj)cache.c - ln -sf $(SRCTREE)/lib_ppc/cache.c $(obj)cache.c + ln -sf $(SRCTREE)/arch/ppc/lib/cache.c $(obj)cache.c $(obj)cpu_init_early.c: @rm -f $(obj)cpu_init_early.c diff --git a/nand_spl/board/freescale/mpc8569mds/Makefile b/nand_spl/board/freescale/mpc8569mds/Makefile index be0caaa7b..ff8b8be6a 100644 --- a/nand_spl/board/freescale/mpc8569mds/Makefile +++ b/nand_spl/board/freescale/mpc8569mds/Makefile @@ -64,7 +64,7 @@ $(nandobj)u-boot-spl: $(OBJS) $(obj)cache.c: @rm -f $(obj)cache.c - ln -sf $(SRCTREE)/lib_ppc/cache.c $(obj)cache.c + ln -sf $(SRCTREE)/arch/ppc/lib/cache.c $(obj)cache.c $(obj)cpu_init_early.c: @rm -f $(obj)cpu_init_early.c diff --git a/nand_spl/board/freescale/p1_p2_rdb/Makefile b/nand_spl/board/freescale/p1_p2_rdb/Makefile index be0caaa7b..ff8b8be6a 100644 --- a/nand_spl/board/freescale/p1_p2_rdb/Makefile +++ b/nand_spl/board/freescale/p1_p2_rdb/Makefile @@ -64,7 +64,7 @@ $(nandobj)u-boot-spl: $(OBJS) $(obj)cache.c: @rm -f $(obj)cache.c - ln -sf $(SRCTREE)/lib_ppc/cache.c $(obj)cache.c + ln -sf $(SRCTREE)/arch/ppc/lib/cache.c $(obj)cache.c $(obj)cpu_init_early.c: @rm -f $(obj)cpu_init_early.c diff --git a/nand_spl/board/sheldon/simpc8313/Makefile b/nand_spl/board/sheldon/simpc8313/Makefile index 6920fe886..48c22f84b 100644 --- a/nand_spl/board/sheldon/simpc8313/Makefile +++ b/nand_spl/board/sheldon/simpc8313/Makefile @@ -90,15 +90,15 @@ $(obj)nand_init.c: $(obj)cache.c: @rm -f $@ - ln -s $(SRCTREE)/lib_ppc/cache.c $@ + ln -s $(SRCTREE)/arch/ppc/lib/cache.c $@ $(obj)time.c: @rm -f $@ - ln -s $(SRCTREE)/lib_ppc/time.c $@ + ln -s $(SRCTREE)/arch/ppc/lib/time.c $@ $(obj)ticks.S: @rm -f $@ - ln -s $(SRCTREE)/lib_ppc/ticks.S $@ + ln -s $(SRCTREE)/arch/ppc/lib/ticks.S $@ ######################################################################### From 78acc472d9719316f22e002a009a998d9ceec29d Mon Sep 17 00:00:00 2001 From: Peter Tyser Date: Mon, 12 Apr 2010 22:28:05 -0500 Subject: [PATCH 135/164] Rename lib_generic/ to lib/ Now that the other architecture-specific lib directories have been moved out of the top-level directory there's not much reason to have the '_generic' suffix on the common lib directory. Signed-off-by: Peter Tyser --- Makefile | 6 +++--- README | 2 +- board/BuS/EB+MCF-EV123/u-boot.lds | 8 ++++---- board/LEOX/elpt860/u-boot.lds | 8 ++++---- board/LEOX/elpt860/u-boot.lds.debug | 4 ++-- board/RPXClassic/u-boot.lds | 6 +++--- board/RPXClassic/u-boot.lds.debug | 4 ++-- board/RPXlite/u-boot.lds | 6 +++--- board/RPXlite/u-boot.lds.debug | 4 ++-- board/RPXlite_dw/u-boot.lds | 6 +++--- board/RPXlite_dw/u-boot.lds.debug | 4 ++-- board/RRvision/u-boot.lds | 6 +++--- board/actux1/u-boot.lds | 4 ++-- board/actux2/u-boot.lds | 4 ++-- board/actux3/u-boot.lds | 4 ++-- board/amirix/ap1000/u-boot.lds | 4 ++-- board/astro/mcf5373l/u-boot.lds | 2 +- board/bf518f-ezbrd/config.mk | 4 ++-- board/bf526-ezbrd/config.mk | 4 ++-- board/bf527-ezkit/config.mk | 4 ++-- board/bf533-ezkit/config.mk | 4 ++-- board/bf533-stamp/config.mk | 4 ++-- board/bf537-stamp/config.mk | 4 ++-- board/bf538f-ezkit/config.mk | 4 ++-- board/bf548-ezkit/config.mk | 4 ++-- board/bf561-acvilon/config.mk | 4 ++-- board/bf561-ezkit/config.mk | 4 ++-- board/c2mon/u-boot.lds | 6 +++--- board/c2mon/u-boot.lds.debug | 4 ++-- board/cm-bf527/config.mk | 4 ++-- board/cm-bf533/config.mk | 4 ++-- board/cm-bf537e/config.mk | 4 ++-- board/cm-bf537u/config.mk | 4 ++-- board/cm-bf548/config.mk | 4 ++-- board/cm-bf561/config.mk | 4 ++-- board/cobra5272/u-boot.lds | 2 +- board/cogent/u-boot.lds.debug | 4 ++-- board/cray/L1/u-boot.lds.debug | 4 ++-- board/eltec/mhpc/u-boot.lds.debug | 4 ++-- board/emk/top860/u-boot.lds.debug | 4 ++-- board/esd/tasreg/u-boot.lds | 2 +- board/esteem192e/u-boot.lds | 6 +++--- board/etx094/u-boot.lds | 4 ++-- board/etx094/u-boot.lds.debug | 4 ++-- board/fads/u-boot.lds.debug | 4 ++-- board/flagadm/u-boot.lds.debug | 4 ++-- board/freescale/m52277evb/u-boot.spa | 2 +- board/freescale/m5235evb/u-boot.16 | 2 +- board/freescale/m5235evb/u-boot.32 | 2 +- board/freescale/m5249evb/u-boot.lds | 2 +- board/freescale/m5253demo/u-boot.lds | 2 +- board/freescale/m5253evbe/u-boot.lds | 2 +- board/freescale/m5271evb/u-boot.lds | 2 +- board/freescale/m5272c3/u-boot.lds | 2 +- board/freescale/m5275evb/u-boot.lds | 4 ++-- board/freescale/m5282evb/u-boot.lds | 6 +++--- board/freescale/m53017evb/u-boot.lds | 2 +- board/freescale/m5329evb/u-boot.lds | 2 +- board/freescale/m5373evb/u-boot.lds | 2 +- board/freescale/m54451evb/u-boot.spa | 2 +- board/freescale/m54451evb/u-boot.stm | 2 +- board/freescale/m54455evb/u-boot.atm | 2 +- board/freescale/m54455evb/u-boot.int | 2 +- board/freescale/mpc8610hpcd/u-boot.lds | 4 ++-- board/freescale/mpc8641hpcn/u-boot.lds | 4 ++-- board/genietv/u-boot.lds | 6 +++--- board/genietv/u-boot.lds.debug | 6 +++--- board/hermes/u-boot.lds | 2 +- board/hymod/u-boot.lds | 6 +++--- board/hymod/u-boot.lds.debug | 4 ++-- board/icu862/u-boot.lds | 6 +++--- board/icu862/u-boot.lds.debug | 4 ++-- board/idmr/u-boot.lds | 2 +- board/ivm/u-boot.lds.debug | 4 ++-- board/keymile/km8xx/u-boot.lds | 6 +++--- board/kup/kup4k/u-boot.lds | 6 +++--- board/kup/kup4k/u-boot.lds.debug | 4 ++-- board/kup/kup4x/u-boot.lds | 6 +++--- board/kup/kup4x/u-boot.lds.debug | 4 ++-- board/lantec/u-boot.lds | 6 +++--- board/lantec/u-boot.lds.debug | 4 ++-- board/lwmon/u-boot.lds.debug | 4 ++-- board/mbx8xx/u-boot.lds.debug | 4 ++-- board/ml2/u-boot.lds | 4 ++-- board/ml2/u-boot.lds.debug | 4 ++-- board/mousse/u-boot.lds | 6 +++--- board/mousse/u-boot.lds.rom | 6 +++--- board/mpl/pip405/u-boot.lds.debug | 4 ++-- board/netphone/u-boot.lds | 6 +++--- board/netphone/u-boot.lds.debug | 4 ++-- board/netstar/Makefile | 2 +- board/netta/u-boot.lds | 6 +++--- board/netta/u-boot.lds.debug | 4 ++-- board/netta2/u-boot.lds | 6 +++--- board/netta2/u-boot.lds.debug | 4 ++-- board/netvia/u-boot.lds | 6 +++--- board/netvia/u-boot.lds.debug | 4 ++-- board/nx823/u-boot.lds.debug | 4 ++-- board/purple/u-boot.lds | 2 +- board/quantum/u-boot.lds | 6 +++--- board/quantum/u-boot.lds.debug | 4 ++-- board/rbc823/u-boot.lds | 6 +++--- board/rmu/u-boot.lds | 6 +++--- board/rmu/u-boot.lds.debug | 4 ++-- board/sandburst/karef/u-boot.lds.debug | 4 ++-- board/sandburst/metrobox/u-boot.lds.debug | 4 ++-- board/sbc8641d/u-boot.lds | 4 ++-- board/sc3/u-boot.lds | 4 ++-- board/siemens/CCM/u-boot.lds | 6 +++--- board/siemens/CCM/u-boot.lds.debug | 4 ++-- board/siemens/pcu_e/u-boot.lds.debug | 4 ++-- board/snmc/qs850/u-boot.lds | 6 +++--- board/snmc/qs860t/u-boot.lds | 6 +++--- board/spc1920/u-boot.lds | 6 +++--- board/spd8xx/u-boot.lds.debug | 4 ++-- board/stx/stxxtc/u-boot.lds | 6 +++--- board/stx/stxxtc/u-boot.lds.debug | 4 ++-- board/svm_sc8xx/u-boot.lds | 6 +++--- board/svm_sc8xx/u-boot.lds.debug | 4 ++-- board/tcm-bf518/config.mk | 4 ++-- board/tcm-bf537/config.mk | 4 ++-- board/tqc/tqm8xx/u-boot.lds | 6 +++--- board/tqc/tqm8xx/u-boot.lds.debug | 4 ++-- board/trab/Makefile | 2 +- board/trab/u-boot.lds | 6 +++--- board/uc100/u-boot.lds | 6 +++--- board/uc100/u-boot.lds.debug | 4 ++-- board/v37/u-boot.lds | 6 +++--- board/w7o/u-boot.lds.debug | 4 ++-- board/westel/amx860/u-boot.lds | 6 +++--- board/westel/amx860/u-boot.lds.debug | 4 ++-- board/xes/xpedite1000/u-boot.lds.debug | 4 ++-- board/xes/xpedite5170/u-boot.lds | 4 ++-- cpu/mpc5xxx/u-boot-customlayout.lds | 2 +- examples/api/Makefile | 14 +++++++------- examples/api/libgenwrap.c | 2 +- include/common.h | 12 ++++++------ include/configs/bf533-stamp.h | 2 +- include/configs/bf537-pnav.h | 2 +- include/configs/bf537-stamp.h | 2 +- include/configs/bf538f-ezkit.h | 2 +- include/configs/bf561-ezkit.h | 4 ++-- include/configs/cm-bf537e.h | 2 +- include/configs/cm-bf537u.h | 2 +- include/configs/ibf-dsp561.h | 4 ++-- include/configs/tcm-bf537.h | 2 +- include/lzma/LzmaDec.h | 2 +- include/lzma/LzmaTools.h | 2 +- include/lzma/LzmaTypes.h | 2 +- include/u-boot/crc.h | 2 +- {lib_generic => lib}/Makefile | 0 {lib_generic => lib}/addr_map.c | 0 {lib_generic => lib}/bzlib.c | 0 {lib_generic => lib}/bzlib_crctable.c | 0 {lib_generic => lib}/bzlib_decompress.c | 0 {lib_generic => lib}/bzlib_huffman.c | 0 {lib_generic => lib}/bzlib_private.h | 0 {lib_generic => lib}/bzlib_randtable.c | 0 {lib_generic => lib}/circbuf.c | 0 {lib_generic => lib}/crc16.c | 0 {lib_generic => lib}/crc32.c | 0 {lib_generic => lib}/ctype.c | 0 {lib_generic => lib}/display_options.c | 0 {lib_generic => lib}/div64.c | 0 {lib_generic => lib}/gunzip.c | 0 {lib_generic => lib}/ldiv.c | 0 {lib_generic => lib}/lmb.c | 0 {lib_generic => lib}/lzma/LzmaDec.c | 0 {lib_generic => lib}/lzma/LzmaDec.h | 0 {lib_generic => lib}/lzma/LzmaTools.c | 0 {lib_generic => lib}/lzma/LzmaTools.h | 0 {lib_generic => lib}/lzma/Makefile | 0 {lib_generic => lib}/lzma/README.txt | 0 {lib_generic => lib}/lzma/Types.h | 0 {lib_generic => lib}/lzma/history.txt | 0 {lib_generic => lib}/lzma/import_lzmasdk.sh | 0 {lib_generic => lib}/lzma/license.txt | 0 {lib_generic => lib}/lzma/lzma.txt | 0 {lib_generic => lib}/lzo/Makefile | 0 {lib_generic => lib}/lzo/lzo1x_decompress.c | 0 {lib_generic => lib}/lzo/lzodefs.h | 0 {lib_generic => lib}/md5.c | 0 {lib_generic => lib}/net_utils.c | 0 {lib_generic => lib}/rbtree.c | 0 {lib_generic => lib}/sha1.c | 0 {lib_generic => lib}/sha256.c | 0 {lib_generic => lib}/string.c | 0 {lib_generic => lib}/strmhz.c | 0 {lib_generic => lib}/time.c | 0 {lib_generic => lib}/vsprintf.c | 0 {lib_generic => lib}/zlib.c | 0 tools/Makefile | 8 ++++---- tools/env/Makefile | 2 +- tools/imls/Makefile | 8 ++++---- 194 files changed, 321 insertions(+), 321 deletions(-) rename {lib_generic => lib}/Makefile (100%) rename {lib_generic => lib}/addr_map.c (100%) rename {lib_generic => lib}/bzlib.c (100%) rename {lib_generic => lib}/bzlib_crctable.c (100%) rename {lib_generic => lib}/bzlib_decompress.c (100%) rename {lib_generic => lib}/bzlib_huffman.c (100%) rename {lib_generic => lib}/bzlib_private.h (100%) rename {lib_generic => lib}/bzlib_randtable.c (100%) rename {lib_generic => lib}/circbuf.c (100%) rename {lib_generic => lib}/crc16.c (100%) rename {lib_generic => lib}/crc32.c (100%) rename {lib_generic => lib}/ctype.c (100%) rename {lib_generic => lib}/display_options.c (100%) rename {lib_generic => lib}/div64.c (100%) rename {lib_generic => lib}/gunzip.c (100%) rename {lib_generic => lib}/ldiv.c (100%) rename {lib_generic => lib}/lmb.c (100%) rename {lib_generic => lib}/lzma/LzmaDec.c (100%) rename {lib_generic => lib}/lzma/LzmaDec.h (100%) rename {lib_generic => lib}/lzma/LzmaTools.c (100%) rename {lib_generic => lib}/lzma/LzmaTools.h (100%) rename {lib_generic => lib}/lzma/Makefile (100%) rename {lib_generic => lib}/lzma/README.txt (100%) rename {lib_generic => lib}/lzma/Types.h (100%) rename {lib_generic => lib}/lzma/history.txt (100%) rename {lib_generic => lib}/lzma/import_lzmasdk.sh (100%) rename {lib_generic => lib}/lzma/license.txt (100%) rename {lib_generic => lib}/lzma/lzma.txt (100%) rename {lib_generic => lib}/lzo/Makefile (100%) rename {lib_generic => lib}/lzo/lzo1x_decompress.c (100%) rename {lib_generic => lib}/lzo/lzodefs.h (100%) rename {lib_generic => lib}/md5.c (100%) rename {lib_generic => lib}/net_utils.c (100%) rename {lib_generic => lib}/rbtree.c (100%) rename {lib_generic => lib}/sha1.c (100%) rename {lib_generic => lib}/sha256.c (100%) rename {lib_generic => lib}/string.c (100%) rename {lib_generic => lib}/strmhz.c (100%) rename {lib_generic => lib}/time.c (100%) rename {lib_generic => lib}/vsprintf.c (100%) rename {lib_generic => lib}/zlib.c (100%) diff --git a/Makefile b/Makefile index de8a4cdba..0b70dcae4 100644 --- a/Makefile +++ b/Makefile @@ -183,9 +183,9 @@ endif OBJS := $(addprefix $(obj),$(OBJS)) -LIBS = lib_generic/libgeneric.a -LIBS += lib_generic/lzma/liblzma.a -LIBS += lib_generic/lzo/liblzo.a +LIBS = lib/libgeneric.a +LIBS += lib/lzma/liblzma.a +LIBS += lib/lzo/liblzo.a LIBS += $(shell if [ -f board/$(VENDOR)/common/Makefile ]; then echo \ "board/$(VENDOR)/common/lib$(VENDOR).a"; fi) LIBS += $(CPUDIR)/lib$(CPU).a diff --git a/README b/README index dc2103fd4..e1d58bdf0 100644 --- a/README +++ b/README @@ -185,7 +185,7 @@ Directory Hierarchy: - arch/arm/lib Files generic to ARM architecture - arch/avr32/lib Files generic to AVR32 architecture - arch/blackfin/lib Files generic to Blackfin architecture -- lib_generic Files generic to all architectures +- lib Files generic to all architectures - arch/i386/lib Files generic to i386 architecture - arch/m68k/lib Files generic to m68k architecture - arch/microblaze/lib Files generic to microblaze architecture diff --git a/board/BuS/EB+MCF-EV123/u-boot.lds b/board/BuS/EB+MCF-EV123/u-boot.lds index 34507938f..b05eacf1a 100644 --- a/board/BuS/EB+MCF-EV123/u-boot.lds +++ b/board/BuS/EB+MCF-EV123/u-boot.lds @@ -57,10 +57,10 @@ SECTIONS cpu/mcf52x2/start.o (.text) common/dlmalloc.o (.text) - lib_generic/string.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/string.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) /* . = env_offset; */ common/env_embedded.o(.text) diff --git a/board/LEOX/elpt860/u-boot.lds b/board/LEOX/elpt860/u-boot.lds index 32778cacd..d3929ea89 100644 --- a/board/LEOX/elpt860/u-boot.lds +++ b/board/LEOX/elpt860/u-boot.lds @@ -67,10 +67,10 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) - lib_generic/string.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) + lib/string.o (.text) arch/ppc/lib/cache.o (.text) arch/ppc/lib/extable.o (.text) arch/ppc/lib/time.o (.text) diff --git a/board/LEOX/elpt860/u-boot.lds.debug b/board/LEOX/elpt860/u-boot.lds.debug index 512608342..f6c21f745 100644 --- a/board/LEOX/elpt860/u-boot.lds.debug +++ b/board/LEOX/elpt860/u-boot.lds.debug @@ -66,8 +66,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) . = env_offset; common/env_embedded.o (.text) diff --git a/board/RPXClassic/u-boot.lds b/board/RPXClassic/u-boot.lds index c354ff828..09d9470f7 100644 --- a/board/RPXClassic/u-boot.lds +++ b/board/RPXClassic/u-boot.lds @@ -58,9 +58,9 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) /* XXX ? . = env_offset; */ diff --git a/board/RPXClassic/u-boot.lds.debug b/board/RPXClassic/u-boot.lds.debug index a2d940f04..f559df716 100644 --- a/board/RPXClassic/u-boot.lds.debug +++ b/board/RPXClassic/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/RPXlite/u-boot.lds b/board/RPXlite/u-boot.lds index c354ff828..09d9470f7 100644 --- a/board/RPXlite/u-boot.lds +++ b/board/RPXlite/u-boot.lds @@ -58,9 +58,9 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) /* XXX ? . = env_offset; */ diff --git a/board/RPXlite/u-boot.lds.debug b/board/RPXlite/u-boot.lds.debug index a2d940f04..f559df716 100644 --- a/board/RPXlite/u-boot.lds.debug +++ b/board/RPXlite/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/RPXlite_dw/u-boot.lds b/board/RPXlite_dw/u-boot.lds index 89aaffff3..a099cb9d5 100644 --- a/board/RPXlite_dw/u-boot.lds +++ b/board/RPXlite_dw/u-boot.lds @@ -58,9 +58,9 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) /* XXX ? . = env_offset; */ diff --git a/board/RPXlite_dw/u-boot.lds.debug b/board/RPXlite_dw/u-boot.lds.debug index 83fdc1501..3b61a4256 100644 --- a/board/RPXlite_dw/u-boot.lds.debug +++ b/board/RPXlite_dw/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/RRvision/u-boot.lds b/board/RRvision/u-boot.lds index 88644a459..1132fd6eb 100644 --- a/board/RRvision/u-boot.lds +++ b/board/RRvision/u-boot.lds @@ -59,9 +59,9 @@ SECTIONS cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) arch/ppc/lib/cache.o (.text) arch/ppc/lib/time.o (.text) diff --git a/board/actux1/u-boot.lds b/board/actux1/u-boot.lds index 1087167ba..40b5ef3bd 100644 --- a/board/actux1/u-boot.lds +++ b/board/actux1/u-boot.lds @@ -31,8 +31,8 @@ SECTIONS . = ALIGN (4); .text : { cpu/ixp/start.o(.text) - lib_generic/string.o(.text) - lib_generic/vsprintf.o(.text) + lib/string.o(.text) + lib/vsprintf.o(.text) arch/arm/lib/board.o(.text) common/dlmalloc.o(.text) cpu/ixp/cpu.o(.text) diff --git a/board/actux2/u-boot.lds b/board/actux2/u-boot.lds index 543af3050..f9ab281bc 100644 --- a/board/actux2/u-boot.lds +++ b/board/actux2/u-boot.lds @@ -31,8 +31,8 @@ SECTIONS . = ALIGN (4); .text : { cpu/ixp/start.o(.text) - lib_generic/string.o(.text) - lib_generic/vsprintf.o(.text) + lib/string.o(.text) + lib/vsprintf.o(.text) arch/arm/lib/board.o(.text) common/dlmalloc.o(.text) cpu/ixp/cpu.o(.text) diff --git a/board/actux3/u-boot.lds b/board/actux3/u-boot.lds index f63251dd9..2fc379615 100644 --- a/board/actux3/u-boot.lds +++ b/board/actux3/u-boot.lds @@ -31,8 +31,8 @@ SECTIONS . = ALIGN (4); .text : { cpu/ixp/start.o (.text) - lib_generic/string.o (.text) - lib_generic/vsprintf.o (.text) + lib/string.o (.text) + lib/vsprintf.o (.text) arch/arm/lib/board.o (.text) common/dlmalloc.o (.text) cpu/ixp/cpu.o (.text) diff --git a/board/amirix/ap1000/u-boot.lds b/board/amirix/ap1000/u-boot.lds index 10308d598..89ffc6d2d 100644 --- a/board/amirix/ap1000/u-boot.lds +++ b/board/amirix/ap1000/u-boot.lds @@ -64,9 +64,9 @@ SECTIONS cpu/ppc4xx/cpu_init.o (.text) cpu/ppc4xx/speed.o (.text) common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) /* . = env_offset;*/ /* common/env_embedded.o(.text)*/ diff --git a/board/astro/mcf5373l/u-boot.lds b/board/astro/mcf5373l/u-boot.lds index 7fbe16f34..73e031015 100644 --- a/board/astro/mcf5373l/u-boot.lds +++ b/board/astro/mcf5373l/u-boot.lds @@ -59,7 +59,7 @@ SECTIONS arch/m68k/lib/traps.o (.text) arch/m68k/lib/interrupts.o (.text) common/dlmalloc.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.text) diff --git a/board/bf518f-ezbrd/config.mk b/board/bf518f-ezbrd/config.mk index fb93531f7..3f9d41f37 100644 --- a/board/bf518f-ezbrd/config.mk +++ b/board/bf518f-ezbrd/config.mk @@ -26,8 +26,8 @@ # This is not actually used for Blackfin boards so do not change it #TEXT_BASE = do-not-use-me -CFLAGS_lib_generic += -O2 -CFLAGS_lib_generic/lzma += -O2 +CFLAGS_lib += -O2 +CFLAGS_lib/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE)) diff --git a/board/bf526-ezbrd/config.mk b/board/bf526-ezbrd/config.mk index fb93531f7..3f9d41f37 100644 --- a/board/bf526-ezbrd/config.mk +++ b/board/bf526-ezbrd/config.mk @@ -26,8 +26,8 @@ # This is not actually used for Blackfin boards so do not change it #TEXT_BASE = do-not-use-me -CFLAGS_lib_generic += -O2 -CFLAGS_lib_generic/lzma += -O2 +CFLAGS_lib += -O2 +CFLAGS_lib/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE)) diff --git a/board/bf527-ezkit/config.mk b/board/bf527-ezkit/config.mk index fb93531f7..3f9d41f37 100644 --- a/board/bf527-ezkit/config.mk +++ b/board/bf527-ezkit/config.mk @@ -26,8 +26,8 @@ # This is not actually used for Blackfin boards so do not change it #TEXT_BASE = do-not-use-me -CFLAGS_lib_generic += -O2 -CFLAGS_lib_generic/lzma += -O2 +CFLAGS_lib += -O2 +CFLAGS_lib/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE)) diff --git a/board/bf533-ezkit/config.mk b/board/bf533-ezkit/config.mk index b50e1f2c8..bc046f129 100644 --- a/board/bf533-ezkit/config.mk +++ b/board/bf533-ezkit/config.mk @@ -26,8 +26,8 @@ # This is not actually used for Blackfin boards so do not change it #TEXT_BASE = do-not-use-me -CFLAGS_lib_generic += -O2 -CFLAGS_lib_generic/lzma += -O2 +CFLAGS_lib += -O2 +CFLAGS_lib/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 diff --git a/board/bf533-stamp/config.mk b/board/bf533-stamp/config.mk index b50e1f2c8..bc046f129 100644 --- a/board/bf533-stamp/config.mk +++ b/board/bf533-stamp/config.mk @@ -26,8 +26,8 @@ # This is not actually used for Blackfin boards so do not change it #TEXT_BASE = do-not-use-me -CFLAGS_lib_generic += -O2 -CFLAGS_lib_generic/lzma += -O2 +CFLAGS_lib += -O2 +CFLAGS_lib/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 diff --git a/board/bf537-stamp/config.mk b/board/bf537-stamp/config.mk index 95d0fcc08..576682911 100644 --- a/board/bf537-stamp/config.mk +++ b/board/bf537-stamp/config.mk @@ -26,8 +26,8 @@ # This is not actually used for Blackfin boards so do not change it #TEXT_BASE = do-not-use-me -CFLAGS_lib_generic += -O2 -CFLAGS_lib_generic/lzma += -O2 +CFLAGS_lib += -O2 +CFLAGS_lib/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 diff --git a/board/bf538f-ezkit/config.mk b/board/bf538f-ezkit/config.mk index b50e1f2c8..bc046f129 100644 --- a/board/bf538f-ezkit/config.mk +++ b/board/bf538f-ezkit/config.mk @@ -26,8 +26,8 @@ # This is not actually used for Blackfin boards so do not change it #TEXT_BASE = do-not-use-me -CFLAGS_lib_generic += -O2 -CFLAGS_lib_generic/lzma += -O2 +CFLAGS_lib += -O2 +CFLAGS_lib/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 diff --git a/board/bf548-ezkit/config.mk b/board/bf548-ezkit/config.mk index aff12e9dc..ce96c0d47 100644 --- a/board/bf548-ezkit/config.mk +++ b/board/bf548-ezkit/config.mk @@ -26,8 +26,8 @@ # This is not actually used for Blackfin boards so do not change it #TEXT_BASE = do-not-use-me -CFLAGS_lib_generic += -O2 -CFLAGS_lib_generic/lzma += -O2 +CFLAGS_lib += -O2 +CFLAGS_lib/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --dma 6 diff --git a/board/bf561-acvilon/config.mk b/board/bf561-acvilon/config.mk index b5170259b..a90b19338 100644 --- a/board/bf561-acvilon/config.mk +++ b/board/bf561-acvilon/config.mk @@ -26,8 +26,8 @@ # This is not actually used for Blackfin boards so do not change it #TEXT_BASE = do-not-use-me -CFLAGS_lib_generic += -O2 -CFLAGS_lib_generic/lzma += -O2 +CFLAGS_lib += -O2 +CFLAGS_lib/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 diff --git a/board/bf561-ezkit/config.mk b/board/bf561-ezkit/config.mk index b5170259b..a90b19338 100644 --- a/board/bf561-ezkit/config.mk +++ b/board/bf561-ezkit/config.mk @@ -26,8 +26,8 @@ # This is not actually used for Blackfin boards so do not change it #TEXT_BASE = do-not-use-me -CFLAGS_lib_generic += -O2 -CFLAGS_lib_generic/lzma += -O2 +CFLAGS_lib += -O2 +CFLAGS_lib/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 diff --git a/board/c2mon/u-boot.lds b/board/c2mon/u-boot.lds index 0571f025a..51e95d555 100644 --- a/board/c2mon/u-boot.lds +++ b/board/c2mon/u-boot.lds @@ -58,9 +58,9 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/c2mon/u-boot.lds.debug b/board/c2mon/u-boot.lds.debug index ad3695391..d55bf33b8 100644 --- a/board/c2mon/u-boot.lds.debug +++ b/board/c2mon/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/cm-bf527/config.mk b/board/cm-bf527/config.mk index fb93531f7..3f9d41f37 100644 --- a/board/cm-bf527/config.mk +++ b/board/cm-bf527/config.mk @@ -26,8 +26,8 @@ # This is not actually used for Blackfin boards so do not change it #TEXT_BASE = do-not-use-me -CFLAGS_lib_generic += -O2 -CFLAGS_lib_generic/lzma += -O2 +CFLAGS_lib += -O2 +CFLAGS_lib/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE)) diff --git a/board/cm-bf533/config.mk b/board/cm-bf533/config.mk index b50e1f2c8..bc046f129 100644 --- a/board/cm-bf533/config.mk +++ b/board/cm-bf533/config.mk @@ -26,8 +26,8 @@ # This is not actually used for Blackfin boards so do not change it #TEXT_BASE = do-not-use-me -CFLAGS_lib_generic += -O2 -CFLAGS_lib_generic/lzma += -O2 +CFLAGS_lib += -O2 +CFLAGS_lib/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 diff --git a/board/cm-bf537e/config.mk b/board/cm-bf537e/config.mk index b50e1f2c8..bc046f129 100644 --- a/board/cm-bf537e/config.mk +++ b/board/cm-bf537e/config.mk @@ -26,8 +26,8 @@ # This is not actually used for Blackfin boards so do not change it #TEXT_BASE = do-not-use-me -CFLAGS_lib_generic += -O2 -CFLAGS_lib_generic/lzma += -O2 +CFLAGS_lib += -O2 +CFLAGS_lib/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 diff --git a/board/cm-bf537u/config.mk b/board/cm-bf537u/config.mk index b50e1f2c8..bc046f129 100644 --- a/board/cm-bf537u/config.mk +++ b/board/cm-bf537u/config.mk @@ -26,8 +26,8 @@ # This is not actually used for Blackfin boards so do not change it #TEXT_BASE = do-not-use-me -CFLAGS_lib_generic += -O2 -CFLAGS_lib_generic/lzma += -O2 +CFLAGS_lib += -O2 +CFLAGS_lib/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 diff --git a/board/cm-bf548/config.mk b/board/cm-bf548/config.mk index 66c7368f7..f071a39d7 100644 --- a/board/cm-bf548/config.mk +++ b/board/cm-bf548/config.mk @@ -26,8 +26,8 @@ # This is not actually used for Blackfin boards so do not change it #TEXT_BASE = do-not-use-me -CFLAGS_lib_generic += -O2 -CFLAGS_lib_generic/lzma += -O2 +CFLAGS_lib += -O2 +CFLAGS_lib/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --dma 6 diff --git a/board/cm-bf561/config.mk b/board/cm-bf561/config.mk index b5170259b..a90b19338 100644 --- a/board/cm-bf561/config.mk +++ b/board/cm-bf561/config.mk @@ -26,8 +26,8 @@ # This is not actually used for Blackfin boards so do not change it #TEXT_BASE = do-not-use-me -CFLAGS_lib_generic += -O2 -CFLAGS_lib_generic/lzma += -O2 +CFLAGS_lib += -O2 +CFLAGS_lib/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 diff --git a/board/cobra5272/u-boot.lds b/board/cobra5272/u-boot.lds index 898988020..aacc0894d 100644 --- a/board/cobra5272/u-boot.lds +++ b/board/cobra5272/u-boot.lds @@ -59,7 +59,7 @@ SECTIONS arch/m68k/lib/traps.o (.text) cpu/mcf52x2/interrupts.o (.text) common/dlmalloc.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.text) diff --git a/board/cogent/u-boot.lds.debug b/board/cogent/u-boot.lds.debug index a2d940f04..f559df716 100644 --- a/board/cogent/u-boot.lds.debug +++ b/board/cogent/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/cray/L1/u-boot.lds.debug b/board/cray/L1/u-boot.lds.debug index 40d2f78ea..09c0191e5 100644 --- a/board/cray/L1/u-boot.lds.debug +++ b/board/cray/L1/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) common/env_embedded.o(.text) diff --git a/board/eltec/mhpc/u-boot.lds.debug b/board/eltec/mhpc/u-boot.lds.debug index ad3695391..d55bf33b8 100644 --- a/board/eltec/mhpc/u-boot.lds.debug +++ b/board/eltec/mhpc/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/emk/top860/u-boot.lds.debug b/board/emk/top860/u-boot.lds.debug index 4e4943fe6..6ca72980e 100644 --- a/board/emk/top860/u-boot.lds.debug +++ b/board/emk/top860/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) . = env_offset; diff --git a/board/esd/tasreg/u-boot.lds b/board/esd/tasreg/u-boot.lds index 54e016953..f87d3cb72 100644 --- a/board/esd/tasreg/u-boot.lds +++ b/board/esd/tasreg/u-boot.lds @@ -59,7 +59,7 @@ SECTIONS arch/m68k/lib/traps.o (.text) cpu/mcf52x2/interrupts.o (.text) common/dlmalloc.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.text) diff --git a/board/esteem192e/u-boot.lds b/board/esteem192e/u-boot.lds index 215a2c49e..848eacdb2 100644 --- a/board/esteem192e/u-boot.lds +++ b/board/esteem192e/u-boot.lds @@ -58,9 +58,9 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/etx094/u-boot.lds b/board/etx094/u-boot.lds index 1d34e68fd..d8112eb0a 100644 --- a/board/etx094/u-boot.lds +++ b/board/etx094/u-boot.lds @@ -62,8 +62,8 @@ SECTIONS cpu/mpc8xx/cpu_init.o (.text) cpu/mpc8xx/speed.o (.text) common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/etx094/u-boot.lds.debug b/board/etx094/u-boot.lds.debug index dd4dbfaa3..12f6ce765 100644 --- a/board/etx094/u-boot.lds.debug +++ b/board/etx094/u-boot.lds.debug @@ -64,8 +64,8 @@ SECTIONS cpu/mpc8xx/serial.o (.text) arch/ppc/lib/extable.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/string.o (.text) - lib_generic/crc32.o (.text) + lib/string.o (.text) + lib/crc32.o (.text) common/dlmalloc.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/fads/u-boot.lds.debug b/board/fads/u-boot.lds.debug index 8d91aed3f..4f179c7fa 100644 --- a/board/fads/u-boot.lds.debug +++ b/board/fads/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) . = env_offset; diff --git a/board/flagadm/u-boot.lds.debug b/board/flagadm/u-boot.lds.debug index ad3695391..d55bf33b8 100644 --- a/board/flagadm/u-boot.lds.debug +++ b/board/flagadm/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/freescale/m52277evb/u-boot.spa b/board/freescale/m52277evb/u-boot.spa index 23d57107e..6d916d84f 100644 --- a/board/freescale/m52277evb/u-boot.spa +++ b/board/freescale/m52277evb/u-boot.spa @@ -58,7 +58,7 @@ SECTIONS cpu/mcf5227x/start.o (.text) cpu/mcf5227x/libmcf5227x.a (.text) arch/m68k/lib/libm68k.a (.text) - lib_generic/libgeneric.a (.text) + lib/libgeneric.a (.text) common/cmd_mem.o (.text) common/main.o (.text) diff --git a/board/freescale/m5235evb/u-boot.16 b/board/freescale/m5235evb/u-boot.16 index 940da1467..4e70efb2f 100644 --- a/board/freescale/m5235evb/u-boot.16 +++ b/board/freescale/m5235evb/u-boot.16 @@ -60,7 +60,7 @@ SECTIONS arch/m68k/lib/traps.o (.text) arch/m68k/lib/interrupts.o (.text) common/dlmalloc.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.text) diff --git a/board/freescale/m5235evb/u-boot.32 b/board/freescale/m5235evb/u-boot.32 index 50045e1a4..cbf224925 100644 --- a/board/freescale/m5235evb/u-boot.32 +++ b/board/freescale/m5235evb/u-boot.32 @@ -68,7 +68,7 @@ SECTIONS common/cmd_mem.o (.text) common/console.o (.text) common/main.o (.text) - lib_generic/libgeneric.a (.text) + lib/libgeneric.a (.text) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.text) diff --git a/board/freescale/m5249evb/u-boot.lds b/board/freescale/m5249evb/u-boot.lds index 54e016953..f87d3cb72 100644 --- a/board/freescale/m5249evb/u-boot.lds +++ b/board/freescale/m5249evb/u-boot.lds @@ -59,7 +59,7 @@ SECTIONS arch/m68k/lib/traps.o (.text) cpu/mcf52x2/interrupts.o (.text) common/dlmalloc.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.text) diff --git a/board/freescale/m5253demo/u-boot.lds b/board/freescale/m5253demo/u-boot.lds index e53e67de9..455e9b8fd 100644 --- a/board/freescale/m5253demo/u-boot.lds +++ b/board/freescale/m5253demo/u-boot.lds @@ -59,7 +59,7 @@ SECTIONS arch/m68k/lib/traps.o (.text) cpu/mcf52x2/interrupts.o (.text) common/dlmalloc.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.text) diff --git a/board/freescale/m5253evbe/u-boot.lds b/board/freescale/m5253evbe/u-boot.lds index 7f4dc2714..99c125cb9 100644 --- a/board/freescale/m5253evbe/u-boot.lds +++ b/board/freescale/m5253evbe/u-boot.lds @@ -59,7 +59,7 @@ SECTIONS arch/m68k/lib/traps.o (.text) cpu/mcf52x2/interrupts.o (.text) common/dlmalloc.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.text) diff --git a/board/freescale/m5271evb/u-boot.lds b/board/freescale/m5271evb/u-boot.lds index 713b18a95..588a12847 100644 --- a/board/freescale/m5271evb/u-boot.lds +++ b/board/freescale/m5271evb/u-boot.lds @@ -60,7 +60,7 @@ SECTIONS arch/m68k/lib/traps.o (.text) cpu/mcf52x2/interrupts.o (.text) common/dlmalloc.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.ppcenv) diff --git a/board/freescale/m5272c3/u-boot.lds b/board/freescale/m5272c3/u-boot.lds index 446ec1be4..aaba5a368 100644 --- a/board/freescale/m5272c3/u-boot.lds +++ b/board/freescale/m5272c3/u-boot.lds @@ -59,7 +59,7 @@ SECTIONS arch/m68k/lib/traps.o (.text) cpu/mcf52x2/interrupts.o (.text) common/dlmalloc.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.text) diff --git a/board/freescale/m5275evb/u-boot.lds b/board/freescale/m5275evb/u-boot.lds index daf8724ae..700b9f509 100644 --- a/board/freescale/m5275evb/u-boot.lds +++ b/board/freescale/m5275evb/u-boot.lds @@ -57,8 +57,8 @@ SECTIONS cpu/mcf52x2/start.o (.text) common/dlmalloc.o (.text) - lib_generic/string.o (.text) - lib_generic/zlib.o (.text) + lib/string.o (.text) + lib/zlib.o (.text) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o(.text) diff --git a/board/freescale/m5282evb/u-boot.lds b/board/freescale/m5282evb/u-boot.lds index f46e0251e..e936adff1 100644 --- a/board/freescale/m5282evb/u-boot.lds +++ b/board/freescale/m5282evb/u-boot.lds @@ -57,9 +57,9 @@ SECTIONS cpu/mcf52x2/start.o (.text) common/dlmalloc.o (.text) - lib_generic/string.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/string.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o(.text) diff --git a/board/freescale/m53017evb/u-boot.lds b/board/freescale/m53017evb/u-boot.lds index fe0e3141f..a725da15e 100644 --- a/board/freescale/m53017evb/u-boot.lds +++ b/board/freescale/m53017evb/u-boot.lds @@ -59,7 +59,7 @@ SECTIONS cpu/mcf532x/libmcf532x.a (.text) arch/m68k/lib/libm68k.a (.text) common/dlmalloc.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.text) diff --git a/board/freescale/m5329evb/u-boot.lds b/board/freescale/m5329evb/u-boot.lds index 0ed87ff30..bf4f1889c 100644 --- a/board/freescale/m5329evb/u-boot.lds +++ b/board/freescale/m5329evb/u-boot.lds @@ -59,7 +59,7 @@ SECTIONS arch/m68k/lib/traps.o (.text) arch/m68k/lib/interrupts.o (.text) common/dlmalloc.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.text) diff --git a/board/freescale/m5373evb/u-boot.lds b/board/freescale/m5373evb/u-boot.lds index 605452b70..c129ac268 100644 --- a/board/freescale/m5373evb/u-boot.lds +++ b/board/freescale/m5373evb/u-boot.lds @@ -59,7 +59,7 @@ SECTIONS arch/m68k/lib/traps.o (.text) arch/m68k/lib/interrupts.o (.text) common/dlmalloc.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.text) diff --git a/board/freescale/m54451evb/u-boot.spa b/board/freescale/m54451evb/u-boot.spa index 569518b89..e63b1f2e9 100644 --- a/board/freescale/m54451evb/u-boot.spa +++ b/board/freescale/m54451evb/u-boot.spa @@ -62,7 +62,7 @@ SECTIONS common/dlmalloc.o (.text) common/main.o (.text) common/image.o (.text) - lib_generic/libgeneric.a (.text) + lib/libgeneric.a (.text) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.text) diff --git a/board/freescale/m54451evb/u-boot.stm b/board/freescale/m54451evb/u-boot.stm index 1b06b12b9..7c3f0684c 100644 --- a/board/freescale/m54451evb/u-boot.stm +++ b/board/freescale/m54451evb/u-boot.stm @@ -64,7 +64,7 @@ SECTIONS arch/m68k/lib/board.o (.text) common/serial.o (.text) common/console.o (.text) - lib_generic/display_options.o (.text) + lib/display_options.o (.text) board/freescale/m54455evb/m54455evb.o (.text) . = DEFINED(env_offset) ? env_offset : .; diff --git a/board/freescale/m54455evb/u-boot.atm b/board/freescale/m54455evb/u-boot.atm index c48dd7522..2dd8a2318 100644 --- a/board/freescale/m54455evb/u-boot.atm +++ b/board/freescale/m54455evb/u-boot.atm @@ -59,7 +59,7 @@ SECTIONS arch/m68k/lib/traps.o (.text) arch/m68k/lib/interrupts.o (.text) common/dlmalloc.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.text) diff --git a/board/freescale/m54455evb/u-boot.int b/board/freescale/m54455evb/u-boot.int index ef0717426..8e54d7918 100644 --- a/board/freescale/m54455evb/u-boot.int +++ b/board/freescale/m54455evb/u-boot.int @@ -59,7 +59,7 @@ SECTIONS arch/m68k/lib/traps.o (.text) arch/m68k/lib/interrupts.o (.text) common/dlmalloc.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) *(.text) *(.fixup) diff --git a/board/freescale/mpc8610hpcd/u-boot.lds b/board/freescale/mpc8610hpcd/u-boot.lds index 2ad0f0e6a..67847f106 100644 --- a/board/freescale/mpc8610hpcd/u-boot.lds +++ b/board/freescale/mpc8610hpcd/u-boot.lds @@ -57,9 +57,9 @@ SECTIONS cpu/mpc86xx/cpu.o (.text) cpu/mpc86xx/speed.o (.text) common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) *(.text) *(.got1) } diff --git a/board/freescale/mpc8641hpcn/u-boot.lds b/board/freescale/mpc8641hpcn/u-boot.lds index 796828a37..20e03447f 100644 --- a/board/freescale/mpc8641hpcn/u-boot.lds +++ b/board/freescale/mpc8641hpcn/u-boot.lds @@ -57,9 +57,9 @@ SECTIONS cpu/mpc86xx/cpu.o (.text) cpu/mpc86xx/speed.o (.text) common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) drivers/bios_emulator/atibios.o (.text) *(.text) *(.got1) diff --git a/board/genietv/u-boot.lds b/board/genietv/u-boot.lds index 9fc71a2c5..1bd1ba70c 100644 --- a/board/genietv/u-boot.lds +++ b/board/genietv/u-boot.lds @@ -58,9 +58,9 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/genietv/u-boot.lds.debug b/board/genietv/u-boot.lds.debug index 9bb2c58f7..c0dd67f05 100644 --- a/board/genietv/u-boot.lds.debug +++ b/board/genietv/u-boot.lds.debug @@ -58,9 +58,9 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/hermes/u-boot.lds b/board/hermes/u-boot.lds index 1252baf41..1f6e7d6c9 100644 --- a/board/hermes/u-boot.lds +++ b/board/hermes/u-boot.lds @@ -61,7 +61,7 @@ SECTIONS arch/ppc/lib/time.o (.text) arch/ppc/lib/ticks.o (.text) arch/ppc/lib/cache.o (.text) - lib_generic/crc32.o (.text) + lib/crc32.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/hymod/u-boot.lds b/board/hymod/u-boot.lds index cc32b4462..965716f71 100644 --- a/board/hymod/u-boot.lds +++ b/board/hymod/u-boot.lds @@ -59,9 +59,9 @@ SECTIONS /* common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) . = env_offset; */ diff --git a/board/hymod/u-boot.lds.debug b/board/hymod/u-boot.lds.debug index a2d940f04..f559df716 100644 --- a/board/hymod/u-boot.lds.debug +++ b/board/hymod/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/icu862/u-boot.lds b/board/icu862/u-boot.lds index b614262b8..d7d0fb3df 100644 --- a/board/icu862/u-boot.lds +++ b/board/icu862/u-boot.lds @@ -60,9 +60,9 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/icu862/u-boot.lds.debug b/board/icu862/u-boot.lds.debug index 919eb2194..282738bd5 100644 --- a/board/icu862/u-boot.lds.debug +++ b/board/icu862/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) . = env_offset; diff --git a/board/idmr/u-boot.lds b/board/idmr/u-boot.lds index 713b18a95..588a12847 100644 --- a/board/idmr/u-boot.lds +++ b/board/idmr/u-boot.lds @@ -60,7 +60,7 @@ SECTIONS arch/m68k/lib/traps.o (.text) cpu/mcf52x2/interrupts.o (.text) common/dlmalloc.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.ppcenv) diff --git a/board/ivm/u-boot.lds.debug b/board/ivm/u-boot.lds.debug index 17965a05c..037785e7d 100644 --- a/board/ivm/u-boot.lds.debug +++ b/board/ivm/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) . = env_offset; diff --git a/board/keymile/km8xx/u-boot.lds b/board/keymile/km8xx/u-boot.lds index 8b6305a55..759072df9 100644 --- a/board/keymile/km8xx/u-boot.lds +++ b/board/keymile/km8xx/u-boot.lds @@ -59,9 +59,9 @@ SECTIONS cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) arch/ppc/lib/cache.o (.text) arch/ppc/lib/time.o (.text) diff --git a/board/kup/kup4k/u-boot.lds b/board/kup/kup4k/u-boot.lds index 8e4faa15b..e1233a748 100644 --- a/board/kup/kup4k/u-boot.lds +++ b/board/kup/kup4k/u-boot.lds @@ -60,9 +60,9 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/kup/kup4k/u-boot.lds.debug b/board/kup/kup4k/u-boot.lds.debug index 83fdc1501..3b61a4256 100644 --- a/board/kup/kup4k/u-boot.lds.debug +++ b/board/kup/kup4k/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/kup/kup4x/u-boot.lds b/board/kup/kup4x/u-boot.lds index 8e4faa15b..e1233a748 100644 --- a/board/kup/kup4x/u-boot.lds +++ b/board/kup/kup4x/u-boot.lds @@ -60,9 +60,9 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/kup/kup4x/u-boot.lds.debug b/board/kup/kup4x/u-boot.lds.debug index 83fdc1501..3b61a4256 100644 --- a/board/kup/kup4x/u-boot.lds.debug +++ b/board/kup/kup4x/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/lantec/u-boot.lds b/board/lantec/u-boot.lds index 814a7a69d..50bdfb457 100644 --- a/board/lantec/u-boot.lds +++ b/board/lantec/u-boot.lds @@ -58,9 +58,9 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/lantec/u-boot.lds.debug b/board/lantec/u-boot.lds.debug index 3b4799e1e..be06235c0 100644 --- a/board/lantec/u-boot.lds.debug +++ b/board/lantec/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/lwmon/u-boot.lds.debug b/board/lwmon/u-boot.lds.debug index 49f897213..251ee9bbd 100644 --- a/board/lwmon/u-boot.lds.debug +++ b/board/lwmon/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) . = env_offset; diff --git a/board/mbx8xx/u-boot.lds.debug b/board/mbx8xx/u-boot.lds.debug index 8d91aed3f..4f179c7fa 100644 --- a/board/mbx8xx/u-boot.lds.debug +++ b/board/mbx8xx/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) . = env_offset; diff --git a/board/ml2/u-boot.lds b/board/ml2/u-boot.lds index 0083a211d..e68cfb81a 100644 --- a/board/ml2/u-boot.lds +++ b/board/ml2/u-boot.lds @@ -64,9 +64,9 @@ SECTIONS cpu/ppc4xx/cpu_init.o (.text) cpu/ppc4xx/speed.o (.text) common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) /* . = env_offset;*/ /* common/env_embedded.o(.text)*/ diff --git a/board/ml2/u-boot.lds.debug b/board/ml2/u-boot.lds.debug index 40d2f78ea..09c0191e5 100644 --- a/board/ml2/u-boot.lds.debug +++ b/board/ml2/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) common/env_embedded.o(.text) diff --git a/board/mousse/u-boot.lds b/board/mousse/u-boot.lds index c92a2abe2..f6930b538 100644 --- a/board/mousse/u-boot.lds +++ b/board/mousse/u-boot.lds @@ -55,9 +55,9 @@ SECTIONS cpu/mpc824x/start.o (.text) arch/ppc/lib/board.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) *(.got1) . = ALIGN(16); diff --git a/board/mousse/u-boot.lds.rom b/board/mousse/u-boot.lds.rom index 9750fc5f1..8355f335e 100644 --- a/board/mousse/u-boot.lds.rom +++ b/board/mousse/u-boot.lds.rom @@ -55,9 +55,9 @@ SECTIONS cpu/mpc824x/start.o (.text) common/board.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) . = env_offset; common/env_embedded.o (.text) diff --git a/board/mpl/pip405/u-boot.lds.debug b/board/mpl/pip405/u-boot.lds.debug index 40d2f78ea..09c0191e5 100644 --- a/board/mpl/pip405/u-boot.lds.debug +++ b/board/mpl/pip405/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) common/env_embedded.o(.text) diff --git a/board/netphone/u-boot.lds b/board/netphone/u-boot.lds index 4b17a1f76..8f96b1de6 100644 --- a/board/netphone/u-boot.lds +++ b/board/netphone/u-boot.lds @@ -56,9 +56,9 @@ SECTIONS cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) arch/ppc/lib/cache.o (.text) arch/ppc/lib/time.o (.text) diff --git a/board/netphone/u-boot.lds.debug b/board/netphone/u-boot.lds.debug index 4ef16f1ff..139751177 100644 --- a/board/netphone/u-boot.lds.debug +++ b/board/netphone/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/netstar/Makefile b/board/netstar/Makefile index c43576296..5773c13f4 100644 --- a/board/netstar/Makefile +++ b/board/netstar/Makefile @@ -72,7 +72,7 @@ $(obj)crcit: $(obj)crcit.o $(obj)crc32.o $(obj)crcit.o: crcit.c $(HOSTCC) $(HOSTCFLAGS) -o $@ -c $< -$(obj)crc32.o: $(SRCTREE)/lib_generic/crc32.c +$(obj)crc32.o: $(SRCTREE)/lib/crc32.c $(HOSTCC) $(HOSTCFLAGS) -DUSE_HOSTCC -I$(TOPDIR)/include \ -o $@ -c $< diff --git a/board/netta/u-boot.lds b/board/netta/u-boot.lds index 991d7a1a9..ff11ad0f6 100644 --- a/board/netta/u-boot.lds +++ b/board/netta/u-boot.lds @@ -56,9 +56,9 @@ SECTIONS cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) arch/ppc/lib/cache.o (.text) arch/ppc/lib/time.o (.text) diff --git a/board/netta/u-boot.lds.debug b/board/netta/u-boot.lds.debug index 4ef16f1ff..139751177 100644 --- a/board/netta/u-boot.lds.debug +++ b/board/netta/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/netta2/u-boot.lds b/board/netta2/u-boot.lds index 991d7a1a9..ff11ad0f6 100644 --- a/board/netta2/u-boot.lds +++ b/board/netta2/u-boot.lds @@ -56,9 +56,9 @@ SECTIONS cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) arch/ppc/lib/cache.o (.text) arch/ppc/lib/time.o (.text) diff --git a/board/netta2/u-boot.lds.debug b/board/netta2/u-boot.lds.debug index 4ef16f1ff..139751177 100644 --- a/board/netta2/u-boot.lds.debug +++ b/board/netta2/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/netvia/u-boot.lds b/board/netvia/u-boot.lds index 7eb01ee72..70d5a6a0d 100644 --- a/board/netvia/u-boot.lds +++ b/board/netvia/u-boot.lds @@ -56,9 +56,9 @@ SECTIONS cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) arch/ppc/lib/cache.o (.text) arch/ppc/lib/time.o (.text) diff --git a/board/netvia/u-boot.lds.debug b/board/netvia/u-boot.lds.debug index c3c99b35c..bc8f32e0f 100644 --- a/board/netvia/u-boot.lds.debug +++ b/board/netvia/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/nx823/u-boot.lds.debug b/board/nx823/u-boot.lds.debug index ad3695391..d55bf33b8 100644 --- a/board/nx823/u-boot.lds.debug +++ b/board/nx823/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/purple/u-boot.lds b/board/purple/u-boot.lds index 04a641a47..236ece478 100644 --- a/board/purple/u-boot.lds +++ b/board/purple/u-boot.lds @@ -40,7 +40,7 @@ SECTIONS common/main.o (.text) common/dlmalloc.o (.text) common/cmd_boot.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.ppcenv) diff --git a/board/quantum/u-boot.lds b/board/quantum/u-boot.lds index c354ff828..09d9470f7 100644 --- a/board/quantum/u-boot.lds +++ b/board/quantum/u-boot.lds @@ -58,9 +58,9 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) /* XXX ? . = env_offset; */ diff --git a/board/quantum/u-boot.lds.debug b/board/quantum/u-boot.lds.debug index ec01fe256..dcad81892 100644 --- a/board/quantum/u-boot.lds.debug +++ b/board/quantum/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/rbc823/u-boot.lds b/board/rbc823/u-boot.lds index 6074c14ba..15aca6c62 100644 --- a/board/rbc823/u-boot.lds +++ b/board/rbc823/u-boot.lds @@ -58,9 +58,9 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/rmu/u-boot.lds b/board/rmu/u-boot.lds index c354ff828..09d9470f7 100644 --- a/board/rmu/u-boot.lds +++ b/board/rmu/u-boot.lds @@ -58,9 +58,9 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) /* XXX ? . = env_offset; */ diff --git a/board/rmu/u-boot.lds.debug b/board/rmu/u-boot.lds.debug index ec01fe256..dcad81892 100644 --- a/board/rmu/u-boot.lds.debug +++ b/board/rmu/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/sandburst/karef/u-boot.lds.debug b/board/sandburst/karef/u-boot.lds.debug index 1d8ce105e..34dce838f 100644 --- a/board/sandburst/karef/u-boot.lds.debug +++ b/board/sandburst/karef/u-boot.lds.debug @@ -66,9 +66,9 @@ SECTIONS cpu/ppc4xx/speed.o (.text) drivers/net/4xx_enet.o (.text) common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) /* common/env_embedded.o(.text) */ diff --git a/board/sandburst/metrobox/u-boot.lds.debug b/board/sandburst/metrobox/u-boot.lds.debug index bbfea131e..fa976c2e5 100644 --- a/board/sandburst/metrobox/u-boot.lds.debug +++ b/board/sandburst/metrobox/u-boot.lds.debug @@ -66,9 +66,9 @@ SECTIONS cpu/ppc4xx/speed.o (.text) drivers/net/4xx_enet.o (.text) common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) /* common/env_embedded.o(.text) */ diff --git a/board/sbc8641d/u-boot.lds b/board/sbc8641d/u-boot.lds index 648efa285..7f0412464 100644 --- a/board/sbc8641d/u-boot.lds +++ b/board/sbc8641d/u-boot.lds @@ -57,9 +57,9 @@ SECTIONS cpu/mpc86xx/cpu.o (.text) cpu/mpc86xx/speed.o (.text) common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) *(.text) *(.got1) } diff --git a/board/sc3/u-boot.lds b/board/sc3/u-boot.lds index 04b350aab..fc7464eee 100644 --- a/board/sc3/u-boot.lds +++ b/board/sc3/u-boot.lds @@ -69,9 +69,9 @@ SECTIONS cpu/ppc4xx/cpu_init.o (.text) cpu/ppc4xx/speed.o (.text) common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) /* . = env_offset;*/ /* common/env_embedded.o(.text)*/ diff --git a/board/siemens/CCM/u-boot.lds b/board/siemens/CCM/u-boot.lds index 0571f025a..51e95d555 100644 --- a/board/siemens/CCM/u-boot.lds +++ b/board/siemens/CCM/u-boot.lds @@ -58,9 +58,9 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/siemens/CCM/u-boot.lds.debug b/board/siemens/CCM/u-boot.lds.debug index 29657e93e..2a6abfab3 100644 --- a/board/siemens/CCM/u-boot.lds.debug +++ b/board/siemens/CCM/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) /* . = env_offset; common/env_embedded.o(.text) diff --git a/board/siemens/pcu_e/u-boot.lds.debug b/board/siemens/pcu_e/u-boot.lds.debug index 49f897213..251ee9bbd 100644 --- a/board/siemens/pcu_e/u-boot.lds.debug +++ b/board/siemens/pcu_e/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) . = env_offset; diff --git a/board/snmc/qs850/u-boot.lds b/board/snmc/qs850/u-boot.lds index ce115f59e..271d74a5c 100644 --- a/board/snmc/qs850/u-boot.lds +++ b/board/snmc/qs850/u-boot.lds @@ -59,9 +59,9 @@ SECTIONS cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) arch/ppc/lib/cache.o (.text) arch/ppc/lib/time.o (.text) diff --git a/board/snmc/qs860t/u-boot.lds b/board/snmc/qs860t/u-boot.lds index ce115f59e..271d74a5c 100644 --- a/board/snmc/qs860t/u-boot.lds +++ b/board/snmc/qs860t/u-boot.lds @@ -59,9 +59,9 @@ SECTIONS cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) arch/ppc/lib/cache.o (.text) arch/ppc/lib/time.o (.text) diff --git a/board/spc1920/u-boot.lds b/board/spc1920/u-boot.lds index 172cfbbc8..f95f695b1 100644 --- a/board/spc1920/u-boot.lds +++ b/board/spc1920/u-boot.lds @@ -59,9 +59,9 @@ SECTIONS cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) arch/ppc/lib/cache.o (.text) arch/ppc/lib/time.o (.text) diff --git a/board/spd8xx/u-boot.lds.debug b/board/spd8xx/u-boot.lds.debug index 8d91aed3f..4f179c7fa 100644 --- a/board/spd8xx/u-boot.lds.debug +++ b/board/spd8xx/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) . = env_offset; diff --git a/board/stx/stxxtc/u-boot.lds b/board/stx/stxxtc/u-boot.lds index 991d7a1a9..ff11ad0f6 100644 --- a/board/stx/stxxtc/u-boot.lds +++ b/board/stx/stxxtc/u-boot.lds @@ -56,9 +56,9 @@ SECTIONS cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) arch/ppc/lib/cache.o (.text) arch/ppc/lib/time.o (.text) diff --git a/board/stx/stxxtc/u-boot.lds.debug b/board/stx/stxxtc/u-boot.lds.debug index 4ef16f1ff..139751177 100644 --- a/board/stx/stxxtc/u-boot.lds.debug +++ b/board/stx/stxxtc/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/svm_sc8xx/u-boot.lds b/board/svm_sc8xx/u-boot.lds index cf7820001..6de74887c 100644 --- a/board/svm_sc8xx/u-boot.lds +++ b/board/svm_sc8xx/u-boot.lds @@ -59,9 +59,9 @@ SECTIONS cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) arch/ppc/lib/cache.o (.text) arch/ppc/lib/time.o (.text) diff --git a/board/svm_sc8xx/u-boot.lds.debug b/board/svm_sc8xx/u-boot.lds.debug index ec01fe256..dcad81892 100644 --- a/board/svm_sc8xx/u-boot.lds.debug +++ b/board/svm_sc8xx/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/tcm-bf518/config.mk b/board/tcm-bf518/config.mk index fb93531f7..3f9d41f37 100644 --- a/board/tcm-bf518/config.mk +++ b/board/tcm-bf518/config.mk @@ -26,8 +26,8 @@ # This is not actually used for Blackfin boards so do not change it #TEXT_BASE = do-not-use-me -CFLAGS_lib_generic += -O2 -CFLAGS_lib_generic/lzma += -O2 +CFLAGS_lib += -O2 +CFLAGS_lib/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE)) diff --git a/board/tcm-bf537/config.mk b/board/tcm-bf537/config.mk index b50e1f2c8..bc046f129 100644 --- a/board/tcm-bf537/config.mk +++ b/board/tcm-bf537/config.mk @@ -26,8 +26,8 @@ # This is not actually used for Blackfin boards so do not change it #TEXT_BASE = do-not-use-me -CFLAGS_lib_generic += -O2 -CFLAGS_lib_generic/lzma += -O2 +CFLAGS_lib += -O2 +CFLAGS_lib/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 diff --git a/board/tqc/tqm8xx/u-boot.lds b/board/tqc/tqm8xx/u-boot.lds index 9f452c1c8..ceaac0005 100644 --- a/board/tqc/tqm8xx/u-boot.lds +++ b/board/tqc/tqm8xx/u-boot.lds @@ -59,9 +59,9 @@ SECTIONS cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) arch/ppc/lib/cache.o (.text) . = DEFINED(env_offset) ? env_offset : .; diff --git a/board/tqc/tqm8xx/u-boot.lds.debug b/board/tqc/tqm8xx/u-boot.lds.debug index a2d940f04..f559df716 100644 --- a/board/tqc/tqm8xx/u-boot.lds.debug +++ b/board/tqc/tqm8xx/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/trab/Makefile b/board/trab/Makefile index 27d75f3a0..0b13dc475 100644 --- a/board/trab/Makefile +++ b/board/trab/Makefile @@ -48,7 +48,7 @@ $(LIB): $(obj).depend $(OBJS) $(SOBJS) $(obj)trab_fkt.srec: $(OBJS_FKT) $(LIB) $(LD) -g -Ttext $(LOAD_ADDR) -o $(<:.o=) -e trab_fkt $^ $(LIB) \ -L$(obj)../../examples/standalone -lstubs \ - -L$(obj)../../lib_generic -lgeneric \ + -L$(obj)../../lib -lgeneric \ $(PLATFORM_LIBS) $(OBJCOPY) -O srec $(<:.o=) $@ diff --git a/board/trab/u-boot.lds b/board/trab/u-boot.lds index c3d5c49a9..05b929f56 100644 --- a/board/trab/u-boot.lds +++ b/board/trab/u-boot.lds @@ -33,9 +33,9 @@ SECTIONS .text : { cpu/arm920t/start.o (.text) - lib_generic/zlib.o (.text) - lib_generic/crc32.o (.text) - lib_generic/string.o (.text) + lib/zlib.o (.text) + lib/crc32.o (.text) + lib/string.o (.text) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.ppcenv) diff --git a/board/uc100/u-boot.lds b/board/uc100/u-boot.lds index 967e4322c..960b2a582 100644 --- a/board/uc100/u-boot.lds +++ b/board/uc100/u-boot.lds @@ -59,9 +59,9 @@ SECTIONS cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) arch/ppc/lib/cache.o (.text) arch/ppc/lib/time.o (.text) diff --git a/board/uc100/u-boot.lds.debug b/board/uc100/u-boot.lds.debug index edaa4020a..116a97208 100644 --- a/board/uc100/u-boot.lds.debug +++ b/board/uc100/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) common/env_embedded.o(.text) diff --git a/board/v37/u-boot.lds b/board/v37/u-boot.lds index c3dd8c7ab..248f4887c 100644 --- a/board/v37/u-boot.lds +++ b/board/v37/u-boot.lds @@ -59,9 +59,9 @@ SECTIONS cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) arch/ppc/lib/cache.o (.text) arch/ppc/lib/time.o (.text) diff --git a/board/w7o/u-boot.lds.debug b/board/w7o/u-boot.lds.debug index 85b1cd69d..369c15a18 100644 --- a/board/w7o/u-boot.lds.debug +++ b/board/w7o/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) common/env_embedded.o(.text) diff --git a/board/westel/amx860/u-boot.lds b/board/westel/amx860/u-boot.lds index 0571f025a..51e95d555 100644 --- a/board/westel/amx860/u-boot.lds +++ b/board/westel/amx860/u-boot.lds @@ -58,9 +58,9 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/westel/amx860/u-boot.lds.debug b/board/westel/amx860/u-boot.lds.debug index 919eb2194..282738bd5 100644 --- a/board/westel/amx860/u-boot.lds.debug +++ b/board/westel/amx860/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) . = env_offset; diff --git a/board/xes/xpedite1000/u-boot.lds.debug b/board/xes/xpedite1000/u-boot.lds.debug index 0830d0aa1..555e1ac03 100644 --- a/board/xes/xpedite1000/u-boot.lds.debug +++ b/board/xes/xpedite1000/u-boot.lds.debug @@ -64,9 +64,9 @@ SECTIONS cpu/ppc4xx/cpu_init.o (.text) cpu/ppc4xx/speed.o (.text) common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) /* common/env_embedded.o(.text) */ diff --git a/board/xes/xpedite5170/u-boot.lds b/board/xes/xpedite5170/u-boot.lds index 648efa285..7f0412464 100644 --- a/board/xes/xpedite5170/u-boot.lds +++ b/board/xes/xpedite5170/u-boot.lds @@ -57,9 +57,9 @@ SECTIONS cpu/mpc86xx/cpu.o (.text) cpu/mpc86xx/speed.o (.text) common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) *(.text) *(.got1) } diff --git a/cpu/mpc5xxx/u-boot-customlayout.lds b/cpu/mpc5xxx/u-boot-customlayout.lds index c08c9c923..6c80139f2 100644 --- a/cpu/mpc5xxx/u-boot-customlayout.lds +++ b/cpu/mpc5xxx/u-boot-customlayout.lds @@ -57,7 +57,7 @@ SECTIONS cpu/mpc5xxx/start.o (.text) cpu/mpc5xxx/traps.o (.text) - lib_generic/crc32.o (.text) + lib/crc32.o (.text) arch/ppc/lib/cache.o (.text) arch/ppc/lib/time.o (.text) diff --git a/examples/api/Makefile b/examples/api/Makefile index 62751ece9..bed16f155 100644 --- a/examples/api/Makefile +++ b/examples/api/Makefile @@ -40,12 +40,12 @@ COBJ_FILES-$(CONFIG_API) += glue.o COBJ_FILES-$(CONFIG_API) += libgenwrap.o # Source files which exist outside the examples/api directory -EXT_COBJ_FILES-$(CONFIG_API) += lib_generic/crc32.o -EXT_COBJ_FILES-$(CONFIG_API) += lib_generic/ctype.o -EXT_COBJ_FILES-$(CONFIG_API) += lib_generic/div64.o -EXT_COBJ_FILES-$(CONFIG_API) += lib_generic/string.o -EXT_COBJ_FILES-$(CONFIG_API) += lib_generic/time.o -EXT_COBJ_FILES-$(CONFIG_API) += lib_generic/vsprintf.o +EXT_COBJ_FILES-$(CONFIG_API) += lib/crc32.o +EXT_COBJ_FILES-$(CONFIG_API) += lib/ctype.o +EXT_COBJ_FILES-$(CONFIG_API) += lib/div64.o +EXT_COBJ_FILES-$(CONFIG_API) += lib/string.o +EXT_COBJ_FILES-$(CONFIG_API) += lib/time.o +EXT_COBJ_FILES-$(CONFIG_API) += lib/vsprintf.o ifeq ($(ARCH),ppc) EXT_SOBJ_FILES-$(CONFIG_API) += arch/ppc/lib/ppcstring.o endif @@ -75,7 +75,7 @@ $(OUTPUT): $(OBJS) $(OBJCOPY) -O binary $@ $(OUTPUT).bin 2>/dev/null # Rule to build generic library C files -$(obj)%.o: $(SRCTREE)/lib_generic/%.c +$(obj)%.o: $(SRCTREE)/lib/%.c $(CC) -g $(CFLAGS) -c -o $@ $< # Rule to build architecture-specific library assembly files diff --git a/examples/api/libgenwrap.c b/examples/api/libgenwrap.c index 2b107d979..b435ddecb 100644 --- a/examples/api/libgenwrap.c +++ b/examples/api/libgenwrap.c @@ -23,7 +23,7 @@ * * * This is is a set of wrappers/stubs that allow to use certain routines from - * U-Boot's lib_generic in the standalone app. This way way we can re-use + * U-Boot's lib in the standalone app. This way way we can re-use * existing code e.g. operations on strings and similar. * */ diff --git a/include/common.h b/include/common.h index 7aa910dc9..df956bbb4 100644 --- a/include/common.h +++ b/include/common.h @@ -620,22 +620,22 @@ ulong usec2ticks (unsigned long usec); ulong ticks2usec (unsigned long ticks); int init_timebase (void); -/* lib_generic/gunzip.c */ +/* lib/gunzip.c */ int gunzip(void *, int, unsigned char *, unsigned long *); int zunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp, int stoponerr, int offset); -/* lib_generic/net_utils.c */ +/* lib/net_utils.c */ #include static inline IPaddr_t getenv_IPaddr (char *var) { return (string_to_ip(getenv(var))); } -/* lib_generic/time.c */ +/* lib/time.c */ void udelay (unsigned long); -/* lib_generic/vsprintf.c */ +/* lib/vsprintf.c */ ulong simple_strtoul(const char *cp,char **endp,unsigned int base); unsigned long long simple_strtoull(const char *cp,char **endp,unsigned int base); long simple_strtol(const char *cp,char **endp,unsigned int base); @@ -645,10 +645,10 @@ int sprintf(char * buf, const char *fmt, ...) __attribute__ ((format (__printf__, 2, 3))); int vsprintf(char *buf, const char *fmt, va_list args); -/* lib_generic/strmhz.c */ +/* lib/strmhz.c */ char * strmhz(char *buf, long hz); -/* lib_generic/crc32.c */ +/* lib/crc32.c */ #include /* common/console.c */ diff --git a/include/configs/bf533-stamp.h b/include/configs/bf533-stamp.h index 083c03017..0b94f559f 100644 --- a/include/configs/bf533-stamp.h +++ b/include/configs/bf533-stamp.h @@ -130,7 +130,7 @@ cpu/blackfin/interrupt.o (.text .text.*); \ cpu/blackfin/serial.o (.text .text.*); \ common/dlmalloc.o (.text .text.*); \ - lib_generic/crc32.o (.text .text.*); \ + lib/crc32.o (.text .text.*); \ . = DEFINED(env_offset) ? env_offset : .; \ common/env_embedded.o (.text .text.*); #endif diff --git a/include/configs/bf537-pnav.h b/include/configs/bf537-pnav.h index 6627a04f5..8038c40de 100644 --- a/include/configs/bf537-pnav.h +++ b/include/configs/bf537-pnav.h @@ -116,7 +116,7 @@ cpu/blackfin/interrupt.o (.text .text.*); \ cpu/blackfin/serial.o (.text .text.*); \ common/dlmalloc.o (.text .text.*); \ - lib_generic/crc32.o (.text .text.*); \ + lib/crc32.o (.text .text.*); \ . = DEFINED(env_offset) ? env_offset : .; \ common/env_embedded.o (.text .text.*); #endif diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h index d3159e59d..0f8679b57 100644 --- a/include/configs/bf537-stamp.h +++ b/include/configs/bf537-stamp.h @@ -126,7 +126,7 @@ cpu/blackfin/interrupt.o (.text .text.*); \ cpu/blackfin/serial.o (.text .text.*); \ common/dlmalloc.o (.text .text.*); \ - lib_generic/crc32.o (.text .text.*); \ + lib/crc32.o (.text .text.*); \ . = DEFINED(env_offset) ? env_offset : .; \ common/env_embedded.o (.text .text.*); #endif diff --git a/include/configs/bf538f-ezkit.h b/include/configs/bf538f-ezkit.h index 4ea2300f4..696fe29d2 100644 --- a/include/configs/bf538f-ezkit.h +++ b/include/configs/bf538f-ezkit.h @@ -123,7 +123,7 @@ cpu/blackfin/interrupt.o (.text .text.*); \ cpu/blackfin/serial.o (.text .text.*); \ common/dlmalloc.o (.text .text.*); \ - lib_generic/crc32.o (.text .text.*); \ + lib/crc32.o (.text .text.*); \ . = DEFINED(env_offset) ? env_offset : .; \ common/env_embedded.o (.text .text.*); #endif diff --git a/include/configs/bf561-ezkit.h b/include/configs/bf561-ezkit.h index 8ab38bbac..fca6e43b4 100644 --- a/include/configs/bf561-ezkit.h +++ b/include/configs/bf561-ezkit.h @@ -100,8 +100,8 @@ cpu/blackfin/interrupt.o (.text .text.*); \ cpu/blackfin/serial.o (.text .text.*); \ common/dlmalloc.o (.text .text.*); \ - lib_generic/crc32.o (.text .text.*); \ - lib_generic/zlib.o (.text .text.*); \ + lib/crc32.o (.text .text.*); \ + lib/zlib.o (.text .text.*); \ board/bf561-ezkit/bf561-ezkit.o (.text .text.*); \ . = DEFINED(env_offset) ? env_offset : .; \ common/env_embedded.o (.text .text.*); diff --git a/include/configs/cm-bf537e.h b/include/configs/cm-bf537e.h index 0d68ebae2..d86409fcd 100644 --- a/include/configs/cm-bf537e.h +++ b/include/configs/cm-bf537e.h @@ -108,7 +108,7 @@ cpu/blackfin/interrupt.o (.text .text.*); \ cpu/blackfin/serial.o (.text .text.*); \ common/dlmalloc.o (.text .text.*); \ - lib_generic/crc32.o (.text .text.*); \ + lib/crc32.o (.text .text.*); \ . = DEFINED(env_offset) ? env_offset : .; \ common/env_embedded.o (.text .text.*); #endif diff --git a/include/configs/cm-bf537u.h b/include/configs/cm-bf537u.h index c1179b0ae..6be9dbad8 100644 --- a/include/configs/cm-bf537u.h +++ b/include/configs/cm-bf537u.h @@ -109,7 +109,7 @@ cpu/blackfin/interrupt.o (.text .text.*); \ cpu/blackfin/serial.o (.text .text.*); \ common/dlmalloc.o (.text .text.*); \ - lib_generic/crc32.o (.text .text.*); \ + lib/crc32.o (.text .text.*); \ . = DEFINED(env_offset) ? env_offset : .; \ common/env_embedded.o (.text .text.*); #endif diff --git a/include/configs/ibf-dsp561.h b/include/configs/ibf-dsp561.h index 7c9f71e88..6fa8cf7a9 100644 --- a/include/configs/ibf-dsp561.h +++ b/include/configs/ibf-dsp561.h @@ -88,8 +88,8 @@ cpu/blackfin/interrupt.o (.text .text.*); \ cpu/blackfin/serial.o (.text .text.*); \ common/dlmalloc.o (.text .text.*); \ - lib_generic/crc32.o (.text .text.*); \ - lib_generic/zlib.o (.text .text.*); \ + lib/crc32.o (.text .text.*); \ + lib/zlib.o (.text .text.*); \ board/ibf-dsp561/ibf-dsp561.o (.text .text.*); \ . = DEFINED(env_offset) ? env_offset : .; \ common/env_embedded.o (.text .text.*); diff --git a/include/configs/tcm-bf537.h b/include/configs/tcm-bf537.h index 5a5fbddac..e9dfcc95f 100644 --- a/include/configs/tcm-bf537.h +++ b/include/configs/tcm-bf537.h @@ -109,7 +109,7 @@ cpu/blackfin/interrupt.o (.text .text.*); \ cpu/blackfin/serial.o (.text .text.*); \ common/dlmalloc.o (.text .text.*); \ - lib_generic/crc32.o (.text .text.*); \ + lib/crc32.o (.text .text.*); \ . = DEFINED(env_offset) ? env_offset : .; \ common/env_embedded.o (.text .text.*); #endif diff --git a/include/lzma/LzmaDec.h b/include/lzma/LzmaDec.h index 967cdd101..b7ef6d6bc 100644 --- a/include/lzma/LzmaDec.h +++ b/include/lzma/LzmaDec.h @@ -26,6 +26,6 @@ #ifndef __LZMADEC_H__FAKE__ #define __LZMADEC_H__FAKE__ -#include "../../lib_generic/lzma/LzmaDec.h" +#include "../../lib/lzma/LzmaDec.h" #endif diff --git a/include/lzma/LzmaTools.h b/include/lzma/LzmaTools.h index 87943c033..48b0af84d 100644 --- a/include/lzma/LzmaTools.h +++ b/include/lzma/LzmaTools.h @@ -26,6 +26,6 @@ #ifndef __LZMATOOLS_H__FAKE__ #define __LZMATOOLS_H__FAKE__ -#include "../../lib_generic/lzma/LzmaTools.h" +#include "../../lib/lzma/LzmaTools.h" #endif diff --git a/include/lzma/LzmaTypes.h b/include/lzma/LzmaTypes.h index 86160a42b..740720cfe 100644 --- a/include/lzma/LzmaTypes.h +++ b/include/lzma/LzmaTypes.h @@ -31,6 +31,6 @@ */ #define Byte LZByte -#include "../../lib_generic/lzma/Types.h" +#include "../../lib/lzma/Types.h" #endif diff --git a/include/u-boot/crc.h b/include/u-boot/crc.h index 61bce6791..07badbfc5 100644 --- a/include/u-boot/crc.h +++ b/include/u-boot/crc.h @@ -25,7 +25,7 @@ #ifndef _UBOOT_CRC_H #define _UBOOT_CRC_H -/* lib_generic/crc32.c */ +/* lib/crc32.c */ uint32_t crc32 (uint32_t, const unsigned char *, uint); uint32_t crc32_wd (uint32_t, const unsigned char *, uint, uint); uint32_t crc32_no_comp (uint32_t, const unsigned char *, uint); diff --git a/lib_generic/Makefile b/lib/Makefile similarity index 100% rename from lib_generic/Makefile rename to lib/Makefile diff --git a/lib_generic/addr_map.c b/lib/addr_map.c similarity index 100% rename from lib_generic/addr_map.c rename to lib/addr_map.c diff --git a/lib_generic/bzlib.c b/lib/bzlib.c similarity index 100% rename from lib_generic/bzlib.c rename to lib/bzlib.c diff --git a/lib_generic/bzlib_crctable.c b/lib/bzlib_crctable.c similarity index 100% rename from lib_generic/bzlib_crctable.c rename to lib/bzlib_crctable.c diff --git a/lib_generic/bzlib_decompress.c b/lib/bzlib_decompress.c similarity index 100% rename from lib_generic/bzlib_decompress.c rename to lib/bzlib_decompress.c diff --git a/lib_generic/bzlib_huffman.c b/lib/bzlib_huffman.c similarity index 100% rename from lib_generic/bzlib_huffman.c rename to lib/bzlib_huffman.c diff --git a/lib_generic/bzlib_private.h b/lib/bzlib_private.h similarity index 100% rename from lib_generic/bzlib_private.h rename to lib/bzlib_private.h diff --git a/lib_generic/bzlib_randtable.c b/lib/bzlib_randtable.c similarity index 100% rename from lib_generic/bzlib_randtable.c rename to lib/bzlib_randtable.c diff --git a/lib_generic/circbuf.c b/lib/circbuf.c similarity index 100% rename from lib_generic/circbuf.c rename to lib/circbuf.c diff --git a/lib_generic/crc16.c b/lib/crc16.c similarity index 100% rename from lib_generic/crc16.c rename to lib/crc16.c diff --git a/lib_generic/crc32.c b/lib/crc32.c similarity index 100% rename from lib_generic/crc32.c rename to lib/crc32.c diff --git a/lib_generic/ctype.c b/lib/ctype.c similarity index 100% rename from lib_generic/ctype.c rename to lib/ctype.c diff --git a/lib_generic/display_options.c b/lib/display_options.c similarity index 100% rename from lib_generic/display_options.c rename to lib/display_options.c diff --git a/lib_generic/div64.c b/lib/div64.c similarity index 100% rename from lib_generic/div64.c rename to lib/div64.c diff --git a/lib_generic/gunzip.c b/lib/gunzip.c similarity index 100% rename from lib_generic/gunzip.c rename to lib/gunzip.c diff --git a/lib_generic/ldiv.c b/lib/ldiv.c similarity index 100% rename from lib_generic/ldiv.c rename to lib/ldiv.c diff --git a/lib_generic/lmb.c b/lib/lmb.c similarity index 100% rename from lib_generic/lmb.c rename to lib/lmb.c diff --git a/lib_generic/lzma/LzmaDec.c b/lib/lzma/LzmaDec.c similarity index 100% rename from lib_generic/lzma/LzmaDec.c rename to lib/lzma/LzmaDec.c diff --git a/lib_generic/lzma/LzmaDec.h b/lib/lzma/LzmaDec.h similarity index 100% rename from lib_generic/lzma/LzmaDec.h rename to lib/lzma/LzmaDec.h diff --git a/lib_generic/lzma/LzmaTools.c b/lib/lzma/LzmaTools.c similarity index 100% rename from lib_generic/lzma/LzmaTools.c rename to lib/lzma/LzmaTools.c diff --git a/lib_generic/lzma/LzmaTools.h b/lib/lzma/LzmaTools.h similarity index 100% rename from lib_generic/lzma/LzmaTools.h rename to lib/lzma/LzmaTools.h diff --git a/lib_generic/lzma/Makefile b/lib/lzma/Makefile similarity index 100% rename from lib_generic/lzma/Makefile rename to lib/lzma/Makefile diff --git a/lib_generic/lzma/README.txt b/lib/lzma/README.txt similarity index 100% rename from lib_generic/lzma/README.txt rename to lib/lzma/README.txt diff --git a/lib_generic/lzma/Types.h b/lib/lzma/Types.h similarity index 100% rename from lib_generic/lzma/Types.h rename to lib/lzma/Types.h diff --git a/lib_generic/lzma/history.txt b/lib/lzma/history.txt similarity index 100% rename from lib_generic/lzma/history.txt rename to lib/lzma/history.txt diff --git a/lib_generic/lzma/import_lzmasdk.sh b/lib/lzma/import_lzmasdk.sh similarity index 100% rename from lib_generic/lzma/import_lzmasdk.sh rename to lib/lzma/import_lzmasdk.sh diff --git a/lib_generic/lzma/license.txt b/lib/lzma/license.txt similarity index 100% rename from lib_generic/lzma/license.txt rename to lib/lzma/license.txt diff --git a/lib_generic/lzma/lzma.txt b/lib/lzma/lzma.txt similarity index 100% rename from lib_generic/lzma/lzma.txt rename to lib/lzma/lzma.txt diff --git a/lib_generic/lzo/Makefile b/lib/lzo/Makefile similarity index 100% rename from lib_generic/lzo/Makefile rename to lib/lzo/Makefile diff --git a/lib_generic/lzo/lzo1x_decompress.c b/lib/lzo/lzo1x_decompress.c similarity index 100% rename from lib_generic/lzo/lzo1x_decompress.c rename to lib/lzo/lzo1x_decompress.c diff --git a/lib_generic/lzo/lzodefs.h b/lib/lzo/lzodefs.h similarity index 100% rename from lib_generic/lzo/lzodefs.h rename to lib/lzo/lzodefs.h diff --git a/lib_generic/md5.c b/lib/md5.c similarity index 100% rename from lib_generic/md5.c rename to lib/md5.c diff --git a/lib_generic/net_utils.c b/lib/net_utils.c similarity index 100% rename from lib_generic/net_utils.c rename to lib/net_utils.c diff --git a/lib_generic/rbtree.c b/lib/rbtree.c similarity index 100% rename from lib_generic/rbtree.c rename to lib/rbtree.c diff --git a/lib_generic/sha1.c b/lib/sha1.c similarity index 100% rename from lib_generic/sha1.c rename to lib/sha1.c diff --git a/lib_generic/sha256.c b/lib/sha256.c similarity index 100% rename from lib_generic/sha256.c rename to lib/sha256.c diff --git a/lib_generic/string.c b/lib/string.c similarity index 100% rename from lib_generic/string.c rename to lib/string.c diff --git a/lib_generic/strmhz.c b/lib/strmhz.c similarity index 100% rename from lib_generic/strmhz.c rename to lib/strmhz.c diff --git a/lib_generic/time.c b/lib/time.c similarity index 100% rename from lib_generic/time.c rename to lib/time.c diff --git a/lib_generic/vsprintf.c b/lib/vsprintf.c similarity index 100% rename from lib_generic/vsprintf.c rename to lib/vsprintf.c diff --git a/lib_generic/zlib.c b/lib/zlib.c similarity index 100% rename from lib_generic/zlib.c rename to lib/zlib.c diff --git a/tools/Makefile b/tools/Makefile index 743505f92..a6f11c9a2 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -68,9 +68,9 @@ BIN_FILES-$(CONFIG_SHA1_CHECK_UB_IMG) += ubsha1$(SFX) # Source files which exist outside the tools directory EXT_OBJ_FILES-y += common/env_embedded.o EXT_OBJ_FILES-y += common/image.o -EXT_OBJ_FILES-y += lib_generic/crc32.o -EXT_OBJ_FILES-y += lib_generic/md5.o -EXT_OBJ_FILES-y += lib_generic/sha1.o +EXT_OBJ_FILES-y += lib/crc32.o +EXT_OBJ_FILES-y += lib/md5.o +EXT_OBJ_FILES-y += lib/sha1.o # Source files located in the tools directory OBJ_FILES-$(CONFIG_LCD_LOGO) += bmp_logo.o @@ -196,7 +196,7 @@ $(obj)ubsha1$(SFX): $(obj)os_support.o $(obj)sha1.o $(obj)ubsha1.o $(obj)%.o: $(SRCTREE)/common/%.c $(HOSTCC) -g $(HOSTCFLAGS_NOPED) -c -o $@ $< -$(obj)%.o: $(SRCTREE)/lib_generic/%.c +$(obj)%.o: $(SRCTREE)/lib/%.c $(HOSTCC) -g $(HOSTCFLAGS) -c -o $@ $< $(obj)%.o: $(SRCTREE)/libfdt/%.c diff --git a/tools/env/Makefile b/tools/env/Makefile index 9629ee58e..2df631e98 100644 --- a/tools/env/Makefile +++ b/tools/env/Makefile @@ -41,7 +41,7 @@ clean: rm -f $(obj)fw_printenv $(obj)crc32.c $(obj)crc32.c: - ln -s $(src)../../lib_generic/crc32.c $(obj)crc32.c + ln -s $(src)../../lib/crc32.c $(obj)crc32.c ######################################################################### diff --git a/tools/imls/Makefile b/tools/imls/Makefile index 9b2afb076..82c272806 100644 --- a/tools/imls/Makefile +++ b/tools/imls/Makefile @@ -23,9 +23,9 @@ include $(TOPDIR)/config.mk BIN_FILES-y += imls # Source files which exist outside the tools/imls directory -EXT_OBJ_FILES-y += lib_generic/crc32.o -EXT_OBJ_FILES-y += lib_generic/md5.o -EXT_OBJ_FILES-y += lib_generic/sha1.o +EXT_OBJ_FILES-y += lib/crc32.o +EXT_OBJ_FILES-y += lib/md5.o +EXT_OBJ_FILES-y += lib/sha1.o EXT_OBJ_FILES-y += common/image.o # Source files located in the tools/imls directory @@ -78,7 +78,7 @@ $(obj)imls.o: $(SRCTREE)/tools/imls/imls.c $(obj)%.o: $(SRCTREE)/common/%.c $(CC) -g $(HOSTCFLAGS_NOPED) -c -o $@ $< -$(obj)%.o: $(SRCTREE)/lib_generic/%.c +$(obj)%.o: $(SRCTREE)/lib/%.c $(CC) -g $(HOSTCFLAGS) -c -o $@ $< $(obj)%.o: $(SRCTREE)/libfdt/%.c From 0de71d507157c4bd4fddcd3a419140d2b986eed2 Mon Sep 17 00:00:00 2001 From: Peter Tyser Date: Mon, 12 Apr 2010 22:28:06 -0500 Subject: [PATCH 136/164] Move libfdt/ into lib/ Move the libfdt directory into the common lib/ directory to clean up the top-level directory. Signed-off-by: Peter Tyser --- Makefile | 2 +- {libfdt => lib/libfdt}/Makefile | 0 {libfdt => lib/libfdt}/README | 0 {libfdt => lib/libfdt}/fdt.c | 0 {libfdt => lib/libfdt}/fdt_ro.c | 0 {libfdt => lib/libfdt}/fdt_rw.c | 0 {libfdt => lib/libfdt}/fdt_strerror.c | 0 {libfdt => lib/libfdt}/fdt_sw.c | 0 {libfdt => lib/libfdt}/fdt_wip.c | 0 {libfdt => lib/libfdt}/libfdt_internal.h | 0 tools/Makefile | 6 +++--- tools/imls/Makefile | 6 +++--- 12 files changed, 7 insertions(+), 7 deletions(-) rename {libfdt => lib/libfdt}/Makefile (100%) rename {libfdt => lib/libfdt}/README (100%) rename {libfdt => lib/libfdt}/fdt.c (100%) rename {libfdt => lib/libfdt}/fdt_ro.c (100%) rename {libfdt => lib/libfdt}/fdt_rw.c (100%) rename {libfdt => lib/libfdt}/fdt_strerror.c (100%) rename {libfdt => lib/libfdt}/fdt_sw.c (100%) rename {libfdt => lib/libfdt}/fdt_wip.c (100%) rename {libfdt => lib/libfdt}/libfdt_internal.h (100%) diff --git a/Makefile b/Makefile index 0b70dcae4..fdd781a86 100644 --- a/Makefile +++ b/Makefile @@ -244,7 +244,7 @@ LIBS += drivers/usb/phy/libusb_phy.a LIBS += drivers/video/libvideo.a LIBS += drivers/watchdog/libwatchdog.a LIBS += common/libcommon.a -LIBS += libfdt/libfdt.a +LIBS += lib/libfdt/libfdt.a LIBS += api/libapi.a LIBS += post/libpost.a diff --git a/libfdt/Makefile b/lib/libfdt/Makefile similarity index 100% rename from libfdt/Makefile rename to lib/libfdt/Makefile diff --git a/libfdt/README b/lib/libfdt/README similarity index 100% rename from libfdt/README rename to lib/libfdt/README diff --git a/libfdt/fdt.c b/lib/libfdt/fdt.c similarity index 100% rename from libfdt/fdt.c rename to lib/libfdt/fdt.c diff --git a/libfdt/fdt_ro.c b/lib/libfdt/fdt_ro.c similarity index 100% rename from libfdt/fdt_ro.c rename to lib/libfdt/fdt_ro.c diff --git a/libfdt/fdt_rw.c b/lib/libfdt/fdt_rw.c similarity index 100% rename from libfdt/fdt_rw.c rename to lib/libfdt/fdt_rw.c diff --git a/libfdt/fdt_strerror.c b/lib/libfdt/fdt_strerror.c similarity index 100% rename from libfdt/fdt_strerror.c rename to lib/libfdt/fdt_strerror.c diff --git a/libfdt/fdt_sw.c b/lib/libfdt/fdt_sw.c similarity index 100% rename from libfdt/fdt_sw.c rename to lib/libfdt/fdt_sw.c diff --git a/libfdt/fdt_wip.c b/lib/libfdt/fdt_wip.c similarity index 100% rename from libfdt/fdt_wip.c rename to lib/libfdt/fdt_wip.c diff --git a/libfdt/libfdt_internal.h b/lib/libfdt/libfdt_internal.h similarity index 100% rename from libfdt/libfdt_internal.h rename to lib/libfdt/libfdt_internal.h diff --git a/tools/Makefile b/tools/Makefile index a6f11c9a2..749d99423 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -122,7 +122,7 @@ endif # now $(obj) is defined HOSTSRCS += $(addprefix $(SRCTREE)/,$(EXT_OBJ_FILES-y:.o=.c)) HOSTSRCS += $(addprefix $(SRCTREE)/tools/,$(OBJ_FILES-y:.o=.c)) -HOSTSRCS += $(addprefix $(SRCTREE)/libfdt/,$(LIBFDT_OBJ_FILES-y:.o=.c)) +HOSTSRCS += $(addprefix $(SRCTREE)/lib/libfdt/,$(LIBFDT_OBJ_FILES-y:.o=.c)) BINS := $(addprefix $(obj),$(sort $(BIN_FILES-y))) LIBFDT_OBJS := $(addprefix $(obj),$(LIBFDT_OBJ_FILES-y)) @@ -136,7 +136,7 @@ NOPEDOBJS := $(addprefix $(obj),$(NOPED_OBJ_FILES-y)) HOSTCPPFLAGS = -idirafter $(SRCTREE)/include \ -idirafter $(OBJTREE)/include2 \ -idirafter $(OBJTREE)/include \ - -I $(SRCTREE)/libfdt \ + -I $(SRCTREE)/lib/libfdt \ -I $(SRCTREE)/tools \ -DTEXT_BASE=$(TEXT_BASE) -DUSE_HOSTCC \ -D__KERNEL_STRICT_NAMES @@ -199,7 +199,7 @@ $(obj)%.o: $(SRCTREE)/common/%.c $(obj)%.o: $(SRCTREE)/lib/%.c $(HOSTCC) -g $(HOSTCFLAGS) -c -o $@ $< -$(obj)%.o: $(SRCTREE)/libfdt/%.c +$(obj)%.o: $(SRCTREE)/lib/libfdt/%.c $(HOSTCC) -g $(HOSTCFLAGS_NOPED) -c -o $@ $< subdirs: diff --git a/tools/imls/Makefile b/tools/imls/Makefile index 82c272806..840727707 100644 --- a/tools/imls/Makefile +++ b/tools/imls/Makefile @@ -41,7 +41,7 @@ LIBFDT_OBJ_FILES-y += fdt_wip.o # now $(obj) is defined SRCS += $(addprefix $(SRCTREE)/,$(EXT_OBJ_FILES-y:.o=.c)) SRCS += $(addprefix $(SRCTREE)/tools/,$(OBJ_FILES-y:.o=.c)) -SRCS += $(addprefix $(SRCTREE)/libfdt/,$(LIBFDT_OBJ_FILES-y:.o=.c)) +SRCS += $(addprefix $(SRCTREE)/lib/libfdt/,$(LIBFDT_OBJ_FILES-y:.o=.c)) BINS := $(addprefix $(obj),$(sort $(BIN_FILES-y))) LIBFDT_OBJS := $(addprefix $(obj),$(LIBFDT_OBJ_FILES-y)) @@ -52,7 +52,7 @@ LIBFDT_OBJS := $(addprefix $(obj),$(LIBFDT_OBJ_FILES-y)) HOSTCPPFLAGS = -idirafter $(SRCTREE)/include \ -idirafter $(OBJTREE)/include2 \ -idirafter $(OBJTREE)/include \ - -I $(SRCTREE)/libfdt \ + -I $(SRCTREE)/lib/libfdt \ -I $(SRCTREE)/tools \ -DUSE_HOSTCC -D__KERNEL_STRICT_NAMES @@ -81,7 +81,7 @@ $(obj)%.o: $(SRCTREE)/common/%.c $(obj)%.o: $(SRCTREE)/lib/%.c $(CC) -g $(HOSTCFLAGS) -c -o $@ $< -$(obj)%.o: $(SRCTREE)/libfdt/%.c +$(obj)%.o: $(SRCTREE)/lib/libfdt/%.c $(CC) -g $(HOSTCFLAGS_NOPED) -c -o $@ $< clean: From 61f2b38a17f5b21c59f2afe6cf1cbb5f28638cf9 Mon Sep 17 00:00:00 2001 From: Peter Tyser Date: Mon, 12 Apr 2010 22:28:07 -0500 Subject: [PATCH 137/164] Replace "#include " with "#include " The appropriate include/asm-$ARCH directory should already by symlinked to include/asm so using the whole "asm-$ARCH" path is unnecessary. This change should also allow us to move the include/asm-$ARCH directories into their appropriate lib/$ARCH/ directories. Signed-off-by: Peter Tyser --- board/amcc/bamboo/init.S | 2 +- board/amcc/canyonlands/init.S | 2 +- board/amcc/ebony/init.S | 2 +- board/amcc/katmai/init.S | 2 +- board/amcc/luan/init.S | 2 +- board/amcc/ocotea/init.S | 2 +- board/amcc/redwood/init.S | 2 +- board/amcc/redwood/redwood.c | 2 +- board/amcc/sequoia/init.S | 2 +- board/amcc/yucca/init.S | 2 +- board/bf537-stamp/cmd_bf537led.c | 2 +- board/esd/du440/init.S | 2 +- board/esd/pmc440/init.S | 2 +- board/galaxy5200/galaxy5200.c | 2 +- board/gdsys/intip/init.S | 2 +- board/korat/init.S | 2 +- board/lwmon5/init.S | 2 +- board/m501sk/m501sk.h | 6 +++--- board/netstal/hcu4/hcu4.c | 2 +- board/netstal/mcu25/mcu25.c | 2 +- board/phytec/pcm030/pcm030.c | 2 +- board/pleb2/pleb2.c | 2 +- board/prodrive/alpr/fpga.c | 2 +- board/sandburst/common/ppc440gx_i2c.c | 2 +- board/tqc/tqm834x/tqm834x.c | 2 +- board/xilinx/ppc440-generic/init.S | 2 +- cpu/ppc4xx/4xx_pcie.c | 2 +- drivers/i2c/ppc4xx_i2c.c | 2 +- include/asm-arm/arch-arm720t/hardware.h | 2 +- include/asm-arm/arch-lpc2292/hardware.h | 2 +- nand_spl/board/freescale/mpc8569mds/nand_boot.c | 2 +- nand_spl/board/freescale/p1_p2_rdb/nand_boot.c | 2 +- nand_spl/nand_boot_fsl_nfc.c | 4 ++-- 33 files changed, 36 insertions(+), 36 deletions(-) diff --git a/board/amcc/bamboo/init.S b/board/amcc/bamboo/init.S index a5c9d6d76..7439c805c 100644 --- a/board/amcc/bamboo/init.S +++ b/board/amcc/bamboo/init.S @@ -25,7 +25,7 @@ #include #include -#include +#include /************************************************************************** * TLB TABLE diff --git a/board/amcc/canyonlands/init.S b/board/amcc/canyonlands/init.S index 0b667968a..993bec30e 100644 --- a/board/amcc/canyonlands/init.S +++ b/board/amcc/canyonlands/init.S @@ -23,7 +23,7 @@ #include #include -#include +#include /************************************************************************** * TLB TABLE diff --git a/board/amcc/ebony/init.S b/board/amcc/ebony/init.S index 811a96a1f..153fa811c 100644 --- a/board/amcc/ebony/init.S +++ b/board/amcc/ebony/init.S @@ -22,7 +22,7 @@ #include #include -#include +#include /************************************************************************** * TLB TABLE diff --git a/board/amcc/katmai/init.S b/board/amcc/katmai/init.S index 1c74a82c3..90598f63b 100644 --- a/board/amcc/katmai/init.S +++ b/board/amcc/katmai/init.S @@ -25,7 +25,7 @@ #include #include -#include +#include /************************************************************************** * TLB TABLE diff --git a/board/amcc/luan/init.S b/board/amcc/luan/init.S index fb54dea3a..513b0fc56 100644 --- a/board/amcc/luan/init.S +++ b/board/amcc/luan/init.S @@ -25,7 +25,7 @@ #include #include -#include +#include /************************************************************************** * TLB TABLE diff --git a/board/amcc/ocotea/init.S b/board/amcc/ocotea/init.S index 8bcfbb197..e7c75dfac 100644 --- a/board/amcc/ocotea/init.S +++ b/board/amcc/ocotea/init.S @@ -22,7 +22,7 @@ #include #include -#include +#include /************************************************************************** * TLB TABLE diff --git a/board/amcc/redwood/init.S b/board/amcc/redwood/init.S index 363d7932a..4da586918 100644 --- a/board/amcc/redwood/init.S +++ b/board/amcc/redwood/init.S @@ -23,7 +23,7 @@ #include #include -#include +#include /************************************************************************** * TLB TABLE diff --git a/board/amcc/redwood/redwood.c b/board/amcc/redwood/redwood.c index bc8cb0c44..32fb8c584 100644 --- a/board/amcc/redwood/redwood.c +++ b/board/amcc/redwood/redwood.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include int compare_to_true(char *str); char *remove_l_w_space(char *in_str); diff --git a/board/amcc/sequoia/init.S b/board/amcc/sequoia/init.S index 3c0e400f9..f090070b4 100644 --- a/board/amcc/sequoia/init.S +++ b/board/amcc/sequoia/init.S @@ -22,7 +22,7 @@ */ #include -#include +#include #include /* diff --git a/board/amcc/yucca/init.S b/board/amcc/yucca/init.S index 9308fdac2..f51035ff6 100644 --- a/board/amcc/yucca/init.S +++ b/board/amcc/yucca/init.S @@ -25,7 +25,7 @@ #include #include -#include +#include /************************************************************************** * TLB TABLE diff --git a/board/bf537-stamp/cmd_bf537led.c b/board/bf537-stamp/cmd_bf537led.c index e65c4f835..317f08849 100644 --- a/board/bf537-stamp/cmd_bf537led.c +++ b/board/bf537-stamp/cmd_bf537led.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include #ifdef CONFIG_BF537_STAMP_LEDCMD /* Define the command usage in a reusable way */ diff --git a/board/esd/du440/init.S b/board/esd/du440/init.S index 3cac6b11b..afcf9c4a5 100644 --- a/board/esd/du440/init.S +++ b/board/esd/du440/init.S @@ -22,7 +22,7 @@ */ #include -#include +#include #include /* diff --git a/board/esd/pmc440/init.S b/board/esd/pmc440/init.S index 6585fed66..d51cd0cf0 100644 --- a/board/esd/pmc440/init.S +++ b/board/esd/pmc440/init.S @@ -20,7 +20,7 @@ */ #include -#include +#include #include /* diff --git a/board/galaxy5200/galaxy5200.c b/board/galaxy5200/galaxy5200.c index 5aa9d3a6f..d4a2245b2 100644 --- a/board/galaxy5200/galaxy5200.c +++ b/board/galaxy5200/galaxy5200.c @@ -33,7 +33,7 @@ #include #include #include -#include +#include #ifndef CONFIG_SYS_RAMBOOT static void sdram_start(int hi_addr) diff --git a/board/gdsys/intip/init.S b/board/gdsys/intip/init.S index e205c9d7e..a8e8b6c1c 100644 --- a/board/gdsys/intip/init.S +++ b/board/gdsys/intip/init.S @@ -27,7 +27,7 @@ #include #include -#include +#include /************************************************************************** * TLB TABLE diff --git a/board/korat/init.S b/board/korat/init.S index ea43a1f89..c725bbbb4 100644 --- a/board/korat/init.S +++ b/board/korat/init.S @@ -20,7 +20,7 @@ */ #include -#include +#include #include /************************************************************************** diff --git a/board/lwmon5/init.S b/board/lwmon5/init.S index 718cec6af..c714fb7ad 100644 --- a/board/lwmon5/init.S +++ b/board/lwmon5/init.S @@ -25,7 +25,7 @@ #include #include -#include +#include /************************************************************************** * TLB TABLE diff --git a/board/m501sk/m501sk.h b/board/m501sk/m501sk.h index 42a67573d..51d10f58a 100644 --- a/board/m501sk/m501sk.h +++ b/board/m501sk/m501sk.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-at91/hardware.h + * linux/include/asm/arch-at91/hardware.h * * Copyright (C) 2003 SAN People * @@ -21,9 +21,9 @@ #define __M501SK_H #ifndef __ASSEMBLY__ -#include +#include #else -#include +#include #endif #define AT91C_PIO_PA22 ((unsigned int) 1 << 22) /* Pin Controlled by PA22 */ diff --git a/board/netstal/hcu4/hcu4.c b/board/netstal/hcu4/hcu4.c index 3f07ff126..1c99405be 100644 --- a/board/netstal/hcu4/hcu4.c +++ b/board/netstal/hcu4/hcu4.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include "../common/nm.h" DECLARE_GLOBAL_DATA_PTR; diff --git a/board/netstal/mcu25/mcu25.c b/board/netstal/mcu25/mcu25.c index cc2f99874..87bc45edb 100644 --- a/board/netstal/mcu25/mcu25.c +++ b/board/netstal/mcu25/mcu25.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include "../common/nm.h" DECLARE_GLOBAL_DATA_PTR; diff --git a/board/phytec/pcm030/pcm030.c b/board/phytec/pcm030/pcm030.c index 416d3070b..77ce3899e 100644 --- a/board/phytec/pcm030/pcm030.c +++ b/board/phytec/pcm030/pcm030.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include "mt46v32m16-75.h" diff --git a/board/pleb2/pleb2.c b/board/pleb2/pleb2.c index dc6fac46d..97c37eaa3 100644 --- a/board/pleb2/pleb2.c +++ b/board/pleb2/pleb2.c @@ -26,7 +26,7 @@ */ #include -#include +#include DECLARE_GLOBAL_DATA_PTR; diff --git a/board/prodrive/alpr/fpga.c b/board/prodrive/alpr/fpga.c index 7571cd950..f3bc1fa7a 100644 --- a/board/prodrive/alpr/fpga.c +++ b/board/prodrive/alpr/fpga.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include "fpga.h" diff --git a/board/sandburst/common/ppc440gx_i2c.c b/board/sandburst/common/ppc440gx_i2c.c index 35c4e60b5..dbc0cee75 100644 --- a/board/sandburst/common/ppc440gx_i2c.c +++ b/board/sandburst/common/ppc440gx_i2c.c @@ -31,7 +31,7 @@ #include #include #include "ppc440gx_i2c.h" -#include +#include #ifdef CONFIG_I2C_BUS1 diff --git a/board/tqc/tqm834x/tqm834x.c b/board/tqc/tqm834x/tqm834x.c index 4fd8cd696..e5648799a 100644 --- a/board/tqc/tqm834x/tqm834x.c +++ b/board/tqc/tqm834x/tqm834x.c @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include DECLARE_GLOBAL_DATA_PTR; diff --git a/board/xilinx/ppc440-generic/init.S b/board/xilinx/ppc440-generic/init.S index 1409467ea..54f2d7fbc 100644 --- a/board/xilinx/ppc440-generic/init.S +++ b/board/xilinx/ppc440-generic/init.S @@ -19,7 +19,7 @@ #include #include -#include +#include .section .bootpg,"ax" .globl tlbtab diff --git a/cpu/ppc4xx/4xx_pcie.c b/cpu/ppc4xx/4xx_pcie.c index f3b921477..10b58b711 100644 --- a/cpu/ppc4xx/4xx_pcie.c +++ b/cpu/ppc4xx/4xx_pcie.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #if (defined(CONFIG_440SPE) || defined(CONFIG_405EX) || \ diff --git a/drivers/i2c/ppc4xx_i2c.c b/drivers/i2c/ppc4xx_i2c.c index 9b86187a7..e9548f1a6 100644 --- a/drivers/i2c/ppc4xx_i2c.c +++ b/drivers/i2c/ppc4xx_i2c.c @@ -30,7 +30,7 @@ #include #include <4xx_i2c.h> #include -#include +#include #ifdef CONFIG_HARD_I2C diff --git a/include/asm-arm/arch-arm720t/hardware.h b/include/asm-arm/arch-arm720t/hardware.h index ec053c991..9bee19ffb 100644 --- a/include/asm-arm/arch-arm720t/hardware.h +++ b/include/asm-arm/arch-arm720t/hardware.h @@ -25,7 +25,7 @@ */ #if defined(CONFIG_NETARM) -#include +#include #elif defined(CONFIG_IMPA7) /* include IMPA7 specific hardware file if there was one */ #elif defined(CONFIG_EP7312) diff --git a/include/asm-arm/arch-lpc2292/hardware.h b/include/asm-arm/arch-lpc2292/hardware.h index fd2b464e3..5e227e367 100644 --- a/include/asm-arm/arch-lpc2292/hardware.h +++ b/include/asm-arm/arch-lpc2292/hardware.h @@ -25,7 +25,7 @@ */ #if defined(CONFIG_LPC2292) -#include +#include #else #error No hardware file defined for this configuration #endif diff --git a/nand_spl/board/freescale/mpc8569mds/nand_boot.c b/nand_spl/board/freescale/mpc8569mds/nand_boot.c index e03065699..047da3470 100644 --- a/nand_spl/board/freescale/mpc8569mds/nand_boot.c +++ b/nand_spl/board/freescale/mpc8569mds/nand_boot.c @@ -20,7 +20,7 @@ */ #include #include -#include +#include #include #include #include diff --git a/nand_spl/board/freescale/p1_p2_rdb/nand_boot.c b/nand_spl/board/freescale/p1_p2_rdb/nand_boot.c index af442ea27..16a756c38 100644 --- a/nand_spl/board/freescale/p1_p2_rdb/nand_boot.c +++ b/nand_spl/board/freescale/p1_p2_rdb/nand_boot.c @@ -20,7 +20,7 @@ */ #include #include -#include +#include #include #include #include diff --git a/nand_spl/nand_boot_fsl_nfc.c b/nand_spl/nand_boot_fsl_nfc.c index f4040a7cf..bfae30e46 100644 --- a/nand_spl/nand_boot_fsl_nfc.c +++ b/nand_spl/nand_boot_fsl_nfc.c @@ -27,9 +27,9 @@ #include #include #ifdef CONFIG_MX31 -#include +#include #else -#include +#include #endif #include #include From 819833af39a91fa1c1e8252862bbda6f5a602f7b Mon Sep 17 00:00:00 2001 From: Peter Tyser Date: Mon, 12 Apr 2010 22:28:08 -0500 Subject: [PATCH 138/164] Move architecture-specific includes to arch/$ARCH/include/asm This helps to clean up the include/ directory so that it only contains non-architecture-specific headers and also matches Linux's directory layout which many U-Boot developers are already familiar with. Signed-off-by: Peter Tyser --- .../arm/include/asm}/arch-a320/a320.h | 0 .../arm/include/asm}/arch-a320/ftpmu010.h | 0 .../arm/include/asm}/arch-a320/ftsdmc020.h | 0 .../arm/include/asm}/arch-a320/ftsmc020.h | 0 .../arm/include/asm}/arch-a320/fttmr010.h | 0 .../arm/include/asm}/arch-arm720t/hardware.h | 0 .../asm}/arch-arm720t/netarm_dma_module.h | 0 .../asm}/arch-arm720t/netarm_eni_module.h | 0 .../asm}/arch-arm720t/netarm_eth_module.h | 0 .../asm}/arch-arm720t/netarm_gen_module.h | 0 .../asm}/arch-arm720t/netarm_mem_module.h | 0 .../asm}/arch-arm720t/netarm_registers.h | 0 .../asm}/arch-arm720t/netarm_ser_module.h | 0 .../arm/include/asm}/arch-arm925t/sizes.h | 0 .../arm/include/asm}/arch-arm926ejs/sizes.h | 0 .../arm/include/asm}/arch-at91/at91_common.h | 0 .../arm/include/asm}/arch-at91/at91_emac.h | 0 .../arm/include/asm}/arch-at91/at91_matrix.h | 0 .../arm/include/asm}/arch-at91/at91_mc.h | 0 .../arm/include/asm}/arch-at91/at91_pdc.h | 0 .../arm/include/asm}/arch-at91/at91_pio.h | 0 .../arm/include/asm}/arch-at91/at91_pit.h | 0 .../arm/include/asm}/arch-at91/at91_pmc.h | 0 .../arm/include/asm}/arch-at91/at91_rstc.h | 0 .../arm/include/asm}/arch-at91/at91_spi.h | 0 .../arm/include/asm}/arch-at91/at91_st.h | 0 .../arm/include/asm}/arch-at91/at91_tc.h | 0 .../arm/include/asm}/arch-at91/at91_wdt.h | 0 .../arm/include/asm}/arch-at91/at91cap9.h | 0 .../include/asm}/arch-at91/at91cap9_matrix.h | 0 .../arm/include/asm}/arch-at91/at91rm9200.h | 0 .../arm/include/asm}/arch-at91/at91sam9260.h | 0 .../asm}/arch-at91/at91sam9260_matrix.h | 0 .../arm/include/asm}/arch-at91/at91sam9261.h | 0 .../asm}/arch-at91/at91sam9261_matrix.h | 0 .../arm/include/asm}/arch-at91/at91sam9263.h | 0 .../asm}/arch-at91/at91sam9263_matrix.h | 0 .../include/asm}/arch-at91/at91sam9_matrix.h | 0 .../include/asm}/arch-at91/at91sam9_sdramc.h | 0 .../arm/include/asm}/arch-at91/at91sam9_smc.h | 0 .../arm/include/asm}/arch-at91/at91sam9g45.h | 0 .../asm}/arch-at91/at91sam9g45_matrix.h | 0 .../arm/include/asm}/arch-at91/at91sam9rl.h | 0 .../asm}/arch-at91/at91sam9rl_matrix.h | 0 .../arm/include/asm}/arch-at91/clk.h | 0 .../arm/include/asm}/arch-at91/gpio.h | 0 .../arm/include/asm}/arch-at91/hardware.h | 0 .../arm/include/asm}/arch-at91/io.h | 0 .../arm/include/asm}/arch-at91/memory-map.h | 0 .../include/asm}/arch-at91rm9200/AT91RM9200.h | 0 .../include/asm}/arch-at91rm9200/hardware.h | 0 .../arm/include/asm}/arch-davinci/emac_defs.h | 0 .../arm/include/asm}/arch-davinci/emif_defs.h | 0 .../arm/include/asm}/arch-davinci/gpio_defs.h | 0 .../arm/include/asm}/arch-davinci/hardware.h | 0 .../arm/include/asm}/arch-davinci/i2c_defs.h | 0 .../arm/include/asm}/arch-davinci/nand_defs.h | 0 .../arm/include/asm}/arch-ep93xx/ep93xx.h | 0 .../arm/include/asm}/arch-imx/imx-regs.h | 0 .../arm/include/asm}/arch-ixp/ixp425.h | 0 .../arm/include/asm}/arch-ixp/ixp425pci.h | 0 .../arm/include/asm}/arch-kirkwood/cpu.h | 0 .../arm/include/asm}/arch-kirkwood/gpio.h | 0 .../arm/include/asm}/arch-kirkwood/kirkwood.h | 0 .../include/asm}/arch-kirkwood/kw88f6192.h | 0 .../include/asm}/arch-kirkwood/kw88f6281.h | 0 .../arm/include/asm}/arch-kirkwood/mpp.h | 0 .../arm/include/asm}/arch-kirkwood/spi.h | 0 .../arm/include/asm}/arch-ks8695/platform.h | 0 .../arm/include/asm}/arch-lpc2292/hardware.h | 0 .../asm}/arch-lpc2292/lpc2292_registers.h | 0 .../arm/include/asm}/arch-lpc2292/spi.h | 0 .../arm/include/asm}/arch-mx25/clock.h | 0 .../arm/include/asm}/arch-mx25/imx-regs.h | 0 .../arm/include/asm}/arch-mx25/imx25-pinmux.h | 0 .../arm/include/asm}/arch-mx27/asm-offsets.h | 0 .../arm/include/asm}/arch-mx27/clock.h | 0 .../arm/include/asm}/arch-mx27/imx-regs.h | 0 .../arm/include/asm}/arch-mx27/mxcmmc.h | 0 .../arm/include/asm}/arch-mx31/mx31-regs.h | 0 .../arm/include/asm}/arch-mx31/mx31.h | 0 .../arm/include/asm}/arch-mx51/asm-offsets.h | 0 .../arm/include/asm}/arch-mx51/clock.h | 0 .../arm/include/asm}/arch-mx51/crm_regs.h | 0 .../arm/include/asm}/arch-mx51/imx-regs.h | 0 .../arm/include/asm}/arch-mx51/iomux.h | 0 .../arm/include/asm}/arch-mx51/mx51_pins.h | 0 .../arm/include/asm}/arch-mx51/sys_proto.h | 0 .../arm/include/asm}/arch-nomadik/gpio.h | 0 .../arm/include/asm}/arch-nomadik/mtu.h | 0 .../arm/include/asm}/arch-omap/sizes.h | 0 .../arm/include/asm}/arch-omap24xx/bits.h | 0 .../arm/include/asm}/arch-omap24xx/clocks.h | 0 .../arm/include/asm}/arch-omap24xx/i2c.h | 0 .../arm/include/asm}/arch-omap24xx/mem.h | 0 .../arm/include/asm}/arch-omap24xx/mux.h | 0 .../arm/include/asm}/arch-omap24xx/omap2420.h | 0 .../arm/include/asm}/arch-omap24xx/sizes.h | 0 .../arm/include/asm}/arch-omap24xx/sys_info.h | 0 .../include/asm}/arch-omap24xx/sys_proto.h | 0 .../arm/include/asm}/arch-omap3/clocks.h | 0 .../include/asm}/arch-omap3/clocks_omap3.h | 0 .../arm/include/asm}/arch-omap3/cpu.h | 0 .../arm/include/asm}/arch-omap3/gpio.h | 0 .../arm/include/asm}/arch-omap3/i2c.h | 0 .../arm/include/asm}/arch-omap3/mem.h | 0 .../arm/include/asm}/arch-omap3/mmc.h | 0 .../include/asm}/arch-omap3/mmc_host_def.h | 0 .../arm/include/asm}/arch-omap3/mux.h | 0 .../arm/include/asm}/arch-omap3/omap3.h | 0 .../arm/include/asm}/arch-omap3/omap_gpmc.h | 0 .../arm/include/asm}/arch-omap3/sys_proto.h | 0 .../arm/include/asm}/arch-pxa/bitfield.h | 0 .../arm/include/asm}/arch-pxa/hardware.h | 0 .../arm/include/asm}/arch-pxa/pxa-regs.h | 0 .../arm/include/asm}/arch-s3c24x0/memory.h | 0 .../arm/include/asm}/arch-s3c24x0/s3c2400.h | 0 .../arm/include/asm}/arch-s3c24x0/s3c2410.h | 0 .../arm/include/asm}/arch-s3c24x0/s3c24x0.h | 0 .../include/asm}/arch-s3c24x0/s3c24x0_cpu.h | 0 .../arm/include/asm}/arch-s3c44b0/hardware.h | 0 .../arm/include/asm}/arch-s3c4510b/hardware.h | 0 .../arm/include/asm}/arch-s3c64xx/hardware.h | 0 .../arm/include/asm}/arch-s3c64xx/s3c6400.h | 0 .../arm/include/asm}/arch-s3c64xx/s3c64x0.h | 0 .../arm/include/asm}/arch-s5pc1xx/clk.h | 0 .../arm/include/asm}/arch-s5pc1xx/clock.h | 0 .../arm/include/asm}/arch-s5pc1xx/cpu.h | 0 .../arm/include/asm}/arch-s5pc1xx/gpio.h | 0 .../arm/include/asm}/arch-s5pc1xx/power.h | 0 .../arm/include/asm}/arch-s5pc1xx/pwm.h | 0 .../arm/include/asm}/arch-s5pc1xx/smc.h | 0 .../arm/include/asm}/arch-s5pc1xx/sys_proto.h | 0 .../arm/include/asm}/arch-s5pc1xx/uart.h | 0 .../arm/include/asm}/arch-sa1100/bitfield.h | 0 .../arm/include/asm}/arch-spear/hardware.h | 0 .../arm/include/asm}/arch-spear/spr_defs.h | 0 .../arm/include/asm}/arch-spear/spr_emi.h | 0 .../arm/include/asm}/arch-spear/spr_gpt.h | 0 .../arm/include/asm}/arch-spear/spr_i2c.h | 0 .../arm/include/asm}/arch-spear/spr_misc.h | 0 .../arm/include/asm}/arch-spear/spr_nand.h | 0 .../arm/include/asm}/arch-spear/spr_smi.h | 0 .../arm/include/asm}/arch-spear/spr_syscntl.h | 0 .../asm}/arch-spear/spr_xloader_table.h | 0 .../asm-arm => arch/arm/include/asm}/atomic.h | 0 .../asm-arm => arch/arm/include/asm}/bitops.h | 0 .../arm/include/asm}/byteorder.h | 0 .../asm-arm => arch/arm/include/asm}/cache.h | 0 .../asm-arm => arch/arm/include/asm}/config.h | 0 .../arm/include/asm}/dma-mapping.h | 0 .../asm-arm => arch/arm/include/asm}/errno.h | 0 .../arm/include/asm}/global_data.h | 0 .../arm/include/asm}/hardware.h | 0 .../asm-arm => arch/arm/include/asm}/io.h | 0 .../arm/include/asm}/mach-types.h | 0 .../asm-arm => arch/arm/include/asm}/macro.h | 0 .../asm-arm => arch/arm/include/asm}/memory.h | 0 .../arm/include/asm}/posix_types.h | 0 .../arm/include/asm}/proc-armv/domain.h | 0 .../arm/include/asm}/proc-armv/processor.h | 0 .../arm/include/asm}/proc-armv/ptrace.h | 0 .../arm/include/asm}/proc-armv/system.h | 0 .../arm/include/asm}/processor.h | 0 .../asm-arm => arch/arm/include/asm}/ptrace.h | 0 .../asm-arm => arch/arm/include/asm}/setup.h | 0 .../asm-arm => arch/arm/include/asm}/sizes.h | 0 .../asm-arm => arch/arm/include/asm}/string.h | 0 .../asm-arm => arch/arm/include/asm}/system.h | 0 .../asm-arm => arch/arm/include/asm}/types.h | 0 .../arm/include/asm}/u-boot-arm.h | 0 .../asm-arm => arch/arm/include/asm}/u-boot.h | 0 .../arm/include/asm}/unaligned.h | 0 .../include/asm}/arch-at32ap700x/addrspace.h | 0 .../include/asm}/arch-at32ap700x/cacheflush.h | 0 .../asm}/arch-at32ap700x/chip-features.h | 0 .../avr32/include/asm}/arch-at32ap700x/clk.h | 0 .../include/asm}/arch-at32ap700x/gpio-impl.h | 0 .../avr32/include/asm}/arch-at32ap700x/gpio.h | 0 .../include/asm}/arch-at32ap700x/hmatrix.h | 0 .../include/asm}/arch-at32ap700x/memory-map.h | 0 .../include/asm}/arch-at32ap700x/portmux.h | 0 .../include/asm}/arch-common/portmux-gpio.h | 0 .../include/asm}/arch-common/portmux-pio.h | 0 .../avr32/include/asm}/bitops.h | 0 .../avr32/include/asm}/byteorder.h | 0 .../avr32/include/asm}/config.h | 0 .../avr32/include/asm}/dma-mapping.h | 0 .../avr32/include/asm}/errno.h | 0 .../avr32/include/asm}/global_data.h | 0 .../avr32/include/asm}/hmatrix-common.h | 0 .../avr32/include/asm}/initcalls.h | 0 .../asm-avr32 => arch/avr32/include/asm}/io.h | 0 .../avr32/include/asm}/posix_types.h | 0 .../avr32/include/asm}/processor.h | 0 .../avr32/include/asm}/ptrace.h | 0 .../avr32/include/asm}/sdram.h | 0 .../avr32/include/asm}/sections.h | 0 .../avr32/include/asm}/setup.h | 0 .../avr32/include/asm}/string.h | 0 .../avr32/include/asm}/sysreg.h | 0 .../avr32/include/asm}/types.h | 0 .../avr32/include/asm}/u-boot.h | 0 .../blackfin/include/asm}/bfin_logo_230x230.h | 0 .../include/asm}/bfin_logo_rgb565_230x230.h | 0 .../blackfin/include/asm}/bitops.h | 0 .../blackfin/include/asm}/blackfin.h | 0 .../blackfin/include/asm}/blackfin_cdef.h | 0 .../blackfin/include/asm}/blackfin_def.h | 0 .../blackfin/include/asm}/blackfin_local.h | 0 .../blackfin/include/asm}/byteorder.h | 0 .../blackfin/include/asm}/config-pre.h | 0 .../blackfin/include/asm}/config.h | 0 .../blackfin/include/asm}/cplb.h | 0 .../blackfin/include/asm}/deferred.h | 0 .../blackfin/include/asm}/delay.h | 0 .../blackfin/include/asm}/entry.h | 0 .../blackfin/include/asm}/errno.h | 0 .../blackfin/include/asm}/global_data.h | 0 .../blackfin/include/asm}/io.h | 0 .../blackfin/include/asm}/linkage.h | 0 .../mach-bf527/ADSP-EDN-BF52x-extended_cdef.h | 0 .../mach-bf527/ADSP-EDN-BF52x-extended_def.h | 0 .../include/asm}/mach-bf527/BF522_cdef.h | 0 .../include/asm}/mach-bf527/BF522_def.h | 0 .../include/asm}/mach-bf527/BF523_cdef.h | 0 .../include/asm}/mach-bf527/BF523_def.h | 0 .../include/asm}/mach-bf527/BF524_cdef.h | 0 .../include/asm}/mach-bf527/BF524_def.h | 0 .../include/asm}/mach-bf527/BF525_cdef.h | 0 .../include/asm}/mach-bf527/BF525_def.h | 0 .../include/asm}/mach-bf527/BF526_cdef.h | 0 .../include/asm}/mach-bf527/BF526_def.h | 0 .../include/asm}/mach-bf527/BF527_cdef.h | 0 .../include/asm}/mach-bf527/BF527_def.h | 0 .../include/asm}/mach-bf527/anomaly.h | 0 .../include/asm}/mach-bf527/def_local.h | 0 .../include/asm}/mach-bf527/mem_map.h | 0 .../blackfin/include/asm}/mach-bf527/ports.h | 0 .../include/asm}/mach-bf533/BF531_cdef.h | 0 .../include/asm}/mach-bf533/BF531_def.h | 0 .../include/asm}/mach-bf533/BF532_cdef.h | 0 .../include/asm}/mach-bf533/BF532_def.h | 0 .../include/asm}/mach-bf533/BF533_cdef.h | 0 .../include/asm}/mach-bf533/BF533_def.h | 0 .../include/asm}/mach-bf533/anomaly.h | 0 .../include/asm}/mach-bf533/def_local.h | 0 .../blackfin/include/asm}/mach-bf533/ports.h | 0 .../mach-bf537/ADSP-EDN-BF534-extended_cdef.h | 0 .../mach-bf537/ADSP-EDN-BF534-extended_def.h | 0 .../include/asm}/mach-bf537/BF534_cdef.h | 0 .../include/asm}/mach-bf537/BF534_def.h | 0 .../include/asm}/mach-bf537/BF536_cdef.h | 0 .../include/asm}/mach-bf537/BF536_def.h | 0 .../include/asm}/mach-bf537/BF537_cdef.h | 0 .../include/asm}/mach-bf537/BF537_def.h | 0 .../include/asm}/mach-bf537/anomaly.h | 0 .../include/asm}/mach-bf537/def_local.h | 0 .../blackfin/include/asm}/mach-bf537/ports.h | 0 .../mach-bf548/ADSP-EDN-BF542-extended_cdef.h | 0 .../mach-bf548/ADSP-EDN-BF542-extended_def.h | 0 .../mach-bf548/ADSP-EDN-BF544-extended_cdef.h | 0 .../mach-bf548/ADSP-EDN-BF544-extended_def.h | 0 .../mach-bf548/ADSP-EDN-BF547-extended_cdef.h | 0 .../mach-bf548/ADSP-EDN-BF547-extended_def.h | 0 .../mach-bf548/ADSP-EDN-BF548-extended_cdef.h | 0 .../mach-bf548/ADSP-EDN-BF548-extended_def.h | 0 .../mach-bf548/ADSP-EDN-BF549-extended_cdef.h | 0 .../mach-bf548/ADSP-EDN-BF549-extended_def.h | 0 .../include/asm}/mach-bf548/BF541_cdef.h | 0 .../include/asm}/mach-bf548/BF541_def.h | 0 .../include/asm}/mach-bf548/BF542_cdef.h | 0 .../include/asm}/mach-bf548/BF542_def.h | 0 .../include/asm}/mach-bf548/BF544_cdef.h | 0 .../include/asm}/mach-bf548/BF544_def.h | 0 .../include/asm}/mach-bf548/BF547_cdef.h | 0 .../include/asm}/mach-bf548/BF547_def.h | 0 .../include/asm}/mach-bf548/BF548_cdef.h | 0 .../include/asm}/mach-bf548/BF548_def.h | 0 .../include/asm}/mach-bf548/BF549_cdef.h | 0 .../include/asm}/mach-bf548/BF549_def.h | 0 .../include/asm}/mach-bf548/anomaly.h | 0 .../include/asm}/mach-bf548/def_local.h | 0 .../include/asm}/mach-bf548/mem_map.h | 0 .../blackfin/include/asm}/mach-bf548/ports.h | 0 .../include/asm}/mach-bf561/BF561_cdef.h | 0 .../include/asm}/mach-bf561/BF561_def.h | 0 .../include/asm}/mach-bf561/anomaly.h | 0 .../include/asm}/mach-bf561/def_local.h | 0 .../blackfin/include/asm}/mach-bf561/ports.h | 0 .../ADSP-EDN-DUAL-CORE-extended_cdef.h | 0 .../ADSP-EDN-DUAL-CORE-extended_def.h | 0 .../asm}/mach-common/ADSP-EDN-core_cdef.h | 0 .../asm}/mach-common/ADSP-EDN-core_def.h | 0 .../asm}/mach-common/ADSP-EDN-extended_cdef.h | 0 .../asm}/mach-common/ADSP-EDN-extended_def.h | 0 .../include/asm}/mach-common/bits/bootrom.h | 0 .../include/asm}/mach-common/bits/core.h | 0 .../include/asm}/mach-common/bits/dma.h | 0 .../include/asm}/mach-common/bits/ebiu.h | 0 .../include/asm}/mach-common/bits/emac.h | 0 .../include/asm}/mach-common/bits/eppi.h | 0 .../include/asm}/mach-common/bits/lockbox.h | 0 .../include/asm}/mach-common/bits/mpu.h | 0 .../include/asm}/mach-common/bits/otp.h | 0 .../include/asm}/mach-common/bits/pata.h | 0 .../include/asm}/mach-common/bits/pll.h | 0 .../include/asm}/mach-common/bits/ports-a.h | 0 .../include/asm}/mach-common/bits/ports-b.h | 0 .../include/asm}/mach-common/bits/ports-c.h | 0 .../include/asm}/mach-common/bits/ports-d.h | 0 .../include/asm}/mach-common/bits/ports-e.h | 0 .../include/asm}/mach-common/bits/ports-f.h | 0 .../include/asm}/mach-common/bits/ports-g.h | 0 .../include/asm}/mach-common/bits/ports-h.h | 0 .../include/asm}/mach-common/bits/ports-i.h | 0 .../include/asm}/mach-common/bits/ports-j.h | 0 .../include/asm}/mach-common/bits/ppi.h | 0 .../include/asm}/mach-common/bits/rtc.h | 0 .../include/asm}/mach-common/bits/sdh.h | 0 .../include/asm}/mach-common/bits/spi.h | 0 .../include/asm}/mach-common/bits/sport.h | 0 .../include/asm}/mach-common/bits/timer.h | 0 .../include/asm}/mach-common/bits/trace.h | 0 .../include/asm}/mach-common/bits/twi.h | 0 .../include/asm}/mach-common/bits/uart.h | 0 .../include/asm}/mach-common/bits/usb.h | 0 .../include/asm}/mach-common/bits/watchdog.h | 0 .../blackfin/include/asm}/mem_map.h | 0 .../blackfin/include/asm}/net.h | 0 .../blackfin/include/asm}/posix_types.h | 0 .../blackfin/include/asm}/processor.h | 0 .../blackfin/include/asm}/ptrace.h | 0 .../blackfin/include/asm}/sdh.h | 0 .../blackfin/include/asm}/shared_resources.h | 0 .../blackfin/include/asm}/signal.h | 0 .../blackfin/include/asm}/string.h | 0 .../blackfin/include/asm}/system.h | 0 .../blackfin/include/asm}/traps.h | 0 .../blackfin/include/asm}/types.h | 0 .../blackfin/include/asm}/u-boot.h | 0 .../blackfin/include/asm}/unaligned.h | 0 .../i386/include/asm}/bitops.h | 0 .../i386/include/asm}/byteorder.h | 0 .../i386/include/asm}/config.h | 0 .../i386/include/asm}/errno.h | 0 .../i386/include/asm}/global_data.h | 0 .../i386/include/asm}/i8254.h | 0 .../i386/include/asm}/i8259.h | 0 .../i386/include/asm}/ibmpc.h | 0 .../i386/include/asm}/ic/pci.h | 0 .../i386/include/asm}/ic/sc520.h | 0 .../i386/include/asm}/ic/ssi.h | 0 .../i386/include/asm}/interrupt.h | 0 .../asm-i386 => arch/i386/include/asm}/io.h | 0 .../asm-i386 => arch/i386/include/asm}/pci.h | 0 .../i386/include/asm}/posix_types.h | 0 .../i386/include/asm}/processor.h | 0 .../i386/include/asm}/ptrace.h | 0 .../i386/include/asm}/realmode.h | 0 .../i386/include/asm}/string.h | 0 .../i386/include/asm}/types.h | 0 .../i386/include/asm}/u-boot-i386.h | 0 .../i386/include/asm}/u-boot.h | 0 .../i386/include/asm}/zimage.h | 0 .../m68k/include/asm}/bitops.h | 0 .../m68k/include/asm}/byteorder.h | 0 .../m68k/include/asm}/cache.h | 0 .../m68k/include/asm}/coldfire/ata.h | 0 .../m68k/include/asm}/coldfire/crossbar.h | 0 .../m68k/include/asm}/coldfire/dspi.h | 0 .../m68k/include/asm}/coldfire/edma.h | 0 .../m68k/include/asm}/coldfire/eport.h | 0 .../m68k/include/asm}/coldfire/flexbus.h | 0 .../m68k/include/asm}/coldfire/flexcan.h | 0 .../m68k/include/asm}/coldfire/intctrl.h | 0 .../m68k/include/asm}/coldfire/lcd.h | 0 .../m68k/include/asm}/coldfire/mdha.h | 0 .../m68k/include/asm}/coldfire/pwm.h | 0 .../m68k/include/asm}/coldfire/qspi.h | 0 .../m68k/include/asm}/coldfire/rng.h | 0 .../m68k/include/asm}/coldfire/skha.h | 0 .../m68k/include/asm}/coldfire/ssi.h | 0 .../m68k/include/asm}/config.h | 0 .../m68k/include/asm}/errno.h | 0 .../asm-m68k => arch/m68k/include/asm}/fec.h | 0 .../m68k/include/asm}/fsl_i2c.h | 0 .../m68k/include/asm}/fsl_mcdmafec.h | 0 .../m68k/include/asm}/global_data.h | 0 .../m68k/include/asm}/immap.h | 0 .../m68k/include/asm}/immap_520x.h | 0 .../m68k/include/asm}/immap_5227x.h | 0 .../m68k/include/asm}/immap_5235.h | 0 .../m68k/include/asm}/immap_5249.h | 0 .../m68k/include/asm}/immap_5253.h | 0 .../m68k/include/asm}/immap_5271.h | 0 .../m68k/include/asm}/immap_5272.h | 0 .../m68k/include/asm}/immap_5275.h | 0 .../m68k/include/asm}/immap_5282.h | 0 .../m68k/include/asm}/immap_5301x.h | 0 .../m68k/include/asm}/immap_5329.h | 0 .../m68k/include/asm}/immap_5445x.h | 0 .../m68k/include/asm}/immap_547x_8x.h | 0 .../asm-m68k => arch/m68k/include/asm}/io.h | 0 .../m68k/include/asm}/m520x.h | 0 .../m68k/include/asm}/m5227x.h | 0 .../m68k/include/asm}/m5235.h | 0 .../m68k/include/asm}/m5249.h | 0 .../m68k/include/asm}/m5253.h | 0 .../m68k/include/asm}/m5271.h | 0 .../m68k/include/asm}/m5272.h | 0 .../m68k/include/asm}/m5275.h | 0 .../m68k/include/asm}/m5282.h | 0 .../m68k/include/asm}/m5301x.h | 0 .../m68k/include/asm}/m5329.h | 0 .../m68k/include/asm}/m5445x.h | 0 .../m68k/include/asm}/m547x_8x.h | 0 .../m68k/include/asm}/posix_types.h | 0 .../m68k/include/asm}/processor.h | 0 .../m68k/include/asm}/ptrace.h | 0 .../asm-m68k => arch/m68k/include/asm}/rtc.h | 0 .../m68k/include/asm}/string.h | 0 .../m68k/include/asm}/timer.h | 0 .../m68k/include/asm}/types.h | 0 .../m68k/include/asm}/u-boot.h | 0 .../asm-m68k => arch/m68k/include/asm}/uart.h | 0 .../m68k/include/asm}/unaligned.h | 0 .../microblaze/include/asm}/asm.h | 0 .../microblaze/include/asm}/bitops.h | 0 .../microblaze/include/asm}/byteorder.h | 0 .../microblaze/include/asm}/config.h | 0 .../microblaze/include/asm}/errno.h | 0 .../microblaze/include/asm}/global_data.h | 0 .../microblaze/include/asm}/io.h | 0 .../microblaze/include/asm}/microblaze_intc.h | 0 .../include/asm}/microblaze_timer.h | 0 .../microblaze/include/asm}/posix_types.h | 0 .../microblaze/include/asm}/processor.h | 0 .../microblaze/include/asm}/ptrace.h | 0 .../microblaze/include/asm}/string.h | 0 .../microblaze/include/asm}/system.h | 0 .../microblaze/include/asm}/types.h | 0 .../microblaze/include/asm}/u-boot.h | 0 .../microblaze/include/asm}/unaligned.h | 0 .../mips/include/asm}/addrspace.h | 0 .../asm-mips => arch/mips/include/asm}/asm.h | 0 .../mips/include/asm}/au1x00.h | 0 .../mips/include/asm}/bitops.h | 0 .../mips/include/asm}/byteorder.h | 0 .../mips/include/asm}/cachectl.h | 0 .../mips/include/asm}/cacheops.h | 0 .../mips/include/asm}/config.h | 0 .../mips/include/asm}/errno.h | 0 .../mips/include/asm}/global_data.h | 0 .../mips/include/asm}/inca-ip.h | 0 .../asm-mips => arch/mips/include/asm}/io.h | 0 .../mips/include/asm}/isadep.h | 0 .../mips/include/asm}/mipsregs.h | 0 .../mips/include/asm}/posix_types.h | 0 .../mips/include/asm}/processor.h | 0 .../mips/include/asm}/ptrace.h | 0 .../mips/include/asm}/reboot.h | 0 .../asm-mips => arch/mips/include/asm}/reg.h | 0 .../mips/include/asm}/regdef.h | 0 .../mips/include/asm}/sgidefs.h | 0 .../mips/include/asm}/string.h | 0 .../mips/include/asm}/system.h | 0 .../mips/include/asm}/types.h | 0 .../mips/include/asm}/u-boot.h | 0 .../mips/include/asm}/unaligned.h | 0 .../nios/include/asm}/bitops.h | 0 .../nios/include/asm}/byteorder.h | 0 .../nios/include/asm}/cache.h | 0 .../nios/include/asm}/config.h | 0 .../nios/include/asm}/global_data.h | 0 .../asm-nios => arch/nios/include/asm}/io.h | 0 .../nios/include/asm}/posix_types.h | 0 .../nios/include/asm}/processor.h | 0 .../asm-nios => arch/nios/include/asm}/psr.h | 0 .../nios/include/asm}/ptrace.h | 0 .../nios/include/asm}/status_led.h | 0 .../nios/include/asm}/string.h | 0 .../nios/include/asm}/system.h | 0 .../nios/include/asm}/types.h | 0 .../nios/include/asm}/u-boot.h | 0 .../nios2/include/asm}/bitops.h | 0 .../nios2/include/asm}/bitops/atomic.h | 0 .../nios2/include/asm}/bitops/ffs.h | 0 .../nios2/include/asm}/bitops/non-atomic.h | 0 .../nios2/include/asm}/byteorder.h | 0 .../nios2/include/asm}/cache.h | 0 .../nios2/include/asm}/config.h | 0 .../nios2/include/asm}/errno.h | 0 .../nios2/include/asm}/global_data.h | 0 .../asm-nios2 => arch/nios2/include/asm}/io.h | 0 .../nios2/include/asm}/opcodes.h | 0 .../nios2/include/asm}/posix_types.h | 0 .../nios2/include/asm}/processor.h | 0 .../nios2/include/asm}/psr.h | 0 .../nios2/include/asm}/ptrace.h | 0 .../nios2/include/asm}/status_led.h | 0 .../nios2/include/asm}/string.h | 0 .../nios2/include/asm}/system.h | 0 .../nios2/include/asm}/types.h | 0 .../nios2/include/asm}/u-boot.h | 0 .../nios2/include/asm}/unaligned.h | 0 .../ppc/include/asm}/4xx_pci.h | 0 .../ppc/include/asm}/4xx_pcie.h | 0 .../ppc/include/asm}/5xx_immap.h | 0 .../ppc/include/asm}/8xx_immap.h | 0 .../asm-ppc => arch/ppc/include/asm}/atomic.h | 0 .../asm-ppc => arch/ppc/include/asm}/bitops.h | 0 .../ppc/include/asm}/byteorder.h | 0 .../asm-ppc => arch/ppc/include/asm}/cache.h | 0 .../asm-ppc => arch/ppc/include/asm}/config.h | 0 .../ppc/include/asm}/cpm_8260.h | 0 .../ppc/include/asm}/cpm_85xx.h | 0 .../asm-ppc => arch/ppc/include/asm}/e300.h | 0 .../asm-ppc => arch/ppc/include/asm}/errno.h | 0 .../ppc/include/asm}/fsl_ddr_dimm_params.h | 0 .../ppc/include/asm}/fsl_ddr_sdram.h | 0 .../ppc/include/asm}/fsl_dma.h | 0 .../ppc/include/asm}/fsl_i2c.h | 0 .../ppc/include/asm}/fsl_law.h | 0 .../ppc/include/asm}/fsl_lbc.h | 0 .../ppc/include/asm}/fsl_pci.h | 0 .../ppc/include/asm}/fsl_serdes.h | 0 .../ppc/include/asm}/global_data.h | 0 .../asm-ppc => arch/ppc/include/asm}/gpio.h | 0 .../ppc/include/asm}/immap_512x.h | 0 .../ppc/include/asm}/immap_8220.h | 0 .../ppc/include/asm}/immap_8260.h | 0 .../ppc/include/asm}/immap_83xx.h | 0 .../ppc/include/asm}/immap_85xx.h | 0 .../ppc/include/asm}/immap_86xx.h | 0 .../ppc/include/asm}/immap_qe.h | 0 .../ppc/include/asm}/interrupt.h | 0 .../asm-ppc => arch/ppc/include/asm}/io.h | 0 .../ppc/include/asm}/iopin_8260.h | 0 .../ppc/include/asm}/iopin_85xx.h | 0 .../ppc/include/asm}/iopin_8xx.h | 0 .../ppc/include/asm}/m8260_pci.h | 0 .../ppc/include/asm}/mc146818rtc.h | 0 .../asm-ppc => arch/ppc/include/asm}/mmu.h | 0 .../asm-ppc => arch/ppc/include/asm}/mp.h | 0 .../ppc/include/asm}/mpc512x.h | 0 .../ppc/include/asm}/mpc8349_pci.h | 0 .../ppc/include/asm}/mpc8xxx_spi.h | 0 .../asm-ppc => arch/ppc/include/asm}/pci_io.h | 0 .../asm-ppc => arch/ppc/include/asm}/pnp.h | 0 .../ppc/include/asm}/posix_types.h | 0 .../ppc/include/asm}/ppc4xx-ebc.h | 0 .../ppc/include/asm}/ppc4xx-isram.h | 0 .../ppc/include/asm}/ppc4xx-sdram.h | 0 .../ppc/include/asm}/ppc4xx-uic.h | 0 .../ppc/include/asm}/ppc4xx_config.h | 0 .../ppc/include/asm}/processor.h | 0 .../asm-ppc => arch/ppc/include/asm}/ptrace.h | 0 .../ppc/include/asm}/residual.h | 0 .../ppc/include/asm}/sigcontext.h | 0 .../asm-ppc => arch/ppc/include/asm}/signal.h | 0 .../ppc/include/asm}/status_led.h | 0 .../asm-ppc => arch/ppc/include/asm}/string.h | 0 .../asm-ppc => arch/ppc/include/asm}/types.h | 0 .../asm-ppc => arch/ppc/include/asm}/u-boot.h | 0 .../ppc/include/asm}/unaligned.h | 0 .../ppc/include/asm}/xilinx_irq.h | 0 .../asm-sh => arch/sh/include/asm}/bitops.h | 0 .../sh/include/asm}/byteorder.h | 0 .../asm-sh => arch/sh/include/asm}/cache.h | 0 {include/asm-sh => arch/sh/include/asm}/clk.h | 0 .../asm-sh => arch/sh/include/asm}/config.h | 0 .../asm-sh => arch/sh/include/asm}/cpu_sh2.h | 0 .../asm-sh => arch/sh/include/asm}/cpu_sh3.h | 0 .../asm-sh => arch/sh/include/asm}/cpu_sh4.h | 0 .../sh/include/asm}/cpu_sh7203.h | 0 .../sh/include/asm}/cpu_sh7710.h | 0 .../sh/include/asm}/cpu_sh7720.h | 0 .../sh/include/asm}/cpu_sh7722.h | 0 .../sh/include/asm}/cpu_sh7723.h | 0 .../sh/include/asm}/cpu_sh7750.h | 0 .../sh/include/asm}/cpu_sh7763.h | 0 .../sh/include/asm}/cpu_sh7780.h | 0 .../sh/include/asm}/cpu_sh7785.h | 0 .../asm-sh => arch/sh/include/asm}/errno.h | 0 .../sh/include/asm}/global_data.h | 0 {include/asm-sh => arch/sh/include/asm}/io.h | 0 .../asm-sh => arch/sh/include/asm}/irqflags.h | 0 .../asm-sh => arch/sh/include/asm}/macro.h | 0 {include/asm-sh => arch/sh/include/asm}/pci.h | 0 .../sh/include/asm}/posix_types.h | 0 .../sh/include/asm}/processor.h | 0 .../asm-sh => arch/sh/include/asm}/ptrace.h | 0 .../asm-sh => arch/sh/include/asm}/string.h | 0 .../asm-sh => arch/sh/include/asm}/system.h | 0 .../asm-sh => arch/sh/include/asm}/types.h | 0 .../asm-sh => arch/sh/include/asm}/u-boot.h | 0 .../sh/include/asm}/unaligned-sh4a.h | 0 .../sh/include/asm}/unaligned.h | 0 .../sparc/include/asm}/arch-leon2/asi.h | 0 .../sparc/include/asm}/arch-leon3/asi.h | 0 .../sparc/include/asm}/asi.h | 0 .../sparc/include/asm}/asmmacro.h | 0 .../sparc/include/asm}/atomic.h | 0 .../sparc/include/asm}/bitops.h | 0 .../sparc/include/asm}/byteorder.h | 0 .../sparc/include/asm}/cache.h | 0 .../sparc/include/asm}/config.h | 0 .../sparc/include/asm}/errno.h | 0 .../sparc/include/asm}/global_data.h | 0 .../asm-sparc => arch/sparc/include/asm}/io.h | 0 .../sparc/include/asm}/irq.h | 0 .../sparc/include/asm}/leon.h | 0 .../sparc/include/asm}/leon2.h | 0 .../sparc/include/asm}/leon3.h | 0 .../sparc/include/asm}/machines.h | 0 .../sparc/include/asm}/page.h | 0 .../sparc/include/asm}/posix_types.h | 0 .../sparc/include/asm}/processor.h | 0 .../sparc/include/asm}/prom.h | 0 .../sparc/include/asm}/psr.h | 0 .../sparc/include/asm}/ptrace.h | 0 .../sparc/include/asm}/srmmu.h | 0 .../sparc/include/asm}/stack.h | 0 .../sparc/include/asm}/string.h | 0 .../sparc/include/asm}/types.h | 0 .../sparc/include/asm}/u-boot.h | 0 .../sparc/include/asm}/winmacro.h | 0 mkconfig | 20 +++++++++---------- 629 files changed, 9 insertions(+), 11 deletions(-) rename {include/asm-arm => arch/arm/include/asm}/arch-a320/a320.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-a320/ftpmu010.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-a320/ftsdmc020.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-a320/ftsmc020.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-a320/fttmr010.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-arm720t/hardware.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-arm720t/netarm_dma_module.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-arm720t/netarm_eni_module.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-arm720t/netarm_eth_module.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-arm720t/netarm_gen_module.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-arm720t/netarm_mem_module.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-arm720t/netarm_registers.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-arm720t/netarm_ser_module.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-arm925t/sizes.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-arm926ejs/sizes.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91_common.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91_emac.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91_matrix.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91_mc.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91_pdc.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91_pio.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91_pit.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91_pmc.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91_rstc.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91_spi.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91_st.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91_tc.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91_wdt.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91cap9.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91cap9_matrix.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91rm9200.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91sam9260.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91sam9260_matrix.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91sam9261.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91sam9261_matrix.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91sam9263.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91sam9263_matrix.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91sam9_matrix.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91sam9_sdramc.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91sam9_smc.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91sam9g45.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91sam9g45_matrix.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91sam9rl.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91sam9rl_matrix.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/clk.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/gpio.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/hardware.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/io.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91/memory-map.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91rm9200/AT91RM9200.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-at91rm9200/hardware.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-davinci/emac_defs.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-davinci/emif_defs.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-davinci/gpio_defs.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-davinci/hardware.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-davinci/i2c_defs.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-davinci/nand_defs.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-ep93xx/ep93xx.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-imx/imx-regs.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-ixp/ixp425.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-ixp/ixp425pci.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-kirkwood/cpu.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-kirkwood/gpio.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-kirkwood/kirkwood.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-kirkwood/kw88f6192.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-kirkwood/kw88f6281.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-kirkwood/mpp.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-kirkwood/spi.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-ks8695/platform.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-lpc2292/hardware.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-lpc2292/lpc2292_registers.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-lpc2292/spi.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-mx25/clock.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-mx25/imx-regs.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-mx25/imx25-pinmux.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-mx27/asm-offsets.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-mx27/clock.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-mx27/imx-regs.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-mx27/mxcmmc.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-mx31/mx31-regs.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-mx31/mx31.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-mx51/asm-offsets.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-mx51/clock.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-mx51/crm_regs.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-mx51/imx-regs.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-mx51/iomux.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-mx51/mx51_pins.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-mx51/sys_proto.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-nomadik/gpio.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-nomadik/mtu.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-omap/sizes.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-omap24xx/bits.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-omap24xx/clocks.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-omap24xx/i2c.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-omap24xx/mem.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-omap24xx/mux.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-omap24xx/omap2420.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-omap24xx/sizes.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-omap24xx/sys_info.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-omap24xx/sys_proto.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-omap3/clocks.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-omap3/clocks_omap3.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-omap3/cpu.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-omap3/gpio.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-omap3/i2c.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-omap3/mem.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-omap3/mmc.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-omap3/mmc_host_def.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-omap3/mux.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-omap3/omap3.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-omap3/omap_gpmc.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-omap3/sys_proto.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-pxa/bitfield.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-pxa/hardware.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-pxa/pxa-regs.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-s3c24x0/memory.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-s3c24x0/s3c2400.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-s3c24x0/s3c2410.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-s3c24x0/s3c24x0.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-s3c24x0/s3c24x0_cpu.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-s3c44b0/hardware.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-s3c4510b/hardware.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-s3c64xx/hardware.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-s3c64xx/s3c6400.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-s3c64xx/s3c64x0.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-s5pc1xx/clk.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-s5pc1xx/clock.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-s5pc1xx/cpu.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-s5pc1xx/gpio.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-s5pc1xx/power.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-s5pc1xx/pwm.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-s5pc1xx/smc.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-s5pc1xx/sys_proto.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-s5pc1xx/uart.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-sa1100/bitfield.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-spear/hardware.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-spear/spr_defs.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-spear/spr_emi.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-spear/spr_gpt.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-spear/spr_i2c.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-spear/spr_misc.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-spear/spr_nand.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-spear/spr_smi.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-spear/spr_syscntl.h (100%) rename {include/asm-arm => arch/arm/include/asm}/arch-spear/spr_xloader_table.h (100%) rename {include/asm-arm => arch/arm/include/asm}/atomic.h (100%) rename {include/asm-arm => arch/arm/include/asm}/bitops.h (100%) rename {include/asm-arm => arch/arm/include/asm}/byteorder.h (100%) rename {include/asm-arm => arch/arm/include/asm}/cache.h (100%) rename {include/asm-arm => arch/arm/include/asm}/config.h (100%) rename {include/asm-arm => arch/arm/include/asm}/dma-mapping.h (100%) rename {include/asm-arm => arch/arm/include/asm}/errno.h (100%) rename {include/asm-arm => arch/arm/include/asm}/global_data.h (100%) rename {include/asm-arm => arch/arm/include/asm}/hardware.h (100%) rename {include/asm-arm => arch/arm/include/asm}/io.h (100%) rename {include/asm-arm => arch/arm/include/asm}/mach-types.h (100%) rename {include/asm-arm => arch/arm/include/asm}/macro.h (100%) rename {include/asm-arm => arch/arm/include/asm}/memory.h (100%) rename {include/asm-arm => arch/arm/include/asm}/posix_types.h (100%) rename {include/asm-arm => arch/arm/include/asm}/proc-armv/domain.h (100%) rename {include/asm-arm => arch/arm/include/asm}/proc-armv/processor.h (100%) rename {include/asm-arm => arch/arm/include/asm}/proc-armv/ptrace.h (100%) rename {include/asm-arm => arch/arm/include/asm}/proc-armv/system.h (100%) rename {include/asm-arm => arch/arm/include/asm}/processor.h (100%) rename {include/asm-arm => arch/arm/include/asm}/ptrace.h (100%) rename {include/asm-arm => arch/arm/include/asm}/setup.h (100%) rename {include/asm-arm => arch/arm/include/asm}/sizes.h (100%) rename {include/asm-arm => arch/arm/include/asm}/string.h (100%) rename {include/asm-arm => arch/arm/include/asm}/system.h (100%) rename {include/asm-arm => arch/arm/include/asm}/types.h (100%) rename {include/asm-arm => arch/arm/include/asm}/u-boot-arm.h (100%) rename {include/asm-arm => arch/arm/include/asm}/u-boot.h (100%) rename {include/asm-arm => arch/arm/include/asm}/unaligned.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/arch-at32ap700x/addrspace.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/arch-at32ap700x/cacheflush.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/arch-at32ap700x/chip-features.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/arch-at32ap700x/clk.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/arch-at32ap700x/gpio-impl.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/arch-at32ap700x/gpio.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/arch-at32ap700x/hmatrix.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/arch-at32ap700x/memory-map.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/arch-at32ap700x/portmux.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/arch-common/portmux-gpio.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/arch-common/portmux-pio.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/bitops.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/byteorder.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/config.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/dma-mapping.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/errno.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/global_data.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/hmatrix-common.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/initcalls.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/io.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/posix_types.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/processor.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/ptrace.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/sdram.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/sections.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/setup.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/string.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/sysreg.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/types.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/u-boot.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/bfin_logo_230x230.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/bfin_logo_rgb565_230x230.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/bitops.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/blackfin.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/blackfin_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/blackfin_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/blackfin_local.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/byteorder.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/config-pre.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/config.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/cplb.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/deferred.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/delay.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/entry.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/errno.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/global_data.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/io.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/linkage.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/ADSP-EDN-BF52x-extended_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/ADSP-EDN-BF52x-extended_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/BF522_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/BF522_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/BF523_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/BF523_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/BF524_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/BF524_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/BF525_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/BF525_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/BF526_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/BF526_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/BF527_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/BF527_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/anomaly.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/def_local.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/mem_map.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/ports.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf533/BF531_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf533/BF531_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf533/BF532_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf533/BF532_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf533/BF533_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf533/BF533_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf533/anomaly.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf533/def_local.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf533/ports.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf537/ADSP-EDN-BF534-extended_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf537/ADSP-EDN-BF534-extended_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf537/BF534_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf537/BF534_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf537/BF536_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf537/BF536_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf537/BF537_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf537/BF537_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf537/anomaly.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf537/def_local.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf537/ports.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/ADSP-EDN-BF542-extended_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/ADSP-EDN-BF542-extended_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/ADSP-EDN-BF544-extended_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/ADSP-EDN-BF544-extended_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/ADSP-EDN-BF547-extended_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/ADSP-EDN-BF547-extended_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/ADSP-EDN-BF548-extended_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/ADSP-EDN-BF548-extended_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/ADSP-EDN-BF549-extended_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/ADSP-EDN-BF549-extended_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/BF541_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/BF541_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/BF542_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/BF542_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/BF544_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/BF544_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/BF547_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/BF547_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/BF548_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/BF548_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/BF549_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/BF549_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/anomaly.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/def_local.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/mem_map.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/ports.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf561/BF561_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf561/BF561_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf561/anomaly.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf561/def_local.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf561/ports.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/ADSP-EDN-DUAL-CORE-extended_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/ADSP-EDN-DUAL-CORE-extended_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/ADSP-EDN-core_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/ADSP-EDN-core_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/ADSP-EDN-extended_cdef.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/ADSP-EDN-extended_def.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/bootrom.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/core.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/dma.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/ebiu.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/emac.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/eppi.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/lockbox.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/mpu.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/otp.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/pata.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/pll.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/ports-a.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/ports-b.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/ports-c.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/ports-d.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/ports-e.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/ports-f.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/ports-g.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/ports-h.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/ports-i.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/ports-j.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/ppi.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/rtc.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/sdh.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/spi.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/sport.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/timer.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/trace.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/twi.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/uart.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/usb.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/watchdog.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/mem_map.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/net.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/posix_types.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/processor.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/ptrace.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/sdh.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/shared_resources.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/signal.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/string.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/system.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/traps.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/types.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/u-boot.h (100%) rename {include/asm-blackfin => arch/blackfin/include/asm}/unaligned.h (100%) rename {include/asm-i386 => arch/i386/include/asm}/bitops.h (100%) rename {include/asm-i386 => arch/i386/include/asm}/byteorder.h (100%) rename {include/asm-i386 => arch/i386/include/asm}/config.h (100%) rename {include/asm-i386 => arch/i386/include/asm}/errno.h (100%) rename {include/asm-i386 => arch/i386/include/asm}/global_data.h (100%) rename {include/asm-i386 => arch/i386/include/asm}/i8254.h (100%) rename {include/asm-i386 => arch/i386/include/asm}/i8259.h (100%) rename {include/asm-i386 => arch/i386/include/asm}/ibmpc.h (100%) rename {include/asm-i386 => arch/i386/include/asm}/ic/pci.h (100%) rename {include/asm-i386 => arch/i386/include/asm}/ic/sc520.h (100%) rename {include/asm-i386 => arch/i386/include/asm}/ic/ssi.h (100%) rename {include/asm-i386 => arch/i386/include/asm}/interrupt.h (100%) rename {include/asm-i386 => arch/i386/include/asm}/io.h (100%) rename {include/asm-i386 => arch/i386/include/asm}/pci.h (100%) rename {include/asm-i386 => arch/i386/include/asm}/posix_types.h (100%) rename {include/asm-i386 => arch/i386/include/asm}/processor.h (100%) rename {include/asm-i386 => arch/i386/include/asm}/ptrace.h (100%) rename {include/asm-i386 => arch/i386/include/asm}/realmode.h (100%) rename {include/asm-i386 => arch/i386/include/asm}/string.h (100%) rename {include/asm-i386 => arch/i386/include/asm}/types.h (100%) rename {include/asm-i386 => arch/i386/include/asm}/u-boot-i386.h (100%) rename {include/asm-i386 => arch/i386/include/asm}/u-boot.h (100%) rename {include/asm-i386 => arch/i386/include/asm}/zimage.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/bitops.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/byteorder.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/cache.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/coldfire/ata.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/coldfire/crossbar.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/coldfire/dspi.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/coldfire/edma.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/coldfire/eport.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/coldfire/flexbus.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/coldfire/flexcan.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/coldfire/intctrl.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/coldfire/lcd.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/coldfire/mdha.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/coldfire/pwm.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/coldfire/qspi.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/coldfire/rng.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/coldfire/skha.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/coldfire/ssi.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/config.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/errno.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/fec.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/fsl_i2c.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/fsl_mcdmafec.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/global_data.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/immap.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/immap_520x.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/immap_5227x.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/immap_5235.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/immap_5249.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/immap_5253.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/immap_5271.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/immap_5272.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/immap_5275.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/immap_5282.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/immap_5301x.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/immap_5329.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/immap_5445x.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/immap_547x_8x.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/io.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/m520x.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/m5227x.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/m5235.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/m5249.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/m5253.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/m5271.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/m5272.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/m5275.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/m5282.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/m5301x.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/m5329.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/m5445x.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/m547x_8x.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/posix_types.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/processor.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/ptrace.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/rtc.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/string.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/timer.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/types.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/u-boot.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/uart.h (100%) rename {include/asm-m68k => arch/m68k/include/asm}/unaligned.h (100%) rename {include/asm-microblaze => arch/microblaze/include/asm}/asm.h (100%) rename {include/asm-microblaze => arch/microblaze/include/asm}/bitops.h (100%) rename {include/asm-microblaze => arch/microblaze/include/asm}/byteorder.h (100%) rename {include/asm-microblaze => arch/microblaze/include/asm}/config.h (100%) rename {include/asm-microblaze => arch/microblaze/include/asm}/errno.h (100%) rename {include/asm-microblaze => arch/microblaze/include/asm}/global_data.h (100%) rename {include/asm-microblaze => arch/microblaze/include/asm}/io.h (100%) rename {include/asm-microblaze => arch/microblaze/include/asm}/microblaze_intc.h (100%) rename {include/asm-microblaze => arch/microblaze/include/asm}/microblaze_timer.h (100%) rename {include/asm-microblaze => arch/microblaze/include/asm}/posix_types.h (100%) rename {include/asm-microblaze => arch/microblaze/include/asm}/processor.h (100%) rename {include/asm-microblaze => arch/microblaze/include/asm}/ptrace.h (100%) rename {include/asm-microblaze => arch/microblaze/include/asm}/string.h (100%) rename {include/asm-microblaze => arch/microblaze/include/asm}/system.h (100%) rename {include/asm-microblaze => arch/microblaze/include/asm}/types.h (100%) rename {include/asm-microblaze => arch/microblaze/include/asm}/u-boot.h (100%) rename {include/asm-microblaze => arch/microblaze/include/asm}/unaligned.h (100%) rename {include/asm-mips => arch/mips/include/asm}/addrspace.h (100%) rename {include/asm-mips => arch/mips/include/asm}/asm.h (100%) rename {include/asm-mips => arch/mips/include/asm}/au1x00.h (100%) rename {include/asm-mips => arch/mips/include/asm}/bitops.h (100%) rename {include/asm-mips => arch/mips/include/asm}/byteorder.h (100%) rename {include/asm-mips => arch/mips/include/asm}/cachectl.h (100%) rename {include/asm-mips => arch/mips/include/asm}/cacheops.h (100%) rename {include/asm-mips => arch/mips/include/asm}/config.h (100%) rename {include/asm-mips => arch/mips/include/asm}/errno.h (100%) rename {include/asm-mips => arch/mips/include/asm}/global_data.h (100%) rename {include/asm-mips => arch/mips/include/asm}/inca-ip.h (100%) rename {include/asm-mips => arch/mips/include/asm}/io.h (100%) rename {include/asm-mips => arch/mips/include/asm}/isadep.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mipsregs.h (100%) rename {include/asm-mips => arch/mips/include/asm}/posix_types.h (100%) rename {include/asm-mips => arch/mips/include/asm}/processor.h (100%) rename {include/asm-mips => arch/mips/include/asm}/ptrace.h (100%) rename {include/asm-mips => arch/mips/include/asm}/reboot.h (100%) rename {include/asm-mips => arch/mips/include/asm}/reg.h (100%) rename {include/asm-mips => arch/mips/include/asm}/regdef.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sgidefs.h (100%) rename {include/asm-mips => arch/mips/include/asm}/string.h (100%) rename {include/asm-mips => arch/mips/include/asm}/system.h (100%) rename {include/asm-mips => arch/mips/include/asm}/types.h (100%) rename {include/asm-mips => arch/mips/include/asm}/u-boot.h (100%) rename {include/asm-mips => arch/mips/include/asm}/unaligned.h (100%) rename {include/asm-nios => arch/nios/include/asm}/bitops.h (100%) rename {include/asm-nios => arch/nios/include/asm}/byteorder.h (100%) rename {include/asm-nios => arch/nios/include/asm}/cache.h (100%) rename {include/asm-nios => arch/nios/include/asm}/config.h (100%) rename {include/asm-nios => arch/nios/include/asm}/global_data.h (100%) rename {include/asm-nios => arch/nios/include/asm}/io.h (100%) rename {include/asm-nios => arch/nios/include/asm}/posix_types.h (100%) rename {include/asm-nios => arch/nios/include/asm}/processor.h (100%) rename {include/asm-nios => arch/nios/include/asm}/psr.h (100%) rename {include/asm-nios => arch/nios/include/asm}/ptrace.h (100%) rename {include/asm-nios => arch/nios/include/asm}/status_led.h (100%) rename {include/asm-nios => arch/nios/include/asm}/string.h (100%) rename {include/asm-nios => arch/nios/include/asm}/system.h (100%) rename {include/asm-nios => arch/nios/include/asm}/types.h (100%) rename {include/asm-nios => arch/nios/include/asm}/u-boot.h (100%) rename {include/asm-nios2 => arch/nios2/include/asm}/bitops.h (100%) rename {include/asm-nios2 => arch/nios2/include/asm}/bitops/atomic.h (100%) rename {include/asm-nios2 => arch/nios2/include/asm}/bitops/ffs.h (100%) rename {include/asm-nios2 => arch/nios2/include/asm}/bitops/non-atomic.h (100%) rename {include/asm-nios2 => arch/nios2/include/asm}/byteorder.h (100%) rename {include/asm-nios2 => arch/nios2/include/asm}/cache.h (100%) rename {include/asm-nios2 => arch/nios2/include/asm}/config.h (100%) rename {include/asm-nios2 => arch/nios2/include/asm}/errno.h (100%) rename {include/asm-nios2 => arch/nios2/include/asm}/global_data.h (100%) rename {include/asm-nios2 => arch/nios2/include/asm}/io.h (100%) rename {include/asm-nios2 => arch/nios2/include/asm}/opcodes.h (100%) rename {include/asm-nios2 => arch/nios2/include/asm}/posix_types.h (100%) rename {include/asm-nios2 => arch/nios2/include/asm}/processor.h (100%) rename {include/asm-nios2 => arch/nios2/include/asm}/psr.h (100%) rename {include/asm-nios2 => arch/nios2/include/asm}/ptrace.h (100%) rename {include/asm-nios2 => arch/nios2/include/asm}/status_led.h (100%) rename {include/asm-nios2 => arch/nios2/include/asm}/string.h (100%) rename {include/asm-nios2 => arch/nios2/include/asm}/system.h (100%) rename {include/asm-nios2 => arch/nios2/include/asm}/types.h (100%) rename {include/asm-nios2 => arch/nios2/include/asm}/u-boot.h (100%) rename {include/asm-nios2 => arch/nios2/include/asm}/unaligned.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/4xx_pci.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/4xx_pcie.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/5xx_immap.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/8xx_immap.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/atomic.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/bitops.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/byteorder.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/cache.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/config.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/cpm_8260.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/cpm_85xx.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/e300.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/errno.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/fsl_ddr_dimm_params.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/fsl_ddr_sdram.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/fsl_dma.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/fsl_i2c.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/fsl_law.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/fsl_lbc.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/fsl_pci.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/fsl_serdes.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/global_data.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/gpio.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/immap_512x.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/immap_8220.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/immap_8260.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/immap_83xx.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/immap_85xx.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/immap_86xx.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/immap_qe.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/interrupt.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/io.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/iopin_8260.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/iopin_85xx.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/iopin_8xx.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/m8260_pci.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/mc146818rtc.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/mmu.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/mp.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/mpc512x.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/mpc8349_pci.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/mpc8xxx_spi.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/pci_io.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/pnp.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/posix_types.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/ppc4xx-ebc.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/ppc4xx-isram.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/ppc4xx-sdram.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/ppc4xx-uic.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/ppc4xx_config.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/processor.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/ptrace.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/residual.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/sigcontext.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/signal.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/status_led.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/string.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/types.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/u-boot.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/unaligned.h (100%) rename {include/asm-ppc => arch/ppc/include/asm}/xilinx_irq.h (100%) rename {include/asm-sh => arch/sh/include/asm}/bitops.h (100%) rename {include/asm-sh => arch/sh/include/asm}/byteorder.h (100%) rename {include/asm-sh => arch/sh/include/asm}/cache.h (100%) rename {include/asm-sh => arch/sh/include/asm}/clk.h (100%) rename {include/asm-sh => arch/sh/include/asm}/config.h (100%) rename {include/asm-sh => arch/sh/include/asm}/cpu_sh2.h (100%) rename {include/asm-sh => arch/sh/include/asm}/cpu_sh3.h (100%) rename {include/asm-sh => arch/sh/include/asm}/cpu_sh4.h (100%) rename {include/asm-sh => arch/sh/include/asm}/cpu_sh7203.h (100%) rename {include/asm-sh => arch/sh/include/asm}/cpu_sh7710.h (100%) rename {include/asm-sh => arch/sh/include/asm}/cpu_sh7720.h (100%) rename {include/asm-sh => arch/sh/include/asm}/cpu_sh7722.h (100%) rename {include/asm-sh => arch/sh/include/asm}/cpu_sh7723.h (100%) rename {include/asm-sh => arch/sh/include/asm}/cpu_sh7750.h (100%) rename {include/asm-sh => arch/sh/include/asm}/cpu_sh7763.h (100%) rename {include/asm-sh => arch/sh/include/asm}/cpu_sh7780.h (100%) rename {include/asm-sh => arch/sh/include/asm}/cpu_sh7785.h (100%) rename {include/asm-sh => arch/sh/include/asm}/errno.h (100%) rename {include/asm-sh => arch/sh/include/asm}/global_data.h (100%) rename {include/asm-sh => arch/sh/include/asm}/io.h (100%) rename {include/asm-sh => arch/sh/include/asm}/irqflags.h (100%) rename {include/asm-sh => arch/sh/include/asm}/macro.h (100%) rename {include/asm-sh => arch/sh/include/asm}/pci.h (100%) rename {include/asm-sh => arch/sh/include/asm}/posix_types.h (100%) rename {include/asm-sh => arch/sh/include/asm}/processor.h (100%) rename {include/asm-sh => arch/sh/include/asm}/ptrace.h (100%) rename {include/asm-sh => arch/sh/include/asm}/string.h (100%) rename {include/asm-sh => arch/sh/include/asm}/system.h (100%) rename {include/asm-sh => arch/sh/include/asm}/types.h (100%) rename {include/asm-sh => arch/sh/include/asm}/u-boot.h (100%) rename {include/asm-sh => arch/sh/include/asm}/unaligned-sh4a.h (100%) rename {include/asm-sh => arch/sh/include/asm}/unaligned.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/arch-leon2/asi.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/arch-leon3/asi.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/asi.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/asmmacro.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/atomic.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/bitops.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/byteorder.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/cache.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/config.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/errno.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/global_data.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/io.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/irq.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/leon.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/leon2.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/leon3.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/machines.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/page.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/posix_types.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/processor.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/prom.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/psr.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/ptrace.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/srmmu.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/stack.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/string.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/types.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/u-boot.h (100%) rename {include/asm-sparc => arch/sparc/include/asm}/winmacro.h (100%) diff --git a/include/asm-arm/arch-a320/a320.h b/arch/arm/include/asm/arch-a320/a320.h similarity index 100% rename from include/asm-arm/arch-a320/a320.h rename to arch/arm/include/asm/arch-a320/a320.h diff --git a/include/asm-arm/arch-a320/ftpmu010.h b/arch/arm/include/asm/arch-a320/ftpmu010.h similarity index 100% rename from include/asm-arm/arch-a320/ftpmu010.h rename to arch/arm/include/asm/arch-a320/ftpmu010.h diff --git a/include/asm-arm/arch-a320/ftsdmc020.h b/arch/arm/include/asm/arch-a320/ftsdmc020.h similarity index 100% rename from include/asm-arm/arch-a320/ftsdmc020.h rename to arch/arm/include/asm/arch-a320/ftsdmc020.h diff --git a/include/asm-arm/arch-a320/ftsmc020.h b/arch/arm/include/asm/arch-a320/ftsmc020.h similarity index 100% rename from include/asm-arm/arch-a320/ftsmc020.h rename to arch/arm/include/asm/arch-a320/ftsmc020.h diff --git a/include/asm-arm/arch-a320/fttmr010.h b/arch/arm/include/asm/arch-a320/fttmr010.h similarity index 100% rename from include/asm-arm/arch-a320/fttmr010.h rename to arch/arm/include/asm/arch-a320/fttmr010.h diff --git a/include/asm-arm/arch-arm720t/hardware.h b/arch/arm/include/asm/arch-arm720t/hardware.h similarity index 100% rename from include/asm-arm/arch-arm720t/hardware.h rename to arch/arm/include/asm/arch-arm720t/hardware.h diff --git a/include/asm-arm/arch-arm720t/netarm_dma_module.h b/arch/arm/include/asm/arch-arm720t/netarm_dma_module.h similarity index 100% rename from include/asm-arm/arch-arm720t/netarm_dma_module.h rename to arch/arm/include/asm/arch-arm720t/netarm_dma_module.h diff --git a/include/asm-arm/arch-arm720t/netarm_eni_module.h b/arch/arm/include/asm/arch-arm720t/netarm_eni_module.h similarity index 100% rename from include/asm-arm/arch-arm720t/netarm_eni_module.h rename to arch/arm/include/asm/arch-arm720t/netarm_eni_module.h diff --git a/include/asm-arm/arch-arm720t/netarm_eth_module.h b/arch/arm/include/asm/arch-arm720t/netarm_eth_module.h similarity index 100% rename from include/asm-arm/arch-arm720t/netarm_eth_module.h rename to arch/arm/include/asm/arch-arm720t/netarm_eth_module.h diff --git a/include/asm-arm/arch-arm720t/netarm_gen_module.h b/arch/arm/include/asm/arch-arm720t/netarm_gen_module.h similarity index 100% rename from include/asm-arm/arch-arm720t/netarm_gen_module.h rename to arch/arm/include/asm/arch-arm720t/netarm_gen_module.h diff --git a/include/asm-arm/arch-arm720t/netarm_mem_module.h b/arch/arm/include/asm/arch-arm720t/netarm_mem_module.h similarity index 100% rename from include/asm-arm/arch-arm720t/netarm_mem_module.h rename to arch/arm/include/asm/arch-arm720t/netarm_mem_module.h diff --git a/include/asm-arm/arch-arm720t/netarm_registers.h b/arch/arm/include/asm/arch-arm720t/netarm_registers.h similarity index 100% rename from include/asm-arm/arch-arm720t/netarm_registers.h rename to arch/arm/include/asm/arch-arm720t/netarm_registers.h diff --git a/include/asm-arm/arch-arm720t/netarm_ser_module.h b/arch/arm/include/asm/arch-arm720t/netarm_ser_module.h similarity index 100% rename from include/asm-arm/arch-arm720t/netarm_ser_module.h rename to arch/arm/include/asm/arch-arm720t/netarm_ser_module.h diff --git a/include/asm-arm/arch-arm925t/sizes.h b/arch/arm/include/asm/arch-arm925t/sizes.h similarity index 100% rename from include/asm-arm/arch-arm925t/sizes.h rename to arch/arm/include/asm/arch-arm925t/sizes.h diff --git a/include/asm-arm/arch-arm926ejs/sizes.h b/arch/arm/include/asm/arch-arm926ejs/sizes.h similarity index 100% rename from include/asm-arm/arch-arm926ejs/sizes.h rename to arch/arm/include/asm/arch-arm926ejs/sizes.h diff --git a/include/asm-arm/arch-at91/at91_common.h b/arch/arm/include/asm/arch-at91/at91_common.h similarity index 100% rename from include/asm-arm/arch-at91/at91_common.h rename to arch/arm/include/asm/arch-at91/at91_common.h diff --git a/include/asm-arm/arch-at91/at91_emac.h b/arch/arm/include/asm/arch-at91/at91_emac.h similarity index 100% rename from include/asm-arm/arch-at91/at91_emac.h rename to arch/arm/include/asm/arch-at91/at91_emac.h diff --git a/include/asm-arm/arch-at91/at91_matrix.h b/arch/arm/include/asm/arch-at91/at91_matrix.h similarity index 100% rename from include/asm-arm/arch-at91/at91_matrix.h rename to arch/arm/include/asm/arch-at91/at91_matrix.h diff --git a/include/asm-arm/arch-at91/at91_mc.h b/arch/arm/include/asm/arch-at91/at91_mc.h similarity index 100% rename from include/asm-arm/arch-at91/at91_mc.h rename to arch/arm/include/asm/arch-at91/at91_mc.h diff --git a/include/asm-arm/arch-at91/at91_pdc.h b/arch/arm/include/asm/arch-at91/at91_pdc.h similarity index 100% rename from include/asm-arm/arch-at91/at91_pdc.h rename to arch/arm/include/asm/arch-at91/at91_pdc.h diff --git a/include/asm-arm/arch-at91/at91_pio.h b/arch/arm/include/asm/arch-at91/at91_pio.h similarity index 100% rename from include/asm-arm/arch-at91/at91_pio.h rename to arch/arm/include/asm/arch-at91/at91_pio.h diff --git a/include/asm-arm/arch-at91/at91_pit.h b/arch/arm/include/asm/arch-at91/at91_pit.h similarity index 100% rename from include/asm-arm/arch-at91/at91_pit.h rename to arch/arm/include/asm/arch-at91/at91_pit.h diff --git a/include/asm-arm/arch-at91/at91_pmc.h b/arch/arm/include/asm/arch-at91/at91_pmc.h similarity index 100% rename from include/asm-arm/arch-at91/at91_pmc.h rename to arch/arm/include/asm/arch-at91/at91_pmc.h diff --git a/include/asm-arm/arch-at91/at91_rstc.h b/arch/arm/include/asm/arch-at91/at91_rstc.h similarity index 100% rename from include/asm-arm/arch-at91/at91_rstc.h rename to arch/arm/include/asm/arch-at91/at91_rstc.h diff --git a/include/asm-arm/arch-at91/at91_spi.h b/arch/arm/include/asm/arch-at91/at91_spi.h similarity index 100% rename from include/asm-arm/arch-at91/at91_spi.h rename to arch/arm/include/asm/arch-at91/at91_spi.h diff --git a/include/asm-arm/arch-at91/at91_st.h b/arch/arm/include/asm/arch-at91/at91_st.h similarity index 100% rename from include/asm-arm/arch-at91/at91_st.h rename to arch/arm/include/asm/arch-at91/at91_st.h diff --git a/include/asm-arm/arch-at91/at91_tc.h b/arch/arm/include/asm/arch-at91/at91_tc.h similarity index 100% rename from include/asm-arm/arch-at91/at91_tc.h rename to arch/arm/include/asm/arch-at91/at91_tc.h diff --git a/include/asm-arm/arch-at91/at91_wdt.h b/arch/arm/include/asm/arch-at91/at91_wdt.h similarity index 100% rename from include/asm-arm/arch-at91/at91_wdt.h rename to arch/arm/include/asm/arch-at91/at91_wdt.h diff --git a/include/asm-arm/arch-at91/at91cap9.h b/arch/arm/include/asm/arch-at91/at91cap9.h similarity index 100% rename from include/asm-arm/arch-at91/at91cap9.h rename to arch/arm/include/asm/arch-at91/at91cap9.h diff --git a/include/asm-arm/arch-at91/at91cap9_matrix.h b/arch/arm/include/asm/arch-at91/at91cap9_matrix.h similarity index 100% rename from include/asm-arm/arch-at91/at91cap9_matrix.h rename to arch/arm/include/asm/arch-at91/at91cap9_matrix.h diff --git a/include/asm-arm/arch-at91/at91rm9200.h b/arch/arm/include/asm/arch-at91/at91rm9200.h similarity index 100% rename from include/asm-arm/arch-at91/at91rm9200.h rename to arch/arm/include/asm/arch-at91/at91rm9200.h diff --git a/include/asm-arm/arch-at91/at91sam9260.h b/arch/arm/include/asm/arch-at91/at91sam9260.h similarity index 100% rename from include/asm-arm/arch-at91/at91sam9260.h rename to arch/arm/include/asm/arch-at91/at91sam9260.h diff --git a/include/asm-arm/arch-at91/at91sam9260_matrix.h b/arch/arm/include/asm/arch-at91/at91sam9260_matrix.h similarity index 100% rename from include/asm-arm/arch-at91/at91sam9260_matrix.h rename to arch/arm/include/asm/arch-at91/at91sam9260_matrix.h diff --git a/include/asm-arm/arch-at91/at91sam9261.h b/arch/arm/include/asm/arch-at91/at91sam9261.h similarity index 100% rename from include/asm-arm/arch-at91/at91sam9261.h rename to arch/arm/include/asm/arch-at91/at91sam9261.h diff --git a/include/asm-arm/arch-at91/at91sam9261_matrix.h b/arch/arm/include/asm/arch-at91/at91sam9261_matrix.h similarity index 100% rename from include/asm-arm/arch-at91/at91sam9261_matrix.h rename to arch/arm/include/asm/arch-at91/at91sam9261_matrix.h diff --git a/include/asm-arm/arch-at91/at91sam9263.h b/arch/arm/include/asm/arch-at91/at91sam9263.h similarity index 100% rename from include/asm-arm/arch-at91/at91sam9263.h rename to arch/arm/include/asm/arch-at91/at91sam9263.h diff --git a/include/asm-arm/arch-at91/at91sam9263_matrix.h b/arch/arm/include/asm/arch-at91/at91sam9263_matrix.h similarity index 100% rename from include/asm-arm/arch-at91/at91sam9263_matrix.h rename to arch/arm/include/asm/arch-at91/at91sam9263_matrix.h diff --git a/include/asm-arm/arch-at91/at91sam9_matrix.h b/arch/arm/include/asm/arch-at91/at91sam9_matrix.h similarity index 100% rename from include/asm-arm/arch-at91/at91sam9_matrix.h rename to arch/arm/include/asm/arch-at91/at91sam9_matrix.h diff --git a/include/asm-arm/arch-at91/at91sam9_sdramc.h b/arch/arm/include/asm/arch-at91/at91sam9_sdramc.h similarity index 100% rename from include/asm-arm/arch-at91/at91sam9_sdramc.h rename to arch/arm/include/asm/arch-at91/at91sam9_sdramc.h diff --git a/include/asm-arm/arch-at91/at91sam9_smc.h b/arch/arm/include/asm/arch-at91/at91sam9_smc.h similarity index 100% rename from include/asm-arm/arch-at91/at91sam9_smc.h rename to arch/arm/include/asm/arch-at91/at91sam9_smc.h diff --git a/include/asm-arm/arch-at91/at91sam9g45.h b/arch/arm/include/asm/arch-at91/at91sam9g45.h similarity index 100% rename from include/asm-arm/arch-at91/at91sam9g45.h rename to arch/arm/include/asm/arch-at91/at91sam9g45.h diff --git a/include/asm-arm/arch-at91/at91sam9g45_matrix.h b/arch/arm/include/asm/arch-at91/at91sam9g45_matrix.h similarity index 100% rename from include/asm-arm/arch-at91/at91sam9g45_matrix.h rename to arch/arm/include/asm/arch-at91/at91sam9g45_matrix.h diff --git a/include/asm-arm/arch-at91/at91sam9rl.h b/arch/arm/include/asm/arch-at91/at91sam9rl.h similarity index 100% rename from include/asm-arm/arch-at91/at91sam9rl.h rename to arch/arm/include/asm/arch-at91/at91sam9rl.h diff --git a/include/asm-arm/arch-at91/at91sam9rl_matrix.h b/arch/arm/include/asm/arch-at91/at91sam9rl_matrix.h similarity index 100% rename from include/asm-arm/arch-at91/at91sam9rl_matrix.h rename to arch/arm/include/asm/arch-at91/at91sam9rl_matrix.h diff --git a/include/asm-arm/arch-at91/clk.h b/arch/arm/include/asm/arch-at91/clk.h similarity index 100% rename from include/asm-arm/arch-at91/clk.h rename to arch/arm/include/asm/arch-at91/clk.h diff --git a/include/asm-arm/arch-at91/gpio.h b/arch/arm/include/asm/arch-at91/gpio.h similarity index 100% rename from include/asm-arm/arch-at91/gpio.h rename to arch/arm/include/asm/arch-at91/gpio.h diff --git a/include/asm-arm/arch-at91/hardware.h b/arch/arm/include/asm/arch-at91/hardware.h similarity index 100% rename from include/asm-arm/arch-at91/hardware.h rename to arch/arm/include/asm/arch-at91/hardware.h diff --git a/include/asm-arm/arch-at91/io.h b/arch/arm/include/asm/arch-at91/io.h similarity index 100% rename from include/asm-arm/arch-at91/io.h rename to arch/arm/include/asm/arch-at91/io.h diff --git a/include/asm-arm/arch-at91/memory-map.h b/arch/arm/include/asm/arch-at91/memory-map.h similarity index 100% rename from include/asm-arm/arch-at91/memory-map.h rename to arch/arm/include/asm/arch-at91/memory-map.h diff --git a/include/asm-arm/arch-at91rm9200/AT91RM9200.h b/arch/arm/include/asm/arch-at91rm9200/AT91RM9200.h similarity index 100% rename from include/asm-arm/arch-at91rm9200/AT91RM9200.h rename to arch/arm/include/asm/arch-at91rm9200/AT91RM9200.h diff --git a/include/asm-arm/arch-at91rm9200/hardware.h b/arch/arm/include/asm/arch-at91rm9200/hardware.h similarity index 100% rename from include/asm-arm/arch-at91rm9200/hardware.h rename to arch/arm/include/asm/arch-at91rm9200/hardware.h diff --git a/include/asm-arm/arch-davinci/emac_defs.h b/arch/arm/include/asm/arch-davinci/emac_defs.h similarity index 100% rename from include/asm-arm/arch-davinci/emac_defs.h rename to arch/arm/include/asm/arch-davinci/emac_defs.h diff --git a/include/asm-arm/arch-davinci/emif_defs.h b/arch/arm/include/asm/arch-davinci/emif_defs.h similarity index 100% rename from include/asm-arm/arch-davinci/emif_defs.h rename to arch/arm/include/asm/arch-davinci/emif_defs.h diff --git a/include/asm-arm/arch-davinci/gpio_defs.h b/arch/arm/include/asm/arch-davinci/gpio_defs.h similarity index 100% rename from include/asm-arm/arch-davinci/gpio_defs.h rename to arch/arm/include/asm/arch-davinci/gpio_defs.h diff --git a/include/asm-arm/arch-davinci/hardware.h b/arch/arm/include/asm/arch-davinci/hardware.h similarity index 100% rename from include/asm-arm/arch-davinci/hardware.h rename to arch/arm/include/asm/arch-davinci/hardware.h diff --git a/include/asm-arm/arch-davinci/i2c_defs.h b/arch/arm/include/asm/arch-davinci/i2c_defs.h similarity index 100% rename from include/asm-arm/arch-davinci/i2c_defs.h rename to arch/arm/include/asm/arch-davinci/i2c_defs.h diff --git a/include/asm-arm/arch-davinci/nand_defs.h b/arch/arm/include/asm/arch-davinci/nand_defs.h similarity index 100% rename from include/asm-arm/arch-davinci/nand_defs.h rename to arch/arm/include/asm/arch-davinci/nand_defs.h diff --git a/include/asm-arm/arch-ep93xx/ep93xx.h b/arch/arm/include/asm/arch-ep93xx/ep93xx.h similarity index 100% rename from include/asm-arm/arch-ep93xx/ep93xx.h rename to arch/arm/include/asm/arch-ep93xx/ep93xx.h diff --git a/include/asm-arm/arch-imx/imx-regs.h b/arch/arm/include/asm/arch-imx/imx-regs.h similarity index 100% rename from include/asm-arm/arch-imx/imx-regs.h rename to arch/arm/include/asm/arch-imx/imx-regs.h diff --git a/include/asm-arm/arch-ixp/ixp425.h b/arch/arm/include/asm/arch-ixp/ixp425.h similarity index 100% rename from include/asm-arm/arch-ixp/ixp425.h rename to arch/arm/include/asm/arch-ixp/ixp425.h diff --git a/include/asm-arm/arch-ixp/ixp425pci.h b/arch/arm/include/asm/arch-ixp/ixp425pci.h similarity index 100% rename from include/asm-arm/arch-ixp/ixp425pci.h rename to arch/arm/include/asm/arch-ixp/ixp425pci.h diff --git a/include/asm-arm/arch-kirkwood/cpu.h b/arch/arm/include/asm/arch-kirkwood/cpu.h similarity index 100% rename from include/asm-arm/arch-kirkwood/cpu.h rename to arch/arm/include/asm/arch-kirkwood/cpu.h diff --git a/include/asm-arm/arch-kirkwood/gpio.h b/arch/arm/include/asm/arch-kirkwood/gpio.h similarity index 100% rename from include/asm-arm/arch-kirkwood/gpio.h rename to arch/arm/include/asm/arch-kirkwood/gpio.h diff --git a/include/asm-arm/arch-kirkwood/kirkwood.h b/arch/arm/include/asm/arch-kirkwood/kirkwood.h similarity index 100% rename from include/asm-arm/arch-kirkwood/kirkwood.h rename to arch/arm/include/asm/arch-kirkwood/kirkwood.h diff --git a/include/asm-arm/arch-kirkwood/kw88f6192.h b/arch/arm/include/asm/arch-kirkwood/kw88f6192.h similarity index 100% rename from include/asm-arm/arch-kirkwood/kw88f6192.h rename to arch/arm/include/asm/arch-kirkwood/kw88f6192.h diff --git a/include/asm-arm/arch-kirkwood/kw88f6281.h b/arch/arm/include/asm/arch-kirkwood/kw88f6281.h similarity index 100% rename from include/asm-arm/arch-kirkwood/kw88f6281.h rename to arch/arm/include/asm/arch-kirkwood/kw88f6281.h diff --git a/include/asm-arm/arch-kirkwood/mpp.h b/arch/arm/include/asm/arch-kirkwood/mpp.h similarity index 100% rename from include/asm-arm/arch-kirkwood/mpp.h rename to arch/arm/include/asm/arch-kirkwood/mpp.h diff --git a/include/asm-arm/arch-kirkwood/spi.h b/arch/arm/include/asm/arch-kirkwood/spi.h similarity index 100% rename from include/asm-arm/arch-kirkwood/spi.h rename to arch/arm/include/asm/arch-kirkwood/spi.h diff --git a/include/asm-arm/arch-ks8695/platform.h b/arch/arm/include/asm/arch-ks8695/platform.h similarity index 100% rename from include/asm-arm/arch-ks8695/platform.h rename to arch/arm/include/asm/arch-ks8695/platform.h diff --git a/include/asm-arm/arch-lpc2292/hardware.h b/arch/arm/include/asm/arch-lpc2292/hardware.h similarity index 100% rename from include/asm-arm/arch-lpc2292/hardware.h rename to arch/arm/include/asm/arch-lpc2292/hardware.h diff --git a/include/asm-arm/arch-lpc2292/lpc2292_registers.h b/arch/arm/include/asm/arch-lpc2292/lpc2292_registers.h similarity index 100% rename from include/asm-arm/arch-lpc2292/lpc2292_registers.h rename to arch/arm/include/asm/arch-lpc2292/lpc2292_registers.h diff --git a/include/asm-arm/arch-lpc2292/spi.h b/arch/arm/include/asm/arch-lpc2292/spi.h similarity index 100% rename from include/asm-arm/arch-lpc2292/spi.h rename to arch/arm/include/asm/arch-lpc2292/spi.h diff --git a/include/asm-arm/arch-mx25/clock.h b/arch/arm/include/asm/arch-mx25/clock.h similarity index 100% rename from include/asm-arm/arch-mx25/clock.h rename to arch/arm/include/asm/arch-mx25/clock.h diff --git a/include/asm-arm/arch-mx25/imx-regs.h b/arch/arm/include/asm/arch-mx25/imx-regs.h similarity index 100% rename from include/asm-arm/arch-mx25/imx-regs.h rename to arch/arm/include/asm/arch-mx25/imx-regs.h diff --git a/include/asm-arm/arch-mx25/imx25-pinmux.h b/arch/arm/include/asm/arch-mx25/imx25-pinmux.h similarity index 100% rename from include/asm-arm/arch-mx25/imx25-pinmux.h rename to arch/arm/include/asm/arch-mx25/imx25-pinmux.h diff --git a/include/asm-arm/arch-mx27/asm-offsets.h b/arch/arm/include/asm/arch-mx27/asm-offsets.h similarity index 100% rename from include/asm-arm/arch-mx27/asm-offsets.h rename to arch/arm/include/asm/arch-mx27/asm-offsets.h diff --git a/include/asm-arm/arch-mx27/clock.h b/arch/arm/include/asm/arch-mx27/clock.h similarity index 100% rename from include/asm-arm/arch-mx27/clock.h rename to arch/arm/include/asm/arch-mx27/clock.h diff --git a/include/asm-arm/arch-mx27/imx-regs.h b/arch/arm/include/asm/arch-mx27/imx-regs.h similarity index 100% rename from include/asm-arm/arch-mx27/imx-regs.h rename to arch/arm/include/asm/arch-mx27/imx-regs.h diff --git a/include/asm-arm/arch-mx27/mxcmmc.h b/arch/arm/include/asm/arch-mx27/mxcmmc.h similarity index 100% rename from include/asm-arm/arch-mx27/mxcmmc.h rename to arch/arm/include/asm/arch-mx27/mxcmmc.h diff --git a/include/asm-arm/arch-mx31/mx31-regs.h b/arch/arm/include/asm/arch-mx31/mx31-regs.h similarity index 100% rename from include/asm-arm/arch-mx31/mx31-regs.h rename to arch/arm/include/asm/arch-mx31/mx31-regs.h diff --git a/include/asm-arm/arch-mx31/mx31.h b/arch/arm/include/asm/arch-mx31/mx31.h similarity index 100% rename from include/asm-arm/arch-mx31/mx31.h rename to arch/arm/include/asm/arch-mx31/mx31.h diff --git a/include/asm-arm/arch-mx51/asm-offsets.h b/arch/arm/include/asm/arch-mx51/asm-offsets.h similarity index 100% rename from include/asm-arm/arch-mx51/asm-offsets.h rename to arch/arm/include/asm/arch-mx51/asm-offsets.h diff --git a/include/asm-arm/arch-mx51/clock.h b/arch/arm/include/asm/arch-mx51/clock.h similarity index 100% rename from include/asm-arm/arch-mx51/clock.h rename to arch/arm/include/asm/arch-mx51/clock.h diff --git a/include/asm-arm/arch-mx51/crm_regs.h b/arch/arm/include/asm/arch-mx51/crm_regs.h similarity index 100% rename from include/asm-arm/arch-mx51/crm_regs.h rename to arch/arm/include/asm/arch-mx51/crm_regs.h diff --git a/include/asm-arm/arch-mx51/imx-regs.h b/arch/arm/include/asm/arch-mx51/imx-regs.h similarity index 100% rename from include/asm-arm/arch-mx51/imx-regs.h rename to arch/arm/include/asm/arch-mx51/imx-regs.h diff --git a/include/asm-arm/arch-mx51/iomux.h b/arch/arm/include/asm/arch-mx51/iomux.h similarity index 100% rename from include/asm-arm/arch-mx51/iomux.h rename to arch/arm/include/asm/arch-mx51/iomux.h diff --git a/include/asm-arm/arch-mx51/mx51_pins.h b/arch/arm/include/asm/arch-mx51/mx51_pins.h similarity index 100% rename from include/asm-arm/arch-mx51/mx51_pins.h rename to arch/arm/include/asm/arch-mx51/mx51_pins.h diff --git a/include/asm-arm/arch-mx51/sys_proto.h b/arch/arm/include/asm/arch-mx51/sys_proto.h similarity index 100% rename from include/asm-arm/arch-mx51/sys_proto.h rename to arch/arm/include/asm/arch-mx51/sys_proto.h diff --git a/include/asm-arm/arch-nomadik/gpio.h b/arch/arm/include/asm/arch-nomadik/gpio.h similarity index 100% rename from include/asm-arm/arch-nomadik/gpio.h rename to arch/arm/include/asm/arch-nomadik/gpio.h diff --git a/include/asm-arm/arch-nomadik/mtu.h b/arch/arm/include/asm/arch-nomadik/mtu.h similarity index 100% rename from include/asm-arm/arch-nomadik/mtu.h rename to arch/arm/include/asm/arch-nomadik/mtu.h diff --git a/include/asm-arm/arch-omap/sizes.h b/arch/arm/include/asm/arch-omap/sizes.h similarity index 100% rename from include/asm-arm/arch-omap/sizes.h rename to arch/arm/include/asm/arch-omap/sizes.h diff --git a/include/asm-arm/arch-omap24xx/bits.h b/arch/arm/include/asm/arch-omap24xx/bits.h similarity index 100% rename from include/asm-arm/arch-omap24xx/bits.h rename to arch/arm/include/asm/arch-omap24xx/bits.h diff --git a/include/asm-arm/arch-omap24xx/clocks.h b/arch/arm/include/asm/arch-omap24xx/clocks.h similarity index 100% rename from include/asm-arm/arch-omap24xx/clocks.h rename to arch/arm/include/asm/arch-omap24xx/clocks.h diff --git a/include/asm-arm/arch-omap24xx/i2c.h b/arch/arm/include/asm/arch-omap24xx/i2c.h similarity index 100% rename from include/asm-arm/arch-omap24xx/i2c.h rename to arch/arm/include/asm/arch-omap24xx/i2c.h diff --git a/include/asm-arm/arch-omap24xx/mem.h b/arch/arm/include/asm/arch-omap24xx/mem.h similarity index 100% rename from include/asm-arm/arch-omap24xx/mem.h rename to arch/arm/include/asm/arch-omap24xx/mem.h diff --git a/include/asm-arm/arch-omap24xx/mux.h b/arch/arm/include/asm/arch-omap24xx/mux.h similarity index 100% rename from include/asm-arm/arch-omap24xx/mux.h rename to arch/arm/include/asm/arch-omap24xx/mux.h diff --git a/include/asm-arm/arch-omap24xx/omap2420.h b/arch/arm/include/asm/arch-omap24xx/omap2420.h similarity index 100% rename from include/asm-arm/arch-omap24xx/omap2420.h rename to arch/arm/include/asm/arch-omap24xx/omap2420.h diff --git a/include/asm-arm/arch-omap24xx/sizes.h b/arch/arm/include/asm/arch-omap24xx/sizes.h similarity index 100% rename from include/asm-arm/arch-omap24xx/sizes.h rename to arch/arm/include/asm/arch-omap24xx/sizes.h diff --git a/include/asm-arm/arch-omap24xx/sys_info.h b/arch/arm/include/asm/arch-omap24xx/sys_info.h similarity index 100% rename from include/asm-arm/arch-omap24xx/sys_info.h rename to arch/arm/include/asm/arch-omap24xx/sys_info.h diff --git a/include/asm-arm/arch-omap24xx/sys_proto.h b/arch/arm/include/asm/arch-omap24xx/sys_proto.h similarity index 100% rename from include/asm-arm/arch-omap24xx/sys_proto.h rename to arch/arm/include/asm/arch-omap24xx/sys_proto.h diff --git a/include/asm-arm/arch-omap3/clocks.h b/arch/arm/include/asm/arch-omap3/clocks.h similarity index 100% rename from include/asm-arm/arch-omap3/clocks.h rename to arch/arm/include/asm/arch-omap3/clocks.h diff --git a/include/asm-arm/arch-omap3/clocks_omap3.h b/arch/arm/include/asm/arch-omap3/clocks_omap3.h similarity index 100% rename from include/asm-arm/arch-omap3/clocks_omap3.h rename to arch/arm/include/asm/arch-omap3/clocks_omap3.h diff --git a/include/asm-arm/arch-omap3/cpu.h b/arch/arm/include/asm/arch-omap3/cpu.h similarity index 100% rename from include/asm-arm/arch-omap3/cpu.h rename to arch/arm/include/asm/arch-omap3/cpu.h diff --git a/include/asm-arm/arch-omap3/gpio.h b/arch/arm/include/asm/arch-omap3/gpio.h similarity index 100% rename from include/asm-arm/arch-omap3/gpio.h rename to arch/arm/include/asm/arch-omap3/gpio.h diff --git a/include/asm-arm/arch-omap3/i2c.h b/arch/arm/include/asm/arch-omap3/i2c.h similarity index 100% rename from include/asm-arm/arch-omap3/i2c.h rename to arch/arm/include/asm/arch-omap3/i2c.h diff --git a/include/asm-arm/arch-omap3/mem.h b/arch/arm/include/asm/arch-omap3/mem.h similarity index 100% rename from include/asm-arm/arch-omap3/mem.h rename to arch/arm/include/asm/arch-omap3/mem.h diff --git a/include/asm-arm/arch-omap3/mmc.h b/arch/arm/include/asm/arch-omap3/mmc.h similarity index 100% rename from include/asm-arm/arch-omap3/mmc.h rename to arch/arm/include/asm/arch-omap3/mmc.h diff --git a/include/asm-arm/arch-omap3/mmc_host_def.h b/arch/arm/include/asm/arch-omap3/mmc_host_def.h similarity index 100% rename from include/asm-arm/arch-omap3/mmc_host_def.h rename to arch/arm/include/asm/arch-omap3/mmc_host_def.h diff --git a/include/asm-arm/arch-omap3/mux.h b/arch/arm/include/asm/arch-omap3/mux.h similarity index 100% rename from include/asm-arm/arch-omap3/mux.h rename to arch/arm/include/asm/arch-omap3/mux.h diff --git a/include/asm-arm/arch-omap3/omap3.h b/arch/arm/include/asm/arch-omap3/omap3.h similarity index 100% rename from include/asm-arm/arch-omap3/omap3.h rename to arch/arm/include/asm/arch-omap3/omap3.h diff --git a/include/asm-arm/arch-omap3/omap_gpmc.h b/arch/arm/include/asm/arch-omap3/omap_gpmc.h similarity index 100% rename from include/asm-arm/arch-omap3/omap_gpmc.h rename to arch/arm/include/asm/arch-omap3/omap_gpmc.h diff --git a/include/asm-arm/arch-omap3/sys_proto.h b/arch/arm/include/asm/arch-omap3/sys_proto.h similarity index 100% rename from include/asm-arm/arch-omap3/sys_proto.h rename to arch/arm/include/asm/arch-omap3/sys_proto.h diff --git a/include/asm-arm/arch-pxa/bitfield.h b/arch/arm/include/asm/arch-pxa/bitfield.h similarity index 100% rename from include/asm-arm/arch-pxa/bitfield.h rename to arch/arm/include/asm/arch-pxa/bitfield.h diff --git a/include/asm-arm/arch-pxa/hardware.h b/arch/arm/include/asm/arch-pxa/hardware.h similarity index 100% rename from include/asm-arm/arch-pxa/hardware.h rename to arch/arm/include/asm/arch-pxa/hardware.h diff --git a/include/asm-arm/arch-pxa/pxa-regs.h b/arch/arm/include/asm/arch-pxa/pxa-regs.h similarity index 100% rename from include/asm-arm/arch-pxa/pxa-regs.h rename to arch/arm/include/asm/arch-pxa/pxa-regs.h diff --git a/include/asm-arm/arch-s3c24x0/memory.h b/arch/arm/include/asm/arch-s3c24x0/memory.h similarity index 100% rename from include/asm-arm/arch-s3c24x0/memory.h rename to arch/arm/include/asm/arch-s3c24x0/memory.h diff --git a/include/asm-arm/arch-s3c24x0/s3c2400.h b/arch/arm/include/asm/arch-s3c24x0/s3c2400.h similarity index 100% rename from include/asm-arm/arch-s3c24x0/s3c2400.h rename to arch/arm/include/asm/arch-s3c24x0/s3c2400.h diff --git a/include/asm-arm/arch-s3c24x0/s3c2410.h b/arch/arm/include/asm/arch-s3c24x0/s3c2410.h similarity index 100% rename from include/asm-arm/arch-s3c24x0/s3c2410.h rename to arch/arm/include/asm/arch-s3c24x0/s3c2410.h diff --git a/include/asm-arm/arch-s3c24x0/s3c24x0.h b/arch/arm/include/asm/arch-s3c24x0/s3c24x0.h similarity index 100% rename from include/asm-arm/arch-s3c24x0/s3c24x0.h rename to arch/arm/include/asm/arch-s3c24x0/s3c24x0.h diff --git a/include/asm-arm/arch-s3c24x0/s3c24x0_cpu.h b/arch/arm/include/asm/arch-s3c24x0/s3c24x0_cpu.h similarity index 100% rename from include/asm-arm/arch-s3c24x0/s3c24x0_cpu.h rename to arch/arm/include/asm/arch-s3c24x0/s3c24x0_cpu.h diff --git a/include/asm-arm/arch-s3c44b0/hardware.h b/arch/arm/include/asm/arch-s3c44b0/hardware.h similarity index 100% rename from include/asm-arm/arch-s3c44b0/hardware.h rename to arch/arm/include/asm/arch-s3c44b0/hardware.h diff --git a/include/asm-arm/arch-s3c4510b/hardware.h b/arch/arm/include/asm/arch-s3c4510b/hardware.h similarity index 100% rename from include/asm-arm/arch-s3c4510b/hardware.h rename to arch/arm/include/asm/arch-s3c4510b/hardware.h diff --git a/include/asm-arm/arch-s3c64xx/hardware.h b/arch/arm/include/asm/arch-s3c64xx/hardware.h similarity index 100% rename from include/asm-arm/arch-s3c64xx/hardware.h rename to arch/arm/include/asm/arch-s3c64xx/hardware.h diff --git a/include/asm-arm/arch-s3c64xx/s3c6400.h b/arch/arm/include/asm/arch-s3c64xx/s3c6400.h similarity index 100% rename from include/asm-arm/arch-s3c64xx/s3c6400.h rename to arch/arm/include/asm/arch-s3c64xx/s3c6400.h diff --git a/include/asm-arm/arch-s3c64xx/s3c64x0.h b/arch/arm/include/asm/arch-s3c64xx/s3c64x0.h similarity index 100% rename from include/asm-arm/arch-s3c64xx/s3c64x0.h rename to arch/arm/include/asm/arch-s3c64xx/s3c64x0.h diff --git a/include/asm-arm/arch-s5pc1xx/clk.h b/arch/arm/include/asm/arch-s5pc1xx/clk.h similarity index 100% rename from include/asm-arm/arch-s5pc1xx/clk.h rename to arch/arm/include/asm/arch-s5pc1xx/clk.h diff --git a/include/asm-arm/arch-s5pc1xx/clock.h b/arch/arm/include/asm/arch-s5pc1xx/clock.h similarity index 100% rename from include/asm-arm/arch-s5pc1xx/clock.h rename to arch/arm/include/asm/arch-s5pc1xx/clock.h diff --git a/include/asm-arm/arch-s5pc1xx/cpu.h b/arch/arm/include/asm/arch-s5pc1xx/cpu.h similarity index 100% rename from include/asm-arm/arch-s5pc1xx/cpu.h rename to arch/arm/include/asm/arch-s5pc1xx/cpu.h diff --git a/include/asm-arm/arch-s5pc1xx/gpio.h b/arch/arm/include/asm/arch-s5pc1xx/gpio.h similarity index 100% rename from include/asm-arm/arch-s5pc1xx/gpio.h rename to arch/arm/include/asm/arch-s5pc1xx/gpio.h diff --git a/include/asm-arm/arch-s5pc1xx/power.h b/arch/arm/include/asm/arch-s5pc1xx/power.h similarity index 100% rename from include/asm-arm/arch-s5pc1xx/power.h rename to arch/arm/include/asm/arch-s5pc1xx/power.h diff --git a/include/asm-arm/arch-s5pc1xx/pwm.h b/arch/arm/include/asm/arch-s5pc1xx/pwm.h similarity index 100% rename from include/asm-arm/arch-s5pc1xx/pwm.h rename to arch/arm/include/asm/arch-s5pc1xx/pwm.h diff --git a/include/asm-arm/arch-s5pc1xx/smc.h b/arch/arm/include/asm/arch-s5pc1xx/smc.h similarity index 100% rename from include/asm-arm/arch-s5pc1xx/smc.h rename to arch/arm/include/asm/arch-s5pc1xx/smc.h diff --git a/include/asm-arm/arch-s5pc1xx/sys_proto.h b/arch/arm/include/asm/arch-s5pc1xx/sys_proto.h similarity index 100% rename from include/asm-arm/arch-s5pc1xx/sys_proto.h rename to arch/arm/include/asm/arch-s5pc1xx/sys_proto.h diff --git a/include/asm-arm/arch-s5pc1xx/uart.h b/arch/arm/include/asm/arch-s5pc1xx/uart.h similarity index 100% rename from include/asm-arm/arch-s5pc1xx/uart.h rename to arch/arm/include/asm/arch-s5pc1xx/uart.h diff --git a/include/asm-arm/arch-sa1100/bitfield.h b/arch/arm/include/asm/arch-sa1100/bitfield.h similarity index 100% rename from include/asm-arm/arch-sa1100/bitfield.h rename to arch/arm/include/asm/arch-sa1100/bitfield.h diff --git a/include/asm-arm/arch-spear/hardware.h b/arch/arm/include/asm/arch-spear/hardware.h similarity index 100% rename from include/asm-arm/arch-spear/hardware.h rename to arch/arm/include/asm/arch-spear/hardware.h diff --git a/include/asm-arm/arch-spear/spr_defs.h b/arch/arm/include/asm/arch-spear/spr_defs.h similarity index 100% rename from include/asm-arm/arch-spear/spr_defs.h rename to arch/arm/include/asm/arch-spear/spr_defs.h diff --git a/include/asm-arm/arch-spear/spr_emi.h b/arch/arm/include/asm/arch-spear/spr_emi.h similarity index 100% rename from include/asm-arm/arch-spear/spr_emi.h rename to arch/arm/include/asm/arch-spear/spr_emi.h diff --git a/include/asm-arm/arch-spear/spr_gpt.h b/arch/arm/include/asm/arch-spear/spr_gpt.h similarity index 100% rename from include/asm-arm/arch-spear/spr_gpt.h rename to arch/arm/include/asm/arch-spear/spr_gpt.h diff --git a/include/asm-arm/arch-spear/spr_i2c.h b/arch/arm/include/asm/arch-spear/spr_i2c.h similarity index 100% rename from include/asm-arm/arch-spear/spr_i2c.h rename to arch/arm/include/asm/arch-spear/spr_i2c.h diff --git a/include/asm-arm/arch-spear/spr_misc.h b/arch/arm/include/asm/arch-spear/spr_misc.h similarity index 100% rename from include/asm-arm/arch-spear/spr_misc.h rename to arch/arm/include/asm/arch-spear/spr_misc.h diff --git a/include/asm-arm/arch-spear/spr_nand.h b/arch/arm/include/asm/arch-spear/spr_nand.h similarity index 100% rename from include/asm-arm/arch-spear/spr_nand.h rename to arch/arm/include/asm/arch-spear/spr_nand.h diff --git a/include/asm-arm/arch-spear/spr_smi.h b/arch/arm/include/asm/arch-spear/spr_smi.h similarity index 100% rename from include/asm-arm/arch-spear/spr_smi.h rename to arch/arm/include/asm/arch-spear/spr_smi.h diff --git a/include/asm-arm/arch-spear/spr_syscntl.h b/arch/arm/include/asm/arch-spear/spr_syscntl.h similarity index 100% rename from include/asm-arm/arch-spear/spr_syscntl.h rename to arch/arm/include/asm/arch-spear/spr_syscntl.h diff --git a/include/asm-arm/arch-spear/spr_xloader_table.h b/arch/arm/include/asm/arch-spear/spr_xloader_table.h similarity index 100% rename from include/asm-arm/arch-spear/spr_xloader_table.h rename to arch/arm/include/asm/arch-spear/spr_xloader_table.h diff --git a/include/asm-arm/atomic.h b/arch/arm/include/asm/atomic.h similarity index 100% rename from include/asm-arm/atomic.h rename to arch/arm/include/asm/atomic.h diff --git a/include/asm-arm/bitops.h b/arch/arm/include/asm/bitops.h similarity index 100% rename from include/asm-arm/bitops.h rename to arch/arm/include/asm/bitops.h diff --git a/include/asm-arm/byteorder.h b/arch/arm/include/asm/byteorder.h similarity index 100% rename from include/asm-arm/byteorder.h rename to arch/arm/include/asm/byteorder.h diff --git a/include/asm-arm/cache.h b/arch/arm/include/asm/cache.h similarity index 100% rename from include/asm-arm/cache.h rename to arch/arm/include/asm/cache.h diff --git a/include/asm-arm/config.h b/arch/arm/include/asm/config.h similarity index 100% rename from include/asm-arm/config.h rename to arch/arm/include/asm/config.h diff --git a/include/asm-arm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h similarity index 100% rename from include/asm-arm/dma-mapping.h rename to arch/arm/include/asm/dma-mapping.h diff --git a/include/asm-arm/errno.h b/arch/arm/include/asm/errno.h similarity index 100% rename from include/asm-arm/errno.h rename to arch/arm/include/asm/errno.h diff --git a/include/asm-arm/global_data.h b/arch/arm/include/asm/global_data.h similarity index 100% rename from include/asm-arm/global_data.h rename to arch/arm/include/asm/global_data.h diff --git a/include/asm-arm/hardware.h b/arch/arm/include/asm/hardware.h similarity index 100% rename from include/asm-arm/hardware.h rename to arch/arm/include/asm/hardware.h diff --git a/include/asm-arm/io.h b/arch/arm/include/asm/io.h similarity index 100% rename from include/asm-arm/io.h rename to arch/arm/include/asm/io.h diff --git a/include/asm-arm/mach-types.h b/arch/arm/include/asm/mach-types.h similarity index 100% rename from include/asm-arm/mach-types.h rename to arch/arm/include/asm/mach-types.h diff --git a/include/asm-arm/macro.h b/arch/arm/include/asm/macro.h similarity index 100% rename from include/asm-arm/macro.h rename to arch/arm/include/asm/macro.h diff --git a/include/asm-arm/memory.h b/arch/arm/include/asm/memory.h similarity index 100% rename from include/asm-arm/memory.h rename to arch/arm/include/asm/memory.h diff --git a/include/asm-arm/posix_types.h b/arch/arm/include/asm/posix_types.h similarity index 100% rename from include/asm-arm/posix_types.h rename to arch/arm/include/asm/posix_types.h diff --git a/include/asm-arm/proc-armv/domain.h b/arch/arm/include/asm/proc-armv/domain.h similarity index 100% rename from include/asm-arm/proc-armv/domain.h rename to arch/arm/include/asm/proc-armv/domain.h diff --git a/include/asm-arm/proc-armv/processor.h b/arch/arm/include/asm/proc-armv/processor.h similarity index 100% rename from include/asm-arm/proc-armv/processor.h rename to arch/arm/include/asm/proc-armv/processor.h diff --git a/include/asm-arm/proc-armv/ptrace.h b/arch/arm/include/asm/proc-armv/ptrace.h similarity index 100% rename from include/asm-arm/proc-armv/ptrace.h rename to arch/arm/include/asm/proc-armv/ptrace.h diff --git a/include/asm-arm/proc-armv/system.h b/arch/arm/include/asm/proc-armv/system.h similarity index 100% rename from include/asm-arm/proc-armv/system.h rename to arch/arm/include/asm/proc-armv/system.h diff --git a/include/asm-arm/processor.h b/arch/arm/include/asm/processor.h similarity index 100% rename from include/asm-arm/processor.h rename to arch/arm/include/asm/processor.h diff --git a/include/asm-arm/ptrace.h b/arch/arm/include/asm/ptrace.h similarity index 100% rename from include/asm-arm/ptrace.h rename to arch/arm/include/asm/ptrace.h diff --git a/include/asm-arm/setup.h b/arch/arm/include/asm/setup.h similarity index 100% rename from include/asm-arm/setup.h rename to arch/arm/include/asm/setup.h diff --git a/include/asm-arm/sizes.h b/arch/arm/include/asm/sizes.h similarity index 100% rename from include/asm-arm/sizes.h rename to arch/arm/include/asm/sizes.h diff --git a/include/asm-arm/string.h b/arch/arm/include/asm/string.h similarity index 100% rename from include/asm-arm/string.h rename to arch/arm/include/asm/string.h diff --git a/include/asm-arm/system.h b/arch/arm/include/asm/system.h similarity index 100% rename from include/asm-arm/system.h rename to arch/arm/include/asm/system.h diff --git a/include/asm-arm/types.h b/arch/arm/include/asm/types.h similarity index 100% rename from include/asm-arm/types.h rename to arch/arm/include/asm/types.h diff --git a/include/asm-arm/u-boot-arm.h b/arch/arm/include/asm/u-boot-arm.h similarity index 100% rename from include/asm-arm/u-boot-arm.h rename to arch/arm/include/asm/u-boot-arm.h diff --git a/include/asm-arm/u-boot.h b/arch/arm/include/asm/u-boot.h similarity index 100% rename from include/asm-arm/u-boot.h rename to arch/arm/include/asm/u-boot.h diff --git a/include/asm-arm/unaligned.h b/arch/arm/include/asm/unaligned.h similarity index 100% rename from include/asm-arm/unaligned.h rename to arch/arm/include/asm/unaligned.h diff --git a/include/asm-avr32/arch-at32ap700x/addrspace.h b/arch/avr32/include/asm/arch-at32ap700x/addrspace.h similarity index 100% rename from include/asm-avr32/arch-at32ap700x/addrspace.h rename to arch/avr32/include/asm/arch-at32ap700x/addrspace.h diff --git a/include/asm-avr32/arch-at32ap700x/cacheflush.h b/arch/avr32/include/asm/arch-at32ap700x/cacheflush.h similarity index 100% rename from include/asm-avr32/arch-at32ap700x/cacheflush.h rename to arch/avr32/include/asm/arch-at32ap700x/cacheflush.h diff --git a/include/asm-avr32/arch-at32ap700x/chip-features.h b/arch/avr32/include/asm/arch-at32ap700x/chip-features.h similarity index 100% rename from include/asm-avr32/arch-at32ap700x/chip-features.h rename to arch/avr32/include/asm/arch-at32ap700x/chip-features.h diff --git a/include/asm-avr32/arch-at32ap700x/clk.h b/arch/avr32/include/asm/arch-at32ap700x/clk.h similarity index 100% rename from include/asm-avr32/arch-at32ap700x/clk.h rename to arch/avr32/include/asm/arch-at32ap700x/clk.h diff --git a/include/asm-avr32/arch-at32ap700x/gpio-impl.h b/arch/avr32/include/asm/arch-at32ap700x/gpio-impl.h similarity index 100% rename from include/asm-avr32/arch-at32ap700x/gpio-impl.h rename to arch/avr32/include/asm/arch-at32ap700x/gpio-impl.h diff --git a/include/asm-avr32/arch-at32ap700x/gpio.h b/arch/avr32/include/asm/arch-at32ap700x/gpio.h similarity index 100% rename from include/asm-avr32/arch-at32ap700x/gpio.h rename to arch/avr32/include/asm/arch-at32ap700x/gpio.h diff --git a/include/asm-avr32/arch-at32ap700x/hmatrix.h b/arch/avr32/include/asm/arch-at32ap700x/hmatrix.h similarity index 100% rename from include/asm-avr32/arch-at32ap700x/hmatrix.h rename to arch/avr32/include/asm/arch-at32ap700x/hmatrix.h diff --git a/include/asm-avr32/arch-at32ap700x/memory-map.h b/arch/avr32/include/asm/arch-at32ap700x/memory-map.h similarity index 100% rename from include/asm-avr32/arch-at32ap700x/memory-map.h rename to arch/avr32/include/asm/arch-at32ap700x/memory-map.h diff --git a/include/asm-avr32/arch-at32ap700x/portmux.h b/arch/avr32/include/asm/arch-at32ap700x/portmux.h similarity index 100% rename from include/asm-avr32/arch-at32ap700x/portmux.h rename to arch/avr32/include/asm/arch-at32ap700x/portmux.h diff --git a/include/asm-avr32/arch-common/portmux-gpio.h b/arch/avr32/include/asm/arch-common/portmux-gpio.h similarity index 100% rename from include/asm-avr32/arch-common/portmux-gpio.h rename to arch/avr32/include/asm/arch-common/portmux-gpio.h diff --git a/include/asm-avr32/arch-common/portmux-pio.h b/arch/avr32/include/asm/arch-common/portmux-pio.h similarity index 100% rename from include/asm-avr32/arch-common/portmux-pio.h rename to arch/avr32/include/asm/arch-common/portmux-pio.h diff --git a/include/asm-avr32/bitops.h b/arch/avr32/include/asm/bitops.h similarity index 100% rename from include/asm-avr32/bitops.h rename to arch/avr32/include/asm/bitops.h diff --git a/include/asm-avr32/byteorder.h b/arch/avr32/include/asm/byteorder.h similarity index 100% rename from include/asm-avr32/byteorder.h rename to arch/avr32/include/asm/byteorder.h diff --git a/include/asm-avr32/config.h b/arch/avr32/include/asm/config.h similarity index 100% rename from include/asm-avr32/config.h rename to arch/avr32/include/asm/config.h diff --git a/include/asm-avr32/dma-mapping.h b/arch/avr32/include/asm/dma-mapping.h similarity index 100% rename from include/asm-avr32/dma-mapping.h rename to arch/avr32/include/asm/dma-mapping.h diff --git a/include/asm-avr32/errno.h b/arch/avr32/include/asm/errno.h similarity index 100% rename from include/asm-avr32/errno.h rename to arch/avr32/include/asm/errno.h diff --git a/include/asm-avr32/global_data.h b/arch/avr32/include/asm/global_data.h similarity index 100% rename from include/asm-avr32/global_data.h rename to arch/avr32/include/asm/global_data.h diff --git a/include/asm-avr32/hmatrix-common.h b/arch/avr32/include/asm/hmatrix-common.h similarity index 100% rename from include/asm-avr32/hmatrix-common.h rename to arch/avr32/include/asm/hmatrix-common.h diff --git a/include/asm-avr32/initcalls.h b/arch/avr32/include/asm/initcalls.h similarity index 100% rename from include/asm-avr32/initcalls.h rename to arch/avr32/include/asm/initcalls.h diff --git a/include/asm-avr32/io.h b/arch/avr32/include/asm/io.h similarity index 100% rename from include/asm-avr32/io.h rename to arch/avr32/include/asm/io.h diff --git a/include/asm-avr32/posix_types.h b/arch/avr32/include/asm/posix_types.h similarity index 100% rename from include/asm-avr32/posix_types.h rename to arch/avr32/include/asm/posix_types.h diff --git a/include/asm-avr32/processor.h b/arch/avr32/include/asm/processor.h similarity index 100% rename from include/asm-avr32/processor.h rename to arch/avr32/include/asm/processor.h diff --git a/include/asm-avr32/ptrace.h b/arch/avr32/include/asm/ptrace.h similarity index 100% rename from include/asm-avr32/ptrace.h rename to arch/avr32/include/asm/ptrace.h diff --git a/include/asm-avr32/sdram.h b/arch/avr32/include/asm/sdram.h similarity index 100% rename from include/asm-avr32/sdram.h rename to arch/avr32/include/asm/sdram.h diff --git a/include/asm-avr32/sections.h b/arch/avr32/include/asm/sections.h similarity index 100% rename from include/asm-avr32/sections.h rename to arch/avr32/include/asm/sections.h diff --git a/include/asm-avr32/setup.h b/arch/avr32/include/asm/setup.h similarity index 100% rename from include/asm-avr32/setup.h rename to arch/avr32/include/asm/setup.h diff --git a/include/asm-avr32/string.h b/arch/avr32/include/asm/string.h similarity index 100% rename from include/asm-avr32/string.h rename to arch/avr32/include/asm/string.h diff --git a/include/asm-avr32/sysreg.h b/arch/avr32/include/asm/sysreg.h similarity index 100% rename from include/asm-avr32/sysreg.h rename to arch/avr32/include/asm/sysreg.h diff --git a/include/asm-avr32/types.h b/arch/avr32/include/asm/types.h similarity index 100% rename from include/asm-avr32/types.h rename to arch/avr32/include/asm/types.h diff --git a/include/asm-avr32/u-boot.h b/arch/avr32/include/asm/u-boot.h similarity index 100% rename from include/asm-avr32/u-boot.h rename to arch/avr32/include/asm/u-boot.h diff --git a/include/asm-blackfin/bfin_logo_230x230.h b/arch/blackfin/include/asm/bfin_logo_230x230.h similarity index 100% rename from include/asm-blackfin/bfin_logo_230x230.h rename to arch/blackfin/include/asm/bfin_logo_230x230.h diff --git a/include/asm-blackfin/bfin_logo_rgb565_230x230.h b/arch/blackfin/include/asm/bfin_logo_rgb565_230x230.h similarity index 100% rename from include/asm-blackfin/bfin_logo_rgb565_230x230.h rename to arch/blackfin/include/asm/bfin_logo_rgb565_230x230.h diff --git a/include/asm-blackfin/bitops.h b/arch/blackfin/include/asm/bitops.h similarity index 100% rename from include/asm-blackfin/bitops.h rename to arch/blackfin/include/asm/bitops.h diff --git a/include/asm-blackfin/blackfin.h b/arch/blackfin/include/asm/blackfin.h similarity index 100% rename from include/asm-blackfin/blackfin.h rename to arch/blackfin/include/asm/blackfin.h diff --git a/include/asm-blackfin/blackfin_cdef.h b/arch/blackfin/include/asm/blackfin_cdef.h similarity index 100% rename from include/asm-blackfin/blackfin_cdef.h rename to arch/blackfin/include/asm/blackfin_cdef.h diff --git a/include/asm-blackfin/blackfin_def.h b/arch/blackfin/include/asm/blackfin_def.h similarity index 100% rename from include/asm-blackfin/blackfin_def.h rename to arch/blackfin/include/asm/blackfin_def.h diff --git a/include/asm-blackfin/blackfin_local.h b/arch/blackfin/include/asm/blackfin_local.h similarity index 100% rename from include/asm-blackfin/blackfin_local.h rename to arch/blackfin/include/asm/blackfin_local.h diff --git a/include/asm-blackfin/byteorder.h b/arch/blackfin/include/asm/byteorder.h similarity index 100% rename from include/asm-blackfin/byteorder.h rename to arch/blackfin/include/asm/byteorder.h diff --git a/include/asm-blackfin/config-pre.h b/arch/blackfin/include/asm/config-pre.h similarity index 100% rename from include/asm-blackfin/config-pre.h rename to arch/blackfin/include/asm/config-pre.h diff --git a/include/asm-blackfin/config.h b/arch/blackfin/include/asm/config.h similarity index 100% rename from include/asm-blackfin/config.h rename to arch/blackfin/include/asm/config.h diff --git a/include/asm-blackfin/cplb.h b/arch/blackfin/include/asm/cplb.h similarity index 100% rename from include/asm-blackfin/cplb.h rename to arch/blackfin/include/asm/cplb.h diff --git a/include/asm-blackfin/deferred.h b/arch/blackfin/include/asm/deferred.h similarity index 100% rename from include/asm-blackfin/deferred.h rename to arch/blackfin/include/asm/deferred.h diff --git a/include/asm-blackfin/delay.h b/arch/blackfin/include/asm/delay.h similarity index 100% rename from include/asm-blackfin/delay.h rename to arch/blackfin/include/asm/delay.h diff --git a/include/asm-blackfin/entry.h b/arch/blackfin/include/asm/entry.h similarity index 100% rename from include/asm-blackfin/entry.h rename to arch/blackfin/include/asm/entry.h diff --git a/include/asm-blackfin/errno.h b/arch/blackfin/include/asm/errno.h similarity index 100% rename from include/asm-blackfin/errno.h rename to arch/blackfin/include/asm/errno.h diff --git a/include/asm-blackfin/global_data.h b/arch/blackfin/include/asm/global_data.h similarity index 100% rename from include/asm-blackfin/global_data.h rename to arch/blackfin/include/asm/global_data.h diff --git a/include/asm-blackfin/io.h b/arch/blackfin/include/asm/io.h similarity index 100% rename from include/asm-blackfin/io.h rename to arch/blackfin/include/asm/io.h diff --git a/include/asm-blackfin/linkage.h b/arch/blackfin/include/asm/linkage.h similarity index 100% rename from include/asm-blackfin/linkage.h rename to arch/blackfin/include/asm/linkage.h diff --git a/include/asm-blackfin/mach-bf527/ADSP-EDN-BF52x-extended_cdef.h b/arch/blackfin/include/asm/mach-bf527/ADSP-EDN-BF52x-extended_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf527/ADSP-EDN-BF52x-extended_cdef.h rename to arch/blackfin/include/asm/mach-bf527/ADSP-EDN-BF52x-extended_cdef.h diff --git a/include/asm-blackfin/mach-bf527/ADSP-EDN-BF52x-extended_def.h b/arch/blackfin/include/asm/mach-bf527/ADSP-EDN-BF52x-extended_def.h similarity index 100% rename from include/asm-blackfin/mach-bf527/ADSP-EDN-BF52x-extended_def.h rename to arch/blackfin/include/asm/mach-bf527/ADSP-EDN-BF52x-extended_def.h diff --git a/include/asm-blackfin/mach-bf527/BF522_cdef.h b/arch/blackfin/include/asm/mach-bf527/BF522_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf527/BF522_cdef.h rename to arch/blackfin/include/asm/mach-bf527/BF522_cdef.h diff --git a/include/asm-blackfin/mach-bf527/BF522_def.h b/arch/blackfin/include/asm/mach-bf527/BF522_def.h similarity index 100% rename from include/asm-blackfin/mach-bf527/BF522_def.h rename to arch/blackfin/include/asm/mach-bf527/BF522_def.h diff --git a/include/asm-blackfin/mach-bf527/BF523_cdef.h b/arch/blackfin/include/asm/mach-bf527/BF523_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf527/BF523_cdef.h rename to arch/blackfin/include/asm/mach-bf527/BF523_cdef.h diff --git a/include/asm-blackfin/mach-bf527/BF523_def.h b/arch/blackfin/include/asm/mach-bf527/BF523_def.h similarity index 100% rename from include/asm-blackfin/mach-bf527/BF523_def.h rename to arch/blackfin/include/asm/mach-bf527/BF523_def.h diff --git a/include/asm-blackfin/mach-bf527/BF524_cdef.h b/arch/blackfin/include/asm/mach-bf527/BF524_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf527/BF524_cdef.h rename to arch/blackfin/include/asm/mach-bf527/BF524_cdef.h diff --git a/include/asm-blackfin/mach-bf527/BF524_def.h b/arch/blackfin/include/asm/mach-bf527/BF524_def.h similarity index 100% rename from include/asm-blackfin/mach-bf527/BF524_def.h rename to arch/blackfin/include/asm/mach-bf527/BF524_def.h diff --git a/include/asm-blackfin/mach-bf527/BF525_cdef.h b/arch/blackfin/include/asm/mach-bf527/BF525_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf527/BF525_cdef.h rename to arch/blackfin/include/asm/mach-bf527/BF525_cdef.h diff --git a/include/asm-blackfin/mach-bf527/BF525_def.h b/arch/blackfin/include/asm/mach-bf527/BF525_def.h similarity index 100% rename from include/asm-blackfin/mach-bf527/BF525_def.h rename to arch/blackfin/include/asm/mach-bf527/BF525_def.h diff --git a/include/asm-blackfin/mach-bf527/BF526_cdef.h b/arch/blackfin/include/asm/mach-bf527/BF526_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf527/BF526_cdef.h rename to arch/blackfin/include/asm/mach-bf527/BF526_cdef.h diff --git a/include/asm-blackfin/mach-bf527/BF526_def.h b/arch/blackfin/include/asm/mach-bf527/BF526_def.h similarity index 100% rename from include/asm-blackfin/mach-bf527/BF526_def.h rename to arch/blackfin/include/asm/mach-bf527/BF526_def.h diff --git a/include/asm-blackfin/mach-bf527/BF527_cdef.h b/arch/blackfin/include/asm/mach-bf527/BF527_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf527/BF527_cdef.h rename to arch/blackfin/include/asm/mach-bf527/BF527_cdef.h diff --git a/include/asm-blackfin/mach-bf527/BF527_def.h b/arch/blackfin/include/asm/mach-bf527/BF527_def.h similarity index 100% rename from include/asm-blackfin/mach-bf527/BF527_def.h rename to arch/blackfin/include/asm/mach-bf527/BF527_def.h diff --git a/include/asm-blackfin/mach-bf527/anomaly.h b/arch/blackfin/include/asm/mach-bf527/anomaly.h similarity index 100% rename from include/asm-blackfin/mach-bf527/anomaly.h rename to arch/blackfin/include/asm/mach-bf527/anomaly.h diff --git a/include/asm-blackfin/mach-bf527/def_local.h b/arch/blackfin/include/asm/mach-bf527/def_local.h similarity index 100% rename from include/asm-blackfin/mach-bf527/def_local.h rename to arch/blackfin/include/asm/mach-bf527/def_local.h diff --git a/include/asm-blackfin/mach-bf527/mem_map.h b/arch/blackfin/include/asm/mach-bf527/mem_map.h similarity index 100% rename from include/asm-blackfin/mach-bf527/mem_map.h rename to arch/blackfin/include/asm/mach-bf527/mem_map.h diff --git a/include/asm-blackfin/mach-bf527/ports.h b/arch/blackfin/include/asm/mach-bf527/ports.h similarity index 100% rename from include/asm-blackfin/mach-bf527/ports.h rename to arch/blackfin/include/asm/mach-bf527/ports.h diff --git a/include/asm-blackfin/mach-bf533/BF531_cdef.h b/arch/blackfin/include/asm/mach-bf533/BF531_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf533/BF531_cdef.h rename to arch/blackfin/include/asm/mach-bf533/BF531_cdef.h diff --git a/include/asm-blackfin/mach-bf533/BF531_def.h b/arch/blackfin/include/asm/mach-bf533/BF531_def.h similarity index 100% rename from include/asm-blackfin/mach-bf533/BF531_def.h rename to arch/blackfin/include/asm/mach-bf533/BF531_def.h diff --git a/include/asm-blackfin/mach-bf533/BF532_cdef.h b/arch/blackfin/include/asm/mach-bf533/BF532_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf533/BF532_cdef.h rename to arch/blackfin/include/asm/mach-bf533/BF532_cdef.h diff --git a/include/asm-blackfin/mach-bf533/BF532_def.h b/arch/blackfin/include/asm/mach-bf533/BF532_def.h similarity index 100% rename from include/asm-blackfin/mach-bf533/BF532_def.h rename to arch/blackfin/include/asm/mach-bf533/BF532_def.h diff --git a/include/asm-blackfin/mach-bf533/BF533_cdef.h b/arch/blackfin/include/asm/mach-bf533/BF533_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf533/BF533_cdef.h rename to arch/blackfin/include/asm/mach-bf533/BF533_cdef.h diff --git a/include/asm-blackfin/mach-bf533/BF533_def.h b/arch/blackfin/include/asm/mach-bf533/BF533_def.h similarity index 100% rename from include/asm-blackfin/mach-bf533/BF533_def.h rename to arch/blackfin/include/asm/mach-bf533/BF533_def.h diff --git a/include/asm-blackfin/mach-bf533/anomaly.h b/arch/blackfin/include/asm/mach-bf533/anomaly.h similarity index 100% rename from include/asm-blackfin/mach-bf533/anomaly.h rename to arch/blackfin/include/asm/mach-bf533/anomaly.h diff --git a/include/asm-blackfin/mach-bf533/def_local.h b/arch/blackfin/include/asm/mach-bf533/def_local.h similarity index 100% rename from include/asm-blackfin/mach-bf533/def_local.h rename to arch/blackfin/include/asm/mach-bf533/def_local.h diff --git a/include/asm-blackfin/mach-bf533/ports.h b/arch/blackfin/include/asm/mach-bf533/ports.h similarity index 100% rename from include/asm-blackfin/mach-bf533/ports.h rename to arch/blackfin/include/asm/mach-bf533/ports.h diff --git a/include/asm-blackfin/mach-bf537/ADSP-EDN-BF534-extended_cdef.h b/arch/blackfin/include/asm/mach-bf537/ADSP-EDN-BF534-extended_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf537/ADSP-EDN-BF534-extended_cdef.h rename to arch/blackfin/include/asm/mach-bf537/ADSP-EDN-BF534-extended_cdef.h diff --git a/include/asm-blackfin/mach-bf537/ADSP-EDN-BF534-extended_def.h b/arch/blackfin/include/asm/mach-bf537/ADSP-EDN-BF534-extended_def.h similarity index 100% rename from include/asm-blackfin/mach-bf537/ADSP-EDN-BF534-extended_def.h rename to arch/blackfin/include/asm/mach-bf537/ADSP-EDN-BF534-extended_def.h diff --git a/include/asm-blackfin/mach-bf537/BF534_cdef.h b/arch/blackfin/include/asm/mach-bf537/BF534_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf537/BF534_cdef.h rename to arch/blackfin/include/asm/mach-bf537/BF534_cdef.h diff --git a/include/asm-blackfin/mach-bf537/BF534_def.h b/arch/blackfin/include/asm/mach-bf537/BF534_def.h similarity index 100% rename from include/asm-blackfin/mach-bf537/BF534_def.h rename to arch/blackfin/include/asm/mach-bf537/BF534_def.h diff --git a/include/asm-blackfin/mach-bf537/BF536_cdef.h b/arch/blackfin/include/asm/mach-bf537/BF536_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf537/BF536_cdef.h rename to arch/blackfin/include/asm/mach-bf537/BF536_cdef.h diff --git a/include/asm-blackfin/mach-bf537/BF536_def.h b/arch/blackfin/include/asm/mach-bf537/BF536_def.h similarity index 100% rename from include/asm-blackfin/mach-bf537/BF536_def.h rename to arch/blackfin/include/asm/mach-bf537/BF536_def.h diff --git a/include/asm-blackfin/mach-bf537/BF537_cdef.h b/arch/blackfin/include/asm/mach-bf537/BF537_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf537/BF537_cdef.h rename to arch/blackfin/include/asm/mach-bf537/BF537_cdef.h diff --git a/include/asm-blackfin/mach-bf537/BF537_def.h b/arch/blackfin/include/asm/mach-bf537/BF537_def.h similarity index 100% rename from include/asm-blackfin/mach-bf537/BF537_def.h rename to arch/blackfin/include/asm/mach-bf537/BF537_def.h diff --git a/include/asm-blackfin/mach-bf537/anomaly.h b/arch/blackfin/include/asm/mach-bf537/anomaly.h similarity index 100% rename from include/asm-blackfin/mach-bf537/anomaly.h rename to arch/blackfin/include/asm/mach-bf537/anomaly.h diff --git a/include/asm-blackfin/mach-bf537/def_local.h b/arch/blackfin/include/asm/mach-bf537/def_local.h similarity index 100% rename from include/asm-blackfin/mach-bf537/def_local.h rename to arch/blackfin/include/asm/mach-bf537/def_local.h diff --git a/include/asm-blackfin/mach-bf537/ports.h b/arch/blackfin/include/asm/mach-bf537/ports.h similarity index 100% rename from include/asm-blackfin/mach-bf537/ports.h rename to arch/blackfin/include/asm/mach-bf537/ports.h diff --git a/include/asm-blackfin/mach-bf548/ADSP-EDN-BF542-extended_cdef.h b/arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF542-extended_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf548/ADSP-EDN-BF542-extended_cdef.h rename to arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF542-extended_cdef.h diff --git a/include/asm-blackfin/mach-bf548/ADSP-EDN-BF542-extended_def.h b/arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF542-extended_def.h similarity index 100% rename from include/asm-blackfin/mach-bf548/ADSP-EDN-BF542-extended_def.h rename to arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF542-extended_def.h diff --git a/include/asm-blackfin/mach-bf548/ADSP-EDN-BF544-extended_cdef.h b/arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF544-extended_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf548/ADSP-EDN-BF544-extended_cdef.h rename to arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF544-extended_cdef.h diff --git a/include/asm-blackfin/mach-bf548/ADSP-EDN-BF544-extended_def.h b/arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF544-extended_def.h similarity index 100% rename from include/asm-blackfin/mach-bf548/ADSP-EDN-BF544-extended_def.h rename to arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF544-extended_def.h diff --git a/include/asm-blackfin/mach-bf548/ADSP-EDN-BF547-extended_cdef.h b/arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF547-extended_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf548/ADSP-EDN-BF547-extended_cdef.h rename to arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF547-extended_cdef.h diff --git a/include/asm-blackfin/mach-bf548/ADSP-EDN-BF547-extended_def.h b/arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF547-extended_def.h similarity index 100% rename from include/asm-blackfin/mach-bf548/ADSP-EDN-BF547-extended_def.h rename to arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF547-extended_def.h diff --git a/include/asm-blackfin/mach-bf548/ADSP-EDN-BF548-extended_cdef.h b/arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF548-extended_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf548/ADSP-EDN-BF548-extended_cdef.h rename to arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF548-extended_cdef.h diff --git a/include/asm-blackfin/mach-bf548/ADSP-EDN-BF548-extended_def.h b/arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF548-extended_def.h similarity index 100% rename from include/asm-blackfin/mach-bf548/ADSP-EDN-BF548-extended_def.h rename to arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF548-extended_def.h diff --git a/include/asm-blackfin/mach-bf548/ADSP-EDN-BF549-extended_cdef.h b/arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF549-extended_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf548/ADSP-EDN-BF549-extended_cdef.h rename to arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF549-extended_cdef.h diff --git a/include/asm-blackfin/mach-bf548/ADSP-EDN-BF549-extended_def.h b/arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF549-extended_def.h similarity index 100% rename from include/asm-blackfin/mach-bf548/ADSP-EDN-BF549-extended_def.h rename to arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF549-extended_def.h diff --git a/include/asm-blackfin/mach-bf548/BF541_cdef.h b/arch/blackfin/include/asm/mach-bf548/BF541_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf548/BF541_cdef.h rename to arch/blackfin/include/asm/mach-bf548/BF541_cdef.h diff --git a/include/asm-blackfin/mach-bf548/BF541_def.h b/arch/blackfin/include/asm/mach-bf548/BF541_def.h similarity index 100% rename from include/asm-blackfin/mach-bf548/BF541_def.h rename to arch/blackfin/include/asm/mach-bf548/BF541_def.h diff --git a/include/asm-blackfin/mach-bf548/BF542_cdef.h b/arch/blackfin/include/asm/mach-bf548/BF542_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf548/BF542_cdef.h rename to arch/blackfin/include/asm/mach-bf548/BF542_cdef.h diff --git a/include/asm-blackfin/mach-bf548/BF542_def.h b/arch/blackfin/include/asm/mach-bf548/BF542_def.h similarity index 100% rename from include/asm-blackfin/mach-bf548/BF542_def.h rename to arch/blackfin/include/asm/mach-bf548/BF542_def.h diff --git a/include/asm-blackfin/mach-bf548/BF544_cdef.h b/arch/blackfin/include/asm/mach-bf548/BF544_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf548/BF544_cdef.h rename to arch/blackfin/include/asm/mach-bf548/BF544_cdef.h diff --git a/include/asm-blackfin/mach-bf548/BF544_def.h b/arch/blackfin/include/asm/mach-bf548/BF544_def.h similarity index 100% rename from include/asm-blackfin/mach-bf548/BF544_def.h rename to arch/blackfin/include/asm/mach-bf548/BF544_def.h diff --git a/include/asm-blackfin/mach-bf548/BF547_cdef.h b/arch/blackfin/include/asm/mach-bf548/BF547_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf548/BF547_cdef.h rename to arch/blackfin/include/asm/mach-bf548/BF547_cdef.h diff --git a/include/asm-blackfin/mach-bf548/BF547_def.h b/arch/blackfin/include/asm/mach-bf548/BF547_def.h similarity index 100% rename from include/asm-blackfin/mach-bf548/BF547_def.h rename to arch/blackfin/include/asm/mach-bf548/BF547_def.h diff --git a/include/asm-blackfin/mach-bf548/BF548_cdef.h b/arch/blackfin/include/asm/mach-bf548/BF548_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf548/BF548_cdef.h rename to arch/blackfin/include/asm/mach-bf548/BF548_cdef.h diff --git a/include/asm-blackfin/mach-bf548/BF548_def.h b/arch/blackfin/include/asm/mach-bf548/BF548_def.h similarity index 100% rename from include/asm-blackfin/mach-bf548/BF548_def.h rename to arch/blackfin/include/asm/mach-bf548/BF548_def.h diff --git a/include/asm-blackfin/mach-bf548/BF549_cdef.h b/arch/blackfin/include/asm/mach-bf548/BF549_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf548/BF549_cdef.h rename to arch/blackfin/include/asm/mach-bf548/BF549_cdef.h diff --git a/include/asm-blackfin/mach-bf548/BF549_def.h b/arch/blackfin/include/asm/mach-bf548/BF549_def.h similarity index 100% rename from include/asm-blackfin/mach-bf548/BF549_def.h rename to arch/blackfin/include/asm/mach-bf548/BF549_def.h diff --git a/include/asm-blackfin/mach-bf548/anomaly.h b/arch/blackfin/include/asm/mach-bf548/anomaly.h similarity index 100% rename from include/asm-blackfin/mach-bf548/anomaly.h rename to arch/blackfin/include/asm/mach-bf548/anomaly.h diff --git a/include/asm-blackfin/mach-bf548/def_local.h b/arch/blackfin/include/asm/mach-bf548/def_local.h similarity index 100% rename from include/asm-blackfin/mach-bf548/def_local.h rename to arch/blackfin/include/asm/mach-bf548/def_local.h diff --git a/include/asm-blackfin/mach-bf548/mem_map.h b/arch/blackfin/include/asm/mach-bf548/mem_map.h similarity index 100% rename from include/asm-blackfin/mach-bf548/mem_map.h rename to arch/blackfin/include/asm/mach-bf548/mem_map.h diff --git a/include/asm-blackfin/mach-bf548/ports.h b/arch/blackfin/include/asm/mach-bf548/ports.h similarity index 100% rename from include/asm-blackfin/mach-bf548/ports.h rename to arch/blackfin/include/asm/mach-bf548/ports.h diff --git a/include/asm-blackfin/mach-bf561/BF561_cdef.h b/arch/blackfin/include/asm/mach-bf561/BF561_cdef.h similarity index 100% rename from include/asm-blackfin/mach-bf561/BF561_cdef.h rename to arch/blackfin/include/asm/mach-bf561/BF561_cdef.h diff --git a/include/asm-blackfin/mach-bf561/BF561_def.h b/arch/blackfin/include/asm/mach-bf561/BF561_def.h similarity index 100% rename from include/asm-blackfin/mach-bf561/BF561_def.h rename to arch/blackfin/include/asm/mach-bf561/BF561_def.h diff --git a/include/asm-blackfin/mach-bf561/anomaly.h b/arch/blackfin/include/asm/mach-bf561/anomaly.h similarity index 100% rename from include/asm-blackfin/mach-bf561/anomaly.h rename to arch/blackfin/include/asm/mach-bf561/anomaly.h diff --git a/include/asm-blackfin/mach-bf561/def_local.h b/arch/blackfin/include/asm/mach-bf561/def_local.h similarity index 100% rename from include/asm-blackfin/mach-bf561/def_local.h rename to arch/blackfin/include/asm/mach-bf561/def_local.h diff --git a/include/asm-blackfin/mach-bf561/ports.h b/arch/blackfin/include/asm/mach-bf561/ports.h similarity index 100% rename from include/asm-blackfin/mach-bf561/ports.h rename to arch/blackfin/include/asm/mach-bf561/ports.h diff --git a/include/asm-blackfin/mach-common/ADSP-EDN-DUAL-CORE-extended_cdef.h b/arch/blackfin/include/asm/mach-common/ADSP-EDN-DUAL-CORE-extended_cdef.h similarity index 100% rename from include/asm-blackfin/mach-common/ADSP-EDN-DUAL-CORE-extended_cdef.h rename to arch/blackfin/include/asm/mach-common/ADSP-EDN-DUAL-CORE-extended_cdef.h diff --git a/include/asm-blackfin/mach-common/ADSP-EDN-DUAL-CORE-extended_def.h b/arch/blackfin/include/asm/mach-common/ADSP-EDN-DUAL-CORE-extended_def.h similarity index 100% rename from include/asm-blackfin/mach-common/ADSP-EDN-DUAL-CORE-extended_def.h rename to arch/blackfin/include/asm/mach-common/ADSP-EDN-DUAL-CORE-extended_def.h diff --git a/include/asm-blackfin/mach-common/ADSP-EDN-core_cdef.h b/arch/blackfin/include/asm/mach-common/ADSP-EDN-core_cdef.h similarity index 100% rename from include/asm-blackfin/mach-common/ADSP-EDN-core_cdef.h rename to arch/blackfin/include/asm/mach-common/ADSP-EDN-core_cdef.h diff --git a/include/asm-blackfin/mach-common/ADSP-EDN-core_def.h b/arch/blackfin/include/asm/mach-common/ADSP-EDN-core_def.h similarity index 100% rename from include/asm-blackfin/mach-common/ADSP-EDN-core_def.h rename to arch/blackfin/include/asm/mach-common/ADSP-EDN-core_def.h diff --git a/include/asm-blackfin/mach-common/ADSP-EDN-extended_cdef.h b/arch/blackfin/include/asm/mach-common/ADSP-EDN-extended_cdef.h similarity index 100% rename from include/asm-blackfin/mach-common/ADSP-EDN-extended_cdef.h rename to arch/blackfin/include/asm/mach-common/ADSP-EDN-extended_cdef.h diff --git a/include/asm-blackfin/mach-common/ADSP-EDN-extended_def.h b/arch/blackfin/include/asm/mach-common/ADSP-EDN-extended_def.h similarity index 100% rename from include/asm-blackfin/mach-common/ADSP-EDN-extended_def.h rename to arch/blackfin/include/asm/mach-common/ADSP-EDN-extended_def.h diff --git a/include/asm-blackfin/mach-common/bits/bootrom.h b/arch/blackfin/include/asm/mach-common/bits/bootrom.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/bootrom.h rename to arch/blackfin/include/asm/mach-common/bits/bootrom.h diff --git a/include/asm-blackfin/mach-common/bits/core.h b/arch/blackfin/include/asm/mach-common/bits/core.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/core.h rename to arch/blackfin/include/asm/mach-common/bits/core.h diff --git a/include/asm-blackfin/mach-common/bits/dma.h b/arch/blackfin/include/asm/mach-common/bits/dma.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/dma.h rename to arch/blackfin/include/asm/mach-common/bits/dma.h diff --git a/include/asm-blackfin/mach-common/bits/ebiu.h b/arch/blackfin/include/asm/mach-common/bits/ebiu.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/ebiu.h rename to arch/blackfin/include/asm/mach-common/bits/ebiu.h diff --git a/include/asm-blackfin/mach-common/bits/emac.h b/arch/blackfin/include/asm/mach-common/bits/emac.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/emac.h rename to arch/blackfin/include/asm/mach-common/bits/emac.h diff --git a/include/asm-blackfin/mach-common/bits/eppi.h b/arch/blackfin/include/asm/mach-common/bits/eppi.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/eppi.h rename to arch/blackfin/include/asm/mach-common/bits/eppi.h diff --git a/include/asm-blackfin/mach-common/bits/lockbox.h b/arch/blackfin/include/asm/mach-common/bits/lockbox.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/lockbox.h rename to arch/blackfin/include/asm/mach-common/bits/lockbox.h diff --git a/include/asm-blackfin/mach-common/bits/mpu.h b/arch/blackfin/include/asm/mach-common/bits/mpu.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/mpu.h rename to arch/blackfin/include/asm/mach-common/bits/mpu.h diff --git a/include/asm-blackfin/mach-common/bits/otp.h b/arch/blackfin/include/asm/mach-common/bits/otp.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/otp.h rename to arch/blackfin/include/asm/mach-common/bits/otp.h diff --git a/include/asm-blackfin/mach-common/bits/pata.h b/arch/blackfin/include/asm/mach-common/bits/pata.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/pata.h rename to arch/blackfin/include/asm/mach-common/bits/pata.h diff --git a/include/asm-blackfin/mach-common/bits/pll.h b/arch/blackfin/include/asm/mach-common/bits/pll.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/pll.h rename to arch/blackfin/include/asm/mach-common/bits/pll.h diff --git a/include/asm-blackfin/mach-common/bits/ports-a.h b/arch/blackfin/include/asm/mach-common/bits/ports-a.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/ports-a.h rename to arch/blackfin/include/asm/mach-common/bits/ports-a.h diff --git a/include/asm-blackfin/mach-common/bits/ports-b.h b/arch/blackfin/include/asm/mach-common/bits/ports-b.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/ports-b.h rename to arch/blackfin/include/asm/mach-common/bits/ports-b.h diff --git a/include/asm-blackfin/mach-common/bits/ports-c.h b/arch/blackfin/include/asm/mach-common/bits/ports-c.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/ports-c.h rename to arch/blackfin/include/asm/mach-common/bits/ports-c.h diff --git a/include/asm-blackfin/mach-common/bits/ports-d.h b/arch/blackfin/include/asm/mach-common/bits/ports-d.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/ports-d.h rename to arch/blackfin/include/asm/mach-common/bits/ports-d.h diff --git a/include/asm-blackfin/mach-common/bits/ports-e.h b/arch/blackfin/include/asm/mach-common/bits/ports-e.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/ports-e.h rename to arch/blackfin/include/asm/mach-common/bits/ports-e.h diff --git a/include/asm-blackfin/mach-common/bits/ports-f.h b/arch/blackfin/include/asm/mach-common/bits/ports-f.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/ports-f.h rename to arch/blackfin/include/asm/mach-common/bits/ports-f.h diff --git a/include/asm-blackfin/mach-common/bits/ports-g.h b/arch/blackfin/include/asm/mach-common/bits/ports-g.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/ports-g.h rename to arch/blackfin/include/asm/mach-common/bits/ports-g.h diff --git a/include/asm-blackfin/mach-common/bits/ports-h.h b/arch/blackfin/include/asm/mach-common/bits/ports-h.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/ports-h.h rename to arch/blackfin/include/asm/mach-common/bits/ports-h.h diff --git a/include/asm-blackfin/mach-common/bits/ports-i.h b/arch/blackfin/include/asm/mach-common/bits/ports-i.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/ports-i.h rename to arch/blackfin/include/asm/mach-common/bits/ports-i.h diff --git a/include/asm-blackfin/mach-common/bits/ports-j.h b/arch/blackfin/include/asm/mach-common/bits/ports-j.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/ports-j.h rename to arch/blackfin/include/asm/mach-common/bits/ports-j.h diff --git a/include/asm-blackfin/mach-common/bits/ppi.h b/arch/blackfin/include/asm/mach-common/bits/ppi.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/ppi.h rename to arch/blackfin/include/asm/mach-common/bits/ppi.h diff --git a/include/asm-blackfin/mach-common/bits/rtc.h b/arch/blackfin/include/asm/mach-common/bits/rtc.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/rtc.h rename to arch/blackfin/include/asm/mach-common/bits/rtc.h diff --git a/include/asm-blackfin/mach-common/bits/sdh.h b/arch/blackfin/include/asm/mach-common/bits/sdh.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/sdh.h rename to arch/blackfin/include/asm/mach-common/bits/sdh.h diff --git a/include/asm-blackfin/mach-common/bits/spi.h b/arch/blackfin/include/asm/mach-common/bits/spi.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/spi.h rename to arch/blackfin/include/asm/mach-common/bits/spi.h diff --git a/include/asm-blackfin/mach-common/bits/sport.h b/arch/blackfin/include/asm/mach-common/bits/sport.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/sport.h rename to arch/blackfin/include/asm/mach-common/bits/sport.h diff --git a/include/asm-blackfin/mach-common/bits/timer.h b/arch/blackfin/include/asm/mach-common/bits/timer.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/timer.h rename to arch/blackfin/include/asm/mach-common/bits/timer.h diff --git a/include/asm-blackfin/mach-common/bits/trace.h b/arch/blackfin/include/asm/mach-common/bits/trace.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/trace.h rename to arch/blackfin/include/asm/mach-common/bits/trace.h diff --git a/include/asm-blackfin/mach-common/bits/twi.h b/arch/blackfin/include/asm/mach-common/bits/twi.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/twi.h rename to arch/blackfin/include/asm/mach-common/bits/twi.h diff --git a/include/asm-blackfin/mach-common/bits/uart.h b/arch/blackfin/include/asm/mach-common/bits/uart.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/uart.h rename to arch/blackfin/include/asm/mach-common/bits/uart.h diff --git a/include/asm-blackfin/mach-common/bits/usb.h b/arch/blackfin/include/asm/mach-common/bits/usb.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/usb.h rename to arch/blackfin/include/asm/mach-common/bits/usb.h diff --git a/include/asm-blackfin/mach-common/bits/watchdog.h b/arch/blackfin/include/asm/mach-common/bits/watchdog.h similarity index 100% rename from include/asm-blackfin/mach-common/bits/watchdog.h rename to arch/blackfin/include/asm/mach-common/bits/watchdog.h diff --git a/include/asm-blackfin/mem_map.h b/arch/blackfin/include/asm/mem_map.h similarity index 100% rename from include/asm-blackfin/mem_map.h rename to arch/blackfin/include/asm/mem_map.h diff --git a/include/asm-blackfin/net.h b/arch/blackfin/include/asm/net.h similarity index 100% rename from include/asm-blackfin/net.h rename to arch/blackfin/include/asm/net.h diff --git a/include/asm-blackfin/posix_types.h b/arch/blackfin/include/asm/posix_types.h similarity index 100% rename from include/asm-blackfin/posix_types.h rename to arch/blackfin/include/asm/posix_types.h diff --git a/include/asm-blackfin/processor.h b/arch/blackfin/include/asm/processor.h similarity index 100% rename from include/asm-blackfin/processor.h rename to arch/blackfin/include/asm/processor.h diff --git a/include/asm-blackfin/ptrace.h b/arch/blackfin/include/asm/ptrace.h similarity index 100% rename from include/asm-blackfin/ptrace.h rename to arch/blackfin/include/asm/ptrace.h diff --git a/include/asm-blackfin/sdh.h b/arch/blackfin/include/asm/sdh.h similarity index 100% rename from include/asm-blackfin/sdh.h rename to arch/blackfin/include/asm/sdh.h diff --git a/include/asm-blackfin/shared_resources.h b/arch/blackfin/include/asm/shared_resources.h similarity index 100% rename from include/asm-blackfin/shared_resources.h rename to arch/blackfin/include/asm/shared_resources.h diff --git a/include/asm-blackfin/signal.h b/arch/blackfin/include/asm/signal.h similarity index 100% rename from include/asm-blackfin/signal.h rename to arch/blackfin/include/asm/signal.h diff --git a/include/asm-blackfin/string.h b/arch/blackfin/include/asm/string.h similarity index 100% rename from include/asm-blackfin/string.h rename to arch/blackfin/include/asm/string.h diff --git a/include/asm-blackfin/system.h b/arch/blackfin/include/asm/system.h similarity index 100% rename from include/asm-blackfin/system.h rename to arch/blackfin/include/asm/system.h diff --git a/include/asm-blackfin/traps.h b/arch/blackfin/include/asm/traps.h similarity index 100% rename from include/asm-blackfin/traps.h rename to arch/blackfin/include/asm/traps.h diff --git a/include/asm-blackfin/types.h b/arch/blackfin/include/asm/types.h similarity index 100% rename from include/asm-blackfin/types.h rename to arch/blackfin/include/asm/types.h diff --git a/include/asm-blackfin/u-boot.h b/arch/blackfin/include/asm/u-boot.h similarity index 100% rename from include/asm-blackfin/u-boot.h rename to arch/blackfin/include/asm/u-boot.h diff --git a/include/asm-blackfin/unaligned.h b/arch/blackfin/include/asm/unaligned.h similarity index 100% rename from include/asm-blackfin/unaligned.h rename to arch/blackfin/include/asm/unaligned.h diff --git a/include/asm-i386/bitops.h b/arch/i386/include/asm/bitops.h similarity index 100% rename from include/asm-i386/bitops.h rename to arch/i386/include/asm/bitops.h diff --git a/include/asm-i386/byteorder.h b/arch/i386/include/asm/byteorder.h similarity index 100% rename from include/asm-i386/byteorder.h rename to arch/i386/include/asm/byteorder.h diff --git a/include/asm-i386/config.h b/arch/i386/include/asm/config.h similarity index 100% rename from include/asm-i386/config.h rename to arch/i386/include/asm/config.h diff --git a/include/asm-i386/errno.h b/arch/i386/include/asm/errno.h similarity index 100% rename from include/asm-i386/errno.h rename to arch/i386/include/asm/errno.h diff --git a/include/asm-i386/global_data.h b/arch/i386/include/asm/global_data.h similarity index 100% rename from include/asm-i386/global_data.h rename to arch/i386/include/asm/global_data.h diff --git a/include/asm-i386/i8254.h b/arch/i386/include/asm/i8254.h similarity index 100% rename from include/asm-i386/i8254.h rename to arch/i386/include/asm/i8254.h diff --git a/include/asm-i386/i8259.h b/arch/i386/include/asm/i8259.h similarity index 100% rename from include/asm-i386/i8259.h rename to arch/i386/include/asm/i8259.h diff --git a/include/asm-i386/ibmpc.h b/arch/i386/include/asm/ibmpc.h similarity index 100% rename from include/asm-i386/ibmpc.h rename to arch/i386/include/asm/ibmpc.h diff --git a/include/asm-i386/ic/pci.h b/arch/i386/include/asm/ic/pci.h similarity index 100% rename from include/asm-i386/ic/pci.h rename to arch/i386/include/asm/ic/pci.h diff --git a/include/asm-i386/ic/sc520.h b/arch/i386/include/asm/ic/sc520.h similarity index 100% rename from include/asm-i386/ic/sc520.h rename to arch/i386/include/asm/ic/sc520.h diff --git a/include/asm-i386/ic/ssi.h b/arch/i386/include/asm/ic/ssi.h similarity index 100% rename from include/asm-i386/ic/ssi.h rename to arch/i386/include/asm/ic/ssi.h diff --git a/include/asm-i386/interrupt.h b/arch/i386/include/asm/interrupt.h similarity index 100% rename from include/asm-i386/interrupt.h rename to arch/i386/include/asm/interrupt.h diff --git a/include/asm-i386/io.h b/arch/i386/include/asm/io.h similarity index 100% rename from include/asm-i386/io.h rename to arch/i386/include/asm/io.h diff --git a/include/asm-i386/pci.h b/arch/i386/include/asm/pci.h similarity index 100% rename from include/asm-i386/pci.h rename to arch/i386/include/asm/pci.h diff --git a/include/asm-i386/posix_types.h b/arch/i386/include/asm/posix_types.h similarity index 100% rename from include/asm-i386/posix_types.h rename to arch/i386/include/asm/posix_types.h diff --git a/include/asm-i386/processor.h b/arch/i386/include/asm/processor.h similarity index 100% rename from include/asm-i386/processor.h rename to arch/i386/include/asm/processor.h diff --git a/include/asm-i386/ptrace.h b/arch/i386/include/asm/ptrace.h similarity index 100% rename from include/asm-i386/ptrace.h rename to arch/i386/include/asm/ptrace.h diff --git a/include/asm-i386/realmode.h b/arch/i386/include/asm/realmode.h similarity index 100% rename from include/asm-i386/realmode.h rename to arch/i386/include/asm/realmode.h diff --git a/include/asm-i386/string.h b/arch/i386/include/asm/string.h similarity index 100% rename from include/asm-i386/string.h rename to arch/i386/include/asm/string.h diff --git a/include/asm-i386/types.h b/arch/i386/include/asm/types.h similarity index 100% rename from include/asm-i386/types.h rename to arch/i386/include/asm/types.h diff --git a/include/asm-i386/u-boot-i386.h b/arch/i386/include/asm/u-boot-i386.h similarity index 100% rename from include/asm-i386/u-boot-i386.h rename to arch/i386/include/asm/u-boot-i386.h diff --git a/include/asm-i386/u-boot.h b/arch/i386/include/asm/u-boot.h similarity index 100% rename from include/asm-i386/u-boot.h rename to arch/i386/include/asm/u-boot.h diff --git a/include/asm-i386/zimage.h b/arch/i386/include/asm/zimage.h similarity index 100% rename from include/asm-i386/zimage.h rename to arch/i386/include/asm/zimage.h diff --git a/include/asm-m68k/bitops.h b/arch/m68k/include/asm/bitops.h similarity index 100% rename from include/asm-m68k/bitops.h rename to arch/m68k/include/asm/bitops.h diff --git a/include/asm-m68k/byteorder.h b/arch/m68k/include/asm/byteorder.h similarity index 100% rename from include/asm-m68k/byteorder.h rename to arch/m68k/include/asm/byteorder.h diff --git a/include/asm-m68k/cache.h b/arch/m68k/include/asm/cache.h similarity index 100% rename from include/asm-m68k/cache.h rename to arch/m68k/include/asm/cache.h diff --git a/include/asm-m68k/coldfire/ata.h b/arch/m68k/include/asm/coldfire/ata.h similarity index 100% rename from include/asm-m68k/coldfire/ata.h rename to arch/m68k/include/asm/coldfire/ata.h diff --git a/include/asm-m68k/coldfire/crossbar.h b/arch/m68k/include/asm/coldfire/crossbar.h similarity index 100% rename from include/asm-m68k/coldfire/crossbar.h rename to arch/m68k/include/asm/coldfire/crossbar.h diff --git a/include/asm-m68k/coldfire/dspi.h b/arch/m68k/include/asm/coldfire/dspi.h similarity index 100% rename from include/asm-m68k/coldfire/dspi.h rename to arch/m68k/include/asm/coldfire/dspi.h diff --git a/include/asm-m68k/coldfire/edma.h b/arch/m68k/include/asm/coldfire/edma.h similarity index 100% rename from include/asm-m68k/coldfire/edma.h rename to arch/m68k/include/asm/coldfire/edma.h diff --git a/include/asm-m68k/coldfire/eport.h b/arch/m68k/include/asm/coldfire/eport.h similarity index 100% rename from include/asm-m68k/coldfire/eport.h rename to arch/m68k/include/asm/coldfire/eport.h diff --git a/include/asm-m68k/coldfire/flexbus.h b/arch/m68k/include/asm/coldfire/flexbus.h similarity index 100% rename from include/asm-m68k/coldfire/flexbus.h rename to arch/m68k/include/asm/coldfire/flexbus.h diff --git a/include/asm-m68k/coldfire/flexcan.h b/arch/m68k/include/asm/coldfire/flexcan.h similarity index 100% rename from include/asm-m68k/coldfire/flexcan.h rename to arch/m68k/include/asm/coldfire/flexcan.h diff --git a/include/asm-m68k/coldfire/intctrl.h b/arch/m68k/include/asm/coldfire/intctrl.h similarity index 100% rename from include/asm-m68k/coldfire/intctrl.h rename to arch/m68k/include/asm/coldfire/intctrl.h diff --git a/include/asm-m68k/coldfire/lcd.h b/arch/m68k/include/asm/coldfire/lcd.h similarity index 100% rename from include/asm-m68k/coldfire/lcd.h rename to arch/m68k/include/asm/coldfire/lcd.h diff --git a/include/asm-m68k/coldfire/mdha.h b/arch/m68k/include/asm/coldfire/mdha.h similarity index 100% rename from include/asm-m68k/coldfire/mdha.h rename to arch/m68k/include/asm/coldfire/mdha.h diff --git a/include/asm-m68k/coldfire/pwm.h b/arch/m68k/include/asm/coldfire/pwm.h similarity index 100% rename from include/asm-m68k/coldfire/pwm.h rename to arch/m68k/include/asm/coldfire/pwm.h diff --git a/include/asm-m68k/coldfire/qspi.h b/arch/m68k/include/asm/coldfire/qspi.h similarity index 100% rename from include/asm-m68k/coldfire/qspi.h rename to arch/m68k/include/asm/coldfire/qspi.h diff --git a/include/asm-m68k/coldfire/rng.h b/arch/m68k/include/asm/coldfire/rng.h similarity index 100% rename from include/asm-m68k/coldfire/rng.h rename to arch/m68k/include/asm/coldfire/rng.h diff --git a/include/asm-m68k/coldfire/skha.h b/arch/m68k/include/asm/coldfire/skha.h similarity index 100% rename from include/asm-m68k/coldfire/skha.h rename to arch/m68k/include/asm/coldfire/skha.h diff --git a/include/asm-m68k/coldfire/ssi.h b/arch/m68k/include/asm/coldfire/ssi.h similarity index 100% rename from include/asm-m68k/coldfire/ssi.h rename to arch/m68k/include/asm/coldfire/ssi.h diff --git a/include/asm-m68k/config.h b/arch/m68k/include/asm/config.h similarity index 100% rename from include/asm-m68k/config.h rename to arch/m68k/include/asm/config.h diff --git a/include/asm-m68k/errno.h b/arch/m68k/include/asm/errno.h similarity index 100% rename from include/asm-m68k/errno.h rename to arch/m68k/include/asm/errno.h diff --git a/include/asm-m68k/fec.h b/arch/m68k/include/asm/fec.h similarity index 100% rename from include/asm-m68k/fec.h rename to arch/m68k/include/asm/fec.h diff --git a/include/asm-m68k/fsl_i2c.h b/arch/m68k/include/asm/fsl_i2c.h similarity index 100% rename from include/asm-m68k/fsl_i2c.h rename to arch/m68k/include/asm/fsl_i2c.h diff --git a/include/asm-m68k/fsl_mcdmafec.h b/arch/m68k/include/asm/fsl_mcdmafec.h similarity index 100% rename from include/asm-m68k/fsl_mcdmafec.h rename to arch/m68k/include/asm/fsl_mcdmafec.h diff --git a/include/asm-m68k/global_data.h b/arch/m68k/include/asm/global_data.h similarity index 100% rename from include/asm-m68k/global_data.h rename to arch/m68k/include/asm/global_data.h diff --git a/include/asm-m68k/immap.h b/arch/m68k/include/asm/immap.h similarity index 100% rename from include/asm-m68k/immap.h rename to arch/m68k/include/asm/immap.h diff --git a/include/asm-m68k/immap_520x.h b/arch/m68k/include/asm/immap_520x.h similarity index 100% rename from include/asm-m68k/immap_520x.h rename to arch/m68k/include/asm/immap_520x.h diff --git a/include/asm-m68k/immap_5227x.h b/arch/m68k/include/asm/immap_5227x.h similarity index 100% rename from include/asm-m68k/immap_5227x.h rename to arch/m68k/include/asm/immap_5227x.h diff --git a/include/asm-m68k/immap_5235.h b/arch/m68k/include/asm/immap_5235.h similarity index 100% rename from include/asm-m68k/immap_5235.h rename to arch/m68k/include/asm/immap_5235.h diff --git a/include/asm-m68k/immap_5249.h b/arch/m68k/include/asm/immap_5249.h similarity index 100% rename from include/asm-m68k/immap_5249.h rename to arch/m68k/include/asm/immap_5249.h diff --git a/include/asm-m68k/immap_5253.h b/arch/m68k/include/asm/immap_5253.h similarity index 100% rename from include/asm-m68k/immap_5253.h rename to arch/m68k/include/asm/immap_5253.h diff --git a/include/asm-m68k/immap_5271.h b/arch/m68k/include/asm/immap_5271.h similarity index 100% rename from include/asm-m68k/immap_5271.h rename to arch/m68k/include/asm/immap_5271.h diff --git a/include/asm-m68k/immap_5272.h b/arch/m68k/include/asm/immap_5272.h similarity index 100% rename from include/asm-m68k/immap_5272.h rename to arch/m68k/include/asm/immap_5272.h diff --git a/include/asm-m68k/immap_5275.h b/arch/m68k/include/asm/immap_5275.h similarity index 100% rename from include/asm-m68k/immap_5275.h rename to arch/m68k/include/asm/immap_5275.h diff --git a/include/asm-m68k/immap_5282.h b/arch/m68k/include/asm/immap_5282.h similarity index 100% rename from include/asm-m68k/immap_5282.h rename to arch/m68k/include/asm/immap_5282.h diff --git a/include/asm-m68k/immap_5301x.h b/arch/m68k/include/asm/immap_5301x.h similarity index 100% rename from include/asm-m68k/immap_5301x.h rename to arch/m68k/include/asm/immap_5301x.h diff --git a/include/asm-m68k/immap_5329.h b/arch/m68k/include/asm/immap_5329.h similarity index 100% rename from include/asm-m68k/immap_5329.h rename to arch/m68k/include/asm/immap_5329.h diff --git a/include/asm-m68k/immap_5445x.h b/arch/m68k/include/asm/immap_5445x.h similarity index 100% rename from include/asm-m68k/immap_5445x.h rename to arch/m68k/include/asm/immap_5445x.h diff --git a/include/asm-m68k/immap_547x_8x.h b/arch/m68k/include/asm/immap_547x_8x.h similarity index 100% rename from include/asm-m68k/immap_547x_8x.h rename to arch/m68k/include/asm/immap_547x_8x.h diff --git a/include/asm-m68k/io.h b/arch/m68k/include/asm/io.h similarity index 100% rename from include/asm-m68k/io.h rename to arch/m68k/include/asm/io.h diff --git a/include/asm-m68k/m520x.h b/arch/m68k/include/asm/m520x.h similarity index 100% rename from include/asm-m68k/m520x.h rename to arch/m68k/include/asm/m520x.h diff --git a/include/asm-m68k/m5227x.h b/arch/m68k/include/asm/m5227x.h similarity index 100% rename from include/asm-m68k/m5227x.h rename to arch/m68k/include/asm/m5227x.h diff --git a/include/asm-m68k/m5235.h b/arch/m68k/include/asm/m5235.h similarity index 100% rename from include/asm-m68k/m5235.h rename to arch/m68k/include/asm/m5235.h diff --git a/include/asm-m68k/m5249.h b/arch/m68k/include/asm/m5249.h similarity index 100% rename from include/asm-m68k/m5249.h rename to arch/m68k/include/asm/m5249.h diff --git a/include/asm-m68k/m5253.h b/arch/m68k/include/asm/m5253.h similarity index 100% rename from include/asm-m68k/m5253.h rename to arch/m68k/include/asm/m5253.h diff --git a/include/asm-m68k/m5271.h b/arch/m68k/include/asm/m5271.h similarity index 100% rename from include/asm-m68k/m5271.h rename to arch/m68k/include/asm/m5271.h diff --git a/include/asm-m68k/m5272.h b/arch/m68k/include/asm/m5272.h similarity index 100% rename from include/asm-m68k/m5272.h rename to arch/m68k/include/asm/m5272.h diff --git a/include/asm-m68k/m5275.h b/arch/m68k/include/asm/m5275.h similarity index 100% rename from include/asm-m68k/m5275.h rename to arch/m68k/include/asm/m5275.h diff --git a/include/asm-m68k/m5282.h b/arch/m68k/include/asm/m5282.h similarity index 100% rename from include/asm-m68k/m5282.h rename to arch/m68k/include/asm/m5282.h diff --git a/include/asm-m68k/m5301x.h b/arch/m68k/include/asm/m5301x.h similarity index 100% rename from include/asm-m68k/m5301x.h rename to arch/m68k/include/asm/m5301x.h diff --git a/include/asm-m68k/m5329.h b/arch/m68k/include/asm/m5329.h similarity index 100% rename from include/asm-m68k/m5329.h rename to arch/m68k/include/asm/m5329.h diff --git a/include/asm-m68k/m5445x.h b/arch/m68k/include/asm/m5445x.h similarity index 100% rename from include/asm-m68k/m5445x.h rename to arch/m68k/include/asm/m5445x.h diff --git a/include/asm-m68k/m547x_8x.h b/arch/m68k/include/asm/m547x_8x.h similarity index 100% rename from include/asm-m68k/m547x_8x.h rename to arch/m68k/include/asm/m547x_8x.h diff --git a/include/asm-m68k/posix_types.h b/arch/m68k/include/asm/posix_types.h similarity index 100% rename from include/asm-m68k/posix_types.h rename to arch/m68k/include/asm/posix_types.h diff --git a/include/asm-m68k/processor.h b/arch/m68k/include/asm/processor.h similarity index 100% rename from include/asm-m68k/processor.h rename to arch/m68k/include/asm/processor.h diff --git a/include/asm-m68k/ptrace.h b/arch/m68k/include/asm/ptrace.h similarity index 100% rename from include/asm-m68k/ptrace.h rename to arch/m68k/include/asm/ptrace.h diff --git a/include/asm-m68k/rtc.h b/arch/m68k/include/asm/rtc.h similarity index 100% rename from include/asm-m68k/rtc.h rename to arch/m68k/include/asm/rtc.h diff --git a/include/asm-m68k/string.h b/arch/m68k/include/asm/string.h similarity index 100% rename from include/asm-m68k/string.h rename to arch/m68k/include/asm/string.h diff --git a/include/asm-m68k/timer.h b/arch/m68k/include/asm/timer.h similarity index 100% rename from include/asm-m68k/timer.h rename to arch/m68k/include/asm/timer.h diff --git a/include/asm-m68k/types.h b/arch/m68k/include/asm/types.h similarity index 100% rename from include/asm-m68k/types.h rename to arch/m68k/include/asm/types.h diff --git a/include/asm-m68k/u-boot.h b/arch/m68k/include/asm/u-boot.h similarity index 100% rename from include/asm-m68k/u-boot.h rename to arch/m68k/include/asm/u-boot.h diff --git a/include/asm-m68k/uart.h b/arch/m68k/include/asm/uart.h similarity index 100% rename from include/asm-m68k/uart.h rename to arch/m68k/include/asm/uart.h diff --git a/include/asm-m68k/unaligned.h b/arch/m68k/include/asm/unaligned.h similarity index 100% rename from include/asm-m68k/unaligned.h rename to arch/m68k/include/asm/unaligned.h diff --git a/include/asm-microblaze/asm.h b/arch/microblaze/include/asm/asm.h similarity index 100% rename from include/asm-microblaze/asm.h rename to arch/microblaze/include/asm/asm.h diff --git a/include/asm-microblaze/bitops.h b/arch/microblaze/include/asm/bitops.h similarity index 100% rename from include/asm-microblaze/bitops.h rename to arch/microblaze/include/asm/bitops.h diff --git a/include/asm-microblaze/byteorder.h b/arch/microblaze/include/asm/byteorder.h similarity index 100% rename from include/asm-microblaze/byteorder.h rename to arch/microblaze/include/asm/byteorder.h diff --git a/include/asm-microblaze/config.h b/arch/microblaze/include/asm/config.h similarity index 100% rename from include/asm-microblaze/config.h rename to arch/microblaze/include/asm/config.h diff --git a/include/asm-microblaze/errno.h b/arch/microblaze/include/asm/errno.h similarity index 100% rename from include/asm-microblaze/errno.h rename to arch/microblaze/include/asm/errno.h diff --git a/include/asm-microblaze/global_data.h b/arch/microblaze/include/asm/global_data.h similarity index 100% rename from include/asm-microblaze/global_data.h rename to arch/microblaze/include/asm/global_data.h diff --git a/include/asm-microblaze/io.h b/arch/microblaze/include/asm/io.h similarity index 100% rename from include/asm-microblaze/io.h rename to arch/microblaze/include/asm/io.h diff --git a/include/asm-microblaze/microblaze_intc.h b/arch/microblaze/include/asm/microblaze_intc.h similarity index 100% rename from include/asm-microblaze/microblaze_intc.h rename to arch/microblaze/include/asm/microblaze_intc.h diff --git a/include/asm-microblaze/microblaze_timer.h b/arch/microblaze/include/asm/microblaze_timer.h similarity index 100% rename from include/asm-microblaze/microblaze_timer.h rename to arch/microblaze/include/asm/microblaze_timer.h diff --git a/include/asm-microblaze/posix_types.h b/arch/microblaze/include/asm/posix_types.h similarity index 100% rename from include/asm-microblaze/posix_types.h rename to arch/microblaze/include/asm/posix_types.h diff --git a/include/asm-microblaze/processor.h b/arch/microblaze/include/asm/processor.h similarity index 100% rename from include/asm-microblaze/processor.h rename to arch/microblaze/include/asm/processor.h diff --git a/include/asm-microblaze/ptrace.h b/arch/microblaze/include/asm/ptrace.h similarity index 100% rename from include/asm-microblaze/ptrace.h rename to arch/microblaze/include/asm/ptrace.h diff --git a/include/asm-microblaze/string.h b/arch/microblaze/include/asm/string.h similarity index 100% rename from include/asm-microblaze/string.h rename to arch/microblaze/include/asm/string.h diff --git a/include/asm-microblaze/system.h b/arch/microblaze/include/asm/system.h similarity index 100% rename from include/asm-microblaze/system.h rename to arch/microblaze/include/asm/system.h diff --git a/include/asm-microblaze/types.h b/arch/microblaze/include/asm/types.h similarity index 100% rename from include/asm-microblaze/types.h rename to arch/microblaze/include/asm/types.h diff --git a/include/asm-microblaze/u-boot.h b/arch/microblaze/include/asm/u-boot.h similarity index 100% rename from include/asm-microblaze/u-boot.h rename to arch/microblaze/include/asm/u-boot.h diff --git a/include/asm-microblaze/unaligned.h b/arch/microblaze/include/asm/unaligned.h similarity index 100% rename from include/asm-microblaze/unaligned.h rename to arch/microblaze/include/asm/unaligned.h diff --git a/include/asm-mips/addrspace.h b/arch/mips/include/asm/addrspace.h similarity index 100% rename from include/asm-mips/addrspace.h rename to arch/mips/include/asm/addrspace.h diff --git a/include/asm-mips/asm.h b/arch/mips/include/asm/asm.h similarity index 100% rename from include/asm-mips/asm.h rename to arch/mips/include/asm/asm.h diff --git a/include/asm-mips/au1x00.h b/arch/mips/include/asm/au1x00.h similarity index 100% rename from include/asm-mips/au1x00.h rename to arch/mips/include/asm/au1x00.h diff --git a/include/asm-mips/bitops.h b/arch/mips/include/asm/bitops.h similarity index 100% rename from include/asm-mips/bitops.h rename to arch/mips/include/asm/bitops.h diff --git a/include/asm-mips/byteorder.h b/arch/mips/include/asm/byteorder.h similarity index 100% rename from include/asm-mips/byteorder.h rename to arch/mips/include/asm/byteorder.h diff --git a/include/asm-mips/cachectl.h b/arch/mips/include/asm/cachectl.h similarity index 100% rename from include/asm-mips/cachectl.h rename to arch/mips/include/asm/cachectl.h diff --git a/include/asm-mips/cacheops.h b/arch/mips/include/asm/cacheops.h similarity index 100% rename from include/asm-mips/cacheops.h rename to arch/mips/include/asm/cacheops.h diff --git a/include/asm-mips/config.h b/arch/mips/include/asm/config.h similarity index 100% rename from include/asm-mips/config.h rename to arch/mips/include/asm/config.h diff --git a/include/asm-mips/errno.h b/arch/mips/include/asm/errno.h similarity index 100% rename from include/asm-mips/errno.h rename to arch/mips/include/asm/errno.h diff --git a/include/asm-mips/global_data.h b/arch/mips/include/asm/global_data.h similarity index 100% rename from include/asm-mips/global_data.h rename to arch/mips/include/asm/global_data.h diff --git a/include/asm-mips/inca-ip.h b/arch/mips/include/asm/inca-ip.h similarity index 100% rename from include/asm-mips/inca-ip.h rename to arch/mips/include/asm/inca-ip.h diff --git a/include/asm-mips/io.h b/arch/mips/include/asm/io.h similarity index 100% rename from include/asm-mips/io.h rename to arch/mips/include/asm/io.h diff --git a/include/asm-mips/isadep.h b/arch/mips/include/asm/isadep.h similarity index 100% rename from include/asm-mips/isadep.h rename to arch/mips/include/asm/isadep.h diff --git a/include/asm-mips/mipsregs.h b/arch/mips/include/asm/mipsregs.h similarity index 100% rename from include/asm-mips/mipsregs.h rename to arch/mips/include/asm/mipsregs.h diff --git a/include/asm-mips/posix_types.h b/arch/mips/include/asm/posix_types.h similarity index 100% rename from include/asm-mips/posix_types.h rename to arch/mips/include/asm/posix_types.h diff --git a/include/asm-mips/processor.h b/arch/mips/include/asm/processor.h similarity index 100% rename from include/asm-mips/processor.h rename to arch/mips/include/asm/processor.h diff --git a/include/asm-mips/ptrace.h b/arch/mips/include/asm/ptrace.h similarity index 100% rename from include/asm-mips/ptrace.h rename to arch/mips/include/asm/ptrace.h diff --git a/include/asm-mips/reboot.h b/arch/mips/include/asm/reboot.h similarity index 100% rename from include/asm-mips/reboot.h rename to arch/mips/include/asm/reboot.h diff --git a/include/asm-mips/reg.h b/arch/mips/include/asm/reg.h similarity index 100% rename from include/asm-mips/reg.h rename to arch/mips/include/asm/reg.h diff --git a/include/asm-mips/regdef.h b/arch/mips/include/asm/regdef.h similarity index 100% rename from include/asm-mips/regdef.h rename to arch/mips/include/asm/regdef.h diff --git a/include/asm-mips/sgidefs.h b/arch/mips/include/asm/sgidefs.h similarity index 100% rename from include/asm-mips/sgidefs.h rename to arch/mips/include/asm/sgidefs.h diff --git a/include/asm-mips/string.h b/arch/mips/include/asm/string.h similarity index 100% rename from include/asm-mips/string.h rename to arch/mips/include/asm/string.h diff --git a/include/asm-mips/system.h b/arch/mips/include/asm/system.h similarity index 100% rename from include/asm-mips/system.h rename to arch/mips/include/asm/system.h diff --git a/include/asm-mips/types.h b/arch/mips/include/asm/types.h similarity index 100% rename from include/asm-mips/types.h rename to arch/mips/include/asm/types.h diff --git a/include/asm-mips/u-boot.h b/arch/mips/include/asm/u-boot.h similarity index 100% rename from include/asm-mips/u-boot.h rename to arch/mips/include/asm/u-boot.h diff --git a/include/asm-mips/unaligned.h b/arch/mips/include/asm/unaligned.h similarity index 100% rename from include/asm-mips/unaligned.h rename to arch/mips/include/asm/unaligned.h diff --git a/include/asm-nios/bitops.h b/arch/nios/include/asm/bitops.h similarity index 100% rename from include/asm-nios/bitops.h rename to arch/nios/include/asm/bitops.h diff --git a/include/asm-nios/byteorder.h b/arch/nios/include/asm/byteorder.h similarity index 100% rename from include/asm-nios/byteorder.h rename to arch/nios/include/asm/byteorder.h diff --git a/include/asm-nios/cache.h b/arch/nios/include/asm/cache.h similarity index 100% rename from include/asm-nios/cache.h rename to arch/nios/include/asm/cache.h diff --git a/include/asm-nios/config.h b/arch/nios/include/asm/config.h similarity index 100% rename from include/asm-nios/config.h rename to arch/nios/include/asm/config.h diff --git a/include/asm-nios/global_data.h b/arch/nios/include/asm/global_data.h similarity index 100% rename from include/asm-nios/global_data.h rename to arch/nios/include/asm/global_data.h diff --git a/include/asm-nios/io.h b/arch/nios/include/asm/io.h similarity index 100% rename from include/asm-nios/io.h rename to arch/nios/include/asm/io.h diff --git a/include/asm-nios/posix_types.h b/arch/nios/include/asm/posix_types.h similarity index 100% rename from include/asm-nios/posix_types.h rename to arch/nios/include/asm/posix_types.h diff --git a/include/asm-nios/processor.h b/arch/nios/include/asm/processor.h similarity index 100% rename from include/asm-nios/processor.h rename to arch/nios/include/asm/processor.h diff --git a/include/asm-nios/psr.h b/arch/nios/include/asm/psr.h similarity index 100% rename from include/asm-nios/psr.h rename to arch/nios/include/asm/psr.h diff --git a/include/asm-nios/ptrace.h b/arch/nios/include/asm/ptrace.h similarity index 100% rename from include/asm-nios/ptrace.h rename to arch/nios/include/asm/ptrace.h diff --git a/include/asm-nios/status_led.h b/arch/nios/include/asm/status_led.h similarity index 100% rename from include/asm-nios/status_led.h rename to arch/nios/include/asm/status_led.h diff --git a/include/asm-nios/string.h b/arch/nios/include/asm/string.h similarity index 100% rename from include/asm-nios/string.h rename to arch/nios/include/asm/string.h diff --git a/include/asm-nios/system.h b/arch/nios/include/asm/system.h similarity index 100% rename from include/asm-nios/system.h rename to arch/nios/include/asm/system.h diff --git a/include/asm-nios/types.h b/arch/nios/include/asm/types.h similarity index 100% rename from include/asm-nios/types.h rename to arch/nios/include/asm/types.h diff --git a/include/asm-nios/u-boot.h b/arch/nios/include/asm/u-boot.h similarity index 100% rename from include/asm-nios/u-boot.h rename to arch/nios/include/asm/u-boot.h diff --git a/include/asm-nios2/bitops.h b/arch/nios2/include/asm/bitops.h similarity index 100% rename from include/asm-nios2/bitops.h rename to arch/nios2/include/asm/bitops.h diff --git a/include/asm-nios2/bitops/atomic.h b/arch/nios2/include/asm/bitops/atomic.h similarity index 100% rename from include/asm-nios2/bitops/atomic.h rename to arch/nios2/include/asm/bitops/atomic.h diff --git a/include/asm-nios2/bitops/ffs.h b/arch/nios2/include/asm/bitops/ffs.h similarity index 100% rename from include/asm-nios2/bitops/ffs.h rename to arch/nios2/include/asm/bitops/ffs.h diff --git a/include/asm-nios2/bitops/non-atomic.h b/arch/nios2/include/asm/bitops/non-atomic.h similarity index 100% rename from include/asm-nios2/bitops/non-atomic.h rename to arch/nios2/include/asm/bitops/non-atomic.h diff --git a/include/asm-nios2/byteorder.h b/arch/nios2/include/asm/byteorder.h similarity index 100% rename from include/asm-nios2/byteorder.h rename to arch/nios2/include/asm/byteorder.h diff --git a/include/asm-nios2/cache.h b/arch/nios2/include/asm/cache.h similarity index 100% rename from include/asm-nios2/cache.h rename to arch/nios2/include/asm/cache.h diff --git a/include/asm-nios2/config.h b/arch/nios2/include/asm/config.h similarity index 100% rename from include/asm-nios2/config.h rename to arch/nios2/include/asm/config.h diff --git a/include/asm-nios2/errno.h b/arch/nios2/include/asm/errno.h similarity index 100% rename from include/asm-nios2/errno.h rename to arch/nios2/include/asm/errno.h diff --git a/include/asm-nios2/global_data.h b/arch/nios2/include/asm/global_data.h similarity index 100% rename from include/asm-nios2/global_data.h rename to arch/nios2/include/asm/global_data.h diff --git a/include/asm-nios2/io.h b/arch/nios2/include/asm/io.h similarity index 100% rename from include/asm-nios2/io.h rename to arch/nios2/include/asm/io.h diff --git a/include/asm-nios2/opcodes.h b/arch/nios2/include/asm/opcodes.h similarity index 100% rename from include/asm-nios2/opcodes.h rename to arch/nios2/include/asm/opcodes.h diff --git a/include/asm-nios2/posix_types.h b/arch/nios2/include/asm/posix_types.h similarity index 100% rename from include/asm-nios2/posix_types.h rename to arch/nios2/include/asm/posix_types.h diff --git a/include/asm-nios2/processor.h b/arch/nios2/include/asm/processor.h similarity index 100% rename from include/asm-nios2/processor.h rename to arch/nios2/include/asm/processor.h diff --git a/include/asm-nios2/psr.h b/arch/nios2/include/asm/psr.h similarity index 100% rename from include/asm-nios2/psr.h rename to arch/nios2/include/asm/psr.h diff --git a/include/asm-nios2/ptrace.h b/arch/nios2/include/asm/ptrace.h similarity index 100% rename from include/asm-nios2/ptrace.h rename to arch/nios2/include/asm/ptrace.h diff --git a/include/asm-nios2/status_led.h b/arch/nios2/include/asm/status_led.h similarity index 100% rename from include/asm-nios2/status_led.h rename to arch/nios2/include/asm/status_led.h diff --git a/include/asm-nios2/string.h b/arch/nios2/include/asm/string.h similarity index 100% rename from include/asm-nios2/string.h rename to arch/nios2/include/asm/string.h diff --git a/include/asm-nios2/system.h b/arch/nios2/include/asm/system.h similarity index 100% rename from include/asm-nios2/system.h rename to arch/nios2/include/asm/system.h diff --git a/include/asm-nios2/types.h b/arch/nios2/include/asm/types.h similarity index 100% rename from include/asm-nios2/types.h rename to arch/nios2/include/asm/types.h diff --git a/include/asm-nios2/u-boot.h b/arch/nios2/include/asm/u-boot.h similarity index 100% rename from include/asm-nios2/u-boot.h rename to arch/nios2/include/asm/u-boot.h diff --git a/include/asm-nios2/unaligned.h b/arch/nios2/include/asm/unaligned.h similarity index 100% rename from include/asm-nios2/unaligned.h rename to arch/nios2/include/asm/unaligned.h diff --git a/include/asm-ppc/4xx_pci.h b/arch/ppc/include/asm/4xx_pci.h similarity index 100% rename from include/asm-ppc/4xx_pci.h rename to arch/ppc/include/asm/4xx_pci.h diff --git a/include/asm-ppc/4xx_pcie.h b/arch/ppc/include/asm/4xx_pcie.h similarity index 100% rename from include/asm-ppc/4xx_pcie.h rename to arch/ppc/include/asm/4xx_pcie.h diff --git a/include/asm-ppc/5xx_immap.h b/arch/ppc/include/asm/5xx_immap.h similarity index 100% rename from include/asm-ppc/5xx_immap.h rename to arch/ppc/include/asm/5xx_immap.h diff --git a/include/asm-ppc/8xx_immap.h b/arch/ppc/include/asm/8xx_immap.h similarity index 100% rename from include/asm-ppc/8xx_immap.h rename to arch/ppc/include/asm/8xx_immap.h diff --git a/include/asm-ppc/atomic.h b/arch/ppc/include/asm/atomic.h similarity index 100% rename from include/asm-ppc/atomic.h rename to arch/ppc/include/asm/atomic.h diff --git a/include/asm-ppc/bitops.h b/arch/ppc/include/asm/bitops.h similarity index 100% rename from include/asm-ppc/bitops.h rename to arch/ppc/include/asm/bitops.h diff --git a/include/asm-ppc/byteorder.h b/arch/ppc/include/asm/byteorder.h similarity index 100% rename from include/asm-ppc/byteorder.h rename to arch/ppc/include/asm/byteorder.h diff --git a/include/asm-ppc/cache.h b/arch/ppc/include/asm/cache.h similarity index 100% rename from include/asm-ppc/cache.h rename to arch/ppc/include/asm/cache.h diff --git a/include/asm-ppc/config.h b/arch/ppc/include/asm/config.h similarity index 100% rename from include/asm-ppc/config.h rename to arch/ppc/include/asm/config.h diff --git a/include/asm-ppc/cpm_8260.h b/arch/ppc/include/asm/cpm_8260.h similarity index 100% rename from include/asm-ppc/cpm_8260.h rename to arch/ppc/include/asm/cpm_8260.h diff --git a/include/asm-ppc/cpm_85xx.h b/arch/ppc/include/asm/cpm_85xx.h similarity index 100% rename from include/asm-ppc/cpm_85xx.h rename to arch/ppc/include/asm/cpm_85xx.h diff --git a/include/asm-ppc/e300.h b/arch/ppc/include/asm/e300.h similarity index 100% rename from include/asm-ppc/e300.h rename to arch/ppc/include/asm/e300.h diff --git a/include/asm-ppc/errno.h b/arch/ppc/include/asm/errno.h similarity index 100% rename from include/asm-ppc/errno.h rename to arch/ppc/include/asm/errno.h diff --git a/include/asm-ppc/fsl_ddr_dimm_params.h b/arch/ppc/include/asm/fsl_ddr_dimm_params.h similarity index 100% rename from include/asm-ppc/fsl_ddr_dimm_params.h rename to arch/ppc/include/asm/fsl_ddr_dimm_params.h diff --git a/include/asm-ppc/fsl_ddr_sdram.h b/arch/ppc/include/asm/fsl_ddr_sdram.h similarity index 100% rename from include/asm-ppc/fsl_ddr_sdram.h rename to arch/ppc/include/asm/fsl_ddr_sdram.h diff --git a/include/asm-ppc/fsl_dma.h b/arch/ppc/include/asm/fsl_dma.h similarity index 100% rename from include/asm-ppc/fsl_dma.h rename to arch/ppc/include/asm/fsl_dma.h diff --git a/include/asm-ppc/fsl_i2c.h b/arch/ppc/include/asm/fsl_i2c.h similarity index 100% rename from include/asm-ppc/fsl_i2c.h rename to arch/ppc/include/asm/fsl_i2c.h diff --git a/include/asm-ppc/fsl_law.h b/arch/ppc/include/asm/fsl_law.h similarity index 100% rename from include/asm-ppc/fsl_law.h rename to arch/ppc/include/asm/fsl_law.h diff --git a/include/asm-ppc/fsl_lbc.h b/arch/ppc/include/asm/fsl_lbc.h similarity index 100% rename from include/asm-ppc/fsl_lbc.h rename to arch/ppc/include/asm/fsl_lbc.h diff --git a/include/asm-ppc/fsl_pci.h b/arch/ppc/include/asm/fsl_pci.h similarity index 100% rename from include/asm-ppc/fsl_pci.h rename to arch/ppc/include/asm/fsl_pci.h diff --git a/include/asm-ppc/fsl_serdes.h b/arch/ppc/include/asm/fsl_serdes.h similarity index 100% rename from include/asm-ppc/fsl_serdes.h rename to arch/ppc/include/asm/fsl_serdes.h diff --git a/include/asm-ppc/global_data.h b/arch/ppc/include/asm/global_data.h similarity index 100% rename from include/asm-ppc/global_data.h rename to arch/ppc/include/asm/global_data.h diff --git a/include/asm-ppc/gpio.h b/arch/ppc/include/asm/gpio.h similarity index 100% rename from include/asm-ppc/gpio.h rename to arch/ppc/include/asm/gpio.h diff --git a/include/asm-ppc/immap_512x.h b/arch/ppc/include/asm/immap_512x.h similarity index 100% rename from include/asm-ppc/immap_512x.h rename to arch/ppc/include/asm/immap_512x.h diff --git a/include/asm-ppc/immap_8220.h b/arch/ppc/include/asm/immap_8220.h similarity index 100% rename from include/asm-ppc/immap_8220.h rename to arch/ppc/include/asm/immap_8220.h diff --git a/include/asm-ppc/immap_8260.h b/arch/ppc/include/asm/immap_8260.h similarity index 100% rename from include/asm-ppc/immap_8260.h rename to arch/ppc/include/asm/immap_8260.h diff --git a/include/asm-ppc/immap_83xx.h b/arch/ppc/include/asm/immap_83xx.h similarity index 100% rename from include/asm-ppc/immap_83xx.h rename to arch/ppc/include/asm/immap_83xx.h diff --git a/include/asm-ppc/immap_85xx.h b/arch/ppc/include/asm/immap_85xx.h similarity index 100% rename from include/asm-ppc/immap_85xx.h rename to arch/ppc/include/asm/immap_85xx.h diff --git a/include/asm-ppc/immap_86xx.h b/arch/ppc/include/asm/immap_86xx.h similarity index 100% rename from include/asm-ppc/immap_86xx.h rename to arch/ppc/include/asm/immap_86xx.h diff --git a/include/asm-ppc/immap_qe.h b/arch/ppc/include/asm/immap_qe.h similarity index 100% rename from include/asm-ppc/immap_qe.h rename to arch/ppc/include/asm/immap_qe.h diff --git a/include/asm-ppc/interrupt.h b/arch/ppc/include/asm/interrupt.h similarity index 100% rename from include/asm-ppc/interrupt.h rename to arch/ppc/include/asm/interrupt.h diff --git a/include/asm-ppc/io.h b/arch/ppc/include/asm/io.h similarity index 100% rename from include/asm-ppc/io.h rename to arch/ppc/include/asm/io.h diff --git a/include/asm-ppc/iopin_8260.h b/arch/ppc/include/asm/iopin_8260.h similarity index 100% rename from include/asm-ppc/iopin_8260.h rename to arch/ppc/include/asm/iopin_8260.h diff --git a/include/asm-ppc/iopin_85xx.h b/arch/ppc/include/asm/iopin_85xx.h similarity index 100% rename from include/asm-ppc/iopin_85xx.h rename to arch/ppc/include/asm/iopin_85xx.h diff --git a/include/asm-ppc/iopin_8xx.h b/arch/ppc/include/asm/iopin_8xx.h similarity index 100% rename from include/asm-ppc/iopin_8xx.h rename to arch/ppc/include/asm/iopin_8xx.h diff --git a/include/asm-ppc/m8260_pci.h b/arch/ppc/include/asm/m8260_pci.h similarity index 100% rename from include/asm-ppc/m8260_pci.h rename to arch/ppc/include/asm/m8260_pci.h diff --git a/include/asm-ppc/mc146818rtc.h b/arch/ppc/include/asm/mc146818rtc.h similarity index 100% rename from include/asm-ppc/mc146818rtc.h rename to arch/ppc/include/asm/mc146818rtc.h diff --git a/include/asm-ppc/mmu.h b/arch/ppc/include/asm/mmu.h similarity index 100% rename from include/asm-ppc/mmu.h rename to arch/ppc/include/asm/mmu.h diff --git a/include/asm-ppc/mp.h b/arch/ppc/include/asm/mp.h similarity index 100% rename from include/asm-ppc/mp.h rename to arch/ppc/include/asm/mp.h diff --git a/include/asm-ppc/mpc512x.h b/arch/ppc/include/asm/mpc512x.h similarity index 100% rename from include/asm-ppc/mpc512x.h rename to arch/ppc/include/asm/mpc512x.h diff --git a/include/asm-ppc/mpc8349_pci.h b/arch/ppc/include/asm/mpc8349_pci.h similarity index 100% rename from include/asm-ppc/mpc8349_pci.h rename to arch/ppc/include/asm/mpc8349_pci.h diff --git a/include/asm-ppc/mpc8xxx_spi.h b/arch/ppc/include/asm/mpc8xxx_spi.h similarity index 100% rename from include/asm-ppc/mpc8xxx_spi.h rename to arch/ppc/include/asm/mpc8xxx_spi.h diff --git a/include/asm-ppc/pci_io.h b/arch/ppc/include/asm/pci_io.h similarity index 100% rename from include/asm-ppc/pci_io.h rename to arch/ppc/include/asm/pci_io.h diff --git a/include/asm-ppc/pnp.h b/arch/ppc/include/asm/pnp.h similarity index 100% rename from include/asm-ppc/pnp.h rename to arch/ppc/include/asm/pnp.h diff --git a/include/asm-ppc/posix_types.h b/arch/ppc/include/asm/posix_types.h similarity index 100% rename from include/asm-ppc/posix_types.h rename to arch/ppc/include/asm/posix_types.h diff --git a/include/asm-ppc/ppc4xx-ebc.h b/arch/ppc/include/asm/ppc4xx-ebc.h similarity index 100% rename from include/asm-ppc/ppc4xx-ebc.h rename to arch/ppc/include/asm/ppc4xx-ebc.h diff --git a/include/asm-ppc/ppc4xx-isram.h b/arch/ppc/include/asm/ppc4xx-isram.h similarity index 100% rename from include/asm-ppc/ppc4xx-isram.h rename to arch/ppc/include/asm/ppc4xx-isram.h diff --git a/include/asm-ppc/ppc4xx-sdram.h b/arch/ppc/include/asm/ppc4xx-sdram.h similarity index 100% rename from include/asm-ppc/ppc4xx-sdram.h rename to arch/ppc/include/asm/ppc4xx-sdram.h diff --git a/include/asm-ppc/ppc4xx-uic.h b/arch/ppc/include/asm/ppc4xx-uic.h similarity index 100% rename from include/asm-ppc/ppc4xx-uic.h rename to arch/ppc/include/asm/ppc4xx-uic.h diff --git a/include/asm-ppc/ppc4xx_config.h b/arch/ppc/include/asm/ppc4xx_config.h similarity index 100% rename from include/asm-ppc/ppc4xx_config.h rename to arch/ppc/include/asm/ppc4xx_config.h diff --git a/include/asm-ppc/processor.h b/arch/ppc/include/asm/processor.h similarity index 100% rename from include/asm-ppc/processor.h rename to arch/ppc/include/asm/processor.h diff --git a/include/asm-ppc/ptrace.h b/arch/ppc/include/asm/ptrace.h similarity index 100% rename from include/asm-ppc/ptrace.h rename to arch/ppc/include/asm/ptrace.h diff --git a/include/asm-ppc/residual.h b/arch/ppc/include/asm/residual.h similarity index 100% rename from include/asm-ppc/residual.h rename to arch/ppc/include/asm/residual.h diff --git a/include/asm-ppc/sigcontext.h b/arch/ppc/include/asm/sigcontext.h similarity index 100% rename from include/asm-ppc/sigcontext.h rename to arch/ppc/include/asm/sigcontext.h diff --git a/include/asm-ppc/signal.h b/arch/ppc/include/asm/signal.h similarity index 100% rename from include/asm-ppc/signal.h rename to arch/ppc/include/asm/signal.h diff --git a/include/asm-ppc/status_led.h b/arch/ppc/include/asm/status_led.h similarity index 100% rename from include/asm-ppc/status_led.h rename to arch/ppc/include/asm/status_led.h diff --git a/include/asm-ppc/string.h b/arch/ppc/include/asm/string.h similarity index 100% rename from include/asm-ppc/string.h rename to arch/ppc/include/asm/string.h diff --git a/include/asm-ppc/types.h b/arch/ppc/include/asm/types.h similarity index 100% rename from include/asm-ppc/types.h rename to arch/ppc/include/asm/types.h diff --git a/include/asm-ppc/u-boot.h b/arch/ppc/include/asm/u-boot.h similarity index 100% rename from include/asm-ppc/u-boot.h rename to arch/ppc/include/asm/u-boot.h diff --git a/include/asm-ppc/unaligned.h b/arch/ppc/include/asm/unaligned.h similarity index 100% rename from include/asm-ppc/unaligned.h rename to arch/ppc/include/asm/unaligned.h diff --git a/include/asm-ppc/xilinx_irq.h b/arch/ppc/include/asm/xilinx_irq.h similarity index 100% rename from include/asm-ppc/xilinx_irq.h rename to arch/ppc/include/asm/xilinx_irq.h diff --git a/include/asm-sh/bitops.h b/arch/sh/include/asm/bitops.h similarity index 100% rename from include/asm-sh/bitops.h rename to arch/sh/include/asm/bitops.h diff --git a/include/asm-sh/byteorder.h b/arch/sh/include/asm/byteorder.h similarity index 100% rename from include/asm-sh/byteorder.h rename to arch/sh/include/asm/byteorder.h diff --git a/include/asm-sh/cache.h b/arch/sh/include/asm/cache.h similarity index 100% rename from include/asm-sh/cache.h rename to arch/sh/include/asm/cache.h diff --git a/include/asm-sh/clk.h b/arch/sh/include/asm/clk.h similarity index 100% rename from include/asm-sh/clk.h rename to arch/sh/include/asm/clk.h diff --git a/include/asm-sh/config.h b/arch/sh/include/asm/config.h similarity index 100% rename from include/asm-sh/config.h rename to arch/sh/include/asm/config.h diff --git a/include/asm-sh/cpu_sh2.h b/arch/sh/include/asm/cpu_sh2.h similarity index 100% rename from include/asm-sh/cpu_sh2.h rename to arch/sh/include/asm/cpu_sh2.h diff --git a/include/asm-sh/cpu_sh3.h b/arch/sh/include/asm/cpu_sh3.h similarity index 100% rename from include/asm-sh/cpu_sh3.h rename to arch/sh/include/asm/cpu_sh3.h diff --git a/include/asm-sh/cpu_sh4.h b/arch/sh/include/asm/cpu_sh4.h similarity index 100% rename from include/asm-sh/cpu_sh4.h rename to arch/sh/include/asm/cpu_sh4.h diff --git a/include/asm-sh/cpu_sh7203.h b/arch/sh/include/asm/cpu_sh7203.h similarity index 100% rename from include/asm-sh/cpu_sh7203.h rename to arch/sh/include/asm/cpu_sh7203.h diff --git a/include/asm-sh/cpu_sh7710.h b/arch/sh/include/asm/cpu_sh7710.h similarity index 100% rename from include/asm-sh/cpu_sh7710.h rename to arch/sh/include/asm/cpu_sh7710.h diff --git a/include/asm-sh/cpu_sh7720.h b/arch/sh/include/asm/cpu_sh7720.h similarity index 100% rename from include/asm-sh/cpu_sh7720.h rename to arch/sh/include/asm/cpu_sh7720.h diff --git a/include/asm-sh/cpu_sh7722.h b/arch/sh/include/asm/cpu_sh7722.h similarity index 100% rename from include/asm-sh/cpu_sh7722.h rename to arch/sh/include/asm/cpu_sh7722.h diff --git a/include/asm-sh/cpu_sh7723.h b/arch/sh/include/asm/cpu_sh7723.h similarity index 100% rename from include/asm-sh/cpu_sh7723.h rename to arch/sh/include/asm/cpu_sh7723.h diff --git a/include/asm-sh/cpu_sh7750.h b/arch/sh/include/asm/cpu_sh7750.h similarity index 100% rename from include/asm-sh/cpu_sh7750.h rename to arch/sh/include/asm/cpu_sh7750.h diff --git a/include/asm-sh/cpu_sh7763.h b/arch/sh/include/asm/cpu_sh7763.h similarity index 100% rename from include/asm-sh/cpu_sh7763.h rename to arch/sh/include/asm/cpu_sh7763.h diff --git a/include/asm-sh/cpu_sh7780.h b/arch/sh/include/asm/cpu_sh7780.h similarity index 100% rename from include/asm-sh/cpu_sh7780.h rename to arch/sh/include/asm/cpu_sh7780.h diff --git a/include/asm-sh/cpu_sh7785.h b/arch/sh/include/asm/cpu_sh7785.h similarity index 100% rename from include/asm-sh/cpu_sh7785.h rename to arch/sh/include/asm/cpu_sh7785.h diff --git a/include/asm-sh/errno.h b/arch/sh/include/asm/errno.h similarity index 100% rename from include/asm-sh/errno.h rename to arch/sh/include/asm/errno.h diff --git a/include/asm-sh/global_data.h b/arch/sh/include/asm/global_data.h similarity index 100% rename from include/asm-sh/global_data.h rename to arch/sh/include/asm/global_data.h diff --git a/include/asm-sh/io.h b/arch/sh/include/asm/io.h similarity index 100% rename from include/asm-sh/io.h rename to arch/sh/include/asm/io.h diff --git a/include/asm-sh/irqflags.h b/arch/sh/include/asm/irqflags.h similarity index 100% rename from include/asm-sh/irqflags.h rename to arch/sh/include/asm/irqflags.h diff --git a/include/asm-sh/macro.h b/arch/sh/include/asm/macro.h similarity index 100% rename from include/asm-sh/macro.h rename to arch/sh/include/asm/macro.h diff --git a/include/asm-sh/pci.h b/arch/sh/include/asm/pci.h similarity index 100% rename from include/asm-sh/pci.h rename to arch/sh/include/asm/pci.h diff --git a/include/asm-sh/posix_types.h b/arch/sh/include/asm/posix_types.h similarity index 100% rename from include/asm-sh/posix_types.h rename to arch/sh/include/asm/posix_types.h diff --git a/include/asm-sh/processor.h b/arch/sh/include/asm/processor.h similarity index 100% rename from include/asm-sh/processor.h rename to arch/sh/include/asm/processor.h diff --git a/include/asm-sh/ptrace.h b/arch/sh/include/asm/ptrace.h similarity index 100% rename from include/asm-sh/ptrace.h rename to arch/sh/include/asm/ptrace.h diff --git a/include/asm-sh/string.h b/arch/sh/include/asm/string.h similarity index 100% rename from include/asm-sh/string.h rename to arch/sh/include/asm/string.h diff --git a/include/asm-sh/system.h b/arch/sh/include/asm/system.h similarity index 100% rename from include/asm-sh/system.h rename to arch/sh/include/asm/system.h diff --git a/include/asm-sh/types.h b/arch/sh/include/asm/types.h similarity index 100% rename from include/asm-sh/types.h rename to arch/sh/include/asm/types.h diff --git a/include/asm-sh/u-boot.h b/arch/sh/include/asm/u-boot.h similarity index 100% rename from include/asm-sh/u-boot.h rename to arch/sh/include/asm/u-boot.h diff --git a/include/asm-sh/unaligned-sh4a.h b/arch/sh/include/asm/unaligned-sh4a.h similarity index 100% rename from include/asm-sh/unaligned-sh4a.h rename to arch/sh/include/asm/unaligned-sh4a.h diff --git a/include/asm-sh/unaligned.h b/arch/sh/include/asm/unaligned.h similarity index 100% rename from include/asm-sh/unaligned.h rename to arch/sh/include/asm/unaligned.h diff --git a/include/asm-sparc/arch-leon2/asi.h b/arch/sparc/include/asm/arch-leon2/asi.h similarity index 100% rename from include/asm-sparc/arch-leon2/asi.h rename to arch/sparc/include/asm/arch-leon2/asi.h diff --git a/include/asm-sparc/arch-leon3/asi.h b/arch/sparc/include/asm/arch-leon3/asi.h similarity index 100% rename from include/asm-sparc/arch-leon3/asi.h rename to arch/sparc/include/asm/arch-leon3/asi.h diff --git a/include/asm-sparc/asi.h b/arch/sparc/include/asm/asi.h similarity index 100% rename from include/asm-sparc/asi.h rename to arch/sparc/include/asm/asi.h diff --git a/include/asm-sparc/asmmacro.h b/arch/sparc/include/asm/asmmacro.h similarity index 100% rename from include/asm-sparc/asmmacro.h rename to arch/sparc/include/asm/asmmacro.h diff --git a/include/asm-sparc/atomic.h b/arch/sparc/include/asm/atomic.h similarity index 100% rename from include/asm-sparc/atomic.h rename to arch/sparc/include/asm/atomic.h diff --git a/include/asm-sparc/bitops.h b/arch/sparc/include/asm/bitops.h similarity index 100% rename from include/asm-sparc/bitops.h rename to arch/sparc/include/asm/bitops.h diff --git a/include/asm-sparc/byteorder.h b/arch/sparc/include/asm/byteorder.h similarity index 100% rename from include/asm-sparc/byteorder.h rename to arch/sparc/include/asm/byteorder.h diff --git a/include/asm-sparc/cache.h b/arch/sparc/include/asm/cache.h similarity index 100% rename from include/asm-sparc/cache.h rename to arch/sparc/include/asm/cache.h diff --git a/include/asm-sparc/config.h b/arch/sparc/include/asm/config.h similarity index 100% rename from include/asm-sparc/config.h rename to arch/sparc/include/asm/config.h diff --git a/include/asm-sparc/errno.h b/arch/sparc/include/asm/errno.h similarity index 100% rename from include/asm-sparc/errno.h rename to arch/sparc/include/asm/errno.h diff --git a/include/asm-sparc/global_data.h b/arch/sparc/include/asm/global_data.h similarity index 100% rename from include/asm-sparc/global_data.h rename to arch/sparc/include/asm/global_data.h diff --git a/include/asm-sparc/io.h b/arch/sparc/include/asm/io.h similarity index 100% rename from include/asm-sparc/io.h rename to arch/sparc/include/asm/io.h diff --git a/include/asm-sparc/irq.h b/arch/sparc/include/asm/irq.h similarity index 100% rename from include/asm-sparc/irq.h rename to arch/sparc/include/asm/irq.h diff --git a/include/asm-sparc/leon.h b/arch/sparc/include/asm/leon.h similarity index 100% rename from include/asm-sparc/leon.h rename to arch/sparc/include/asm/leon.h diff --git a/include/asm-sparc/leon2.h b/arch/sparc/include/asm/leon2.h similarity index 100% rename from include/asm-sparc/leon2.h rename to arch/sparc/include/asm/leon2.h diff --git a/include/asm-sparc/leon3.h b/arch/sparc/include/asm/leon3.h similarity index 100% rename from include/asm-sparc/leon3.h rename to arch/sparc/include/asm/leon3.h diff --git a/include/asm-sparc/machines.h b/arch/sparc/include/asm/machines.h similarity index 100% rename from include/asm-sparc/machines.h rename to arch/sparc/include/asm/machines.h diff --git a/include/asm-sparc/page.h b/arch/sparc/include/asm/page.h similarity index 100% rename from include/asm-sparc/page.h rename to arch/sparc/include/asm/page.h diff --git a/include/asm-sparc/posix_types.h b/arch/sparc/include/asm/posix_types.h similarity index 100% rename from include/asm-sparc/posix_types.h rename to arch/sparc/include/asm/posix_types.h diff --git a/include/asm-sparc/processor.h b/arch/sparc/include/asm/processor.h similarity index 100% rename from include/asm-sparc/processor.h rename to arch/sparc/include/asm/processor.h diff --git a/include/asm-sparc/prom.h b/arch/sparc/include/asm/prom.h similarity index 100% rename from include/asm-sparc/prom.h rename to arch/sparc/include/asm/prom.h diff --git a/include/asm-sparc/psr.h b/arch/sparc/include/asm/psr.h similarity index 100% rename from include/asm-sparc/psr.h rename to arch/sparc/include/asm/psr.h diff --git a/include/asm-sparc/ptrace.h b/arch/sparc/include/asm/ptrace.h similarity index 100% rename from include/asm-sparc/ptrace.h rename to arch/sparc/include/asm/ptrace.h diff --git a/include/asm-sparc/srmmu.h b/arch/sparc/include/asm/srmmu.h similarity index 100% rename from include/asm-sparc/srmmu.h rename to arch/sparc/include/asm/srmmu.h diff --git a/include/asm-sparc/stack.h b/arch/sparc/include/asm/stack.h similarity index 100% rename from include/asm-sparc/stack.h rename to arch/sparc/include/asm/stack.h diff --git a/include/asm-sparc/string.h b/arch/sparc/include/asm/string.h similarity index 100% rename from include/asm-sparc/string.h rename to arch/sparc/include/asm/string.h diff --git a/include/asm-sparc/types.h b/arch/sparc/include/asm/types.h similarity index 100% rename from include/asm-sparc/types.h rename to arch/sparc/include/asm/types.h diff --git a/include/asm-sparc/u-boot.h b/arch/sparc/include/asm/u-boot.h similarity index 100% rename from include/asm-sparc/u-boot.h rename to arch/sparc/include/asm/u-boot.h diff --git a/include/asm-sparc/winmacro.h b/arch/sparc/include/asm/winmacro.h similarity index 100% rename from include/asm-sparc/winmacro.h rename to arch/sparc/include/asm/winmacro.h diff --git a/mkconfig b/mkconfig index 0f7f13e3a..d3109e412 100755 --- a/mkconfig +++ b/mkconfig @@ -42,30 +42,28 @@ if [ "$SRCTREE" != "$OBJTREE" ] ; then mkdir -p ${OBJTREE}/include2 cd ${OBJTREE}/include2 rm -f asm - ln -s ${SRCTREE}/include/asm-$2 asm - LNPREFIX="../../include2/asm/" + ln -s ${SRCTREE}/arch/$2/include/asm asm + LNPREFIX=${SRCTREE}/arch/$2/include/asm/ cd ../include - rm -rf asm-$2 rm -f asm - mkdir asm-$2 - ln -s asm-$2 asm + ln -s ${SRCTREE}/arch/$2/include/asm asm else cd ./include rm -f asm - ln -s asm-$2 asm + ln -s ../arch/$2/include/asm asm fi -rm -f asm-$2/arch +rm -f asm/arch if [ -z "$6" -o "$6" = "NULL" ] ; then - ln -s ${LNPREFIX}arch-$3 asm-$2/arch + ln -s ${LNPREFIX}arch-$3 asm/arch else - ln -s ${LNPREFIX}arch-$6 asm-$2/arch + ln -s ${LNPREFIX}arch-$6 asm/arch fi if [ "$2" = "arm" ] ; then - rm -f asm-$2/proc - ln -s ${LNPREFIX}proc-armv asm-$2/proc + rm -f asm/proc + ln -s ${LNPREFIX}proc-armv asm/proc fi # From 8d1f268204b07e172f3cb5cee0a3974d605b0b98 Mon Sep 17 00:00:00 2001 From: Peter Tyser Date: Mon, 12 Apr 2010 22:28:09 -0500 Subject: [PATCH 139/164] ppc: Move cpu/$CPU to arch/ppc/cpu/$CPU Signed-off-by: Peter Tyser --- Makefile | 10 +++--- README | 4 +-- {cpu => arch/ppc/cpu}/74xx_7xx/Makefile | 0 {cpu => arch/ppc/cpu}/74xx_7xx/cache.S | 0 {cpu => arch/ppc/cpu}/74xx_7xx/config.mk | 0 {cpu => arch/ppc/cpu}/74xx_7xx/cpu.c | 0 {cpu => arch/ppc/cpu}/74xx_7xx/cpu_init.c | 0 {cpu => arch/ppc/cpu}/74xx_7xx/interrupts.c | 0 {cpu => arch/ppc/cpu}/74xx_7xx/io.S | 0 {cpu => arch/ppc/cpu}/74xx_7xx/kgdb.S | 0 {cpu => arch/ppc/cpu}/74xx_7xx/speed.c | 0 {cpu => arch/ppc/cpu}/74xx_7xx/start.S | 0 {cpu => arch/ppc/cpu}/74xx_7xx/traps.c | 0 {cpu => arch/ppc/cpu}/mpc512x/Makefile | 4 +-- {cpu => arch/ppc/cpu}/mpc512x/asm-offsets.h | 2 +- {cpu => arch/ppc/cpu}/mpc512x/config.mk | 2 +- {cpu => arch/ppc/cpu}/mpc512x/cpu.c | 0 {cpu => arch/ppc/cpu}/mpc512x/cpu_init.c | 0 {cpu => arch/ppc/cpu}/mpc512x/diu.c | 2 +- {cpu => arch/ppc/cpu}/mpc512x/fixed_sdram.c | 0 {cpu => arch/ppc/cpu}/mpc512x/i2c.c | 0 {cpu => arch/ppc/cpu}/mpc512x/ide.c | 0 {cpu => arch/ppc/cpu}/mpc512x/iim.c | 0 {cpu => arch/ppc/cpu}/mpc512x/interrupts.c | 0 {cpu => arch/ppc/cpu}/mpc512x/iopin.c | 0 {cpu => arch/ppc/cpu}/mpc512x/pci.c | 0 {cpu => arch/ppc/cpu}/mpc512x/serial.c | 0 {cpu => arch/ppc/cpu}/mpc512x/speed.c | 0 {cpu => arch/ppc/cpu}/mpc512x/start.S | 0 {cpu => arch/ppc/cpu}/mpc512x/traps.c | 0 {cpu => arch/ppc/cpu}/mpc512x/u-boot.lds | 2 +- {cpu => arch/ppc/cpu}/mpc5xx/Makefile | 4 +-- {cpu => arch/ppc/cpu}/mpc5xx/config.mk | 2 +- {cpu => arch/ppc/cpu}/mpc5xx/cpu.c | 0 {cpu => arch/ppc/cpu}/mpc5xx/cpu_init.c | 0 {cpu => arch/ppc/cpu}/mpc5xx/interrupts.c | 0 {cpu => arch/ppc/cpu}/mpc5xx/serial.c | 0 {cpu => arch/ppc/cpu}/mpc5xx/speed.c | 0 {cpu => arch/ppc/cpu}/mpc5xx/spi.c | 0 {cpu => arch/ppc/cpu}/mpc5xx/start.S | 0 {cpu => arch/ppc/cpu}/mpc5xx/traps.c | 0 {cpu => arch/ppc/cpu}/mpc5xx/u-boot.lds | 2 +- {cpu => arch/ppc/cpu}/mpc5xxx/Makefile | 0 {cpu => arch/ppc/cpu}/mpc5xxx/config.mk | 2 +- {cpu => arch/ppc/cpu}/mpc5xxx/cpu.c | 0 {cpu => arch/ppc/cpu}/mpc5xxx/cpu_init.c | 0 .../mpc5xxx/firmware_sc_task_bestcomm.impl.S | 0 {cpu => arch/ppc/cpu}/mpc5xxx/i2c.c | 0 {cpu => arch/ppc/cpu}/mpc5xxx/ide.c | 0 {cpu => arch/ppc/cpu}/mpc5xxx/interrupts.c | 0 {cpu => arch/ppc/cpu}/mpc5xxx/io.S | 0 {cpu => arch/ppc/cpu}/mpc5xxx/loadtask.c | 0 {cpu => arch/ppc/cpu}/mpc5xxx/pci_mpc5200.c | 0 {cpu => arch/ppc/cpu}/mpc5xxx/serial.c | 0 {cpu => arch/ppc/cpu}/mpc5xxx/speed.c | 0 {cpu => arch/ppc/cpu}/mpc5xxx/start.S | 0 {cpu => arch/ppc/cpu}/mpc5xxx/traps.c | 0 .../ppc/cpu}/mpc5xxx/u-boot-customlayout.lds | 4 +-- {cpu => arch/ppc/cpu}/mpc5xxx/u-boot.lds | 2 +- {cpu => arch/ppc/cpu}/mpc5xxx/usb.c | 0 {cpu => arch/ppc/cpu}/mpc5xxx/usb_ohci.c | 0 {cpu => arch/ppc/cpu}/mpc5xxx/usb_ohci.h | 0 {cpu => arch/ppc/cpu}/mpc8220/Makefile | 0 {cpu => arch/ppc/cpu}/mpc8220/config.mk | 2 +- {cpu => arch/ppc/cpu}/mpc8220/cpu.c | 0 {cpu => arch/ppc/cpu}/mpc8220/cpu_init.c | 0 {cpu => arch/ppc/cpu}/mpc8220/dma.h | 0 {cpu => arch/ppc/cpu}/mpc8220/dramSetup.c | 0 {cpu => arch/ppc/cpu}/mpc8220/dramSetup.h | 0 {cpu => arch/ppc/cpu}/mpc8220/fec.c | 0 {cpu => arch/ppc/cpu}/mpc8220/fec.h | 0 {cpu => arch/ppc/cpu}/mpc8220/fec_dma_tasks.S | 0 {cpu => arch/ppc/cpu}/mpc8220/i2c.c | 0 {cpu => arch/ppc/cpu}/mpc8220/i2cCore.c | 0 {cpu => arch/ppc/cpu}/mpc8220/i2cCore.h | 0 {cpu => arch/ppc/cpu}/mpc8220/interrupts.c | 0 {cpu => arch/ppc/cpu}/mpc8220/io.S | 0 {cpu => arch/ppc/cpu}/mpc8220/loadtask.c | 0 {cpu => arch/ppc/cpu}/mpc8220/pci.c | 0 {cpu => arch/ppc/cpu}/mpc8220/speed.c | 0 {cpu => arch/ppc/cpu}/mpc8220/start.S | 0 {cpu => arch/ppc/cpu}/mpc8220/traps.c | 0 {cpu => arch/ppc/cpu}/mpc8220/u-boot.lds | 2 +- {cpu => arch/ppc/cpu}/mpc8220/uart.c | 0 {cpu => arch/ppc/cpu}/mpc824x/.gitignore | 0 {cpu => arch/ppc/cpu}/mpc824x/Makefile | 0 {cpu => arch/ppc/cpu}/mpc824x/config.mk | 2 +- {cpu => arch/ppc/cpu}/mpc824x/cpu.c | 0 {cpu => arch/ppc/cpu}/mpc824x/cpu_init.c | 0 {cpu => arch/ppc/cpu}/mpc824x/drivers/epic.h | 0 .../ppc/cpu}/mpc824x/drivers/epic/README | 0 .../ppc/cpu}/mpc824x/drivers/epic/epic.h | 0 .../ppc/cpu}/mpc824x/drivers/epic/epic1.c | 0 .../ppc/cpu}/mpc824x/drivers/epic/epic2.S | 0 .../ppc/cpu}/mpc824x/drivers/epic/epicutil.S | 0 .../ppc/cpu}/mpc824x/drivers/errors.h | 0 .../ppc/cpu}/mpc824x/drivers/i2c/i2c.c | 0 .../ppc/cpu}/mpc824x/drivers/i2c_export.h | 0 {cpu => arch/ppc/cpu}/mpc824x/interrupts.c | 0 {cpu => arch/ppc/cpu}/mpc824x/pci.c | 0 {cpu => arch/ppc/cpu}/mpc824x/speed.c | 0 {cpu => arch/ppc/cpu}/mpc824x/start.S | 0 {cpu => arch/ppc/cpu}/mpc824x/traps.c | 0 {cpu => arch/ppc/cpu}/mpc824x/u-boot.lds | 2 +- {cpu => arch/ppc/cpu}/mpc8260/Makefile | 0 {cpu => arch/ppc/cpu}/mpc8260/bedbug_603e.c | 0 {cpu => arch/ppc/cpu}/mpc8260/commproc.c | 0 {cpu => arch/ppc/cpu}/mpc8260/config.mk | 2 +- {cpu => arch/ppc/cpu}/mpc8260/cpu.c | 0 {cpu => arch/ppc/cpu}/mpc8260/cpu_init.c | 0 {cpu => arch/ppc/cpu}/mpc8260/ether_fcc.c | 0 {cpu => arch/ppc/cpu}/mpc8260/ether_scc.c | 0 {cpu => arch/ppc/cpu}/mpc8260/i2c.c | 0 {cpu => arch/ppc/cpu}/mpc8260/interrupts.c | 0 {cpu => arch/ppc/cpu}/mpc8260/kgdb.S | 0 {cpu => arch/ppc/cpu}/mpc8260/pci.c | 0 {cpu => arch/ppc/cpu}/mpc8260/serial_scc.c | 0 {cpu => arch/ppc/cpu}/mpc8260/serial_smc.c | 0 {cpu => arch/ppc/cpu}/mpc8260/speed.c | 0 {cpu => arch/ppc/cpu}/mpc8260/speed.h | 0 {cpu => arch/ppc/cpu}/mpc8260/spi.c | 0 {cpu => arch/ppc/cpu}/mpc8260/start.S | 0 {cpu => arch/ppc/cpu}/mpc8260/traps.c | 0 {cpu => arch/ppc/cpu}/mpc8260/u-boot.lds | 2 +- {cpu => arch/ppc/cpu}/mpc83xx/Makefile | 0 {cpu => arch/ppc/cpu}/mpc83xx/config.mk | 2 +- {cpu => arch/ppc/cpu}/mpc83xx/cpu.c | 0 {cpu => arch/ppc/cpu}/mpc83xx/cpu_init.c | 0 {cpu => arch/ppc/cpu}/mpc83xx/ecc.c | 0 {cpu => arch/ppc/cpu}/mpc83xx/fdt.c | 0 {cpu => arch/ppc/cpu}/mpc83xx/interrupts.c | 0 {cpu => arch/ppc/cpu}/mpc83xx/nand_init.c | 0 {cpu => arch/ppc/cpu}/mpc83xx/pci.c | 0 {cpu => arch/ppc/cpu}/mpc83xx/pcie.c | 0 {cpu => arch/ppc/cpu}/mpc83xx/qe_io.c | 0 {cpu => arch/ppc/cpu}/mpc83xx/serdes.c | 0 {cpu => arch/ppc/cpu}/mpc83xx/spd_sdram.c | 0 {cpu => arch/ppc/cpu}/mpc83xx/speed.c | 0 {cpu => arch/ppc/cpu}/mpc83xx/start.S | 0 {cpu => arch/ppc/cpu}/mpc83xx/traps.c | 0 {cpu => arch/ppc/cpu}/mpc83xx/u-boot.lds | 2 +- {cpu => arch/ppc/cpu}/mpc85xx/Makefile | 0 {cpu => arch/ppc/cpu}/mpc85xx/commproc.c | 0 {cpu => arch/ppc/cpu}/mpc85xx/config.mk | 2 +- {cpu => arch/ppc/cpu}/mpc85xx/cpu.c | 0 {cpu => arch/ppc/cpu}/mpc85xx/cpu_init.c | 0 .../ppc/cpu}/mpc85xx/cpu_init_early.c | 0 {cpu => arch/ppc/cpu}/mpc85xx/cpu_init_nand.c | 0 {cpu => arch/ppc/cpu}/mpc85xx/ddr-gen1.c | 0 {cpu => arch/ppc/cpu}/mpc85xx/ddr-gen2.c | 0 {cpu => arch/ppc/cpu}/mpc85xx/ddr-gen3.c | 0 {cpu => arch/ppc/cpu}/mpc85xx/ether_fcc.c | 0 {cpu => arch/ppc/cpu}/mpc85xx/fdt.c | 0 {cpu => arch/ppc/cpu}/mpc85xx/fixed_ivor.S | 0 {cpu => arch/ppc/cpu}/mpc85xx/interrupts.c | 0 {cpu => arch/ppc/cpu}/mpc85xx/mp.c | 0 {cpu => arch/ppc/cpu}/mpc85xx/mp.h | 0 .../ppc/cpu}/mpc85xx/mpc8536_serdes.c | 0 {cpu => arch/ppc/cpu}/mpc85xx/pci.c | 0 {cpu => arch/ppc/cpu}/mpc85xx/qe_io.c | 0 {cpu => arch/ppc/cpu}/mpc85xx/release.S | 0 {cpu => arch/ppc/cpu}/mpc85xx/resetvec.S | 0 {cpu => arch/ppc/cpu}/mpc85xx/serial_scc.c | 0 {cpu => arch/ppc/cpu}/mpc85xx/speed.c | 0 {cpu => arch/ppc/cpu}/mpc85xx/start.S | 0 {cpu => arch/ppc/cpu}/mpc85xx/tlb.c | 0 {cpu => arch/ppc/cpu}/mpc85xx/traps.c | 0 {cpu => arch/ppc/cpu}/mpc85xx/u-boot-nand.lds | 2 +- .../ppc/cpu}/mpc85xx/u-boot-nand_spl.lds | 0 {cpu => arch/ppc/cpu}/mpc85xx/u-boot.lds | 2 +- {cpu => arch/ppc/cpu}/mpc86xx/Makefile | 0 {cpu => arch/ppc/cpu}/mpc86xx/cache.S | 0 {cpu => arch/ppc/cpu}/mpc86xx/config.mk | 0 {cpu => arch/ppc/cpu}/mpc86xx/cpu.c | 0 {cpu => arch/ppc/cpu}/mpc86xx/cpu_init.c | 0 {cpu => arch/ppc/cpu}/mpc86xx/ddr-8641.c | 0 {cpu => arch/ppc/cpu}/mpc86xx/fdt.c | 0 {cpu => arch/ppc/cpu}/mpc86xx/interrupts.c | 0 {cpu => arch/ppc/cpu}/mpc86xx/mp.c | 0 {cpu => arch/ppc/cpu}/mpc86xx/release.S | 0 {cpu => arch/ppc/cpu}/mpc86xx/speed.c | 0 {cpu => arch/ppc/cpu}/mpc86xx/start.S | 0 {cpu => arch/ppc/cpu}/mpc86xx/traps.c | 0 {cpu => arch/ppc/cpu}/mpc8xx/Makefile | 0 {cpu => arch/ppc/cpu}/mpc8xx/bedbug_860.c | 0 {cpu => arch/ppc/cpu}/mpc8xx/commproc.c | 0 {cpu => arch/ppc/cpu}/mpc8xx/config.mk | 0 {cpu => arch/ppc/cpu}/mpc8xx/cpu.c | 0 {cpu => arch/ppc/cpu}/mpc8xx/cpu_init.c | 0 {cpu => arch/ppc/cpu}/mpc8xx/fdt.c | 0 {cpu => arch/ppc/cpu}/mpc8xx/fec.c | 0 {cpu => arch/ppc/cpu}/mpc8xx/fec.h | 0 {cpu => arch/ppc/cpu}/mpc8xx/i2c.c | 0 {cpu => arch/ppc/cpu}/mpc8xx/interrupts.c | 0 {cpu => arch/ppc/cpu}/mpc8xx/kgdb.S | 0 {cpu => arch/ppc/cpu}/mpc8xx/lcd.c | 0 {cpu => arch/ppc/cpu}/mpc8xx/plprcr_write.S | 0 {cpu => arch/ppc/cpu}/mpc8xx/scc.c | 0 {cpu => arch/ppc/cpu}/mpc8xx/serial.c | 0 {cpu => arch/ppc/cpu}/mpc8xx/speed.c | 0 {cpu => arch/ppc/cpu}/mpc8xx/spi.c | 0 {cpu => arch/ppc/cpu}/mpc8xx/start.S | 0 {cpu => arch/ppc/cpu}/mpc8xx/traps.c | 0 {cpu => arch/ppc/cpu}/mpc8xx/upatch.c | 0 {cpu => arch/ppc/cpu}/mpc8xx/video.c | 0 {cpu => arch/ppc/cpu}/mpc8xx/wlkbd.c | 0 {cpu => arch/ppc/cpu}/mpc8xxx/Makefile | 0 {cpu => arch/ppc/cpu}/mpc8xxx/cpu.c | 6 ++-- {cpu => arch/ppc/cpu}/mpc8xxx/ddr/Makefile | 0 .../cpu}/mpc8xxx/ddr/common_timing_params.h | 0 {cpu => arch/ppc/cpu}/mpc8xxx/ddr/ctrl_regs.c | 0 {cpu => arch/ppc/cpu}/mpc8xxx/ddr/ddr.h | 0 .../ppc/cpu}/mpc8xxx/ddr/ddr1_dimm_params.c | 0 .../ppc/cpu}/mpc8xxx/ddr/ddr2_dimm_params.c | 0 .../ppc/cpu}/mpc8xxx/ddr/ddr3_dimm_params.c | 0 .../cpu}/mpc8xxx/ddr/lc_common_dimm_params.c | 0 {cpu => arch/ppc/cpu}/mpc8xxx/ddr/main.c | 0 {cpu => arch/ppc/cpu}/mpc8xxx/ddr/options.c | 0 {cpu => arch/ppc/cpu}/mpc8xxx/ddr/util.c | 0 {cpu => arch/ppc/cpu}/mpc8xxx/fdt.c | 6 ++-- {cpu => arch/ppc/cpu}/mpc8xxx/pci_cfg.c | 0 {cpu => arch/ppc/cpu}/ppc4xx/40x_spd_sdram.c | 2 +- {cpu => arch/ppc/cpu}/ppc4xx/44x_spd_ddr.c | 2 +- {cpu => arch/ppc/cpu}/ppc4xx/44x_spd_ddr2.c | 2 +- .../ppc/cpu}/ppc4xx/4xx_ibm_ddr2_autocalib.c | 2 +- {cpu => arch/ppc/cpu}/ppc4xx/4xx_pci.c | 0 {cpu => arch/ppc/cpu}/ppc4xx/4xx_pcie.c | 0 {cpu => arch/ppc/cpu}/ppc4xx/4xx_uart.c | 0 {cpu => arch/ppc/cpu}/ppc4xx/Makefile | 0 {cpu => arch/ppc/cpu}/ppc4xx/bedbug_405.c | 0 {cpu => arch/ppc/cpu}/ppc4xx/cache.S | 0 .../ppc/cpu}/ppc4xx/cmd_chip_config.c | 0 {cpu => arch/ppc/cpu}/ppc4xx/commproc.c | 0 {cpu => arch/ppc/cpu}/ppc4xx/config.mk | 2 +- {cpu => arch/ppc/cpu}/ppc4xx/cpu.c | 0 {cpu => arch/ppc/cpu}/ppc4xx/cpu_init.c | 0 {cpu => arch/ppc/cpu}/ppc4xx/dcr.S | 0 .../ppc/cpu}/ppc4xx/denali_data_eye.c | 2 +- .../ppc/cpu}/ppc4xx/denali_spd_ddr2.c | 4 +-- {cpu => arch/ppc/cpu}/ppc4xx/ecc.c | 0 {cpu => arch/ppc/cpu}/ppc4xx/ecc.h | 0 {cpu => arch/ppc/cpu}/ppc4xx/fdt.c | 0 {cpu => arch/ppc/cpu}/ppc4xx/gpio.c | 0 {cpu => arch/ppc/cpu}/ppc4xx/interrupts.c | 0 {cpu => arch/ppc/cpu}/ppc4xx/iop480_uart.c | 0 {cpu => arch/ppc/cpu}/ppc4xx/kgdb.S | 0 {cpu => arch/ppc/cpu}/ppc4xx/miiphy.c | 0 {cpu => arch/ppc/cpu}/ppc4xx/reginfo.c | 0 {cpu => arch/ppc/cpu}/ppc4xx/resetvec.S | 0 {cpu => arch/ppc/cpu}/ppc4xx/sdram.c | 0 {cpu => arch/ppc/cpu}/ppc4xx/sdram.h | 0 {cpu => arch/ppc/cpu}/ppc4xx/speed.c | 0 {cpu => arch/ppc/cpu}/ppc4xx/start.S | 0 {cpu => arch/ppc/cpu}/ppc4xx/tlb.c | 0 {cpu => arch/ppc/cpu}/ppc4xx/traps.c | 0 {cpu => arch/ppc/cpu}/ppc4xx/u-boot.lds | 2 +- {cpu => arch/ppc/cpu}/ppc4xx/uic.c | 0 {cpu => arch/ppc/cpu}/ppc4xx/usb.c | 0 {cpu => arch/ppc/cpu}/ppc4xx/usb_ohci.c | 0 {cpu => arch/ppc/cpu}/ppc4xx/usb_ohci.h | 0 {cpu => arch/ppc/cpu}/ppc4xx/usbdev.c | 0 {cpu => arch/ppc/cpu}/ppc4xx/usbdev.h | 0 {cpu => arch/ppc/cpu}/ppc4xx/xilinx_irq.c | 0 board/LEOX/elpt860/u-boot.lds | 2 +- board/LEOX/elpt860/u-boot.lds.debug | 2 +- board/MAI/AmigaOneG3SE/u-boot.lds | 2 +- board/Marvell/db64360/u-boot.lds | 2 +- board/Marvell/db64460/u-boot.lds | 2 +- board/RPXClassic/u-boot.lds | 2 +- board/RPXClassic/u-boot.lds.debug | 2 +- board/RPXlite/u-boot.lds | 2 +- board/RPXlite/u-boot.lds.debug | 2 +- board/RPXlite_dw/u-boot.lds | 2 +- board/RPXlite_dw/u-boot.lds.debug | 2 +- board/RRvision/u-boot.lds | 4 +-- board/adder/u-boot.lds | 2 +- board/amcc/acadia/u-boot-nand.lds | 2 +- board/amcc/bamboo/u-boot-nand.lds | 2 +- board/amcc/canyonlands/canyonlands.c | 2 +- board/amcc/canyonlands/u-boot-nand.lds | 2 +- board/amcc/katmai/katmai.c | 2 +- board/amcc/kilauea/u-boot-nand.lds | 2 +- board/amcc/luan/luan.c | 2 +- board/amcc/sequoia/sdram.c | 2 +- board/amcc/sequoia/u-boot-nand.lds | 2 +- board/amcc/sequoia/u-boot-ram.lds | 2 +- board/amcc/yucca/yucca.c | 2 +- board/amirix/ap1000/u-boot.lds | 14 ++++---- board/c2mon/u-boot.lds | 2 +- board/c2mon/u-boot.lds.debug | 2 +- board/cm5200/u-boot.lds | 2 +- board/cogent/u-boot.lds.debug | 2 +- board/csb272/csb272.c | 2 +- board/csb472/csb472.c | 2 +- board/eltec/bab7xx/u-boot.lds | 2 +- board/eltec/elppc/u-boot.lds | 2 +- board/eltec/mhpc/u-boot.lds | 2 +- board/eltec/mhpc/u-boot.lds.debug | 2 +- board/emk/top860/u-boot.lds | 2 +- board/emk/top860/u-boot.lds.debug | 2 +- board/ep88x/u-boot.lds | 2 +- board/eric/eric.c | 2 +- board/esd/cpci750/u-boot.lds | 2 +- board/esd/dasa_sim/u-boot.lds | 2 +- board/esd/pmc440/u-boot-nand.lds | 2 +- board/esteem192e/u-boot.lds | 2 +- board/etx094/u-boot.lds | 12 +++---- board/etx094/u-boot.lds.debug | 14 ++++---- board/evb64260/u-boot.lds | 2 +- board/fads/u-boot.lds | 2 +- board/fads/u-boot.lds.debug | 2 +- board/flagadm/u-boot.lds | 2 +- board/flagadm/u-boot.lds.debug | 2 +- board/freescale/mpc7448hpc2/u-boot.lds | 2 +- board/freescale/mpc8610hpcd/u-boot.lds | 12 +++---- board/freescale/mpc8641hpcn/u-boot.lds | 12 +++---- board/gen860t/ioport.c | 2 +- board/gen860t/u-boot-flashenv.lds | 2 +- board/gen860t/u-boot.lds | 2 +- board/genietv/u-boot.lds | 2 +- board/genietv/u-boot.lds.debug | 2 +- board/gth/u-boot.lds | 2 +- board/hermes/u-boot.lds | 4 +-- board/hermes/u-boot.lds.debug | 4 +-- board/hmi1001/config.mk | 2 +- board/hymod/u-boot.lds | 2 +- board/hymod/u-boot.lds.debug | 2 +- board/icu862/u-boot.lds | 4 +-- board/icu862/u-boot.lds.debug | 2 +- board/inka4x0/config.mk | 2 +- board/ip860/u-boot.lds | 4 +-- board/ip860/u-boot.lds.debug | 4 +-- board/ivm/u-boot.lds | 2 +- board/ivm/u-boot.lds.debug | 2 +- board/keymile/common/keymile_hdlc_enet.c | 2 +- board/keymile/km8xx/km8xx_hdlc_enet.c | 2 +- board/keymile/km8xx/u-boot.lds | 4 +-- board/keymile/mgcoge/mgcoge_hdlc_enet.c | 2 +- board/korat/u-boot-F7FC.lds | 4 +-- board/kup/kup4k/u-boot.lds | 4 +-- board/kup/kup4k/u-boot.lds.debug | 2 +- board/kup/kup4x/u-boot.lds | 4 +-- board/kup/kup4x/u-boot.lds.debug | 2 +- board/lantec/u-boot.lds | 2 +- board/lantec/u-boot.lds.debug | 2 +- board/logicpd/zoom2/zoom2_serial.c | 2 +- board/lwmon/u-boot.lds | 2 +- board/lwmon/u-boot.lds.debug | 2 +- board/mbx8xx/u-boot.lds | 2 +- board/mbx8xx/u-boot.lds.debug | 2 +- board/ml2/u-boot.lds | 14 ++++---- board/mousse/u-boot.lds | 2 +- board/mousse/u-boot.lds.ram | 2 +- board/mousse/u-boot.lds.rom | 2 +- board/mucmc52/config.mk | 2 +- board/munices/u-boot.lds | 2 +- board/nc650/u-boot.lds | 2 +- board/nc650/u-boot.lds.debug | 2 +- board/netphone/u-boot.lds | 4 +-- board/netphone/u-boot.lds.debug | 2 +- board/netstal/hcu5/README.txt | 10 +++--- board/netta/u-boot.lds | 4 +-- board/netta/u-boot.lds.debug | 2 +- board/netta2/u-boot.lds | 4 +-- board/netta2/u-boot.lds.debug | 2 +- board/netvia/u-boot.lds | 4 +-- board/netvia/u-boot.lds.debug | 2 +- board/nx823/u-boot.lds | 2 +- board/nx823/u-boot.lds.debug | 2 +- board/pcippc2/u-boot.lds | 2 +- board/pcs440ep/pcs440ep.c | 2 +- board/ppmc7xx/u-boot.lds | 2 +- board/prodrive/p3mx/u-boot.lds | 2 +- board/quantum/u-boot.lds | 2 +- board/quantum/u-boot.lds.debug | 2 +- board/r360mpi/u-boot.lds | 8 ++--- board/rbc823/u-boot.lds | 2 +- board/rmu/u-boot.lds | 2 +- board/rmu/u-boot.lds.debug | 2 +- board/rsdproto/u-boot.lds | 2 +- board/sandburst/common/ppc440gx_i2c.c | 2 +- board/sandburst/karef/u-boot.lds.debug | 14 ++++---- board/sandburst/metrobox/u-boot.lds.debug | 14 ++++---- board/sbc8641d/u-boot.lds | 12 +++---- board/sc3/u-boot.lds | 14 ++++---- board/siemens/CCM/u-boot.lds | 2 +- board/siemens/CCM/u-boot.lds.debug | 2 +- board/siemens/IAD210/u-boot.lds | 4 +-- board/siemens/pcu_e/u-boot.lds | 2 +- board/siemens/pcu_e/u-boot.lds.debug | 2 +- board/sixnet/u-boot.lds | 2 +- board/snmc/qs850/u-boot.lds | 4 +-- board/snmc/qs860t/u-boot.lds | 4 +-- board/spc1920/u-boot.lds | 4 +-- board/spd8xx/u-boot.lds | 2 +- board/spd8xx/u-boot.lds.debug | 2 +- board/stx/stxxtc/u-boot.lds | 4 +-- board/stx/stxxtc/u-boot.lds.debug | 2 +- board/svm_sc8xx/u-boot.lds | 4 +-- board/svm_sc8xx/u-boot.lds.debug | 2 +- board/tqc/tqm8xx/u-boot.lds | 4 +-- board/tqc/tqm8xx/u-boot.lds.debug | 2 +- board/uc100/u-boot.lds | 4 +-- board/uc100/u-boot.lds.debug | 2 +- board/uc101/config.mk | 2 +- board/v37/u-boot.lds | 4 +-- board/w7o/w7o.c | 2 +- board/westel/amx860/u-boot.lds | 2 +- board/westel/amx860/u-boot.lds.debug | 2 +- board/xes/xpedite1000/u-boot.lds.debug | 14 ++++---- board/xes/xpedite5170/u-boot.lds | 12 +++---- board/xilinx/ppc405-generic/u-boot-rom.lds | 2 +- board/xilinx/ppc440-generic/u-boot-rom.lds | 2 +- config.mk | 7 +++- doc/README.PIP405 | 16 ++++----- doc/README.POST | 4 +-- doc/README.RPXlite | 2 +- doc/README.TQM8260 | 8 ++--- doc/README.alaska8220 | 36 +++++++++---------- doc/README.bedbug | 16 ++++----- doc/README.mpc5xx | 2 +- drivers/qe/uec_phy.c | 2 +- drivers/spi/mpc8xxx_spi.c | 2 +- examples/standalone/mem_to_mem_idma2intr.c | 2 +- include/configs/aria.h | 2 +- include/configs/galaxy5200.h | 2 +- include/configs/kilauea.h | 2 +- include/configs/linkstation.h | 2 +- include/configs/quad100hd.h | 6 ++-- include/configs/sc3.h | 4 +-- nand_spl/board/amcc/acadia/Makefile | 8 ++--- nand_spl/board/amcc/bamboo/Makefile | 4 +-- nand_spl/board/amcc/canyonlands/Makefile | 4 +-- nand_spl/board/amcc/kilauea/Makefile | 10 +++--- nand_spl/board/amcc/sequoia/Makefile | 6 ++-- nand_spl/board/freescale/mpc8313erdb/Makefile | 4 +-- nand_spl/board/freescale/mpc8315erdb/Makefile | 4 +-- nand_spl/board/freescale/mpc8536ds/Makefile | 10 +++--- nand_spl/board/freescale/mpc8569mds/Makefile | 10 +++--- nand_spl/board/freescale/p1_p2_rdb/Makefile | 10 +++--- nand_spl/board/sheldon/simpc8313/Makefile | 4 +-- post/cpu/ppc4xx/spr.c | 2 +- 442 files changed, 392 insertions(+), 387 deletions(-) rename {cpu => arch/ppc/cpu}/74xx_7xx/Makefile (100%) rename {cpu => arch/ppc/cpu}/74xx_7xx/cache.S (100%) rename {cpu => arch/ppc/cpu}/74xx_7xx/config.mk (100%) rename {cpu => arch/ppc/cpu}/74xx_7xx/cpu.c (100%) rename {cpu => arch/ppc/cpu}/74xx_7xx/cpu_init.c (100%) rename {cpu => arch/ppc/cpu}/74xx_7xx/interrupts.c (100%) rename {cpu => arch/ppc/cpu}/74xx_7xx/io.S (100%) rename {cpu => arch/ppc/cpu}/74xx_7xx/kgdb.S (100%) rename {cpu => arch/ppc/cpu}/74xx_7xx/speed.c (100%) rename {cpu => arch/ppc/cpu}/74xx_7xx/start.S (100%) rename {cpu => arch/ppc/cpu}/74xx_7xx/traps.c (100%) rename {cpu => arch/ppc/cpu}/mpc512x/Makefile (91%) rename {cpu => arch/ppc/cpu}/mpc512x/asm-offsets.h (88%) rename {cpu => arch/ppc/cpu}/mpc512x/config.mk (95%) rename {cpu => arch/ppc/cpu}/mpc512x/cpu.c (100%) rename {cpu => arch/ppc/cpu}/mpc512x/cpu_init.c (100%) rename {cpu => arch/ppc/cpu}/mpc512x/diu.c (98%) rename {cpu => arch/ppc/cpu}/mpc512x/fixed_sdram.c (100%) rename {cpu => arch/ppc/cpu}/mpc512x/i2c.c (100%) rename {cpu => arch/ppc/cpu}/mpc512x/ide.c (100%) rename {cpu => arch/ppc/cpu}/mpc512x/iim.c (100%) rename {cpu => arch/ppc/cpu}/mpc512x/interrupts.c (100%) rename {cpu => arch/ppc/cpu}/mpc512x/iopin.c (100%) rename {cpu => arch/ppc/cpu}/mpc512x/pci.c (100%) rename {cpu => arch/ppc/cpu}/mpc512x/serial.c (100%) rename {cpu => arch/ppc/cpu}/mpc512x/speed.c (100%) rename {cpu => arch/ppc/cpu}/mpc512x/start.S (100%) rename {cpu => arch/ppc/cpu}/mpc512x/traps.c (100%) rename {cpu => arch/ppc/cpu}/mpc512x/u-boot.lds (98%) rename {cpu => arch/ppc/cpu}/mpc5xx/Makefile (94%) rename {cpu => arch/ppc/cpu}/mpc5xx/config.mk (95%) rename {cpu => arch/ppc/cpu}/mpc5xx/cpu.c (100%) rename {cpu => arch/ppc/cpu}/mpc5xx/cpu_init.c (100%) rename {cpu => arch/ppc/cpu}/mpc5xx/interrupts.c (100%) rename {cpu => arch/ppc/cpu}/mpc5xx/serial.c (100%) rename {cpu => arch/ppc/cpu}/mpc5xx/speed.c (100%) rename {cpu => arch/ppc/cpu}/mpc5xx/spi.c (100%) rename {cpu => arch/ppc/cpu}/mpc5xx/start.S (100%) rename {cpu => arch/ppc/cpu}/mpc5xx/traps.c (100%) rename {cpu => arch/ppc/cpu}/mpc5xx/u-boot.lds (98%) rename {cpu => arch/ppc/cpu}/mpc5xxx/Makefile (100%) rename {cpu => arch/ppc/cpu}/mpc5xxx/config.mk (95%) rename {cpu => arch/ppc/cpu}/mpc5xxx/cpu.c (100%) rename {cpu => arch/ppc/cpu}/mpc5xxx/cpu_init.c (100%) rename {cpu => arch/ppc/cpu}/mpc5xxx/firmware_sc_task_bestcomm.impl.S (100%) rename {cpu => arch/ppc/cpu}/mpc5xxx/i2c.c (100%) rename {cpu => arch/ppc/cpu}/mpc5xxx/ide.c (100%) rename {cpu => arch/ppc/cpu}/mpc5xxx/interrupts.c (100%) rename {cpu => arch/ppc/cpu}/mpc5xxx/io.S (100%) rename {cpu => arch/ppc/cpu}/mpc5xxx/loadtask.c (100%) rename {cpu => arch/ppc/cpu}/mpc5xxx/pci_mpc5200.c (100%) rename {cpu => arch/ppc/cpu}/mpc5xxx/serial.c (100%) rename {cpu => arch/ppc/cpu}/mpc5xxx/speed.c (100%) rename {cpu => arch/ppc/cpu}/mpc5xxx/start.S (100%) rename {cpu => arch/ppc/cpu}/mpc5xxx/traps.c (100%) rename {cpu => arch/ppc/cpu}/mpc5xxx/u-boot-customlayout.lds (97%) rename {cpu => arch/ppc/cpu}/mpc5xxx/u-boot.lds (98%) rename {cpu => arch/ppc/cpu}/mpc5xxx/usb.c (100%) rename {cpu => arch/ppc/cpu}/mpc5xxx/usb_ohci.c (100%) rename {cpu => arch/ppc/cpu}/mpc5xxx/usb_ohci.h (100%) rename {cpu => arch/ppc/cpu}/mpc8220/Makefile (100%) rename {cpu => arch/ppc/cpu}/mpc8220/config.mk (95%) rename {cpu => arch/ppc/cpu}/mpc8220/cpu.c (100%) rename {cpu => arch/ppc/cpu}/mpc8220/cpu_init.c (100%) rename {cpu => arch/ppc/cpu}/mpc8220/dma.h (100%) rename {cpu => arch/ppc/cpu}/mpc8220/dramSetup.c (100%) rename {cpu => arch/ppc/cpu}/mpc8220/dramSetup.h (100%) rename {cpu => arch/ppc/cpu}/mpc8220/fec.c (100%) rename {cpu => arch/ppc/cpu}/mpc8220/fec.h (100%) rename {cpu => arch/ppc/cpu}/mpc8220/fec_dma_tasks.S (100%) rename {cpu => arch/ppc/cpu}/mpc8220/i2c.c (100%) rename {cpu => arch/ppc/cpu}/mpc8220/i2cCore.c (100%) rename {cpu => arch/ppc/cpu}/mpc8220/i2cCore.h (100%) rename {cpu => arch/ppc/cpu}/mpc8220/interrupts.c (100%) rename {cpu => arch/ppc/cpu}/mpc8220/io.S (100%) rename {cpu => arch/ppc/cpu}/mpc8220/loadtask.c (100%) rename {cpu => arch/ppc/cpu}/mpc8220/pci.c (100%) rename {cpu => arch/ppc/cpu}/mpc8220/speed.c (100%) rename {cpu => arch/ppc/cpu}/mpc8220/start.S (100%) rename {cpu => arch/ppc/cpu}/mpc8220/traps.c (100%) rename {cpu => arch/ppc/cpu}/mpc8220/u-boot.lds (98%) rename {cpu => arch/ppc/cpu}/mpc8220/uart.c (100%) rename {cpu => arch/ppc/cpu}/mpc824x/.gitignore (100%) rename {cpu => arch/ppc/cpu}/mpc824x/Makefile (100%) rename {cpu => arch/ppc/cpu}/mpc824x/config.mk (95%) rename {cpu => arch/ppc/cpu}/mpc824x/cpu.c (100%) rename {cpu => arch/ppc/cpu}/mpc824x/cpu_init.c (100%) rename {cpu => arch/ppc/cpu}/mpc824x/drivers/epic.h (100%) rename {cpu => arch/ppc/cpu}/mpc824x/drivers/epic/README (100%) rename {cpu => arch/ppc/cpu}/mpc824x/drivers/epic/epic.h (100%) rename {cpu => arch/ppc/cpu}/mpc824x/drivers/epic/epic1.c (100%) rename {cpu => arch/ppc/cpu}/mpc824x/drivers/epic/epic2.S (100%) rename {cpu => arch/ppc/cpu}/mpc824x/drivers/epic/epicutil.S (100%) rename {cpu => arch/ppc/cpu}/mpc824x/drivers/errors.h (100%) rename {cpu => arch/ppc/cpu}/mpc824x/drivers/i2c/i2c.c (100%) rename {cpu => arch/ppc/cpu}/mpc824x/drivers/i2c_export.h (100%) rename {cpu => arch/ppc/cpu}/mpc824x/interrupts.c (100%) rename {cpu => arch/ppc/cpu}/mpc824x/pci.c (100%) rename {cpu => arch/ppc/cpu}/mpc824x/speed.c (100%) rename {cpu => arch/ppc/cpu}/mpc824x/start.S (100%) rename {cpu => arch/ppc/cpu}/mpc824x/traps.c (100%) rename {cpu => arch/ppc/cpu}/mpc824x/u-boot.lds (98%) rename {cpu => arch/ppc/cpu}/mpc8260/Makefile (100%) rename {cpu => arch/ppc/cpu}/mpc8260/bedbug_603e.c (100%) rename {cpu => arch/ppc/cpu}/mpc8260/commproc.c (100%) rename {cpu => arch/ppc/cpu}/mpc8260/config.mk (95%) rename {cpu => arch/ppc/cpu}/mpc8260/cpu.c (100%) rename {cpu => arch/ppc/cpu}/mpc8260/cpu_init.c (100%) rename {cpu => arch/ppc/cpu}/mpc8260/ether_fcc.c (100%) rename {cpu => arch/ppc/cpu}/mpc8260/ether_scc.c (100%) rename {cpu => arch/ppc/cpu}/mpc8260/i2c.c (100%) rename {cpu => arch/ppc/cpu}/mpc8260/interrupts.c (100%) rename {cpu => arch/ppc/cpu}/mpc8260/kgdb.S (100%) rename {cpu => arch/ppc/cpu}/mpc8260/pci.c (100%) rename {cpu => arch/ppc/cpu}/mpc8260/serial_scc.c (100%) rename {cpu => arch/ppc/cpu}/mpc8260/serial_smc.c (100%) rename {cpu => arch/ppc/cpu}/mpc8260/speed.c (100%) rename {cpu => arch/ppc/cpu}/mpc8260/speed.h (100%) rename {cpu => arch/ppc/cpu}/mpc8260/spi.c (100%) rename {cpu => arch/ppc/cpu}/mpc8260/start.S (100%) rename {cpu => arch/ppc/cpu}/mpc8260/traps.c (100%) rename {cpu => arch/ppc/cpu}/mpc8260/u-boot.lds (98%) rename {cpu => arch/ppc/cpu}/mpc83xx/Makefile (100%) rename {cpu => arch/ppc/cpu}/mpc83xx/config.mk (94%) rename {cpu => arch/ppc/cpu}/mpc83xx/cpu.c (100%) rename {cpu => arch/ppc/cpu}/mpc83xx/cpu_init.c (100%) rename {cpu => arch/ppc/cpu}/mpc83xx/ecc.c (100%) rename {cpu => arch/ppc/cpu}/mpc83xx/fdt.c (100%) rename {cpu => arch/ppc/cpu}/mpc83xx/interrupts.c (100%) rename {cpu => arch/ppc/cpu}/mpc83xx/nand_init.c (100%) rename {cpu => arch/ppc/cpu}/mpc83xx/pci.c (100%) rename {cpu => arch/ppc/cpu}/mpc83xx/pcie.c (100%) rename {cpu => arch/ppc/cpu}/mpc83xx/qe_io.c (100%) rename {cpu => arch/ppc/cpu}/mpc83xx/serdes.c (100%) rename {cpu => arch/ppc/cpu}/mpc83xx/spd_sdram.c (100%) rename {cpu => arch/ppc/cpu}/mpc83xx/speed.c (100%) rename {cpu => arch/ppc/cpu}/mpc83xx/start.S (100%) rename {cpu => arch/ppc/cpu}/mpc83xx/traps.c (100%) rename {cpu => arch/ppc/cpu}/mpc83xx/u-boot.lds (98%) rename {cpu => arch/ppc/cpu}/mpc85xx/Makefile (100%) rename {cpu => arch/ppc/cpu}/mpc85xx/commproc.c (100%) rename {cpu => arch/ppc/cpu}/mpc85xx/config.mk (95%) rename {cpu => arch/ppc/cpu}/mpc85xx/cpu.c (100%) rename {cpu => arch/ppc/cpu}/mpc85xx/cpu_init.c (100%) rename {cpu => arch/ppc/cpu}/mpc85xx/cpu_init_early.c (100%) rename {cpu => arch/ppc/cpu}/mpc85xx/cpu_init_nand.c (100%) rename {cpu => arch/ppc/cpu}/mpc85xx/ddr-gen1.c (100%) rename {cpu => arch/ppc/cpu}/mpc85xx/ddr-gen2.c (100%) rename {cpu => arch/ppc/cpu}/mpc85xx/ddr-gen3.c (100%) rename {cpu => arch/ppc/cpu}/mpc85xx/ether_fcc.c (100%) rename {cpu => arch/ppc/cpu}/mpc85xx/fdt.c (100%) rename {cpu => arch/ppc/cpu}/mpc85xx/fixed_ivor.S (100%) rename {cpu => arch/ppc/cpu}/mpc85xx/interrupts.c (100%) rename {cpu => arch/ppc/cpu}/mpc85xx/mp.c (100%) rename {cpu => arch/ppc/cpu}/mpc85xx/mp.h (100%) rename {cpu => arch/ppc/cpu}/mpc85xx/mpc8536_serdes.c (100%) rename {cpu => arch/ppc/cpu}/mpc85xx/pci.c (100%) rename {cpu => arch/ppc/cpu}/mpc85xx/qe_io.c (100%) rename {cpu => arch/ppc/cpu}/mpc85xx/release.S (100%) rename {cpu => arch/ppc/cpu}/mpc85xx/resetvec.S (100%) rename {cpu => arch/ppc/cpu}/mpc85xx/serial_scc.c (100%) rename {cpu => arch/ppc/cpu}/mpc85xx/speed.c (100%) rename {cpu => arch/ppc/cpu}/mpc85xx/start.S (100%) rename {cpu => arch/ppc/cpu}/mpc85xx/tlb.c (100%) rename {cpu => arch/ppc/cpu}/mpc85xx/traps.c (100%) rename {cpu => arch/ppc/cpu}/mpc85xx/u-boot-nand.lds (98%) rename {cpu => arch/ppc/cpu}/mpc85xx/u-boot-nand_spl.lds (100%) rename {cpu => arch/ppc/cpu}/mpc85xx/u-boot.lds (98%) rename {cpu => arch/ppc/cpu}/mpc86xx/Makefile (100%) rename {cpu => arch/ppc/cpu}/mpc86xx/cache.S (100%) rename {cpu => arch/ppc/cpu}/mpc86xx/config.mk (100%) rename {cpu => arch/ppc/cpu}/mpc86xx/cpu.c (100%) rename {cpu => arch/ppc/cpu}/mpc86xx/cpu_init.c (100%) rename {cpu => arch/ppc/cpu}/mpc86xx/ddr-8641.c (100%) rename {cpu => arch/ppc/cpu}/mpc86xx/fdt.c (100%) rename {cpu => arch/ppc/cpu}/mpc86xx/interrupts.c (100%) rename {cpu => arch/ppc/cpu}/mpc86xx/mp.c (100%) rename {cpu => arch/ppc/cpu}/mpc86xx/release.S (100%) rename {cpu => arch/ppc/cpu}/mpc86xx/speed.c (100%) rename {cpu => arch/ppc/cpu}/mpc86xx/start.S (100%) rename {cpu => arch/ppc/cpu}/mpc86xx/traps.c (100%) rename {cpu => arch/ppc/cpu}/mpc8xx/Makefile (100%) rename {cpu => arch/ppc/cpu}/mpc8xx/bedbug_860.c (100%) rename {cpu => arch/ppc/cpu}/mpc8xx/commproc.c (100%) rename {cpu => arch/ppc/cpu}/mpc8xx/config.mk (100%) rename {cpu => arch/ppc/cpu}/mpc8xx/cpu.c (100%) rename {cpu => arch/ppc/cpu}/mpc8xx/cpu_init.c (100%) rename {cpu => arch/ppc/cpu}/mpc8xx/fdt.c (100%) rename {cpu => arch/ppc/cpu}/mpc8xx/fec.c (100%) rename {cpu => arch/ppc/cpu}/mpc8xx/fec.h (100%) rename {cpu => arch/ppc/cpu}/mpc8xx/i2c.c (100%) rename {cpu => arch/ppc/cpu}/mpc8xx/interrupts.c (100%) rename {cpu => arch/ppc/cpu}/mpc8xx/kgdb.S (100%) rename {cpu => arch/ppc/cpu}/mpc8xx/lcd.c (100%) rename {cpu => arch/ppc/cpu}/mpc8xx/plprcr_write.S (100%) rename {cpu => arch/ppc/cpu}/mpc8xx/scc.c (100%) rename {cpu => arch/ppc/cpu}/mpc8xx/serial.c (100%) rename {cpu => arch/ppc/cpu}/mpc8xx/speed.c (100%) rename {cpu => arch/ppc/cpu}/mpc8xx/spi.c (100%) rename {cpu => arch/ppc/cpu}/mpc8xx/start.S (100%) rename {cpu => arch/ppc/cpu}/mpc8xx/traps.c (100%) rename {cpu => arch/ppc/cpu}/mpc8xx/upatch.c (100%) rename {cpu => arch/ppc/cpu}/mpc8xx/video.c (100%) rename {cpu => arch/ppc/cpu}/mpc8xx/wlkbd.c (100%) rename {cpu => arch/ppc/cpu}/mpc8xxx/Makefile (100%) rename {cpu => arch/ppc/cpu}/mpc8xxx/cpu.c (95%) rename {cpu => arch/ppc/cpu}/mpc8xxx/ddr/Makefile (100%) rename {cpu => arch/ppc/cpu}/mpc8xxx/ddr/common_timing_params.h (100%) rename {cpu => arch/ppc/cpu}/mpc8xxx/ddr/ctrl_regs.c (100%) rename {cpu => arch/ppc/cpu}/mpc8xxx/ddr/ddr.h (100%) rename {cpu => arch/ppc/cpu}/mpc8xxx/ddr/ddr1_dimm_params.c (100%) rename {cpu => arch/ppc/cpu}/mpc8xxx/ddr/ddr2_dimm_params.c (100%) rename {cpu => arch/ppc/cpu}/mpc8xxx/ddr/ddr3_dimm_params.c (100%) rename {cpu => arch/ppc/cpu}/mpc8xxx/ddr/lc_common_dimm_params.c (100%) rename {cpu => arch/ppc/cpu}/mpc8xxx/ddr/main.c (100%) rename {cpu => arch/ppc/cpu}/mpc8xxx/ddr/options.c (100%) rename {cpu => arch/ppc/cpu}/mpc8xxx/ddr/util.c (100%) rename {cpu => arch/ppc/cpu}/mpc8xxx/fdt.c (90%) rename {cpu => arch/ppc/cpu}/mpc8xxx/pci_cfg.c (100%) rename {cpu => arch/ppc/cpu}/ppc4xx/40x_spd_sdram.c (99%) rename {cpu => arch/ppc/cpu}/ppc4xx/44x_spd_ddr.c (99%) rename {cpu => arch/ppc/cpu}/ppc4xx/44x_spd_ddr2.c (99%) rename {cpu => arch/ppc/cpu}/ppc4xx/4xx_ibm_ddr2_autocalib.c (99%) rename {cpu => arch/ppc/cpu}/ppc4xx/4xx_pci.c (100%) rename {cpu => arch/ppc/cpu}/ppc4xx/4xx_pcie.c (100%) rename {cpu => arch/ppc/cpu}/ppc4xx/4xx_uart.c (100%) rename {cpu => arch/ppc/cpu}/ppc4xx/Makefile (100%) rename {cpu => arch/ppc/cpu}/ppc4xx/bedbug_405.c (100%) rename {cpu => arch/ppc/cpu}/ppc4xx/cache.S (100%) rename {cpu => arch/ppc/cpu}/ppc4xx/cmd_chip_config.c (100%) rename {cpu => arch/ppc/cpu}/ppc4xx/commproc.c (100%) rename {cpu => arch/ppc/cpu}/ppc4xx/config.mk (96%) rename {cpu => arch/ppc/cpu}/ppc4xx/cpu.c (100%) rename {cpu => arch/ppc/cpu}/ppc4xx/cpu_init.c (100%) rename {cpu => arch/ppc/cpu}/ppc4xx/dcr.S (100%) rename {cpu => arch/ppc/cpu}/ppc4xx/denali_data_eye.c (99%) rename {cpu => arch/ppc/cpu}/ppc4xx/denali_spd_ddr2.c (99%) rename {cpu => arch/ppc/cpu}/ppc4xx/ecc.c (100%) rename {cpu => arch/ppc/cpu}/ppc4xx/ecc.h (100%) rename {cpu => arch/ppc/cpu}/ppc4xx/fdt.c (100%) rename {cpu => arch/ppc/cpu}/ppc4xx/gpio.c (100%) rename {cpu => arch/ppc/cpu}/ppc4xx/interrupts.c (100%) rename {cpu => arch/ppc/cpu}/ppc4xx/iop480_uart.c (100%) rename {cpu => arch/ppc/cpu}/ppc4xx/kgdb.S (100%) rename {cpu => arch/ppc/cpu}/ppc4xx/miiphy.c (100%) rename {cpu => arch/ppc/cpu}/ppc4xx/reginfo.c (100%) rename {cpu => arch/ppc/cpu}/ppc4xx/resetvec.S (100%) rename {cpu => arch/ppc/cpu}/ppc4xx/sdram.c (100%) rename {cpu => arch/ppc/cpu}/ppc4xx/sdram.h (100%) rename {cpu => arch/ppc/cpu}/ppc4xx/speed.c (100%) rename {cpu => arch/ppc/cpu}/ppc4xx/start.S (100%) rename {cpu => arch/ppc/cpu}/ppc4xx/tlb.c (100%) rename {cpu => arch/ppc/cpu}/ppc4xx/traps.c (100%) rename {cpu => arch/ppc/cpu}/ppc4xx/u-boot.lds (98%) rename {cpu => arch/ppc/cpu}/ppc4xx/uic.c (100%) rename {cpu => arch/ppc/cpu}/ppc4xx/usb.c (100%) rename {cpu => arch/ppc/cpu}/ppc4xx/usb_ohci.c (100%) rename {cpu => arch/ppc/cpu}/ppc4xx/usb_ohci.h (100%) rename {cpu => arch/ppc/cpu}/ppc4xx/usbdev.c (100%) rename {cpu => arch/ppc/cpu}/ppc4xx/usbdev.h (100%) rename {cpu => arch/ppc/cpu}/ppc4xx/xilinx_irq.c (100%) diff --git a/Makefile b/Makefile index fdd781a86..ddfe73c06 100644 --- a/Makefile +++ b/Makefile @@ -227,12 +227,12 @@ LIBS += drivers/qe/qe.a endif ifeq ($(CPU),mpc85xx) LIBS += drivers/qe/qe.a -LIBS += cpu/mpc8xxx/ddr/libddr.a -LIBS += cpu/mpc8xxx/lib8xxx.a +LIBS += arch/ppc/cpu/mpc8xxx/ddr/libddr.a +LIBS += arch/ppc/cpu/mpc8xxx/lib8xxx.a endif ifeq ($(CPU),mpc86xx) -LIBS += cpu/mpc8xxx/ddr/libddr.a -LIBS += cpu/mpc8xxx/lib8xxx.a +LIBS += arch/ppc/cpu/mpc8xxx/ddr/libddr.a +LIBS += arch/ppc/cpu/mpc8xxx/lib8xxx.a endif LIBS += drivers/rtc/librtc.a LIBS += drivers/serial/libserial.a @@ -3768,7 +3768,7 @@ clobber: clean @rm -f $(obj)u-boot.kwb @rm -f $(obj)u-boot.imx @rm -f $(obj)tools/{env/crc32.c,inca-swap-bytes} - @rm -f $(obj)cpu/mpc824x/bedbug_603e.c + @rm -f $(obj)arch/ppc/cpu/mpc824x/bedbug_603e.c @rm -f $(obj)include/asm/proc $(obj)include/asm/arch $(obj)include/asm @[ ! -d $(obj)nand_spl ] || find $(obj)nand_spl -name "*" -type l -print | xargs rm -f @[ ! -d $(obj)onenand_ipl ] || find $(obj)onenand_ipl -name "*" -type l -print | xargs rm -f diff --git a/README b/README index e1d58bdf0..d5ccdc552 100644 --- a/README +++ b/README @@ -1393,7 +1393,7 @@ The following options need to be configured: to run and CONFIG_SYS_I2C_SLAVE to be the address of this node (ie the CPU's i2c node address). - Now, the u-boot i2c code for the mpc8xx (cpu/mpc8xx/i2c.c) + Now, the u-boot i2c code for the mpc8xx (arch/ppc/cpu/mpc8xx/i2c.c) sets the CPU up as a master node and so its address should therefore be cleared to 0 (See, eg, MPC823e User's Manual p.16-473). So, set CONFIG_SYS_I2C_SLAVE to 0. @@ -2703,7 +2703,7 @@ Low Level (hardware related) configuration options: CONFIG_SYS_PCI_MSTR_MEMIO_SIZE, CONFIG_SYS_POCMR1_MASK_ATTRIB, CONFIG_SYS_PCI_MSTR_IO_LOCAL, CONFIG_SYS_PCI_MSTR_IO_BUS, CONFIG_SYS_CPU_PCI_IO_START, CONFIG_SYS_PCI_MSTR_IO_SIZE, CONFIG_SYS_POCMR2_MASK_ATTRIB: (MPC826x only) - Overrides the default PCI memory map in cpu/mpc8260/pci.c if set. + Overrides the default PCI memory map in arch/ppc/cpu/mpc8260/pci.c if set. - CONFIG_PCI_DISABLE_PCIE: Disable PCI-Express on systems where it is supported but not diff --git a/cpu/74xx_7xx/Makefile b/arch/ppc/cpu/74xx_7xx/Makefile similarity index 100% rename from cpu/74xx_7xx/Makefile rename to arch/ppc/cpu/74xx_7xx/Makefile diff --git a/cpu/74xx_7xx/cache.S b/arch/ppc/cpu/74xx_7xx/cache.S similarity index 100% rename from cpu/74xx_7xx/cache.S rename to arch/ppc/cpu/74xx_7xx/cache.S diff --git a/cpu/74xx_7xx/config.mk b/arch/ppc/cpu/74xx_7xx/config.mk similarity index 100% rename from cpu/74xx_7xx/config.mk rename to arch/ppc/cpu/74xx_7xx/config.mk diff --git a/cpu/74xx_7xx/cpu.c b/arch/ppc/cpu/74xx_7xx/cpu.c similarity index 100% rename from cpu/74xx_7xx/cpu.c rename to arch/ppc/cpu/74xx_7xx/cpu.c diff --git a/cpu/74xx_7xx/cpu_init.c b/arch/ppc/cpu/74xx_7xx/cpu_init.c similarity index 100% rename from cpu/74xx_7xx/cpu_init.c rename to arch/ppc/cpu/74xx_7xx/cpu_init.c diff --git a/cpu/74xx_7xx/interrupts.c b/arch/ppc/cpu/74xx_7xx/interrupts.c similarity index 100% rename from cpu/74xx_7xx/interrupts.c rename to arch/ppc/cpu/74xx_7xx/interrupts.c diff --git a/cpu/74xx_7xx/io.S b/arch/ppc/cpu/74xx_7xx/io.S similarity index 100% rename from cpu/74xx_7xx/io.S rename to arch/ppc/cpu/74xx_7xx/io.S diff --git a/cpu/74xx_7xx/kgdb.S b/arch/ppc/cpu/74xx_7xx/kgdb.S similarity index 100% rename from cpu/74xx_7xx/kgdb.S rename to arch/ppc/cpu/74xx_7xx/kgdb.S diff --git a/cpu/74xx_7xx/speed.c b/arch/ppc/cpu/74xx_7xx/speed.c similarity index 100% rename from cpu/74xx_7xx/speed.c rename to arch/ppc/cpu/74xx_7xx/speed.c diff --git a/cpu/74xx_7xx/start.S b/arch/ppc/cpu/74xx_7xx/start.S similarity index 100% rename from cpu/74xx_7xx/start.S rename to arch/ppc/cpu/74xx_7xx/start.S diff --git a/cpu/74xx_7xx/traps.c b/arch/ppc/cpu/74xx_7xx/traps.c similarity index 100% rename from cpu/74xx_7xx/traps.c rename to arch/ppc/cpu/74xx_7xx/traps.c diff --git a/cpu/mpc512x/Makefile b/arch/ppc/cpu/mpc512x/Makefile similarity index 91% rename from cpu/mpc512x/Makefile rename to arch/ppc/cpu/mpc512x/Makefile index 427db7ae0..1719c66e8 100644 --- a/cpu/mpc512x/Makefile +++ b/arch/ppc/cpu/mpc512x/Makefile @@ -37,8 +37,8 @@ COBJS-y += iopin.o COBJS-y += serial.o COBJS-y += speed.o COBJS-${CONFIG_FSL_DIU_FB} += diu.o -COBJS-${CONFIG_FSL_DIU_FB} += ../../board/freescale/common/fsl_diu_fb.o -COBJS-${CONFIG_FSL_DIU_FB} += ../../board/freescale/common/fsl_logo_bmp.o +COBJS-${CONFIG_FSL_DIU_FB} += ../../../../board/freescale/common/fsl_diu_fb.o +COBJS-${CONFIG_FSL_DIU_FB} += ../../../../board/freescale/common/fsl_logo_bmp.o COBJS-${CONFIG_CMD_IDE} += ide.o COBJS-${CONFIG_IIM} += iim.o COBJS-$(CONFIG_PCI) += pci.o diff --git a/cpu/mpc512x/asm-offsets.h b/arch/ppc/cpu/mpc512x/asm-offsets.h similarity index 88% rename from cpu/mpc512x/asm-offsets.h rename to arch/ppc/cpu/mpc512x/asm-offsets.h index 4b147783f..5873fe05e 100644 --- a/cpu/mpc512x/asm-offsets.h +++ b/arch/ppc/cpu/mpc512x/asm-offsets.h @@ -1,5 +1,5 @@ /* - * needed for cpu/mpc512x/start.S + * needed for arch/ppc/cpu/mpc512x/start.S * * These should be auto-generated */ diff --git a/cpu/mpc512x/config.mk b/arch/ppc/cpu/mpc512x/config.mk similarity index 95% rename from cpu/mpc512x/config.mk rename to arch/ppc/cpu/mpc512x/config.mk index fb0a563e6..b6727dcd2 100644 --- a/cpu/mpc512x/config.mk +++ b/arch/ppc/cpu/mpc512x/config.mk @@ -26,4 +26,4 @@ PLATFORM_CPPFLAGS += -DCONFIG_MPC512X -DCONFIG_E300 \ # Use default linker script. # A board port can override this setting in board/*/config.mk -LDSCRIPT := $(SRCTREE)/cpu/mpc512x/u-boot.lds +LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc512x/u-boot.lds diff --git a/cpu/mpc512x/cpu.c b/arch/ppc/cpu/mpc512x/cpu.c similarity index 100% rename from cpu/mpc512x/cpu.c rename to arch/ppc/cpu/mpc512x/cpu.c diff --git a/cpu/mpc512x/cpu_init.c b/arch/ppc/cpu/mpc512x/cpu_init.c similarity index 100% rename from cpu/mpc512x/cpu_init.c rename to arch/ppc/cpu/mpc512x/cpu_init.c diff --git a/cpu/mpc512x/diu.c b/arch/ppc/cpu/mpc512x/diu.c similarity index 98% rename from cpu/mpc512x/diu.c rename to arch/ppc/cpu/mpc512x/diu.c index c2453c68d..93611615f 100644 --- a/cpu/mpc512x/diu.c +++ b/arch/ppc/cpu/mpc512x/diu.c @@ -27,7 +27,7 @@ #include #include -#include "../../board/freescale/common/fsl_diu_fb.h" +#include "../../../../board/freescale/common/fsl_diu_fb.h" #if defined(CONFIG_VIDEO) || defined(CONFIG_CFB_CONSOLE) #include diff --git a/cpu/mpc512x/fixed_sdram.c b/arch/ppc/cpu/mpc512x/fixed_sdram.c similarity index 100% rename from cpu/mpc512x/fixed_sdram.c rename to arch/ppc/cpu/mpc512x/fixed_sdram.c diff --git a/cpu/mpc512x/i2c.c b/arch/ppc/cpu/mpc512x/i2c.c similarity index 100% rename from cpu/mpc512x/i2c.c rename to arch/ppc/cpu/mpc512x/i2c.c diff --git a/cpu/mpc512x/ide.c b/arch/ppc/cpu/mpc512x/ide.c similarity index 100% rename from cpu/mpc512x/ide.c rename to arch/ppc/cpu/mpc512x/ide.c diff --git a/cpu/mpc512x/iim.c b/arch/ppc/cpu/mpc512x/iim.c similarity index 100% rename from cpu/mpc512x/iim.c rename to arch/ppc/cpu/mpc512x/iim.c diff --git a/cpu/mpc512x/interrupts.c b/arch/ppc/cpu/mpc512x/interrupts.c similarity index 100% rename from cpu/mpc512x/interrupts.c rename to arch/ppc/cpu/mpc512x/interrupts.c diff --git a/cpu/mpc512x/iopin.c b/arch/ppc/cpu/mpc512x/iopin.c similarity index 100% rename from cpu/mpc512x/iopin.c rename to arch/ppc/cpu/mpc512x/iopin.c diff --git a/cpu/mpc512x/pci.c b/arch/ppc/cpu/mpc512x/pci.c similarity index 100% rename from cpu/mpc512x/pci.c rename to arch/ppc/cpu/mpc512x/pci.c diff --git a/cpu/mpc512x/serial.c b/arch/ppc/cpu/mpc512x/serial.c similarity index 100% rename from cpu/mpc512x/serial.c rename to arch/ppc/cpu/mpc512x/serial.c diff --git a/cpu/mpc512x/speed.c b/arch/ppc/cpu/mpc512x/speed.c similarity index 100% rename from cpu/mpc512x/speed.c rename to arch/ppc/cpu/mpc512x/speed.c diff --git a/cpu/mpc512x/start.S b/arch/ppc/cpu/mpc512x/start.S similarity index 100% rename from cpu/mpc512x/start.S rename to arch/ppc/cpu/mpc512x/start.S diff --git a/cpu/mpc512x/traps.c b/arch/ppc/cpu/mpc512x/traps.c similarity index 100% rename from cpu/mpc512x/traps.c rename to arch/ppc/cpu/mpc512x/traps.c diff --git a/cpu/mpc512x/u-boot.lds b/arch/ppc/cpu/mpc512x/u-boot.lds similarity index 98% rename from cpu/mpc512x/u-boot.lds rename to arch/ppc/cpu/mpc512x/u-boot.lds index 2e260eb2a..fbc2026d5 100644 --- a/cpu/mpc512x/u-boot.lds +++ b/arch/ppc/cpu/mpc512x/u-boot.lds @@ -49,7 +49,7 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/mpc512x/start.o (.text) + arch/ppc/cpu/mpc512x/start.o (.text) *(.text) *(.got1) . = ALIGN(16); diff --git a/cpu/mpc5xx/Makefile b/arch/ppc/cpu/mpc5xx/Makefile similarity index 94% rename from cpu/mpc5xx/Makefile rename to arch/ppc/cpu/mpc5xx/Makefile index 8aab0189d..f2ebb9a12 100644 --- a/cpu/mpc5xx/Makefile +++ b/arch/ppc/cpu/mpc5xx/Makefile @@ -25,11 +25,11 @@ # # -# File: cpu/mpc5xx/Makefile +# File: arch/ppc/cpu/mpc5xx/Makefile # # Discription: Makefile to build mpc5xx cpu configuration. # Will include top config.mk which itselfs -# uses the definitions made in cpu/mpc5xx/config.mk +# uses the definitions made in arch/ppc/cpu/mpc5xx/config.mk # diff --git a/cpu/mpc5xx/config.mk b/arch/ppc/cpu/mpc5xx/config.mk similarity index 95% rename from cpu/mpc5xx/config.mk rename to arch/ppc/cpu/mpc5xx/config.mk index 78549249b..e0b0ce1fd 100644 --- a/cpu/mpc5xx/config.mk +++ b/arch/ppc/cpu/mpc5xx/config.mk @@ -33,4 +33,4 @@ PLATFORM_RELFLAGS += -fPIC -meabi PLATFORM_CPPFLAGS += -DCONFIG_5xx -ffixed-r2 -mpowerpc -msoft-float # Use default linker script. Board port can override in board/*/config.mk -LDSCRIPT := $(SRCTREE)/cpu/mpc5xx/u-boot.lds +LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc5xx/u-boot.lds diff --git a/cpu/mpc5xx/cpu.c b/arch/ppc/cpu/mpc5xx/cpu.c similarity index 100% rename from cpu/mpc5xx/cpu.c rename to arch/ppc/cpu/mpc5xx/cpu.c diff --git a/cpu/mpc5xx/cpu_init.c b/arch/ppc/cpu/mpc5xx/cpu_init.c similarity index 100% rename from cpu/mpc5xx/cpu_init.c rename to arch/ppc/cpu/mpc5xx/cpu_init.c diff --git a/cpu/mpc5xx/interrupts.c b/arch/ppc/cpu/mpc5xx/interrupts.c similarity index 100% rename from cpu/mpc5xx/interrupts.c rename to arch/ppc/cpu/mpc5xx/interrupts.c diff --git a/cpu/mpc5xx/serial.c b/arch/ppc/cpu/mpc5xx/serial.c similarity index 100% rename from cpu/mpc5xx/serial.c rename to arch/ppc/cpu/mpc5xx/serial.c diff --git a/cpu/mpc5xx/speed.c b/arch/ppc/cpu/mpc5xx/speed.c similarity index 100% rename from cpu/mpc5xx/speed.c rename to arch/ppc/cpu/mpc5xx/speed.c diff --git a/cpu/mpc5xx/spi.c b/arch/ppc/cpu/mpc5xx/spi.c similarity index 100% rename from cpu/mpc5xx/spi.c rename to arch/ppc/cpu/mpc5xx/spi.c diff --git a/cpu/mpc5xx/start.S b/arch/ppc/cpu/mpc5xx/start.S similarity index 100% rename from cpu/mpc5xx/start.S rename to arch/ppc/cpu/mpc5xx/start.S diff --git a/cpu/mpc5xx/traps.c b/arch/ppc/cpu/mpc5xx/traps.c similarity index 100% rename from cpu/mpc5xx/traps.c rename to arch/ppc/cpu/mpc5xx/traps.c diff --git a/cpu/mpc5xx/u-boot.lds b/arch/ppc/cpu/mpc5xx/u-boot.lds similarity index 98% rename from cpu/mpc5xx/u-boot.lds rename to arch/ppc/cpu/mpc5xx/u-boot.lds index deeb06ae2..55190c72d 100644 --- a/cpu/mpc5xx/u-boot.lds +++ b/arch/ppc/cpu/mpc5xx/u-boot.lds @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc5xx/start.o (.text) + arch/ppc/cpu/mpc5xx/start.o (.text) *(.text) *(.got1) diff --git a/cpu/mpc5xxx/Makefile b/arch/ppc/cpu/mpc5xxx/Makefile similarity index 100% rename from cpu/mpc5xxx/Makefile rename to arch/ppc/cpu/mpc5xxx/Makefile diff --git a/cpu/mpc5xxx/config.mk b/arch/ppc/cpu/mpc5xxx/config.mk similarity index 95% rename from cpu/mpc5xxx/config.mk rename to arch/ppc/cpu/mpc5xxx/config.mk index 5e82f67ea..9a64cb623 100644 --- a/cpu/mpc5xxx/config.mk +++ b/arch/ppc/cpu/mpc5xxx/config.mk @@ -27,4 +27,4 @@ PLATFORM_CPPFLAGS += -DCONFIG_MPC5xxx -ffixed-r2 \ -mstring -mcpu=603e -mmultiple # Use default linker script. Board port can override in board/*/config.mk -LDSCRIPT := $(SRCTREE)/cpu/mpc5xxx/u-boot.lds +LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc5xxx/u-boot.lds diff --git a/cpu/mpc5xxx/cpu.c b/arch/ppc/cpu/mpc5xxx/cpu.c similarity index 100% rename from cpu/mpc5xxx/cpu.c rename to arch/ppc/cpu/mpc5xxx/cpu.c diff --git a/cpu/mpc5xxx/cpu_init.c b/arch/ppc/cpu/mpc5xxx/cpu_init.c similarity index 100% rename from cpu/mpc5xxx/cpu_init.c rename to arch/ppc/cpu/mpc5xxx/cpu_init.c diff --git a/cpu/mpc5xxx/firmware_sc_task_bestcomm.impl.S b/arch/ppc/cpu/mpc5xxx/firmware_sc_task_bestcomm.impl.S similarity index 100% rename from cpu/mpc5xxx/firmware_sc_task_bestcomm.impl.S rename to arch/ppc/cpu/mpc5xxx/firmware_sc_task_bestcomm.impl.S diff --git a/cpu/mpc5xxx/i2c.c b/arch/ppc/cpu/mpc5xxx/i2c.c similarity index 100% rename from cpu/mpc5xxx/i2c.c rename to arch/ppc/cpu/mpc5xxx/i2c.c diff --git a/cpu/mpc5xxx/ide.c b/arch/ppc/cpu/mpc5xxx/ide.c similarity index 100% rename from cpu/mpc5xxx/ide.c rename to arch/ppc/cpu/mpc5xxx/ide.c diff --git a/cpu/mpc5xxx/interrupts.c b/arch/ppc/cpu/mpc5xxx/interrupts.c similarity index 100% rename from cpu/mpc5xxx/interrupts.c rename to arch/ppc/cpu/mpc5xxx/interrupts.c diff --git a/cpu/mpc5xxx/io.S b/arch/ppc/cpu/mpc5xxx/io.S similarity index 100% rename from cpu/mpc5xxx/io.S rename to arch/ppc/cpu/mpc5xxx/io.S diff --git a/cpu/mpc5xxx/loadtask.c b/arch/ppc/cpu/mpc5xxx/loadtask.c similarity index 100% rename from cpu/mpc5xxx/loadtask.c rename to arch/ppc/cpu/mpc5xxx/loadtask.c diff --git a/cpu/mpc5xxx/pci_mpc5200.c b/arch/ppc/cpu/mpc5xxx/pci_mpc5200.c similarity index 100% rename from cpu/mpc5xxx/pci_mpc5200.c rename to arch/ppc/cpu/mpc5xxx/pci_mpc5200.c diff --git a/cpu/mpc5xxx/serial.c b/arch/ppc/cpu/mpc5xxx/serial.c similarity index 100% rename from cpu/mpc5xxx/serial.c rename to arch/ppc/cpu/mpc5xxx/serial.c diff --git a/cpu/mpc5xxx/speed.c b/arch/ppc/cpu/mpc5xxx/speed.c similarity index 100% rename from cpu/mpc5xxx/speed.c rename to arch/ppc/cpu/mpc5xxx/speed.c diff --git a/cpu/mpc5xxx/start.S b/arch/ppc/cpu/mpc5xxx/start.S similarity index 100% rename from cpu/mpc5xxx/start.S rename to arch/ppc/cpu/mpc5xxx/start.S diff --git a/cpu/mpc5xxx/traps.c b/arch/ppc/cpu/mpc5xxx/traps.c similarity index 100% rename from cpu/mpc5xxx/traps.c rename to arch/ppc/cpu/mpc5xxx/traps.c diff --git a/cpu/mpc5xxx/u-boot-customlayout.lds b/arch/ppc/cpu/mpc5xxx/u-boot-customlayout.lds similarity index 97% rename from cpu/mpc5xxx/u-boot-customlayout.lds rename to arch/ppc/cpu/mpc5xxx/u-boot-customlayout.lds index 6c80139f2..81ebde987 100644 --- a/cpu/mpc5xxx/u-boot-customlayout.lds +++ b/arch/ppc/cpu/mpc5xxx/u-boot-customlayout.lds @@ -55,8 +55,8 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc5xxx/start.o (.text) - cpu/mpc5xxx/traps.o (.text) + arch/ppc/cpu/mpc5xxx/start.o (.text) + arch/ppc/cpu/mpc5xxx/traps.o (.text) lib/crc32.o (.text) arch/ppc/lib/cache.o (.text) arch/ppc/lib/time.o (.text) diff --git a/cpu/mpc5xxx/u-boot.lds b/arch/ppc/cpu/mpc5xxx/u-boot.lds similarity index 98% rename from cpu/mpc5xxx/u-boot.lds rename to arch/ppc/cpu/mpc5xxx/u-boot.lds index 7fe1e9512..64ef48129 100644 --- a/cpu/mpc5xxx/u-boot.lds +++ b/arch/ppc/cpu/mpc5xxx/u-boot.lds @@ -52,7 +52,7 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/mpc5xxx/start.o (.text) + arch/ppc/cpu/mpc5xxx/start.o (.text) *(.text) *(.got1) . = ALIGN(16); diff --git a/cpu/mpc5xxx/usb.c b/arch/ppc/cpu/mpc5xxx/usb.c similarity index 100% rename from cpu/mpc5xxx/usb.c rename to arch/ppc/cpu/mpc5xxx/usb.c diff --git a/cpu/mpc5xxx/usb_ohci.c b/arch/ppc/cpu/mpc5xxx/usb_ohci.c similarity index 100% rename from cpu/mpc5xxx/usb_ohci.c rename to arch/ppc/cpu/mpc5xxx/usb_ohci.c diff --git a/cpu/mpc5xxx/usb_ohci.h b/arch/ppc/cpu/mpc5xxx/usb_ohci.h similarity index 100% rename from cpu/mpc5xxx/usb_ohci.h rename to arch/ppc/cpu/mpc5xxx/usb_ohci.h diff --git a/cpu/mpc8220/Makefile b/arch/ppc/cpu/mpc8220/Makefile similarity index 100% rename from cpu/mpc8220/Makefile rename to arch/ppc/cpu/mpc8220/Makefile diff --git a/cpu/mpc8220/config.mk b/arch/ppc/cpu/mpc8220/config.mk similarity index 95% rename from cpu/mpc8220/config.mk rename to arch/ppc/cpu/mpc8220/config.mk index 3ce40c0db..e2ebf38bd 100644 --- a/cpu/mpc8220/config.mk +++ b/arch/ppc/cpu/mpc8220/config.mk @@ -27,4 +27,4 @@ PLATFORM_CPPFLAGS += -DCONFIG_MPC8220 -ffixed-r2 \ -mstring -mcpu=603e -mmultiple # Use default linker script. Board port can override in board/*/config.mk -LDSCRIPT := $(SRCTREE)/cpu/mpc8220/u-boot.lds +LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc8220/u-boot.lds diff --git a/cpu/mpc8220/cpu.c b/arch/ppc/cpu/mpc8220/cpu.c similarity index 100% rename from cpu/mpc8220/cpu.c rename to arch/ppc/cpu/mpc8220/cpu.c diff --git a/cpu/mpc8220/cpu_init.c b/arch/ppc/cpu/mpc8220/cpu_init.c similarity index 100% rename from cpu/mpc8220/cpu_init.c rename to arch/ppc/cpu/mpc8220/cpu_init.c diff --git a/cpu/mpc8220/dma.h b/arch/ppc/cpu/mpc8220/dma.h similarity index 100% rename from cpu/mpc8220/dma.h rename to arch/ppc/cpu/mpc8220/dma.h diff --git a/cpu/mpc8220/dramSetup.c b/arch/ppc/cpu/mpc8220/dramSetup.c similarity index 100% rename from cpu/mpc8220/dramSetup.c rename to arch/ppc/cpu/mpc8220/dramSetup.c diff --git a/cpu/mpc8220/dramSetup.h b/arch/ppc/cpu/mpc8220/dramSetup.h similarity index 100% rename from cpu/mpc8220/dramSetup.h rename to arch/ppc/cpu/mpc8220/dramSetup.h diff --git a/cpu/mpc8220/fec.c b/arch/ppc/cpu/mpc8220/fec.c similarity index 100% rename from cpu/mpc8220/fec.c rename to arch/ppc/cpu/mpc8220/fec.c diff --git a/cpu/mpc8220/fec.h b/arch/ppc/cpu/mpc8220/fec.h similarity index 100% rename from cpu/mpc8220/fec.h rename to arch/ppc/cpu/mpc8220/fec.h diff --git a/cpu/mpc8220/fec_dma_tasks.S b/arch/ppc/cpu/mpc8220/fec_dma_tasks.S similarity index 100% rename from cpu/mpc8220/fec_dma_tasks.S rename to arch/ppc/cpu/mpc8220/fec_dma_tasks.S diff --git a/cpu/mpc8220/i2c.c b/arch/ppc/cpu/mpc8220/i2c.c similarity index 100% rename from cpu/mpc8220/i2c.c rename to arch/ppc/cpu/mpc8220/i2c.c diff --git a/cpu/mpc8220/i2cCore.c b/arch/ppc/cpu/mpc8220/i2cCore.c similarity index 100% rename from cpu/mpc8220/i2cCore.c rename to arch/ppc/cpu/mpc8220/i2cCore.c diff --git a/cpu/mpc8220/i2cCore.h b/arch/ppc/cpu/mpc8220/i2cCore.h similarity index 100% rename from cpu/mpc8220/i2cCore.h rename to arch/ppc/cpu/mpc8220/i2cCore.h diff --git a/cpu/mpc8220/interrupts.c b/arch/ppc/cpu/mpc8220/interrupts.c similarity index 100% rename from cpu/mpc8220/interrupts.c rename to arch/ppc/cpu/mpc8220/interrupts.c diff --git a/cpu/mpc8220/io.S b/arch/ppc/cpu/mpc8220/io.S similarity index 100% rename from cpu/mpc8220/io.S rename to arch/ppc/cpu/mpc8220/io.S diff --git a/cpu/mpc8220/loadtask.c b/arch/ppc/cpu/mpc8220/loadtask.c similarity index 100% rename from cpu/mpc8220/loadtask.c rename to arch/ppc/cpu/mpc8220/loadtask.c diff --git a/cpu/mpc8220/pci.c b/arch/ppc/cpu/mpc8220/pci.c similarity index 100% rename from cpu/mpc8220/pci.c rename to arch/ppc/cpu/mpc8220/pci.c diff --git a/cpu/mpc8220/speed.c b/arch/ppc/cpu/mpc8220/speed.c similarity index 100% rename from cpu/mpc8220/speed.c rename to arch/ppc/cpu/mpc8220/speed.c diff --git a/cpu/mpc8220/start.S b/arch/ppc/cpu/mpc8220/start.S similarity index 100% rename from cpu/mpc8220/start.S rename to arch/ppc/cpu/mpc8220/start.S diff --git a/cpu/mpc8220/traps.c b/arch/ppc/cpu/mpc8220/traps.c similarity index 100% rename from cpu/mpc8220/traps.c rename to arch/ppc/cpu/mpc8220/traps.c diff --git a/cpu/mpc8220/u-boot.lds b/arch/ppc/cpu/mpc8220/u-boot.lds similarity index 98% rename from cpu/mpc8220/u-boot.lds rename to arch/ppc/cpu/mpc8220/u-boot.lds index 4400e60c8..8c5d3071f 100644 --- a/cpu/mpc8220/u-boot.lds +++ b/arch/ppc/cpu/mpc8220/u-boot.lds @@ -52,7 +52,7 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/mpc8220/start.o (.text) + arch/ppc/cpu/mpc8220/start.o (.text) *(.text) *(.got1) . = ALIGN(16); diff --git a/cpu/mpc8220/uart.c b/arch/ppc/cpu/mpc8220/uart.c similarity index 100% rename from cpu/mpc8220/uart.c rename to arch/ppc/cpu/mpc8220/uart.c diff --git a/cpu/mpc824x/.gitignore b/arch/ppc/cpu/mpc824x/.gitignore similarity index 100% rename from cpu/mpc824x/.gitignore rename to arch/ppc/cpu/mpc824x/.gitignore diff --git a/cpu/mpc824x/Makefile b/arch/ppc/cpu/mpc824x/Makefile similarity index 100% rename from cpu/mpc824x/Makefile rename to arch/ppc/cpu/mpc824x/Makefile diff --git a/cpu/mpc824x/config.mk b/arch/ppc/cpu/mpc824x/config.mk similarity index 95% rename from cpu/mpc824x/config.mk rename to arch/ppc/cpu/mpc824x/config.mk index 940474bbd..31ecd20d9 100644 --- a/cpu/mpc824x/config.mk +++ b/arch/ppc/cpu/mpc824x/config.mk @@ -26,4 +26,4 @@ PLATFORM_RELFLAGS += -fPIC -meabi PLATFORM_CPPFLAGS += -DCONFIG_MPC824X -ffixed-r2 -mstring -mcpu=603e -msoft-float # Use default linker script. Board port can override in board/*/config.mk -LDSCRIPT := $(SRCTREE)/cpu/mpc824x/u-boot.lds +LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc824x/u-boot.lds diff --git a/cpu/mpc824x/cpu.c b/arch/ppc/cpu/mpc824x/cpu.c similarity index 100% rename from cpu/mpc824x/cpu.c rename to arch/ppc/cpu/mpc824x/cpu.c diff --git a/cpu/mpc824x/cpu_init.c b/arch/ppc/cpu/mpc824x/cpu_init.c similarity index 100% rename from cpu/mpc824x/cpu_init.c rename to arch/ppc/cpu/mpc824x/cpu_init.c diff --git a/cpu/mpc824x/drivers/epic.h b/arch/ppc/cpu/mpc824x/drivers/epic.h similarity index 100% rename from cpu/mpc824x/drivers/epic.h rename to arch/ppc/cpu/mpc824x/drivers/epic.h diff --git a/cpu/mpc824x/drivers/epic/README b/arch/ppc/cpu/mpc824x/drivers/epic/README similarity index 100% rename from cpu/mpc824x/drivers/epic/README rename to arch/ppc/cpu/mpc824x/drivers/epic/README diff --git a/cpu/mpc824x/drivers/epic/epic.h b/arch/ppc/cpu/mpc824x/drivers/epic/epic.h similarity index 100% rename from cpu/mpc824x/drivers/epic/epic.h rename to arch/ppc/cpu/mpc824x/drivers/epic/epic.h diff --git a/cpu/mpc824x/drivers/epic/epic1.c b/arch/ppc/cpu/mpc824x/drivers/epic/epic1.c similarity index 100% rename from cpu/mpc824x/drivers/epic/epic1.c rename to arch/ppc/cpu/mpc824x/drivers/epic/epic1.c diff --git a/cpu/mpc824x/drivers/epic/epic2.S b/arch/ppc/cpu/mpc824x/drivers/epic/epic2.S similarity index 100% rename from cpu/mpc824x/drivers/epic/epic2.S rename to arch/ppc/cpu/mpc824x/drivers/epic/epic2.S diff --git a/cpu/mpc824x/drivers/epic/epicutil.S b/arch/ppc/cpu/mpc824x/drivers/epic/epicutil.S similarity index 100% rename from cpu/mpc824x/drivers/epic/epicutil.S rename to arch/ppc/cpu/mpc824x/drivers/epic/epicutil.S diff --git a/cpu/mpc824x/drivers/errors.h b/arch/ppc/cpu/mpc824x/drivers/errors.h similarity index 100% rename from cpu/mpc824x/drivers/errors.h rename to arch/ppc/cpu/mpc824x/drivers/errors.h diff --git a/cpu/mpc824x/drivers/i2c/i2c.c b/arch/ppc/cpu/mpc824x/drivers/i2c/i2c.c similarity index 100% rename from cpu/mpc824x/drivers/i2c/i2c.c rename to arch/ppc/cpu/mpc824x/drivers/i2c/i2c.c diff --git a/cpu/mpc824x/drivers/i2c_export.h b/arch/ppc/cpu/mpc824x/drivers/i2c_export.h similarity index 100% rename from cpu/mpc824x/drivers/i2c_export.h rename to arch/ppc/cpu/mpc824x/drivers/i2c_export.h diff --git a/cpu/mpc824x/interrupts.c b/arch/ppc/cpu/mpc824x/interrupts.c similarity index 100% rename from cpu/mpc824x/interrupts.c rename to arch/ppc/cpu/mpc824x/interrupts.c diff --git a/cpu/mpc824x/pci.c b/arch/ppc/cpu/mpc824x/pci.c similarity index 100% rename from cpu/mpc824x/pci.c rename to arch/ppc/cpu/mpc824x/pci.c diff --git a/cpu/mpc824x/speed.c b/arch/ppc/cpu/mpc824x/speed.c similarity index 100% rename from cpu/mpc824x/speed.c rename to arch/ppc/cpu/mpc824x/speed.c diff --git a/cpu/mpc824x/start.S b/arch/ppc/cpu/mpc824x/start.S similarity index 100% rename from cpu/mpc824x/start.S rename to arch/ppc/cpu/mpc824x/start.S diff --git a/cpu/mpc824x/traps.c b/arch/ppc/cpu/mpc824x/traps.c similarity index 100% rename from cpu/mpc824x/traps.c rename to arch/ppc/cpu/mpc824x/traps.c diff --git a/cpu/mpc824x/u-boot.lds b/arch/ppc/cpu/mpc824x/u-boot.lds similarity index 98% rename from cpu/mpc824x/u-boot.lds rename to arch/ppc/cpu/mpc824x/u-boot.lds index 0eac48f2c..8a6d5084e 100644 --- a/cpu/mpc824x/u-boot.lds +++ b/arch/ppc/cpu/mpc824x/u-boot.lds @@ -52,7 +52,7 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/mpc824x/start.o (.text) + arch/ppc/cpu/mpc824x/start.o (.text) *(.text) *(.got1) . = ALIGN(16); diff --git a/cpu/mpc8260/Makefile b/arch/ppc/cpu/mpc8260/Makefile similarity index 100% rename from cpu/mpc8260/Makefile rename to arch/ppc/cpu/mpc8260/Makefile diff --git a/cpu/mpc8260/bedbug_603e.c b/arch/ppc/cpu/mpc8260/bedbug_603e.c similarity index 100% rename from cpu/mpc8260/bedbug_603e.c rename to arch/ppc/cpu/mpc8260/bedbug_603e.c diff --git a/cpu/mpc8260/commproc.c b/arch/ppc/cpu/mpc8260/commproc.c similarity index 100% rename from cpu/mpc8260/commproc.c rename to arch/ppc/cpu/mpc8260/commproc.c diff --git a/cpu/mpc8260/config.mk b/arch/ppc/cpu/mpc8260/config.mk similarity index 95% rename from cpu/mpc8260/config.mk rename to arch/ppc/cpu/mpc8260/config.mk index 39d81eef8..51bb9faf2 100644 --- a/cpu/mpc8260/config.mk +++ b/arch/ppc/cpu/mpc8260/config.mk @@ -27,4 +27,4 @@ PLATFORM_CPPFLAGS += -DCONFIG_8260 -DCONFIG_CPM2 -ffixed-r2 \ -mstring -mcpu=603e -mmultiple # Use default linker script. Board port can override in board/*/config.mk -LDSCRIPT := $(SRCTREE)/cpu/mpc8260/u-boot.lds +LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc8260/u-boot.lds diff --git a/cpu/mpc8260/cpu.c b/arch/ppc/cpu/mpc8260/cpu.c similarity index 100% rename from cpu/mpc8260/cpu.c rename to arch/ppc/cpu/mpc8260/cpu.c diff --git a/cpu/mpc8260/cpu_init.c b/arch/ppc/cpu/mpc8260/cpu_init.c similarity index 100% rename from cpu/mpc8260/cpu_init.c rename to arch/ppc/cpu/mpc8260/cpu_init.c diff --git a/cpu/mpc8260/ether_fcc.c b/arch/ppc/cpu/mpc8260/ether_fcc.c similarity index 100% rename from cpu/mpc8260/ether_fcc.c rename to arch/ppc/cpu/mpc8260/ether_fcc.c diff --git a/cpu/mpc8260/ether_scc.c b/arch/ppc/cpu/mpc8260/ether_scc.c similarity index 100% rename from cpu/mpc8260/ether_scc.c rename to arch/ppc/cpu/mpc8260/ether_scc.c diff --git a/cpu/mpc8260/i2c.c b/arch/ppc/cpu/mpc8260/i2c.c similarity index 100% rename from cpu/mpc8260/i2c.c rename to arch/ppc/cpu/mpc8260/i2c.c diff --git a/cpu/mpc8260/interrupts.c b/arch/ppc/cpu/mpc8260/interrupts.c similarity index 100% rename from cpu/mpc8260/interrupts.c rename to arch/ppc/cpu/mpc8260/interrupts.c diff --git a/cpu/mpc8260/kgdb.S b/arch/ppc/cpu/mpc8260/kgdb.S similarity index 100% rename from cpu/mpc8260/kgdb.S rename to arch/ppc/cpu/mpc8260/kgdb.S diff --git a/cpu/mpc8260/pci.c b/arch/ppc/cpu/mpc8260/pci.c similarity index 100% rename from cpu/mpc8260/pci.c rename to arch/ppc/cpu/mpc8260/pci.c diff --git a/cpu/mpc8260/serial_scc.c b/arch/ppc/cpu/mpc8260/serial_scc.c similarity index 100% rename from cpu/mpc8260/serial_scc.c rename to arch/ppc/cpu/mpc8260/serial_scc.c diff --git a/cpu/mpc8260/serial_smc.c b/arch/ppc/cpu/mpc8260/serial_smc.c similarity index 100% rename from cpu/mpc8260/serial_smc.c rename to arch/ppc/cpu/mpc8260/serial_smc.c diff --git a/cpu/mpc8260/speed.c b/arch/ppc/cpu/mpc8260/speed.c similarity index 100% rename from cpu/mpc8260/speed.c rename to arch/ppc/cpu/mpc8260/speed.c diff --git a/cpu/mpc8260/speed.h b/arch/ppc/cpu/mpc8260/speed.h similarity index 100% rename from cpu/mpc8260/speed.h rename to arch/ppc/cpu/mpc8260/speed.h diff --git a/cpu/mpc8260/spi.c b/arch/ppc/cpu/mpc8260/spi.c similarity index 100% rename from cpu/mpc8260/spi.c rename to arch/ppc/cpu/mpc8260/spi.c diff --git a/cpu/mpc8260/start.S b/arch/ppc/cpu/mpc8260/start.S similarity index 100% rename from cpu/mpc8260/start.S rename to arch/ppc/cpu/mpc8260/start.S diff --git a/cpu/mpc8260/traps.c b/arch/ppc/cpu/mpc8260/traps.c similarity index 100% rename from cpu/mpc8260/traps.c rename to arch/ppc/cpu/mpc8260/traps.c diff --git a/cpu/mpc8260/u-boot.lds b/arch/ppc/cpu/mpc8260/u-boot.lds similarity index 98% rename from cpu/mpc8260/u-boot.lds rename to arch/ppc/cpu/mpc8260/u-boot.lds index c777cf9da..988784416 100644 --- a/cpu/mpc8260/u-boot.lds +++ b/arch/ppc/cpu/mpc8260/u-boot.lds @@ -52,7 +52,7 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/mpc8260/start.o (.text) + arch/ppc/cpu/mpc8260/start.o (.text) *(.text) *(.got1) . = ALIGN(16); diff --git a/cpu/mpc83xx/Makefile b/arch/ppc/cpu/mpc83xx/Makefile similarity index 100% rename from cpu/mpc83xx/Makefile rename to arch/ppc/cpu/mpc83xx/Makefile diff --git a/cpu/mpc83xx/config.mk b/arch/ppc/cpu/mpc83xx/config.mk similarity index 94% rename from cpu/mpc83xx/config.mk rename to arch/ppc/cpu/mpc83xx/config.mk index e80919bc2..8596f6a5e 100644 --- a/cpu/mpc83xx/config.mk +++ b/arch/ppc/cpu/mpc83xx/config.mk @@ -26,4 +26,4 @@ PLATFORM_CPPFLAGS += -DCONFIG_MPC83xx -DCONFIG_E300 \ -ffixed-r2 -msoft-float # Use default linker script. Board port can override in board/*/config.mk -LDSCRIPT := $(SRCTREE)/cpu/mpc83xx/u-boot.lds +LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc83xx/u-boot.lds diff --git a/cpu/mpc83xx/cpu.c b/arch/ppc/cpu/mpc83xx/cpu.c similarity index 100% rename from cpu/mpc83xx/cpu.c rename to arch/ppc/cpu/mpc83xx/cpu.c diff --git a/cpu/mpc83xx/cpu_init.c b/arch/ppc/cpu/mpc83xx/cpu_init.c similarity index 100% rename from cpu/mpc83xx/cpu_init.c rename to arch/ppc/cpu/mpc83xx/cpu_init.c diff --git a/cpu/mpc83xx/ecc.c b/arch/ppc/cpu/mpc83xx/ecc.c similarity index 100% rename from cpu/mpc83xx/ecc.c rename to arch/ppc/cpu/mpc83xx/ecc.c diff --git a/cpu/mpc83xx/fdt.c b/arch/ppc/cpu/mpc83xx/fdt.c similarity index 100% rename from cpu/mpc83xx/fdt.c rename to arch/ppc/cpu/mpc83xx/fdt.c diff --git a/cpu/mpc83xx/interrupts.c b/arch/ppc/cpu/mpc83xx/interrupts.c similarity index 100% rename from cpu/mpc83xx/interrupts.c rename to arch/ppc/cpu/mpc83xx/interrupts.c diff --git a/cpu/mpc83xx/nand_init.c b/arch/ppc/cpu/mpc83xx/nand_init.c similarity index 100% rename from cpu/mpc83xx/nand_init.c rename to arch/ppc/cpu/mpc83xx/nand_init.c diff --git a/cpu/mpc83xx/pci.c b/arch/ppc/cpu/mpc83xx/pci.c similarity index 100% rename from cpu/mpc83xx/pci.c rename to arch/ppc/cpu/mpc83xx/pci.c diff --git a/cpu/mpc83xx/pcie.c b/arch/ppc/cpu/mpc83xx/pcie.c similarity index 100% rename from cpu/mpc83xx/pcie.c rename to arch/ppc/cpu/mpc83xx/pcie.c diff --git a/cpu/mpc83xx/qe_io.c b/arch/ppc/cpu/mpc83xx/qe_io.c similarity index 100% rename from cpu/mpc83xx/qe_io.c rename to arch/ppc/cpu/mpc83xx/qe_io.c diff --git a/cpu/mpc83xx/serdes.c b/arch/ppc/cpu/mpc83xx/serdes.c similarity index 100% rename from cpu/mpc83xx/serdes.c rename to arch/ppc/cpu/mpc83xx/serdes.c diff --git a/cpu/mpc83xx/spd_sdram.c b/arch/ppc/cpu/mpc83xx/spd_sdram.c similarity index 100% rename from cpu/mpc83xx/spd_sdram.c rename to arch/ppc/cpu/mpc83xx/spd_sdram.c diff --git a/cpu/mpc83xx/speed.c b/arch/ppc/cpu/mpc83xx/speed.c similarity index 100% rename from cpu/mpc83xx/speed.c rename to arch/ppc/cpu/mpc83xx/speed.c diff --git a/cpu/mpc83xx/start.S b/arch/ppc/cpu/mpc83xx/start.S similarity index 100% rename from cpu/mpc83xx/start.S rename to arch/ppc/cpu/mpc83xx/start.S diff --git a/cpu/mpc83xx/traps.c b/arch/ppc/cpu/mpc83xx/traps.c similarity index 100% rename from cpu/mpc83xx/traps.c rename to arch/ppc/cpu/mpc83xx/traps.c diff --git a/cpu/mpc83xx/u-boot.lds b/arch/ppc/cpu/mpc83xx/u-boot.lds similarity index 98% rename from cpu/mpc83xx/u-boot.lds rename to arch/ppc/cpu/mpc83xx/u-boot.lds index c84d4b022..157cef676 100644 --- a/cpu/mpc83xx/u-boot.lds +++ b/arch/ppc/cpu/mpc83xx/u-boot.lds @@ -50,7 +50,7 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/mpc83xx/start.o (.text) + arch/ppc/cpu/mpc83xx/start.o (.text) *(.text) *(.got1) . = ALIGN(16); diff --git a/cpu/mpc85xx/Makefile b/arch/ppc/cpu/mpc85xx/Makefile similarity index 100% rename from cpu/mpc85xx/Makefile rename to arch/ppc/cpu/mpc85xx/Makefile diff --git a/cpu/mpc85xx/commproc.c b/arch/ppc/cpu/mpc85xx/commproc.c similarity index 100% rename from cpu/mpc85xx/commproc.c rename to arch/ppc/cpu/mpc85xx/commproc.c diff --git a/cpu/mpc85xx/config.mk b/arch/ppc/cpu/mpc85xx/config.mk similarity index 95% rename from cpu/mpc85xx/config.mk rename to arch/ppc/cpu/mpc85xx/config.mk index 408184ad1..ffb813dc3 100644 --- a/cpu/mpc85xx/config.mk +++ b/arch/ppc/cpu/mpc85xx/config.mk @@ -32,4 +32,4 @@ PLATFORM_CPPFLAGS +=$(call cc-option,-mspe=yes) PLATFORM_CPPFLAGS +=$(call cc-option,-mno-spe) # Use default linker script. Board port can override in board/*/config.mk -LDSCRIPT := $(SRCTREE)/cpu/mpc85xx/u-boot.lds +LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc85xx/u-boot.lds diff --git a/cpu/mpc85xx/cpu.c b/arch/ppc/cpu/mpc85xx/cpu.c similarity index 100% rename from cpu/mpc85xx/cpu.c rename to arch/ppc/cpu/mpc85xx/cpu.c diff --git a/cpu/mpc85xx/cpu_init.c b/arch/ppc/cpu/mpc85xx/cpu_init.c similarity index 100% rename from cpu/mpc85xx/cpu_init.c rename to arch/ppc/cpu/mpc85xx/cpu_init.c diff --git a/cpu/mpc85xx/cpu_init_early.c b/arch/ppc/cpu/mpc85xx/cpu_init_early.c similarity index 100% rename from cpu/mpc85xx/cpu_init_early.c rename to arch/ppc/cpu/mpc85xx/cpu_init_early.c diff --git a/cpu/mpc85xx/cpu_init_nand.c b/arch/ppc/cpu/mpc85xx/cpu_init_nand.c similarity index 100% rename from cpu/mpc85xx/cpu_init_nand.c rename to arch/ppc/cpu/mpc85xx/cpu_init_nand.c diff --git a/cpu/mpc85xx/ddr-gen1.c b/arch/ppc/cpu/mpc85xx/ddr-gen1.c similarity index 100% rename from cpu/mpc85xx/ddr-gen1.c rename to arch/ppc/cpu/mpc85xx/ddr-gen1.c diff --git a/cpu/mpc85xx/ddr-gen2.c b/arch/ppc/cpu/mpc85xx/ddr-gen2.c similarity index 100% rename from cpu/mpc85xx/ddr-gen2.c rename to arch/ppc/cpu/mpc85xx/ddr-gen2.c diff --git a/cpu/mpc85xx/ddr-gen3.c b/arch/ppc/cpu/mpc85xx/ddr-gen3.c similarity index 100% rename from cpu/mpc85xx/ddr-gen3.c rename to arch/ppc/cpu/mpc85xx/ddr-gen3.c diff --git a/cpu/mpc85xx/ether_fcc.c b/arch/ppc/cpu/mpc85xx/ether_fcc.c similarity index 100% rename from cpu/mpc85xx/ether_fcc.c rename to arch/ppc/cpu/mpc85xx/ether_fcc.c diff --git a/cpu/mpc85xx/fdt.c b/arch/ppc/cpu/mpc85xx/fdt.c similarity index 100% rename from cpu/mpc85xx/fdt.c rename to arch/ppc/cpu/mpc85xx/fdt.c diff --git a/cpu/mpc85xx/fixed_ivor.S b/arch/ppc/cpu/mpc85xx/fixed_ivor.S similarity index 100% rename from cpu/mpc85xx/fixed_ivor.S rename to arch/ppc/cpu/mpc85xx/fixed_ivor.S diff --git a/cpu/mpc85xx/interrupts.c b/arch/ppc/cpu/mpc85xx/interrupts.c similarity index 100% rename from cpu/mpc85xx/interrupts.c rename to arch/ppc/cpu/mpc85xx/interrupts.c diff --git a/cpu/mpc85xx/mp.c b/arch/ppc/cpu/mpc85xx/mp.c similarity index 100% rename from cpu/mpc85xx/mp.c rename to arch/ppc/cpu/mpc85xx/mp.c diff --git a/cpu/mpc85xx/mp.h b/arch/ppc/cpu/mpc85xx/mp.h similarity index 100% rename from cpu/mpc85xx/mp.h rename to arch/ppc/cpu/mpc85xx/mp.h diff --git a/cpu/mpc85xx/mpc8536_serdes.c b/arch/ppc/cpu/mpc85xx/mpc8536_serdes.c similarity index 100% rename from cpu/mpc85xx/mpc8536_serdes.c rename to arch/ppc/cpu/mpc85xx/mpc8536_serdes.c diff --git a/cpu/mpc85xx/pci.c b/arch/ppc/cpu/mpc85xx/pci.c similarity index 100% rename from cpu/mpc85xx/pci.c rename to arch/ppc/cpu/mpc85xx/pci.c diff --git a/cpu/mpc85xx/qe_io.c b/arch/ppc/cpu/mpc85xx/qe_io.c similarity index 100% rename from cpu/mpc85xx/qe_io.c rename to arch/ppc/cpu/mpc85xx/qe_io.c diff --git a/cpu/mpc85xx/release.S b/arch/ppc/cpu/mpc85xx/release.S similarity index 100% rename from cpu/mpc85xx/release.S rename to arch/ppc/cpu/mpc85xx/release.S diff --git a/cpu/mpc85xx/resetvec.S b/arch/ppc/cpu/mpc85xx/resetvec.S similarity index 100% rename from cpu/mpc85xx/resetvec.S rename to arch/ppc/cpu/mpc85xx/resetvec.S diff --git a/cpu/mpc85xx/serial_scc.c b/arch/ppc/cpu/mpc85xx/serial_scc.c similarity index 100% rename from cpu/mpc85xx/serial_scc.c rename to arch/ppc/cpu/mpc85xx/serial_scc.c diff --git a/cpu/mpc85xx/speed.c b/arch/ppc/cpu/mpc85xx/speed.c similarity index 100% rename from cpu/mpc85xx/speed.c rename to arch/ppc/cpu/mpc85xx/speed.c diff --git a/cpu/mpc85xx/start.S b/arch/ppc/cpu/mpc85xx/start.S similarity index 100% rename from cpu/mpc85xx/start.S rename to arch/ppc/cpu/mpc85xx/start.S diff --git a/cpu/mpc85xx/tlb.c b/arch/ppc/cpu/mpc85xx/tlb.c similarity index 100% rename from cpu/mpc85xx/tlb.c rename to arch/ppc/cpu/mpc85xx/tlb.c diff --git a/cpu/mpc85xx/traps.c b/arch/ppc/cpu/mpc85xx/traps.c similarity index 100% rename from cpu/mpc85xx/traps.c rename to arch/ppc/cpu/mpc85xx/traps.c diff --git a/cpu/mpc85xx/u-boot-nand.lds b/arch/ppc/cpu/mpc85xx/u-boot-nand.lds similarity index 98% rename from cpu/mpc85xx/u-boot-nand.lds rename to arch/ppc/cpu/mpc85xx/u-boot-nand.lds index b4c63e2a2..b9240f22a 100644 --- a/cpu/mpc85xx/u-boot-nand.lds +++ b/arch/ppc/cpu/mpc85xx/u-boot-nand.lds @@ -117,7 +117,7 @@ SECTIONS .bootpg ADDR(.text) - 0x1000 : { - cpu/mpc85xx/start.o (.bootpg) + arch/ppc/cpu/mpc85xx/start.o (.bootpg) } :text = 0xffff . = ADDR(.text) + 0x80000; diff --git a/cpu/mpc85xx/u-boot-nand_spl.lds b/arch/ppc/cpu/mpc85xx/u-boot-nand_spl.lds similarity index 100% rename from cpu/mpc85xx/u-boot-nand_spl.lds rename to arch/ppc/cpu/mpc85xx/u-boot-nand_spl.lds diff --git a/cpu/mpc85xx/u-boot.lds b/arch/ppc/cpu/mpc85xx/u-boot.lds similarity index 98% rename from cpu/mpc85xx/u-boot.lds rename to arch/ppc/cpu/mpc85xx/u-boot.lds index 183dce951..9698bf405 100644 --- a/cpu/mpc85xx/u-boot.lds +++ b/arch/ppc/cpu/mpc85xx/u-boot.lds @@ -121,7 +121,7 @@ SECTIONS .bootpg RESET_VECTOR_ADDRESS - 0xffc : { - cpu/mpc85xx/start.o (.bootpg) + arch/ppc/cpu/mpc85xx/start.o (.bootpg) } :text = 0xffff .resetvec RESET_VECTOR_ADDRESS : diff --git a/cpu/mpc86xx/Makefile b/arch/ppc/cpu/mpc86xx/Makefile similarity index 100% rename from cpu/mpc86xx/Makefile rename to arch/ppc/cpu/mpc86xx/Makefile diff --git a/cpu/mpc86xx/cache.S b/arch/ppc/cpu/mpc86xx/cache.S similarity index 100% rename from cpu/mpc86xx/cache.S rename to arch/ppc/cpu/mpc86xx/cache.S diff --git a/cpu/mpc86xx/config.mk b/arch/ppc/cpu/mpc86xx/config.mk similarity index 100% rename from cpu/mpc86xx/config.mk rename to arch/ppc/cpu/mpc86xx/config.mk diff --git a/cpu/mpc86xx/cpu.c b/arch/ppc/cpu/mpc86xx/cpu.c similarity index 100% rename from cpu/mpc86xx/cpu.c rename to arch/ppc/cpu/mpc86xx/cpu.c diff --git a/cpu/mpc86xx/cpu_init.c b/arch/ppc/cpu/mpc86xx/cpu_init.c similarity index 100% rename from cpu/mpc86xx/cpu_init.c rename to arch/ppc/cpu/mpc86xx/cpu_init.c diff --git a/cpu/mpc86xx/ddr-8641.c b/arch/ppc/cpu/mpc86xx/ddr-8641.c similarity index 100% rename from cpu/mpc86xx/ddr-8641.c rename to arch/ppc/cpu/mpc86xx/ddr-8641.c diff --git a/cpu/mpc86xx/fdt.c b/arch/ppc/cpu/mpc86xx/fdt.c similarity index 100% rename from cpu/mpc86xx/fdt.c rename to arch/ppc/cpu/mpc86xx/fdt.c diff --git a/cpu/mpc86xx/interrupts.c b/arch/ppc/cpu/mpc86xx/interrupts.c similarity index 100% rename from cpu/mpc86xx/interrupts.c rename to arch/ppc/cpu/mpc86xx/interrupts.c diff --git a/cpu/mpc86xx/mp.c b/arch/ppc/cpu/mpc86xx/mp.c similarity index 100% rename from cpu/mpc86xx/mp.c rename to arch/ppc/cpu/mpc86xx/mp.c diff --git a/cpu/mpc86xx/release.S b/arch/ppc/cpu/mpc86xx/release.S similarity index 100% rename from cpu/mpc86xx/release.S rename to arch/ppc/cpu/mpc86xx/release.S diff --git a/cpu/mpc86xx/speed.c b/arch/ppc/cpu/mpc86xx/speed.c similarity index 100% rename from cpu/mpc86xx/speed.c rename to arch/ppc/cpu/mpc86xx/speed.c diff --git a/cpu/mpc86xx/start.S b/arch/ppc/cpu/mpc86xx/start.S similarity index 100% rename from cpu/mpc86xx/start.S rename to arch/ppc/cpu/mpc86xx/start.S diff --git a/cpu/mpc86xx/traps.c b/arch/ppc/cpu/mpc86xx/traps.c similarity index 100% rename from cpu/mpc86xx/traps.c rename to arch/ppc/cpu/mpc86xx/traps.c diff --git a/cpu/mpc8xx/Makefile b/arch/ppc/cpu/mpc8xx/Makefile similarity index 100% rename from cpu/mpc8xx/Makefile rename to arch/ppc/cpu/mpc8xx/Makefile diff --git a/cpu/mpc8xx/bedbug_860.c b/arch/ppc/cpu/mpc8xx/bedbug_860.c similarity index 100% rename from cpu/mpc8xx/bedbug_860.c rename to arch/ppc/cpu/mpc8xx/bedbug_860.c diff --git a/cpu/mpc8xx/commproc.c b/arch/ppc/cpu/mpc8xx/commproc.c similarity index 100% rename from cpu/mpc8xx/commproc.c rename to arch/ppc/cpu/mpc8xx/commproc.c diff --git a/cpu/mpc8xx/config.mk b/arch/ppc/cpu/mpc8xx/config.mk similarity index 100% rename from cpu/mpc8xx/config.mk rename to arch/ppc/cpu/mpc8xx/config.mk diff --git a/cpu/mpc8xx/cpu.c b/arch/ppc/cpu/mpc8xx/cpu.c similarity index 100% rename from cpu/mpc8xx/cpu.c rename to arch/ppc/cpu/mpc8xx/cpu.c diff --git a/cpu/mpc8xx/cpu_init.c b/arch/ppc/cpu/mpc8xx/cpu_init.c similarity index 100% rename from cpu/mpc8xx/cpu_init.c rename to arch/ppc/cpu/mpc8xx/cpu_init.c diff --git a/cpu/mpc8xx/fdt.c b/arch/ppc/cpu/mpc8xx/fdt.c similarity index 100% rename from cpu/mpc8xx/fdt.c rename to arch/ppc/cpu/mpc8xx/fdt.c diff --git a/cpu/mpc8xx/fec.c b/arch/ppc/cpu/mpc8xx/fec.c similarity index 100% rename from cpu/mpc8xx/fec.c rename to arch/ppc/cpu/mpc8xx/fec.c diff --git a/cpu/mpc8xx/fec.h b/arch/ppc/cpu/mpc8xx/fec.h similarity index 100% rename from cpu/mpc8xx/fec.h rename to arch/ppc/cpu/mpc8xx/fec.h diff --git a/cpu/mpc8xx/i2c.c b/arch/ppc/cpu/mpc8xx/i2c.c similarity index 100% rename from cpu/mpc8xx/i2c.c rename to arch/ppc/cpu/mpc8xx/i2c.c diff --git a/cpu/mpc8xx/interrupts.c b/arch/ppc/cpu/mpc8xx/interrupts.c similarity index 100% rename from cpu/mpc8xx/interrupts.c rename to arch/ppc/cpu/mpc8xx/interrupts.c diff --git a/cpu/mpc8xx/kgdb.S b/arch/ppc/cpu/mpc8xx/kgdb.S similarity index 100% rename from cpu/mpc8xx/kgdb.S rename to arch/ppc/cpu/mpc8xx/kgdb.S diff --git a/cpu/mpc8xx/lcd.c b/arch/ppc/cpu/mpc8xx/lcd.c similarity index 100% rename from cpu/mpc8xx/lcd.c rename to arch/ppc/cpu/mpc8xx/lcd.c diff --git a/cpu/mpc8xx/plprcr_write.S b/arch/ppc/cpu/mpc8xx/plprcr_write.S similarity index 100% rename from cpu/mpc8xx/plprcr_write.S rename to arch/ppc/cpu/mpc8xx/plprcr_write.S diff --git a/cpu/mpc8xx/scc.c b/arch/ppc/cpu/mpc8xx/scc.c similarity index 100% rename from cpu/mpc8xx/scc.c rename to arch/ppc/cpu/mpc8xx/scc.c diff --git a/cpu/mpc8xx/serial.c b/arch/ppc/cpu/mpc8xx/serial.c similarity index 100% rename from cpu/mpc8xx/serial.c rename to arch/ppc/cpu/mpc8xx/serial.c diff --git a/cpu/mpc8xx/speed.c b/arch/ppc/cpu/mpc8xx/speed.c similarity index 100% rename from cpu/mpc8xx/speed.c rename to arch/ppc/cpu/mpc8xx/speed.c diff --git a/cpu/mpc8xx/spi.c b/arch/ppc/cpu/mpc8xx/spi.c similarity index 100% rename from cpu/mpc8xx/spi.c rename to arch/ppc/cpu/mpc8xx/spi.c diff --git a/cpu/mpc8xx/start.S b/arch/ppc/cpu/mpc8xx/start.S similarity index 100% rename from cpu/mpc8xx/start.S rename to arch/ppc/cpu/mpc8xx/start.S diff --git a/cpu/mpc8xx/traps.c b/arch/ppc/cpu/mpc8xx/traps.c similarity index 100% rename from cpu/mpc8xx/traps.c rename to arch/ppc/cpu/mpc8xx/traps.c diff --git a/cpu/mpc8xx/upatch.c b/arch/ppc/cpu/mpc8xx/upatch.c similarity index 100% rename from cpu/mpc8xx/upatch.c rename to arch/ppc/cpu/mpc8xx/upatch.c diff --git a/cpu/mpc8xx/video.c b/arch/ppc/cpu/mpc8xx/video.c similarity index 100% rename from cpu/mpc8xx/video.c rename to arch/ppc/cpu/mpc8xx/video.c diff --git a/cpu/mpc8xx/wlkbd.c b/arch/ppc/cpu/mpc8xx/wlkbd.c similarity index 100% rename from cpu/mpc8xx/wlkbd.c rename to arch/ppc/cpu/mpc8xx/wlkbd.c diff --git a/cpu/mpc8xxx/Makefile b/arch/ppc/cpu/mpc8xxx/Makefile similarity index 100% rename from cpu/mpc8xxx/Makefile rename to arch/ppc/cpu/mpc8xxx/Makefile diff --git a/cpu/mpc8xxx/cpu.c b/arch/ppc/cpu/mpc8xxx/cpu.c similarity index 95% rename from cpu/mpc8xxx/cpu.c rename to arch/ppc/cpu/mpc8xxx/cpu.c index 47842e98d..fef062b22 100644 --- a/cpu/mpc8xxx/cpu.c +++ b/arch/ppc/cpu/mpc8xxx/cpu.c @@ -1,9 +1,9 @@ /* * Copyright 2009-2010 Freescale Semiconductor, Inc. * - * This file is derived from cpu/mpc85xx/cpu.c and cpu/mpc86xx/cpu.c. - * Basically this file contains cpu specific common code for 85xx/86xx - * processors. + * This file is derived from arch/ppc/cpu/mpc85xx/cpu.c and + * arch/ppc/cpu/mpc86xx/cpu.c. Basically this file contains + * cpu specific common code for 85xx/86xx processors. * See file CREDITS for list of people who contributed to this * project. * diff --git a/cpu/mpc8xxx/ddr/Makefile b/arch/ppc/cpu/mpc8xxx/ddr/Makefile similarity index 100% rename from cpu/mpc8xxx/ddr/Makefile rename to arch/ppc/cpu/mpc8xxx/ddr/Makefile diff --git a/cpu/mpc8xxx/ddr/common_timing_params.h b/arch/ppc/cpu/mpc8xxx/ddr/common_timing_params.h similarity index 100% rename from cpu/mpc8xxx/ddr/common_timing_params.h rename to arch/ppc/cpu/mpc8xxx/ddr/common_timing_params.h diff --git a/cpu/mpc8xxx/ddr/ctrl_regs.c b/arch/ppc/cpu/mpc8xxx/ddr/ctrl_regs.c similarity index 100% rename from cpu/mpc8xxx/ddr/ctrl_regs.c rename to arch/ppc/cpu/mpc8xxx/ddr/ctrl_regs.c diff --git a/cpu/mpc8xxx/ddr/ddr.h b/arch/ppc/cpu/mpc8xxx/ddr/ddr.h similarity index 100% rename from cpu/mpc8xxx/ddr/ddr.h rename to arch/ppc/cpu/mpc8xxx/ddr/ddr.h diff --git a/cpu/mpc8xxx/ddr/ddr1_dimm_params.c b/arch/ppc/cpu/mpc8xxx/ddr/ddr1_dimm_params.c similarity index 100% rename from cpu/mpc8xxx/ddr/ddr1_dimm_params.c rename to arch/ppc/cpu/mpc8xxx/ddr/ddr1_dimm_params.c diff --git a/cpu/mpc8xxx/ddr/ddr2_dimm_params.c b/arch/ppc/cpu/mpc8xxx/ddr/ddr2_dimm_params.c similarity index 100% rename from cpu/mpc8xxx/ddr/ddr2_dimm_params.c rename to arch/ppc/cpu/mpc8xxx/ddr/ddr2_dimm_params.c diff --git a/cpu/mpc8xxx/ddr/ddr3_dimm_params.c b/arch/ppc/cpu/mpc8xxx/ddr/ddr3_dimm_params.c similarity index 100% rename from cpu/mpc8xxx/ddr/ddr3_dimm_params.c rename to arch/ppc/cpu/mpc8xxx/ddr/ddr3_dimm_params.c diff --git a/cpu/mpc8xxx/ddr/lc_common_dimm_params.c b/arch/ppc/cpu/mpc8xxx/ddr/lc_common_dimm_params.c similarity index 100% rename from cpu/mpc8xxx/ddr/lc_common_dimm_params.c rename to arch/ppc/cpu/mpc8xxx/ddr/lc_common_dimm_params.c diff --git a/cpu/mpc8xxx/ddr/main.c b/arch/ppc/cpu/mpc8xxx/ddr/main.c similarity index 100% rename from cpu/mpc8xxx/ddr/main.c rename to arch/ppc/cpu/mpc8xxx/ddr/main.c diff --git a/cpu/mpc8xxx/ddr/options.c b/arch/ppc/cpu/mpc8xxx/ddr/options.c similarity index 100% rename from cpu/mpc8xxx/ddr/options.c rename to arch/ppc/cpu/mpc8xxx/ddr/options.c diff --git a/cpu/mpc8xxx/ddr/util.c b/arch/ppc/cpu/mpc8xxx/ddr/util.c similarity index 100% rename from cpu/mpc8xxx/ddr/util.c rename to arch/ppc/cpu/mpc8xxx/ddr/util.c diff --git a/cpu/mpc8xxx/fdt.c b/arch/ppc/cpu/mpc8xxx/fdt.c similarity index 90% rename from cpu/mpc8xxx/fdt.c rename to arch/ppc/cpu/mpc8xxx/fdt.c index 3a9b5841b..e68d6f336 100644 --- a/cpu/mpc8xxx/fdt.c +++ b/arch/ppc/cpu/mpc8xxx/fdt.c @@ -1,9 +1,9 @@ /* * Copyright 2009 Freescale Semiconductor, Inc. * - * This file is derived from cpu/mpc85xx/cpu.c and cpu/mpc86xx/cpu.c. - * Basically this file contains cpu specific common code for 85xx/86xx - * processors. + * This file is derived from arch/ppc/cpu/mpc85xx/cpu.c and + * arch/ppc/cpu/mpc86xx/cpu.c. Basically this file contains + * cpu specific common code for 85xx/86xx processors. * See file CREDITS for list of people who contributed to this * project. * diff --git a/cpu/mpc8xxx/pci_cfg.c b/arch/ppc/cpu/mpc8xxx/pci_cfg.c similarity index 100% rename from cpu/mpc8xxx/pci_cfg.c rename to arch/ppc/cpu/mpc8xxx/pci_cfg.c diff --git a/cpu/ppc4xx/40x_spd_sdram.c b/arch/ppc/cpu/ppc4xx/40x_spd_sdram.c similarity index 99% rename from cpu/ppc4xx/40x_spd_sdram.c rename to arch/ppc/cpu/ppc4xx/40x_spd_sdram.c index 5e6dbe333..595d5687d 100644 --- a/cpu/ppc4xx/40x_spd_sdram.c +++ b/arch/ppc/cpu/ppc4xx/40x_spd_sdram.c @@ -1,5 +1,5 @@ /* - * cpu/ppc4xx/40x_spd_sdram.c + * arch/ppc/cpu/ppc4xx/40x_spd_sdram.c * This SPD SDRAM detection code supports IBM/AMCC PPC44x cpu with a * SDRAM controller. Those are all current 405 PPC's. * diff --git a/cpu/ppc4xx/44x_spd_ddr.c b/arch/ppc/cpu/ppc4xx/44x_spd_ddr.c similarity index 99% rename from cpu/ppc4xx/44x_spd_ddr.c rename to arch/ppc/cpu/ppc4xx/44x_spd_ddr.c index 6176eabfb..9d1994f99 100644 --- a/cpu/ppc4xx/44x_spd_ddr.c +++ b/arch/ppc/cpu/ppc4xx/44x_spd_ddr.c @@ -1,5 +1,5 @@ /* - * cpu/ppc4xx/44x_spd_ddr.c + * arch/ppc/cpu/ppc4xx/44x_spd_ddr.c * This SPD DDR detection code supports IBM/AMCC PPC44x cpu with a * DDR controller. Those are 440GP/GX/EP/GR. * diff --git a/cpu/ppc4xx/44x_spd_ddr2.c b/arch/ppc/cpu/ppc4xx/44x_spd_ddr2.c similarity index 99% rename from cpu/ppc4xx/44x_spd_ddr2.c rename to arch/ppc/cpu/ppc4xx/44x_spd_ddr2.c index 593a28691..ea6c2ac77 100644 --- a/cpu/ppc4xx/44x_spd_ddr2.c +++ b/arch/ppc/cpu/ppc4xx/44x_spd_ddr2.c @@ -1,5 +1,5 @@ /* - * cpu/ppc4xx/44x_spd_ddr2.c + * arch/ppc/cpu/ppc4xx/44x_spd_ddr2.c * This SPD SDRAM detection code supports AMCC PPC44x cpu's with a * DDR2 controller (non Denali Core). Those currently are: * diff --git a/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c b/arch/ppc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c similarity index 99% rename from cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c rename to arch/ppc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c index 0283c91d8..72630716c 100644 --- a/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c +++ b/arch/ppc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c @@ -1,5 +1,5 @@ /* - * cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c + * arch/ppc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c * This SPD SDRAM detection code supports AMCC PPC44x cpu's with a * DDR2 controller (non Denali Core). Those currently are: * diff --git a/cpu/ppc4xx/4xx_pci.c b/arch/ppc/cpu/ppc4xx/4xx_pci.c similarity index 100% rename from cpu/ppc4xx/4xx_pci.c rename to arch/ppc/cpu/ppc4xx/4xx_pci.c diff --git a/cpu/ppc4xx/4xx_pcie.c b/arch/ppc/cpu/ppc4xx/4xx_pcie.c similarity index 100% rename from cpu/ppc4xx/4xx_pcie.c rename to arch/ppc/cpu/ppc4xx/4xx_pcie.c diff --git a/cpu/ppc4xx/4xx_uart.c b/arch/ppc/cpu/ppc4xx/4xx_uart.c similarity index 100% rename from cpu/ppc4xx/4xx_uart.c rename to arch/ppc/cpu/ppc4xx/4xx_uart.c diff --git a/cpu/ppc4xx/Makefile b/arch/ppc/cpu/ppc4xx/Makefile similarity index 100% rename from cpu/ppc4xx/Makefile rename to arch/ppc/cpu/ppc4xx/Makefile diff --git a/cpu/ppc4xx/bedbug_405.c b/arch/ppc/cpu/ppc4xx/bedbug_405.c similarity index 100% rename from cpu/ppc4xx/bedbug_405.c rename to arch/ppc/cpu/ppc4xx/bedbug_405.c diff --git a/cpu/ppc4xx/cache.S b/arch/ppc/cpu/ppc4xx/cache.S similarity index 100% rename from cpu/ppc4xx/cache.S rename to arch/ppc/cpu/ppc4xx/cache.S diff --git a/cpu/ppc4xx/cmd_chip_config.c b/arch/ppc/cpu/ppc4xx/cmd_chip_config.c similarity index 100% rename from cpu/ppc4xx/cmd_chip_config.c rename to arch/ppc/cpu/ppc4xx/cmd_chip_config.c diff --git a/cpu/ppc4xx/commproc.c b/arch/ppc/cpu/ppc4xx/commproc.c similarity index 100% rename from cpu/ppc4xx/commproc.c rename to arch/ppc/cpu/ppc4xx/commproc.c diff --git a/cpu/ppc4xx/config.mk b/arch/ppc/cpu/ppc4xx/config.mk similarity index 96% rename from cpu/ppc4xx/config.mk rename to arch/ppc/cpu/ppc4xx/config.mk index c1de1e97e..ea4d70784 100644 --- a/cpu/ppc4xx/config.mk +++ b/arch/ppc/cpu/ppc4xx/config.mk @@ -34,4 +34,4 @@ PLATFORM_CPPFLAGS += -Wa,-m405 -mcpu=405 endif # Use default linker script. Board port can override in board/*/config.mk -LDSCRIPT := $(SRCTREE)/cpu/ppc4xx/u-boot.lds +LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/ppc4xx/u-boot.lds diff --git a/cpu/ppc4xx/cpu.c b/arch/ppc/cpu/ppc4xx/cpu.c similarity index 100% rename from cpu/ppc4xx/cpu.c rename to arch/ppc/cpu/ppc4xx/cpu.c diff --git a/cpu/ppc4xx/cpu_init.c b/arch/ppc/cpu/ppc4xx/cpu_init.c similarity index 100% rename from cpu/ppc4xx/cpu_init.c rename to arch/ppc/cpu/ppc4xx/cpu_init.c diff --git a/cpu/ppc4xx/dcr.S b/arch/ppc/cpu/ppc4xx/dcr.S similarity index 100% rename from cpu/ppc4xx/dcr.S rename to arch/ppc/cpu/ppc4xx/dcr.S diff --git a/cpu/ppc4xx/denali_data_eye.c b/arch/ppc/cpu/ppc4xx/denali_data_eye.c similarity index 99% rename from cpu/ppc4xx/denali_data_eye.c rename to arch/ppc/cpu/ppc4xx/denali_data_eye.c index ffc381744..15a9b4f3e 100644 --- a/cpu/ppc4xx/denali_data_eye.c +++ b/arch/ppc/cpu/ppc4xx/denali_data_eye.c @@ -1,5 +1,5 @@ /* - * cpu/ppc4xx/denali_data_eye.c + * arch/ppc/cpu/ppc4xx/denali_data_eye.c * Extracted from board/amcc/sequoia/sdram.c by Larry Johnson . * * (C) Copyright 2006 diff --git a/cpu/ppc4xx/denali_spd_ddr2.c b/arch/ppc/cpu/ppc4xx/denali_spd_ddr2.c similarity index 99% rename from cpu/ppc4xx/denali_spd_ddr2.c rename to arch/ppc/cpu/ppc4xx/denali_spd_ddr2.c index 5858cb36a..72f76cd2f 100644 --- a/cpu/ppc4xx/denali_spd_ddr2.c +++ b/arch/ppc/cpu/ppc4xx/denali_spd_ddr2.c @@ -1,12 +1,12 @@ /* - * cpu/ppc4xx/denali_spd_ddr2.c + * arch/ppc/cpu/ppc4xx/denali_spd_ddr2.c * This SPD SDRAM detection code supports AMCC PPC44x CPUs with a Denali-core * DDR2 controller, specifically the 440EPx/GRx. * * (C) Copyright 2007-2008 * Larry Johnson, lrj@acm.org. * - * Based primarily on cpu/ppc4xx/4xx_spd_ddr2.c, which is... + * Based primarily on arch/ppc/cpu/ppc4xx/4xx_spd_ddr2.c, which is... * * (C) Copyright 2007 * Stefan Roese, DENX Software Engineering, sr@denx.de. diff --git a/cpu/ppc4xx/ecc.c b/arch/ppc/cpu/ppc4xx/ecc.c similarity index 100% rename from cpu/ppc4xx/ecc.c rename to arch/ppc/cpu/ppc4xx/ecc.c diff --git a/cpu/ppc4xx/ecc.h b/arch/ppc/cpu/ppc4xx/ecc.h similarity index 100% rename from cpu/ppc4xx/ecc.h rename to arch/ppc/cpu/ppc4xx/ecc.h diff --git a/cpu/ppc4xx/fdt.c b/arch/ppc/cpu/ppc4xx/fdt.c similarity index 100% rename from cpu/ppc4xx/fdt.c rename to arch/ppc/cpu/ppc4xx/fdt.c diff --git a/cpu/ppc4xx/gpio.c b/arch/ppc/cpu/ppc4xx/gpio.c similarity index 100% rename from cpu/ppc4xx/gpio.c rename to arch/ppc/cpu/ppc4xx/gpio.c diff --git a/cpu/ppc4xx/interrupts.c b/arch/ppc/cpu/ppc4xx/interrupts.c similarity index 100% rename from cpu/ppc4xx/interrupts.c rename to arch/ppc/cpu/ppc4xx/interrupts.c diff --git a/cpu/ppc4xx/iop480_uart.c b/arch/ppc/cpu/ppc4xx/iop480_uart.c similarity index 100% rename from cpu/ppc4xx/iop480_uart.c rename to arch/ppc/cpu/ppc4xx/iop480_uart.c diff --git a/cpu/ppc4xx/kgdb.S b/arch/ppc/cpu/ppc4xx/kgdb.S similarity index 100% rename from cpu/ppc4xx/kgdb.S rename to arch/ppc/cpu/ppc4xx/kgdb.S diff --git a/cpu/ppc4xx/miiphy.c b/arch/ppc/cpu/ppc4xx/miiphy.c similarity index 100% rename from cpu/ppc4xx/miiphy.c rename to arch/ppc/cpu/ppc4xx/miiphy.c diff --git a/cpu/ppc4xx/reginfo.c b/arch/ppc/cpu/ppc4xx/reginfo.c similarity index 100% rename from cpu/ppc4xx/reginfo.c rename to arch/ppc/cpu/ppc4xx/reginfo.c diff --git a/cpu/ppc4xx/resetvec.S b/arch/ppc/cpu/ppc4xx/resetvec.S similarity index 100% rename from cpu/ppc4xx/resetvec.S rename to arch/ppc/cpu/ppc4xx/resetvec.S diff --git a/cpu/ppc4xx/sdram.c b/arch/ppc/cpu/ppc4xx/sdram.c similarity index 100% rename from cpu/ppc4xx/sdram.c rename to arch/ppc/cpu/ppc4xx/sdram.c diff --git a/cpu/ppc4xx/sdram.h b/arch/ppc/cpu/ppc4xx/sdram.h similarity index 100% rename from cpu/ppc4xx/sdram.h rename to arch/ppc/cpu/ppc4xx/sdram.h diff --git a/cpu/ppc4xx/speed.c b/arch/ppc/cpu/ppc4xx/speed.c similarity index 100% rename from cpu/ppc4xx/speed.c rename to arch/ppc/cpu/ppc4xx/speed.c diff --git a/cpu/ppc4xx/start.S b/arch/ppc/cpu/ppc4xx/start.S similarity index 100% rename from cpu/ppc4xx/start.S rename to arch/ppc/cpu/ppc4xx/start.S diff --git a/cpu/ppc4xx/tlb.c b/arch/ppc/cpu/ppc4xx/tlb.c similarity index 100% rename from cpu/ppc4xx/tlb.c rename to arch/ppc/cpu/ppc4xx/tlb.c diff --git a/cpu/ppc4xx/traps.c b/arch/ppc/cpu/ppc4xx/traps.c similarity index 100% rename from cpu/ppc4xx/traps.c rename to arch/ppc/cpu/ppc4xx/traps.c diff --git a/cpu/ppc4xx/u-boot.lds b/arch/ppc/cpu/ppc4xx/u-boot.lds similarity index 98% rename from cpu/ppc4xx/u-boot.lds rename to arch/ppc/cpu/ppc4xx/u-boot.lds index 2b47934a2..3704d8a69 100644 --- a/cpu/ppc4xx/u-boot.lds +++ b/arch/ppc/cpu/ppc4xx/u-boot.lds @@ -124,7 +124,7 @@ SECTIONS #ifdef CONFIG_440 .bootpg RESET_VECTOR_ADDRESS - 0xffc : { - cpu/ppc4xx/start.o (.bootpg) + arch/ppc/cpu/ppc4xx/start.o (.bootpg) /* * PPC440 board need a board specific object with the diff --git a/cpu/ppc4xx/uic.c b/arch/ppc/cpu/ppc4xx/uic.c similarity index 100% rename from cpu/ppc4xx/uic.c rename to arch/ppc/cpu/ppc4xx/uic.c diff --git a/cpu/ppc4xx/usb.c b/arch/ppc/cpu/ppc4xx/usb.c similarity index 100% rename from cpu/ppc4xx/usb.c rename to arch/ppc/cpu/ppc4xx/usb.c diff --git a/cpu/ppc4xx/usb_ohci.c b/arch/ppc/cpu/ppc4xx/usb_ohci.c similarity index 100% rename from cpu/ppc4xx/usb_ohci.c rename to arch/ppc/cpu/ppc4xx/usb_ohci.c diff --git a/cpu/ppc4xx/usb_ohci.h b/arch/ppc/cpu/ppc4xx/usb_ohci.h similarity index 100% rename from cpu/ppc4xx/usb_ohci.h rename to arch/ppc/cpu/ppc4xx/usb_ohci.h diff --git a/cpu/ppc4xx/usbdev.c b/arch/ppc/cpu/ppc4xx/usbdev.c similarity index 100% rename from cpu/ppc4xx/usbdev.c rename to arch/ppc/cpu/ppc4xx/usbdev.c diff --git a/cpu/ppc4xx/usbdev.h b/arch/ppc/cpu/ppc4xx/usbdev.h similarity index 100% rename from cpu/ppc4xx/usbdev.h rename to arch/ppc/cpu/ppc4xx/usbdev.h diff --git a/cpu/ppc4xx/xilinx_irq.c b/arch/ppc/cpu/ppc4xx/xilinx_irq.c similarity index 100% rename from cpu/ppc4xx/xilinx_irq.c rename to arch/ppc/cpu/ppc4xx/xilinx_irq.c diff --git a/board/LEOX/elpt860/u-boot.lds b/board/LEOX/elpt860/u-boot.lds index d3929ea89..e26792cc2 100644 --- a/board/LEOX/elpt860/u-boot.lds +++ b/board/LEOX/elpt860/u-boot.lds @@ -64,7 +64,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) lib/vsprintf.o (.text) diff --git a/board/LEOX/elpt860/u-boot.lds.debug b/board/LEOX/elpt860/u-boot.lds.debug index f6c21f745..707ff7a6b 100644 --- a/board/LEOX/elpt860/u-boot.lds.debug +++ b/board/LEOX/elpt860/u-boot.lds.debug @@ -64,7 +64,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) lib/vsprintf.o (.text) lib/crc32.o (.text) diff --git a/board/MAI/AmigaOneG3SE/u-boot.lds b/board/MAI/AmigaOneG3SE/u-boot.lds index 18510a8e7..1f55c6571 100644 --- a/board/MAI/AmigaOneG3SE/u-boot.lds +++ b/board/MAI/AmigaOneG3SE/u-boot.lds @@ -59,7 +59,7 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/74xx_7xx/start.o (.text) + arch/ppc/cpu/74xx_7xx/start.o (.text) /* store the environment in a seperate sector in the boot flash */ /* . = env_offset; */ common/env_embedded.o(.text) diff --git a/board/Marvell/db64360/u-boot.lds b/board/Marvell/db64360/u-boot.lds index d02133114..6dff003dc 100644 --- a/board/Marvell/db64360/u-boot.lds +++ b/board/Marvell/db64360/u-boot.lds @@ -56,7 +56,7 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/74xx_7xx/start.o (.text) + arch/ppc/cpu/74xx_7xx/start.o (.text) /* store the environment in a seperate sector in the boot flash */ /* . = env_offset; */ diff --git a/board/Marvell/db64460/u-boot.lds b/board/Marvell/db64460/u-boot.lds index d02133114..6dff003dc 100644 --- a/board/Marvell/db64460/u-boot.lds +++ b/board/Marvell/db64460/u-boot.lds @@ -56,7 +56,7 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/74xx_7xx/start.o (.text) + arch/ppc/cpu/74xx_7xx/start.o (.text) /* store the environment in a seperate sector in the boot flash */ /* . = env_offset; */ diff --git a/board/RPXClassic/u-boot.lds b/board/RPXClassic/u-boot.lds index 09d9470f7..f7de95dc8 100644 --- a/board/RPXClassic/u-boot.lds +++ b/board/RPXClassic/u-boot.lds @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) lib/vsprintf.o (.text) diff --git a/board/RPXClassic/u-boot.lds.debug b/board/RPXClassic/u-boot.lds.debug index f559df716..57cc30586 100644 --- a/board/RPXClassic/u-boot.lds.debug +++ b/board/RPXClassic/u-boot.lds.debug @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) lib/vsprintf.o (.text) lib/crc32.o (.text) diff --git a/board/RPXlite/u-boot.lds b/board/RPXlite/u-boot.lds index 09d9470f7..f7de95dc8 100644 --- a/board/RPXlite/u-boot.lds +++ b/board/RPXlite/u-boot.lds @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) lib/vsprintf.o (.text) diff --git a/board/RPXlite/u-boot.lds.debug b/board/RPXlite/u-boot.lds.debug index f559df716..57cc30586 100644 --- a/board/RPXlite/u-boot.lds.debug +++ b/board/RPXlite/u-boot.lds.debug @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) lib/vsprintf.o (.text) lib/crc32.o (.text) diff --git a/board/RPXlite_dw/u-boot.lds b/board/RPXlite_dw/u-boot.lds index a099cb9d5..a2db9a628 100644 --- a/board/RPXlite_dw/u-boot.lds +++ b/board/RPXlite_dw/u-boot.lds @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) lib/vsprintf.o (.text) diff --git a/board/RPXlite_dw/u-boot.lds.debug b/board/RPXlite_dw/u-boot.lds.debug index 3b61a4256..723f56291 100644 --- a/board/RPXlite_dw/u-boot.lds.debug +++ b/board/RPXlite_dw/u-boot.lds.debug @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) lib/vsprintf.o (.text) lib/crc32.o (.text) diff --git a/board/RRvision/u-boot.lds b/board/RRvision/u-boot.lds index 1132fd6eb..b323768fb 100644 --- a/board/RRvision/u-boot.lds +++ b/board/RRvision/u-boot.lds @@ -55,8 +55,8 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) - cpu/mpc8xx/traps.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) lib/vsprintf.o (.text) diff --git a/board/adder/u-boot.lds b/board/adder/u-boot.lds index 397ee2f05..018bcf1a2 100644 --- a/board/adder/u-boot.lds +++ b/board/adder/u-boot.lds @@ -52,7 +52,7 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) *(.text) *(.got1) . = ALIGN(16); diff --git a/board/amcc/acadia/u-boot-nand.lds b/board/amcc/acadia/u-boot-nand.lds index 738caa0c5..bfca58271 100644 --- a/board/amcc/acadia/u-boot-nand.lds +++ b/board/amcc/acadia/u-boot-nand.lds @@ -53,7 +53,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/ppc4xx/start.o (.text) + arch/ppc/cpu/ppc4xx/start.o (.text) /* Align to next NAND block */ . = ALIGN(0x4000); diff --git a/board/amcc/bamboo/u-boot-nand.lds b/board/amcc/bamboo/u-boot-nand.lds index 738caa0c5..bfca58271 100644 --- a/board/amcc/bamboo/u-boot-nand.lds +++ b/board/amcc/bamboo/u-boot-nand.lds @@ -53,7 +53,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/ppc4xx/start.o (.text) + arch/ppc/cpu/ppc4xx/start.o (.text) /* Align to next NAND block */ . = ALIGN(0x4000); diff --git a/board/amcc/canyonlands/canyonlands.c b/board/amcc/canyonlands/canyonlands.c index 13a0daced..71a570191 100644 --- a/board/amcc/canyonlands/canyonlands.c +++ b/board/amcc/canyonlands/canyonlands.c @@ -42,7 +42,7 @@ DECLARE_GLOBAL_DATA_PTR; #define BOARD_ARCHES 4 /* - * Override the default functions in cpu/ppc4xx/44x_spd_ddr2.c with + * Override the default functions in arch/ppc/cpu/ppc4xx/44x_spd_ddr2.c with * board specific values. */ #if defined(CONFIG_ARCHES) diff --git a/board/amcc/canyonlands/u-boot-nand.lds b/board/amcc/canyonlands/u-boot-nand.lds index 47c6bd921..b04b05e38 100644 --- a/board/amcc/canyonlands/u-boot-nand.lds +++ b/board/amcc/canyonlands/u-boot-nand.lds @@ -53,7 +53,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/ppc4xx/start.o (.text) + arch/ppc/cpu/ppc4xx/start.o (.text) /* Align to next NAND block */ . = ALIGN(0x20000); diff --git a/board/amcc/katmai/katmai.c b/board/amcc/katmai/katmai.c index 54e2a39aa..15291f96b 100644 --- a/board/amcc/katmai/katmai.c +++ b/board/amcc/katmai/katmai.c @@ -249,7 +249,7 @@ int checkboard (void) } /* - * Override the default functions in cpu/ppc4xx/44x_spd_ddr2.c with + * Override the default functions in arch/ppc/cpu/ppc4xx/44x_spd_ddr2.c with * board specific values. */ u32 ddr_wrdtr(u32 default_val) { diff --git a/board/amcc/kilauea/u-boot-nand.lds b/board/amcc/kilauea/u-boot-nand.lds index 738caa0c5..bfca58271 100644 --- a/board/amcc/kilauea/u-boot-nand.lds +++ b/board/amcc/kilauea/u-boot-nand.lds @@ -53,7 +53,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/ppc4xx/start.o (.text) + arch/ppc/cpu/ppc4xx/start.o (.text) /* Align to next NAND block */ . = ALIGN(0x4000); diff --git a/board/amcc/luan/luan.c b/board/amcc/luan/luan.c index 332d170d6..6542565f0 100644 --- a/board/amcc/luan/luan.c +++ b/board/amcc/luan/luan.c @@ -119,7 +119,7 @@ int checkboard(void) } /* - * Override the default functions in cpu/ppc4xx/44x_spd_ddr2.c with + * Override the default functions in arch/ppc/cpu/ppc4xx/44x_spd_ddr2.c with * board specific values. */ u32 ddr_clktr(u32 default_val) { diff --git a/board/amcc/sequoia/sdram.c b/board/amcc/sequoia/sdram.c index bde471c2e..b5c7d6d50 100644 --- a/board/amcc/sequoia/sdram.c +++ b/board/amcc/sequoia/sdram.c @@ -40,7 +40,7 @@ extern int denali_wait_for_dlllock(void); extern void denali_core_search_data_eye(void); #if defined(CONFIG_NAND_SPL) -/* Using cpu/ppc4xx/speed.c to calculate the bus frequency is too big +/* Using arch/ppc/cpu/ppc4xx/speed.c to calculate the bus frequency is too big * for the 4k NAND boot image so define bus_frequency to 133MHz here * which is save for the refresh counter setup. */ diff --git a/board/amcc/sequoia/u-boot-nand.lds b/board/amcc/sequoia/u-boot-nand.lds index fb629e0c5..8a71bfa44 100644 --- a/board/amcc/sequoia/u-boot-nand.lds +++ b/board/amcc/sequoia/u-boot-nand.lds @@ -53,7 +53,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/ppc4xx/start.o (.text) + arch/ppc/cpu/ppc4xx/start.o (.text) /* Align to next NAND block */ . = ALIGN(0x4000); diff --git a/board/amcc/sequoia/u-boot-ram.lds b/board/amcc/sequoia/u-boot-ram.lds index e22dbecbf..c6a321e40 100644 --- a/board/amcc/sequoia/u-boot-ram.lds +++ b/board/amcc/sequoia/u-boot-ram.lds @@ -50,7 +50,7 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/ppc4xx/start.o (.text) + arch/ppc/cpu/ppc4xx/start.o (.text) *(.text) *(.got1) diff --git a/board/amcc/yucca/yucca.c b/board/amcc/yucca/yucca.c index 8c65cfb6f..241f48449 100644 --- a/board/amcc/yucca/yucca.c +++ b/board/amcc/yucca/yucca.c @@ -555,7 +555,7 @@ int checkboard (void) } /* - * Override the default functions in cpu/ppc4xx/44x_spd_ddr2.c with + * Override the default functions in arch/ppc/cpu/ppc4xx/44x_spd_ddr2.c with * board specific values. */ static int ppc440spe_rev_a(void) diff --git a/board/amirix/ap1000/u-boot.lds b/board/amirix/ap1000/u-boot.lds index 89ffc6d2d..faeefe8bd 100644 --- a/board/amirix/ap1000/u-boot.lds +++ b/board/amirix/ap1000/u-boot.lds @@ -55,14 +55,14 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/ppc4xx/start.o (.text) + arch/ppc/cpu/ppc4xx/start.o (.text) board/amirix/ap1000/init.o (.text) - cpu/ppc4xx/kgdb.o (.text) - cpu/ppc4xx/traps.o (.text) - cpu/ppc4xx/interrupts.o (.text) - cpu/ppc4xx/4xx_uart.o (.text) - cpu/ppc4xx/cpu_init.o (.text) - cpu/ppc4xx/speed.o (.text) + arch/ppc/cpu/ppc4xx/kgdb.o (.text) + arch/ppc/cpu/ppc4xx/traps.o (.text) + arch/ppc/cpu/ppc4xx/interrupts.o (.text) + arch/ppc/cpu/ppc4xx/4xx_uart.o (.text) + arch/ppc/cpu/ppc4xx/cpu_init.o (.text) + arch/ppc/cpu/ppc4xx/speed.o (.text) common/dlmalloc.o (.text) lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) diff --git a/board/c2mon/u-boot.lds b/board/c2mon/u-boot.lds index 51e95d555..5bd5a75c6 100644 --- a/board/c2mon/u-boot.lds +++ b/board/c2mon/u-boot.lds @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) lib/vsprintf.o (.text) diff --git a/board/c2mon/u-boot.lds.debug b/board/c2mon/u-boot.lds.debug index d55bf33b8..e62f6be5a 100644 --- a/board/c2mon/u-boot.lds.debug +++ b/board/c2mon/u-boot.lds.debug @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) lib/vsprintf.o (.text) lib/crc32.o (.text) diff --git a/board/cm5200/u-boot.lds b/board/cm5200/u-boot.lds index 5887f774e..30a37d9fb 100644 --- a/board/cm5200/u-boot.lds +++ b/board/cm5200/u-boot.lds @@ -50,7 +50,7 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/mpc5xxx/start.o (.text) + arch/ppc/cpu/mpc5xxx/start.o (.text) *(.text) *(.got1) . = ALIGN(16); diff --git a/board/cogent/u-boot.lds.debug b/board/cogent/u-boot.lds.debug index f559df716..57cc30586 100644 --- a/board/cogent/u-boot.lds.debug +++ b/board/cogent/u-boot.lds.debug @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) lib/vsprintf.o (.text) lib/crc32.o (.text) diff --git a/board/csb272/csb272.c b/board/csb272/csb272.c index d6d65cf45..5a00afe40 100644 --- a/board/csb272/csb272.c +++ b/board/csb272/csb272.c @@ -129,7 +129,7 @@ phys_size_t initdram (int board_type) /* * ToDo: Move the asm init routine sdram_init() to this C file, * or even better use some common ppc4xx code available - * in cpu/ppc4xx + * in arch/ppc/cpu/ppc4xx */ sdram_init(); diff --git a/board/csb472/csb472.c b/board/csb472/csb472.c index 20d34adfd..996a67b4e 100644 --- a/board/csb472/csb472.c +++ b/board/csb472/csb472.c @@ -97,7 +97,7 @@ phys_size_t initdram (int board_type) /* * ToDo: Move the asm init routine sdram_init() to this C file, * or even better use some common ppc4xx code available - * in cpu/ppc4xx + * in arch/ppc/cpu/ppc4xx */ sdram_init(); diff --git a/board/eltec/bab7xx/u-boot.lds b/board/eltec/bab7xx/u-boot.lds index d02133114..6dff003dc 100644 --- a/board/eltec/bab7xx/u-boot.lds +++ b/board/eltec/bab7xx/u-boot.lds @@ -56,7 +56,7 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/74xx_7xx/start.o (.text) + arch/ppc/cpu/74xx_7xx/start.o (.text) /* store the environment in a seperate sector in the boot flash */ /* . = env_offset; */ diff --git a/board/eltec/elppc/u-boot.lds b/board/eltec/elppc/u-boot.lds index d02133114..6dff003dc 100644 --- a/board/eltec/elppc/u-boot.lds +++ b/board/eltec/elppc/u-boot.lds @@ -56,7 +56,7 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/74xx_7xx/start.o (.text) + arch/ppc/cpu/74xx_7xx/start.o (.text) /* store the environment in a seperate sector in the boot flash */ /* . = env_offset; */ diff --git a/board/eltec/mhpc/u-boot.lds b/board/eltec/mhpc/u-boot.lds index 5c847fbf8..dc370eacf 100644 --- a/board/eltec/mhpc/u-boot.lds +++ b/board/eltec/mhpc/u-boot.lds @@ -52,7 +52,7 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/env_embedded.o(.text) *(.text) diff --git a/board/eltec/mhpc/u-boot.lds.debug b/board/eltec/mhpc/u-boot.lds.debug index d55bf33b8..e62f6be5a 100644 --- a/board/eltec/mhpc/u-boot.lds.debug +++ b/board/eltec/mhpc/u-boot.lds.debug @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) lib/vsprintf.o (.text) lib/crc32.o (.text) diff --git a/board/emk/top860/u-boot.lds b/board/emk/top860/u-boot.lds index 46dca96e6..3fb6d1269 100644 --- a/board/emk/top860/u-boot.lds +++ b/board/emk/top860/u-boot.lds @@ -52,7 +52,7 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) *(.text) *(.got1) diff --git a/board/emk/top860/u-boot.lds.debug b/board/emk/top860/u-boot.lds.debug index 6ca72980e..3229a23a3 100644 --- a/board/emk/top860/u-boot.lds.debug +++ b/board/emk/top860/u-boot.lds.debug @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) lib/vsprintf.o (.text) lib/crc32.o (.text) diff --git a/board/ep88x/u-boot.lds b/board/ep88x/u-boot.lds index 70b84e4c8..f9579a643 100644 --- a/board/ep88x/u-boot.lds +++ b/board/ep88x/u-boot.lds @@ -52,7 +52,7 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) *(.text) *(.got1) . = ALIGN(16); diff --git a/board/eric/eric.c b/board/eric/eric.c index cfcfa525a..96c0b8385 100644 --- a/board/eric/eric.c +++ b/board/eric/eric.c @@ -132,7 +132,7 @@ phys_size_t initdram (int board_type) /* * ToDo: Move the asm init routine sdram_init() to this C file, * or even better use some common ppc4xx code available - * in cpu/ppc4xx + * in arch/ppc/cpu/ppc4xx */ sdram_init(); diff --git a/board/esd/cpci750/u-boot.lds b/board/esd/cpci750/u-boot.lds index d02133114..6dff003dc 100644 --- a/board/esd/cpci750/u-boot.lds +++ b/board/esd/cpci750/u-boot.lds @@ -56,7 +56,7 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/74xx_7xx/start.o (.text) + arch/ppc/cpu/74xx_7xx/start.o (.text) /* store the environment in a seperate sector in the boot flash */ /* . = env_offset; */ diff --git a/board/esd/dasa_sim/u-boot.lds b/board/esd/dasa_sim/u-boot.lds index b044649eb..3d33d0f02 100644 --- a/board/esd/dasa_sim/u-boot.lds +++ b/board/esd/dasa_sim/u-boot.lds @@ -57,7 +57,7 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/ppc4xx/start.o (.text) + arch/ppc/cpu/ppc4xx/start.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/esd/pmc440/u-boot-nand.lds b/board/esd/pmc440/u-boot-nand.lds index fb629e0c5..8a71bfa44 100644 --- a/board/esd/pmc440/u-boot-nand.lds +++ b/board/esd/pmc440/u-boot-nand.lds @@ -53,7 +53,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/ppc4xx/start.o (.text) + arch/ppc/cpu/ppc4xx/start.o (.text) /* Align to next NAND block */ . = ALIGN(0x4000); diff --git a/board/esteem192e/u-boot.lds b/board/esteem192e/u-boot.lds index 848eacdb2..4490f19a1 100644 --- a/board/esteem192e/u-boot.lds +++ b/board/esteem192e/u-boot.lds @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) lib/vsprintf.o (.text) diff --git a/board/etx094/u-boot.lds b/board/etx094/u-boot.lds index d8112eb0a..94b13422a 100644 --- a/board/etx094/u-boot.lds +++ b/board/etx094/u-boot.lds @@ -55,12 +55,12 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) - cpu/mpc8xx/traps.o (.text) - cpu/mpc8xx/interrupts.o (.text) - cpu/mpc8xx/serial.o (.text) - cpu/mpc8xx/cpu_init.o (.text) - cpu/mpc8xx/speed.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/traps.o (.text) + arch/ppc/cpu/mpc8xx/interrupts.o (.text) + arch/ppc/cpu/mpc8xx/serial.o (.text) + arch/ppc/cpu/mpc8xx/cpu_init.o (.text) + arch/ppc/cpu/mpc8xx/speed.o (.text) common/dlmalloc.o (.text) lib/crc32.o (.text) lib/zlib.o (.text) diff --git a/board/etx094/u-boot.lds.debug b/board/etx094/u-boot.lds.debug index 12f6ce765..458d4e076 100644 --- a/board/etx094/u-boot.lds.debug +++ b/board/etx094/u-boot.lds.debug @@ -55,13 +55,13 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) - cpu/mpc8xx/traps.o (.text) - cpu/mpc8xx/interrupts.o (.text) - cpu/mpc8xx/cpu.o (.text) - cpu/mpc8xx/cpu_init.o (.text) - cpu/mpc8xx/speed.o (.text) - cpu/mpc8xx/serial.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/traps.o (.text) + arch/ppc/cpu/mpc8xx/interrupts.o (.text) + arch/ppc/cpu/mpc8xx/cpu.o (.text) + arch/ppc/cpu/mpc8xx/cpu_init.o (.text) + arch/ppc/cpu/mpc8xx/speed.o (.text) + arch/ppc/cpu/mpc8xx/serial.o (.text) arch/ppc/lib/extable.o (.text) arch/ppc/lib/ppcstring.o (.text) lib/string.o (.text) diff --git a/board/evb64260/u-boot.lds b/board/evb64260/u-boot.lds index d02133114..6dff003dc 100644 --- a/board/evb64260/u-boot.lds +++ b/board/evb64260/u-boot.lds @@ -56,7 +56,7 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/74xx_7xx/start.o (.text) + arch/ppc/cpu/74xx_7xx/start.o (.text) /* store the environment in a seperate sector in the boot flash */ /* . = env_offset; */ diff --git a/board/fads/u-boot.lds b/board/fads/u-boot.lds index ce3e32e0d..d6476cdb7 100644 --- a/board/fads/u-boot.lds +++ b/board/fads/u-boot.lds @@ -50,7 +50,7 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) /*. = DEFINED(env_offset) ? env_offset : .;*/ common/env_embedded.o (.ppcenv) diff --git a/board/fads/u-boot.lds.debug b/board/fads/u-boot.lds.debug index 4f179c7fa..61c0d68d7 100644 --- a/board/fads/u-boot.lds.debug +++ b/board/fads/u-boot.lds.debug @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) lib/vsprintf.o (.text) lib/crc32.o (.text) diff --git a/board/flagadm/u-boot.lds b/board/flagadm/u-boot.lds index 877e82c84..fbfba6ec9 100644 --- a/board/flagadm/u-boot.lds +++ b/board/flagadm/u-boot.lds @@ -52,7 +52,7 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) *(.text) *(.got1) diff --git a/board/flagadm/u-boot.lds.debug b/board/flagadm/u-boot.lds.debug index d55bf33b8..e62f6be5a 100644 --- a/board/flagadm/u-boot.lds.debug +++ b/board/flagadm/u-boot.lds.debug @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) lib/vsprintf.o (.text) lib/crc32.o (.text) diff --git a/board/freescale/mpc7448hpc2/u-boot.lds b/board/freescale/mpc7448hpc2/u-boot.lds index 247779f6c..c4266cec5 100644 --- a/board/freescale/mpc7448hpc2/u-boot.lds +++ b/board/freescale/mpc7448hpc2/u-boot.lds @@ -56,7 +56,7 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/74xx_7xx/start.o (.text) + arch/ppc/cpu/74xx_7xx/start.o (.text) /* store the environment in a seperate sector in the boot flash */ /* . = env_offset; */ diff --git a/board/freescale/mpc8610hpcd/u-boot.lds b/board/freescale/mpc8610hpcd/u-boot.lds index 67847f106..1f9f8eb94 100644 --- a/board/freescale/mpc8610hpcd/u-boot.lds +++ b/board/freescale/mpc8610hpcd/u-boot.lds @@ -50,12 +50,12 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/mpc86xx/start.o (.text) - cpu/mpc86xx/traps.o (.text) - cpu/mpc86xx/interrupts.o (.text) - cpu/mpc86xx/cpu_init.o (.text) - cpu/mpc86xx/cpu.o (.text) - cpu/mpc86xx/speed.o (.text) + arch/ppc/cpu/mpc86xx/start.o (.text) + arch/ppc/cpu/mpc86xx/traps.o (.text) + arch/ppc/cpu/mpc86xx/interrupts.o (.text) + arch/ppc/cpu/mpc86xx/cpu_init.o (.text) + arch/ppc/cpu/mpc86xx/cpu.o (.text) + arch/ppc/cpu/mpc86xx/speed.o (.text) common/dlmalloc.o (.text) lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) diff --git a/board/freescale/mpc8641hpcn/u-boot.lds b/board/freescale/mpc8641hpcn/u-boot.lds index 20e03447f..d7c65ce21 100644 --- a/board/freescale/mpc8641hpcn/u-boot.lds +++ b/board/freescale/mpc8641hpcn/u-boot.lds @@ -50,12 +50,12 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/mpc86xx/start.o (.text) - cpu/mpc86xx/traps.o (.text) - cpu/mpc86xx/interrupts.o (.text) - cpu/mpc86xx/cpu_init.o (.text) - cpu/mpc86xx/cpu.o (.text) - cpu/mpc86xx/speed.o (.text) + arch/ppc/cpu/mpc86xx/start.o (.text) + arch/ppc/cpu/mpc86xx/traps.o (.text) + arch/ppc/cpu/mpc86xx/interrupts.o (.text) + arch/ppc/cpu/mpc86xx/cpu_init.o (.text) + arch/ppc/cpu/mpc86xx/cpu.o (.text) + arch/ppc/cpu/mpc86xx/speed.o (.text) common/dlmalloc.o (.text) lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) diff --git a/board/gen860t/ioport.c b/board/gen860t/ioport.c index d8c3006a6..146573e1d 100644 --- a/board/gen860t/ioport.c +++ b/board/gen860t/ioport.c @@ -197,7 +197,7 @@ const mpc8xx_iop_conf_t iop_conf_tab[NUM_PORTS][PORT_BITS] = { /* * Configure the MPC8XX I/O ports per the ioport configuration table - * (taken from ./cpu/mpc8260/cpu_init.c) + * (taken from ./arch/ppc/cpu/mpc8260/cpu_init.c) */ void config_mpc8xx_ioports (volatile immap_t * immr) { diff --git a/board/gen860t/u-boot-flashenv.lds b/board/gen860t/u-boot-flashenv.lds index 7b83b25b6..0e129253e 100644 --- a/board/gen860t/u-boot-flashenv.lds +++ b/board/gen860t/u-boot-flashenv.lds @@ -55,7 +55,7 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) *(.text) *(.got1) } diff --git a/board/gen860t/u-boot.lds b/board/gen860t/u-boot.lds index 8f40b303b..d184379db 100644 --- a/board/gen860t/u-boot.lds +++ b/board/gen860t/u-boot.lds @@ -54,7 +54,7 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) *(.text) *(.got1) } diff --git a/board/genietv/u-boot.lds b/board/genietv/u-boot.lds index 1bd1ba70c..22ada9ae1 100644 --- a/board/genietv/u-boot.lds +++ b/board/genietv/u-boot.lds @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) lib/vsprintf.o (.text) diff --git a/board/genietv/u-boot.lds.debug b/board/genietv/u-boot.lds.debug index c0dd67f05..e5aa625b5 100644 --- a/board/genietv/u-boot.lds.debug +++ b/board/genietv/u-boot.lds.debug @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) lib/vsprintf.o (.text) diff --git a/board/gth/u-boot.lds b/board/gth/u-boot.lds index f6175d9d5..0e68e1414 100644 --- a/board/gth/u-boot.lds +++ b/board/gth/u-boot.lds @@ -52,7 +52,7 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/mpc8xx/start.o(.text) + arch/ppc/cpu/mpc8xx/start.o(.text) *(.text) common/env_embedded.o(.text) *(.got1) diff --git a/board/hermes/u-boot.lds b/board/hermes/u-boot.lds index 1f6e7d6c9..23e3e3bc5 100644 --- a/board/hermes/u-boot.lds +++ b/board/hermes/u-boot.lds @@ -55,9 +55,9 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - cpu/mpc8xx/interrupts.o (.text) + arch/ppc/cpu/mpc8xx/interrupts.o (.text) arch/ppc/lib/time.o (.text) arch/ppc/lib/ticks.o (.text) arch/ppc/lib/cache.o (.text) diff --git a/board/hermes/u-boot.lds.debug b/board/hermes/u-boot.lds.debug index dc810beae..47e3927ec 100644 --- a/board/hermes/u-boot.lds.debug +++ b/board/hermes/u-boot.lds.debug @@ -55,9 +55,9 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) arch/ppc/lib/ppcstring.o (.text) - cpu/mpc8xx/interrupts.o (.text) + arch/ppc/cpu/mpc8xx/interrupts.o (.text) arch/ppc/lib/time.o (.text) arch/ppc/lib/ticks.o (.text) . = env_offset; diff --git a/board/hmi1001/config.mk b/board/hmi1001/config.mk index 4fe18316e..aebf30411 100644 --- a/board/hmi1001/config.mk +++ b/board/hmi1001/config.mk @@ -39,4 +39,4 @@ TEXT_BASE = 0xFFF00000 endif PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board -LDSCRIPT := $(SRCTREE)/cpu/mpc5xxx/u-boot-customlayout.lds +LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc5xxx/u-boot-customlayout.lds diff --git a/board/hymod/u-boot.lds b/board/hymod/u-boot.lds index 965716f71..7086ced34 100644 --- a/board/hymod/u-boot.lds +++ b/board/hymod/u-boot.lds @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8260/start.o (.text) + arch/ppc/cpu/mpc8260/start.o (.text) /* common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) diff --git a/board/hymod/u-boot.lds.debug b/board/hymod/u-boot.lds.debug index f559df716..57cc30586 100644 --- a/board/hymod/u-boot.lds.debug +++ b/board/hymod/u-boot.lds.debug @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) lib/vsprintf.o (.text) lib/crc32.o (.text) diff --git a/board/icu862/u-boot.lds b/board/icu862/u-boot.lds index d7d0fb3df..d6837005f 100644 --- a/board/icu862/u-boot.lds +++ b/board/icu862/u-boot.lds @@ -55,9 +55,9 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) /* - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) lib/vsprintf.o (.text) diff --git a/board/icu862/u-boot.lds.debug b/board/icu862/u-boot.lds.debug index 282738bd5..b331d5afc 100644 --- a/board/icu862/u-boot.lds.debug +++ b/board/icu862/u-boot.lds.debug @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) lib/vsprintf.o (.text) lib/crc32.o (.text) diff --git a/board/inka4x0/config.mk b/board/inka4x0/config.mk index fc70efeee..761efa1d1 100644 --- a/board/inka4x0/config.mk +++ b/board/inka4x0/config.mk @@ -39,4 +39,4 @@ TEXT_BASE = 0xFFE00000 endif PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board -LDSCRIPT := $(SRCTREE)/cpu/mpc5xxx/u-boot-customlayout.lds +LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc5xxx/u-boot-customlayout.lds diff --git a/board/ip860/u-boot.lds b/board/ip860/u-boot.lds index bbc7139e5..d85604237 100644 --- a/board/ip860/u-boot.lds +++ b/board/ip860/u-boot.lds @@ -55,10 +55,10 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - cpu/mpc8xx/interrupts.o (.text) + arch/ppc/cpu/mpc8xx/interrupts.o (.text) arch/ppc/lib/time.o (.text) arch/ppc/lib/ticks.o (.text) /** diff --git a/board/ip860/u-boot.lds.debug b/board/ip860/u-boot.lds.debug index fc8fe6cec..dd39b9ac7 100644 --- a/board/ip860/u-boot.lds.debug +++ b/board/ip860/u-boot.lds.debug @@ -55,9 +55,9 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) arch/ppc/lib/ppcstring.o (.text) - cpu/mpc8xx/interrupts.o (.text) + arch/ppc/cpu/mpc8xx/interrupts.o (.text) arch/ppc/lib/time.o (.text) arch/ppc/lib/ticks.o (.text) /** diff --git a/board/ivm/u-boot.lds b/board/ivm/u-boot.lds index 8d7ff7011..767408b52 100644 --- a/board/ivm/u-boot.lds +++ b/board/ivm/u-boot.lds @@ -52,7 +52,7 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/env_embedded.o(.text) *(.text) *(.got1) diff --git a/board/ivm/u-boot.lds.debug b/board/ivm/u-boot.lds.debug index 037785e7d..5ec82f441 100644 --- a/board/ivm/u-boot.lds.debug +++ b/board/ivm/u-boot.lds.debug @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) lib/vsprintf.o (.text) lib/crc32.o (.text) diff --git a/board/keymile/common/keymile_hdlc_enet.c b/board/keymile/common/keymile_hdlc_enet.c index 2e913adc5..ceddaf752 100644 --- a/board/keymile/common/keymile_hdlc_enet.c +++ b/board/keymile/common/keymile_hdlc_enet.c @@ -2,7 +2,7 @@ * (C) Copyright 2008 * Gary Jennejohn, DENX Software Engineering GmbH, garyj@denx.de. * - * Based in part on cpu/mpc8260/ether_scc.c. + * Based in part on arch/ppc/cpu/mpc8260/ether_scc.c. * * See file CREDITS for list of people who contributed to this * project. diff --git a/board/keymile/km8xx/km8xx_hdlc_enet.c b/board/keymile/km8xx/km8xx_hdlc_enet.c index 9b93131f0..543deafb9 100644 --- a/board/keymile/km8xx/km8xx_hdlc_enet.c +++ b/board/keymile/km8xx/km8xx_hdlc_enet.c @@ -2,7 +2,7 @@ * (C) Copyright 2008 * Gary Jennejohn, DENX Software Engineering GmbH, garyj@denx.de. * - * Based in part on cpu/mpc8xx/scc.c. + * Based in part on arch/ppc/cpu/mpc8xx/scc.c. * * See file CREDITS for list of people who contributed to this * project. diff --git a/board/keymile/km8xx/u-boot.lds b/board/keymile/km8xx/u-boot.lds index 759072df9..19936bd4b 100644 --- a/board/keymile/km8xx/u-boot.lds +++ b/board/keymile/km8xx/u-boot.lds @@ -55,8 +55,8 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) - cpu/mpc8xx/traps.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) lib/vsprintf.o (.text) diff --git a/board/keymile/mgcoge/mgcoge_hdlc_enet.c b/board/keymile/mgcoge/mgcoge_hdlc_enet.c index 34f04f562..6b8e7eaf7 100644 --- a/board/keymile/mgcoge/mgcoge_hdlc_enet.c +++ b/board/keymile/mgcoge/mgcoge_hdlc_enet.c @@ -2,7 +2,7 @@ * (C) Copyright 2008 * Gary Jennejohn, DENX Software Engineering GmbH, garyj@denx.de. * - * Based in part on cpu/mpc8260/ether_scc.c. + * Based in part on arch/ppc/cpu/mpc8260/ether_scc.c. * * See file CREDITS for list of people who contributed to this * project. diff --git a/board/korat/u-boot-F7FC.lds b/board/korat/u-boot-F7FC.lds index cbad8668e..e48339453 100644 --- a/board/korat/u-boot-F7FC.lds +++ b/board/korat/u-boot-F7FC.lds @@ -33,7 +33,7 @@ SECTIONS .bootpg 0xF7FBF000 : { - cpu/ppc4xx/start.o (.bootpg) + arch/ppc/cpu/ppc4xx/start.o (.bootpg) } = 0xffff /* Read-only sections, merged into text segment: */ @@ -65,7 +65,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/ppc4xx/start.o (.text) + arch/ppc/cpu/ppc4xx/start.o (.text) *(.text) *(.got1) diff --git a/board/kup/kup4k/u-boot.lds b/board/kup/kup4k/u-boot.lds index e1233a748..18cecaf51 100644 --- a/board/kup/kup4k/u-boot.lds +++ b/board/kup/kup4k/u-boot.lds @@ -55,9 +55,9 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) /* - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) lib/vsprintf.o (.text) diff --git a/board/kup/kup4k/u-boot.lds.debug b/board/kup/kup4k/u-boot.lds.debug index 3b61a4256..723f56291 100644 --- a/board/kup/kup4k/u-boot.lds.debug +++ b/board/kup/kup4k/u-boot.lds.debug @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) lib/vsprintf.o (.text) lib/crc32.o (.text) diff --git a/board/kup/kup4x/u-boot.lds b/board/kup/kup4x/u-boot.lds index e1233a748..18cecaf51 100644 --- a/board/kup/kup4x/u-boot.lds +++ b/board/kup/kup4x/u-boot.lds @@ -55,9 +55,9 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) /* - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) lib/vsprintf.o (.text) diff --git a/board/kup/kup4x/u-boot.lds.debug b/board/kup/kup4x/u-boot.lds.debug index 3b61a4256..723f56291 100644 --- a/board/kup/kup4x/u-boot.lds.debug +++ b/board/kup/kup4x/u-boot.lds.debug @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) lib/vsprintf.o (.text) lib/crc32.o (.text) diff --git a/board/lantec/u-boot.lds b/board/lantec/u-boot.lds index 50bdfb457..160f5cf38 100644 --- a/board/lantec/u-boot.lds +++ b/board/lantec/u-boot.lds @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) lib/vsprintf.o (.text) diff --git a/board/lantec/u-boot.lds.debug b/board/lantec/u-boot.lds.debug index be06235c0..172482f88 100644 --- a/board/lantec/u-boot.lds.debug +++ b/board/lantec/u-boot.lds.debug @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) lib/vsprintf.o (.text) lib/crc32.o (.text) diff --git a/board/logicpd/zoom2/zoom2_serial.c b/board/logicpd/zoom2/zoom2_serial.c index ba58e3934..cfbad1347 100644 --- a/board/logicpd/zoom2/zoom2_serial.c +++ b/board/logicpd/zoom2/zoom2_serial.c @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * This file was adapted from cpu/mpc5xxx/serial.c + * This file was adapted from arch/ppc/cpu/mpc5xxx/serial.c * */ diff --git a/board/lwmon/u-boot.lds b/board/lwmon/u-boot.lds index cc8ad7d3d..ff2f56640 100644 --- a/board/lwmon/u-boot.lds +++ b/board/lwmon/u-boot.lds @@ -52,7 +52,7 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/env_embedded.o(.text) *(.text) *(.got1) diff --git a/board/lwmon/u-boot.lds.debug b/board/lwmon/u-boot.lds.debug index 251ee9bbd..fcf2cbb96 100644 --- a/board/lwmon/u-boot.lds.debug +++ b/board/lwmon/u-boot.lds.debug @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) lib/vsprintf.o (.text) lib/crc32.o (.text) diff --git a/board/mbx8xx/u-boot.lds b/board/mbx8xx/u-boot.lds index dc3e580fb..3572f1ad3 100644 --- a/board/mbx8xx/u-boot.lds +++ b/board/mbx8xx/u-boot.lds @@ -52,7 +52,7 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) *(.text) *(.got1) diff --git a/board/mbx8xx/u-boot.lds.debug b/board/mbx8xx/u-boot.lds.debug index 4f179c7fa..61c0d68d7 100644 --- a/board/mbx8xx/u-boot.lds.debug +++ b/board/mbx8xx/u-boot.lds.debug @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) lib/vsprintf.o (.text) lib/crc32.o (.text) diff --git a/board/ml2/u-boot.lds b/board/ml2/u-boot.lds index e68cfb81a..e382283ea 100644 --- a/board/ml2/u-boot.lds +++ b/board/ml2/u-boot.lds @@ -55,14 +55,14 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/ppc4xx/start.o (.text) + arch/ppc/cpu/ppc4xx/start.o (.text) board/ml2/init.o (.text) - cpu/ppc4xx/kgdb.o (.text) - cpu/ppc4xx/traps.o (.text) - cpu/ppc4xx/interrupts.o (.text) - cpu/ppc4xx/4xx_uart.o (.text) - cpu/ppc4xx/cpu_init.o (.text) - cpu/ppc4xx/speed.o (.text) + arch/ppc/cpu/ppc4xx/kgdb.o (.text) + arch/ppc/cpu/ppc4xx/traps.o (.text) + arch/ppc/cpu/ppc4xx/interrupts.o (.text) + arch/ppc/cpu/ppc4xx/4xx_uart.o (.text) + arch/ppc/cpu/ppc4xx/cpu_init.o (.text) + arch/ppc/cpu/ppc4xx/speed.o (.text) common/dlmalloc.o (.text) lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) diff --git a/board/mousse/u-boot.lds b/board/mousse/u-boot.lds index f6930b538..ed5492d45 100644 --- a/board/mousse/u-boot.lds +++ b/board/mousse/u-boot.lds @@ -52,7 +52,7 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/mpc824x/start.o (.text) + arch/ppc/cpu/mpc824x/start.o (.text) arch/ppc/lib/board.o (.text) arch/ppc/lib/ppcstring.o (.text) lib/vsprintf.o (.text) diff --git a/board/mousse/u-boot.lds.ram b/board/mousse/u-boot.lds.ram index d048e52d3..d3169489b 100644 --- a/board/mousse/u-boot.lds.ram +++ b/board/mousse/u-boot.lds.ram @@ -37,7 +37,7 @@ SECTIONS PROVIDE(_f_init_rom = .); .init : { - cpu/mpc824x/start.o (.text) + arch/ppc/cpu/mpc824x/start.o (.text) *(.init) } > ram _init_size = SIZEOF(.init); diff --git a/board/mousse/u-boot.lds.rom b/board/mousse/u-boot.lds.rom index 8355f335e..2721fdc6f 100644 --- a/board/mousse/u-boot.lds.rom +++ b/board/mousse/u-boot.lds.rom @@ -52,7 +52,7 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/mpc824x/start.o (.text) + arch/ppc/cpu/mpc824x/start.o (.text) common/board.o (.text) arch/ppc/lib/ppcstring.o (.text) lib/vsprintf.o (.text) diff --git a/board/mucmc52/config.mk b/board/mucmc52/config.mk index 90d9ce2c9..4e9ee73e6 100644 --- a/board/mucmc52/config.mk +++ b/board/mucmc52/config.mk @@ -42,4 +42,4 @@ TEXT_BASE = 0xFFF00000 endif PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board -LDSCRIPT := $(SRCTREE)/cpu/mpc5xxx/u-boot.lds +LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc5xxx/u-boot.lds diff --git a/board/munices/u-boot.lds b/board/munices/u-boot.lds index 8db7f26a5..2cd6d3c1a 100644 --- a/board/munices/u-boot.lds +++ b/board/munices/u-boot.lds @@ -52,7 +52,7 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/mpc5xxx/start.o (.text) + arch/ppc/cpu/mpc5xxx/start.o (.text) *(.text) *(.got1) . = ALIGN(16); diff --git a/board/nc650/u-boot.lds b/board/nc650/u-boot.lds index 21fed6262..90ca165c4 100644 --- a/board/nc650/u-boot.lds +++ b/board/nc650/u-boot.lds @@ -52,7 +52,7 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) *(.text) *(.got1) } diff --git a/board/nc650/u-boot.lds.debug b/board/nc650/u-boot.lds.debug index 5f8dc9d2c..1405b1730 100644 --- a/board/nc650/u-boot.lds.debug +++ b/board/nc650/u-boot.lds.debug @@ -52,7 +52,7 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) *(.text) *(.got1) } diff --git a/board/netphone/u-boot.lds b/board/netphone/u-boot.lds index 8f96b1de6..d6e2404f9 100644 --- a/board/netphone/u-boot.lds +++ b/board/netphone/u-boot.lds @@ -52,8 +52,8 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/mpc8xx/start.o (.text) - cpu/mpc8xx/traps.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) lib/vsprintf.o (.text) diff --git a/board/netphone/u-boot.lds.debug b/board/netphone/u-boot.lds.debug index 139751177..ec479b153 100644 --- a/board/netphone/u-boot.lds.debug +++ b/board/netphone/u-boot.lds.debug @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) lib/vsprintf.o (.text) lib/crc32.o (.text) diff --git a/board/netstal/hcu5/README.txt b/board/netstal/hcu5/README.txt index 0a54f9aee..0be51925c 100644 --- a/board/netstal/hcu5/README.txt +++ b/board/netstal/hcu5/README.txt @@ -83,11 +83,11 @@ System-LEDs ??? (Analog zu HCU4 ???) Startup sequence ---------------- -(cpu/ppc4xx/resetvec.S) +(arch/ppc/cpu/ppc4xx/resetvec.S) depending on configs option call _start_440 _start_pci oder _start -(cpu/ppc4xx/start.S) +(arch/ppc/cpu/ppc4xx/start.S) _start_440: initialize register like @@ -136,7 +136,7 @@ _start: * - board info struct Save local variables to board info struct call relocate_code() does not return - relocate_code: (cpu/ppc4xx/start.S) + relocate_code: (arch/ppc/cpu/ppc4xx/start.S) ------------------------------------------------------- From now on our copy is in RAM and we will run from there, starting with board_init_r @@ -147,7 +147,7 @@ From now on our copy is in RAM and we will run from there, flash_init: (board/netstal/hcu5/flash.c) /* setup for u-boot erase, update */ setup bd flash info - cpu_init_r: (cpu/ppc4xx/cpu_init.c) + cpu_init_r: (arch/ppc/cpu/ppc4xx/cpu_init.c) peripheral chip select in using defines like CONFIG_SYS_EBC_PB0A, CONFIG_SYS_EBC_PB0C from hcu5.h mem_malloc_init @@ -161,7 +161,7 @@ From now on our copy is in RAM and we will run from there, Most of the HW specific code for the HCU5 may be found in include/configs/hcu5.h board/netstal/hcu5/* -cpu/ppc4xx/* +arch/ppc/cpu/ppc4xx/* arch/ppc/lib/* include/ppc440.h diff --git a/board/netta/u-boot.lds b/board/netta/u-boot.lds index ff11ad0f6..c4df378c9 100644 --- a/board/netta/u-boot.lds +++ b/board/netta/u-boot.lds @@ -52,8 +52,8 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/mpc8xx/start.o (.text) - cpu/mpc8xx/traps.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) lib/vsprintf.o (.text) diff --git a/board/netta/u-boot.lds.debug b/board/netta/u-boot.lds.debug index 139751177..ec479b153 100644 --- a/board/netta/u-boot.lds.debug +++ b/board/netta/u-boot.lds.debug @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) lib/vsprintf.o (.text) lib/crc32.o (.text) diff --git a/board/netta2/u-boot.lds b/board/netta2/u-boot.lds index ff11ad0f6..c4df378c9 100644 --- a/board/netta2/u-boot.lds +++ b/board/netta2/u-boot.lds @@ -52,8 +52,8 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/mpc8xx/start.o (.text) - cpu/mpc8xx/traps.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) lib/vsprintf.o (.text) diff --git a/board/netta2/u-boot.lds.debug b/board/netta2/u-boot.lds.debug index 139751177..ec479b153 100644 --- a/board/netta2/u-boot.lds.debug +++ b/board/netta2/u-boot.lds.debug @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) lib/vsprintf.o (.text) lib/crc32.o (.text) diff --git a/board/netvia/u-boot.lds b/board/netvia/u-boot.lds index 70d5a6a0d..6683361ea 100644 --- a/board/netvia/u-boot.lds +++ b/board/netvia/u-boot.lds @@ -52,8 +52,8 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/mpc8xx/start.o (.text) - cpu/mpc8xx/traps.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) lib/vsprintf.o (.text) diff --git a/board/netvia/u-boot.lds.debug b/board/netvia/u-boot.lds.debug index bc8f32e0f..cef1a428b 100644 --- a/board/netvia/u-boot.lds.debug +++ b/board/netvia/u-boot.lds.debug @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) lib/vsprintf.o (.text) lib/crc32.o (.text) diff --git a/board/nx823/u-boot.lds b/board/nx823/u-boot.lds index 5c847fbf8..dc370eacf 100644 --- a/board/nx823/u-boot.lds +++ b/board/nx823/u-boot.lds @@ -52,7 +52,7 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/env_embedded.o(.text) *(.text) diff --git a/board/nx823/u-boot.lds.debug b/board/nx823/u-boot.lds.debug index d55bf33b8..e62f6be5a 100644 --- a/board/nx823/u-boot.lds.debug +++ b/board/nx823/u-boot.lds.debug @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) lib/vsprintf.o (.text) lib/crc32.o (.text) diff --git a/board/pcippc2/u-boot.lds b/board/pcippc2/u-boot.lds index d11bb056f..b2be32812 100644 --- a/board/pcippc2/u-boot.lds +++ b/board/pcippc2/u-boot.lds @@ -59,7 +59,7 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/74xx_7xx/start.o (.text) + arch/ppc/cpu/74xx_7xx/start.o (.text) /* store the environment in a seperate sector in the boot flash */ /* . = env_offset; */ diff --git a/board/pcs440ep/pcs440ep.c b/board/pcs440ep/pcs440ep.c index ce1e61667..bed385c44 100644 --- a/board/pcs440ep/pcs440ep.c +++ b/board/pcs440ep/pcs440ep.c @@ -148,7 +148,7 @@ int board_early_init_f(void) mtdcr(EBC0_CFGDATA, reg | 0x04000000); /* Set ATC */ /*-------------------------------------------------------------------- - * GPIO's are alreay setup in cpu/ppc4xx/cpu_init.c + * GPIO's are alreay setup in arch/ppc/cpu/ppc4xx/cpu_init.c * via define from board config file. *-------------------------------------------------------------------*/ diff --git a/board/ppmc7xx/u-boot.lds b/board/ppmc7xx/u-boot.lds index 30e8972af..aae105716 100644 --- a/board/ppmc7xx/u-boot.lds +++ b/board/ppmc7xx/u-boot.lds @@ -56,7 +56,7 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/74xx_7xx/start.o (.text) + arch/ppc/cpu/74xx_7xx/start.o (.text) /* store the environment in a seperate sector in the boot flash */ /* . = env_offset; */ diff --git a/board/prodrive/p3mx/u-boot.lds b/board/prodrive/p3mx/u-boot.lds index d02133114..6dff003dc 100644 --- a/board/prodrive/p3mx/u-boot.lds +++ b/board/prodrive/p3mx/u-boot.lds @@ -56,7 +56,7 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/74xx_7xx/start.o (.text) + arch/ppc/cpu/74xx_7xx/start.o (.text) /* store the environment in a seperate sector in the boot flash */ /* . = env_offset; */ diff --git a/board/quantum/u-boot.lds b/board/quantum/u-boot.lds index 09d9470f7..f7de95dc8 100644 --- a/board/quantum/u-boot.lds +++ b/board/quantum/u-boot.lds @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) lib/vsprintf.o (.text) diff --git a/board/quantum/u-boot.lds.debug b/board/quantum/u-boot.lds.debug index dcad81892..a2b7bc70d 100644 --- a/board/quantum/u-boot.lds.debug +++ b/board/quantum/u-boot.lds.debug @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) lib/vsprintf.o (.text) lib/crc32.o (.text) diff --git a/board/r360mpi/u-boot.lds b/board/r360mpi/u-boot.lds index 9089f7d6b..4fc18fcf2 100644 --- a/board/r360mpi/u-boot.lds +++ b/board/r360mpi/u-boot.lds @@ -55,10 +55,10 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) - cpu/mpc8xx/cpu_init.o (.text) - cpu/mpc8xx/interrupts.o (.text) - cpu/mpc8xx/traps.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/cpu_init.o (.text) + arch/ppc/cpu/mpc8xx/interrupts.o (.text) + arch/ppc/cpu/mpc8xx/traps.o (.text) /*** . = env_offset; common/env_embedded.o (.text) diff --git a/board/rbc823/u-boot.lds b/board/rbc823/u-boot.lds index 15aca6c62..2161501ff 100644 --- a/board/rbc823/u-boot.lds +++ b/board/rbc823/u-boot.lds @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) lib/vsprintf.o (.text) diff --git a/board/rmu/u-boot.lds b/board/rmu/u-boot.lds index 09d9470f7..f7de95dc8 100644 --- a/board/rmu/u-boot.lds +++ b/board/rmu/u-boot.lds @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) lib/vsprintf.o (.text) diff --git a/board/rmu/u-boot.lds.debug b/board/rmu/u-boot.lds.debug index dcad81892..a2b7bc70d 100644 --- a/board/rmu/u-boot.lds.debug +++ b/board/rmu/u-boot.lds.debug @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) lib/vsprintf.o (.text) lib/crc32.o (.text) diff --git a/board/rsdproto/u-boot.lds b/board/rsdproto/u-boot.lds index 0d4a9efb7..0c51d4812 100644 --- a/board/rsdproto/u-boot.lds +++ b/board/rsdproto/u-boot.lds @@ -52,7 +52,7 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/mpc8260/start.o (.text) + arch/ppc/cpu/mpc8260/start.o (.text) *(.text) *(.got1) /*. = env_offset; */ diff --git a/board/sandburst/common/ppc440gx_i2c.c b/board/sandburst/common/ppc440gx_i2c.c index dbc0cee75..007f875f0 100644 --- a/board/sandburst/common/ppc440gx_i2c.c +++ b/board/sandburst/common/ppc440gx_i2c.c @@ -21,7 +21,7 @@ */ /* - * Ported from cpu/ppc4xx/i2c.c by AS HARNOIS by + * Ported from arch/ppc/cpu/ppc4xx/i2c.c by AS HARNOIS by * Travis B. Sawyer * Sandburst Corporation. */ diff --git a/board/sandburst/karef/u-boot.lds.debug b/board/sandburst/karef/u-boot.lds.debug index 34dce838f..c17439853 100644 --- a/board/sandburst/karef/u-boot.lds.debug +++ b/board/sandburst/karef/u-boot.lds.debug @@ -56,14 +56,14 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/ppc4xx/start.o (.text) + arch/ppc/cpu/ppc4xx/start.o (.text) board/sandburst/karef/init.o (.text) - cpu/ppc4xx/kgdb.o (.text) - cpu/ppc4xx/traps.o (.text) - cpu/ppc4xx/interrupts.o (.text) - cpu/ppc4xx/4xx_uart.o (.text) - cpu/ppc4xx/cpu_init.o (.text) - cpu/ppc4xx/speed.o (.text) + arch/ppc/cpu/ppc4xx/kgdb.o (.text) + arch/ppc/cpu/ppc4xx/traps.o (.text) + arch/ppc/cpu/ppc4xx/interrupts.o (.text) + arch/ppc/cpu/ppc4xx/4xx_uart.o (.text) + arch/ppc/cpu/ppc4xx/cpu_init.o (.text) + arch/ppc/cpu/ppc4xx/speed.o (.text) drivers/net/4xx_enet.o (.text) common/dlmalloc.o (.text) lib/crc32.o (.text) diff --git a/board/sandburst/metrobox/u-boot.lds.debug b/board/sandburst/metrobox/u-boot.lds.debug index fa976c2e5..845841607 100644 --- a/board/sandburst/metrobox/u-boot.lds.debug +++ b/board/sandburst/metrobox/u-boot.lds.debug @@ -56,14 +56,14 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/ppc4xx/start.o (.text) + arch/ppc/cpu/ppc4xx/start.o (.text) board/sandburst/metrobox/init.o (.text) - cpu/ppc4xx/kgdb.o (.text) - cpu/ppc4xx/traps.o (.text) - cpu/ppc4xx/interrupts.o (.text) - cpu/ppc4xx/4xx_uart.o (.text) - cpu/ppc4xx/cpu_init.o (.text) - cpu/ppc4xx/speed.o (.text) + arch/ppc/cpu/ppc4xx/kgdb.o (.text) + arch/ppc/cpu/ppc4xx/traps.o (.text) + arch/ppc/cpu/ppc4xx/interrupts.o (.text) + arch/ppc/cpu/ppc4xx/4xx_uart.o (.text) + arch/ppc/cpu/ppc4xx/cpu_init.o (.text) + arch/ppc/cpu/ppc4xx/speed.o (.text) drivers/net/4xx_enet.o (.text) common/dlmalloc.o (.text) lib/crc32.o (.text) diff --git a/board/sbc8641d/u-boot.lds b/board/sbc8641d/u-boot.lds index 7f0412464..2f8730bf2 100644 --- a/board/sbc8641d/u-boot.lds +++ b/board/sbc8641d/u-boot.lds @@ -50,12 +50,12 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/mpc86xx/start.o (.text) - cpu/mpc86xx/traps.o (.text) - cpu/mpc86xx/interrupts.o (.text) - cpu/mpc86xx/cpu_init.o (.text) - cpu/mpc86xx/cpu.o (.text) - cpu/mpc86xx/speed.o (.text) + arch/ppc/cpu/mpc86xx/start.o (.text) + arch/ppc/cpu/mpc86xx/traps.o (.text) + arch/ppc/cpu/mpc86xx/interrupts.o (.text) + arch/ppc/cpu/mpc86xx/cpu_init.o (.text) + arch/ppc/cpu/mpc86xx/cpu.o (.text) + arch/ppc/cpu/mpc86xx/speed.o (.text) common/dlmalloc.o (.text) lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) diff --git a/board/sc3/u-boot.lds b/board/sc3/u-boot.lds index fc7464eee..573fbee93 100644 --- a/board/sc3/u-boot.lds +++ b/board/sc3/u-boot.lds @@ -60,14 +60,14 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/ppc4xx/start.o (.text) + arch/ppc/cpu/ppc4xx/start.o (.text) board/sc3/init.o (.text) - cpu/ppc4xx/kgdb.o (.text) - cpu/ppc4xx/traps.o (.text) - cpu/ppc4xx/interrupts.o (.text) - cpu/ppc4xx/4xx_uart.o (.text) - cpu/ppc4xx/cpu_init.o (.text) - cpu/ppc4xx/speed.o (.text) + arch/ppc/cpu/ppc4xx/kgdb.o (.text) + arch/ppc/cpu/ppc4xx/traps.o (.text) + arch/ppc/cpu/ppc4xx/interrupts.o (.text) + arch/ppc/cpu/ppc4xx/4xx_uart.o (.text) + arch/ppc/cpu/ppc4xx/cpu_init.o (.text) + arch/ppc/cpu/ppc4xx/speed.o (.text) common/dlmalloc.o (.text) lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) diff --git a/board/siemens/CCM/u-boot.lds b/board/siemens/CCM/u-boot.lds index 51e95d555..5bd5a75c6 100644 --- a/board/siemens/CCM/u-boot.lds +++ b/board/siemens/CCM/u-boot.lds @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) lib/vsprintf.o (.text) diff --git a/board/siemens/CCM/u-boot.lds.debug b/board/siemens/CCM/u-boot.lds.debug index 2a6abfab3..460a98321 100644 --- a/board/siemens/CCM/u-boot.lds.debug +++ b/board/siemens/CCM/u-boot.lds.debug @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) lib/vsprintf.o (.text) lib/crc32.o (.text) diff --git a/board/siemens/IAD210/u-boot.lds b/board/siemens/IAD210/u-boot.lds index 877cf9ae0..904d45fcc 100644 --- a/board/siemens/IAD210/u-boot.lds +++ b/board/siemens/IAD210/u-boot.lds @@ -55,10 +55,10 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - cpu/mpc8xx/interrupts.o (.text) + arch/ppc/cpu/mpc8xx/interrupts.o (.text) arch/ppc/lib/time.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/siemens/pcu_e/u-boot.lds b/board/siemens/pcu_e/u-boot.lds index cc8ad7d3d..ff2f56640 100644 --- a/board/siemens/pcu_e/u-boot.lds +++ b/board/siemens/pcu_e/u-boot.lds @@ -52,7 +52,7 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/env_embedded.o(.text) *(.text) *(.got1) diff --git a/board/siemens/pcu_e/u-boot.lds.debug b/board/siemens/pcu_e/u-boot.lds.debug index 251ee9bbd..fcf2cbb96 100644 --- a/board/siemens/pcu_e/u-boot.lds.debug +++ b/board/siemens/pcu_e/u-boot.lds.debug @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) lib/vsprintf.o (.text) lib/crc32.o (.text) diff --git a/board/sixnet/u-boot.lds b/board/sixnet/u-boot.lds index dd632a44c..c3e7f501c 100644 --- a/board/sixnet/u-boot.lds +++ b/board/sixnet/u-boot.lds @@ -52,7 +52,7 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/env_embedded.o(.text) *(.text) *(.got1) diff --git a/board/snmc/qs850/u-boot.lds b/board/snmc/qs850/u-boot.lds index 271d74a5c..f2154c429 100644 --- a/board/snmc/qs850/u-boot.lds +++ b/board/snmc/qs850/u-boot.lds @@ -55,8 +55,8 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) - cpu/mpc8xx/traps.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) lib/vsprintf.o (.text) diff --git a/board/snmc/qs860t/u-boot.lds b/board/snmc/qs860t/u-boot.lds index 271d74a5c..f2154c429 100644 --- a/board/snmc/qs860t/u-boot.lds +++ b/board/snmc/qs860t/u-boot.lds @@ -55,8 +55,8 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) - cpu/mpc8xx/traps.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) lib/vsprintf.o (.text) diff --git a/board/spc1920/u-boot.lds b/board/spc1920/u-boot.lds index f95f695b1..c000746c5 100644 --- a/board/spc1920/u-boot.lds +++ b/board/spc1920/u-boot.lds @@ -55,8 +55,8 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) - cpu/mpc8xx/traps.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) lib/vsprintf.o (.text) diff --git a/board/spd8xx/u-boot.lds b/board/spd8xx/u-boot.lds index 7b9455b25..c4d83574d 100644 --- a/board/spd8xx/u-boot.lds +++ b/board/spd8xx/u-boot.lds @@ -52,7 +52,7 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/env_embedded.o(.text) *(.text) *(.got1) diff --git a/board/spd8xx/u-boot.lds.debug b/board/spd8xx/u-boot.lds.debug index 4f179c7fa..61c0d68d7 100644 --- a/board/spd8xx/u-boot.lds.debug +++ b/board/spd8xx/u-boot.lds.debug @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) lib/vsprintf.o (.text) lib/crc32.o (.text) diff --git a/board/stx/stxxtc/u-boot.lds b/board/stx/stxxtc/u-boot.lds index ff11ad0f6..c4df378c9 100644 --- a/board/stx/stxxtc/u-boot.lds +++ b/board/stx/stxxtc/u-boot.lds @@ -52,8 +52,8 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/mpc8xx/start.o (.text) - cpu/mpc8xx/traps.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) lib/vsprintf.o (.text) diff --git a/board/stx/stxxtc/u-boot.lds.debug b/board/stx/stxxtc/u-boot.lds.debug index 139751177..ec479b153 100644 --- a/board/stx/stxxtc/u-boot.lds.debug +++ b/board/stx/stxxtc/u-boot.lds.debug @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) lib/vsprintf.o (.text) lib/crc32.o (.text) diff --git a/board/svm_sc8xx/u-boot.lds b/board/svm_sc8xx/u-boot.lds index 6de74887c..90270954e 100644 --- a/board/svm_sc8xx/u-boot.lds +++ b/board/svm_sc8xx/u-boot.lds @@ -55,8 +55,8 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) - cpu/mpc8xx/traps.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) lib/vsprintf.o (.text) diff --git a/board/svm_sc8xx/u-boot.lds.debug b/board/svm_sc8xx/u-boot.lds.debug index dcad81892..a2b7bc70d 100644 --- a/board/svm_sc8xx/u-boot.lds.debug +++ b/board/svm_sc8xx/u-boot.lds.debug @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) lib/vsprintf.o (.text) lib/crc32.o (.text) diff --git a/board/tqc/tqm8xx/u-boot.lds b/board/tqc/tqm8xx/u-boot.lds index ceaac0005..a2277c260 100644 --- a/board/tqc/tqm8xx/u-boot.lds +++ b/board/tqc/tqm8xx/u-boot.lds @@ -55,8 +55,8 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) - cpu/mpc8xx/traps.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) lib/vsprintf.o (.text) diff --git a/board/tqc/tqm8xx/u-boot.lds.debug b/board/tqc/tqm8xx/u-boot.lds.debug index f559df716..57cc30586 100644 --- a/board/tqc/tqm8xx/u-boot.lds.debug +++ b/board/tqc/tqm8xx/u-boot.lds.debug @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) lib/vsprintf.o (.text) lib/crc32.o (.text) diff --git a/board/uc100/u-boot.lds b/board/uc100/u-boot.lds index 960b2a582..f67b1d9c1 100644 --- a/board/uc100/u-boot.lds +++ b/board/uc100/u-boot.lds @@ -55,8 +55,8 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) - cpu/mpc8xx/traps.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) lib/vsprintf.o (.text) diff --git a/board/uc100/u-boot.lds.debug b/board/uc100/u-boot.lds.debug index 116a97208..84b338a75 100644 --- a/board/uc100/u-boot.lds.debug +++ b/board/uc100/u-boot.lds.debug @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) lib/vsprintf.o (.text) lib/crc32.o (.text) diff --git a/board/uc101/config.mk b/board/uc101/config.mk index 4fe18316e..aebf30411 100644 --- a/board/uc101/config.mk +++ b/board/uc101/config.mk @@ -39,4 +39,4 @@ TEXT_BASE = 0xFFF00000 endif PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board -LDSCRIPT := $(SRCTREE)/cpu/mpc5xxx/u-boot-customlayout.lds +LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc5xxx/u-boot-customlayout.lds diff --git a/board/v37/u-boot.lds b/board/v37/u-boot.lds index 248f4887c..bc47060f2 100644 --- a/board/v37/u-boot.lds +++ b/board/v37/u-boot.lds @@ -55,8 +55,8 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) - cpu/mpc8xx/traps.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) lib/vsprintf.o (.text) diff --git a/board/w7o/w7o.c b/board/w7o/w7o.c index a818808ba..96a12d73e 100644 --- a/board/w7o/w7o.c +++ b/board/w7o/w7o.c @@ -157,7 +157,7 @@ phys_size_t initdram (int board_type) /* * ToDo: Move the asm init routine sdram_init() to this C file, * or even better use some common ppc4xx code available - * in cpu/ppc4xx + * in arch/ppc/cpu/ppc4xx */ sdram_init(); diff --git a/board/westel/amx860/u-boot.lds b/board/westel/amx860/u-boot.lds index 51e95d555..5bd5a75c6 100644 --- a/board/westel/amx860/u-boot.lds +++ b/board/westel/amx860/u-boot.lds @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) lib/vsprintf.o (.text) diff --git a/board/westel/amx860/u-boot.lds.debug b/board/westel/amx860/u-boot.lds.debug index 282738bd5..b331d5afc 100644 --- a/board/westel/amx860/u-boot.lds.debug +++ b/board/westel/amx860/u-boot.lds.debug @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mpc8xx/start.o (.text) + arch/ppc/cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) lib/vsprintf.o (.text) lib/crc32.o (.text) diff --git a/board/xes/xpedite1000/u-boot.lds.debug b/board/xes/xpedite1000/u-boot.lds.debug index 555e1ac03..c3f6fefb4 100644 --- a/board/xes/xpedite1000/u-boot.lds.debug +++ b/board/xes/xpedite1000/u-boot.lds.debug @@ -55,14 +55,14 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/ppc4xx/start.o (.text) + arch/ppc/cpu/ppc4xx/start.o (.text) board/xes/xpedite1000/init.o (.text) - cpu/ppc4xx/kgdb.o (.text) - cpu/ppc4xx/traps.o (.text) - cpu/ppc4xx/interrupts.o (.text) - cpu/ppc4xx/4xx_uart.o (.text) - cpu/ppc4xx/cpu_init.o (.text) - cpu/ppc4xx/speed.o (.text) + arch/ppc/cpu/ppc4xx/kgdb.o (.text) + arch/ppc/cpu/ppc4xx/traps.o (.text) + arch/ppc/cpu/ppc4xx/interrupts.o (.text) + arch/ppc/cpu/ppc4xx/4xx_uart.o (.text) + arch/ppc/cpu/ppc4xx/cpu_init.o (.text) + arch/ppc/cpu/ppc4xx/speed.o (.text) common/dlmalloc.o (.text) lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) diff --git a/board/xes/xpedite5170/u-boot.lds b/board/xes/xpedite5170/u-boot.lds index 7f0412464..2f8730bf2 100644 --- a/board/xes/xpedite5170/u-boot.lds +++ b/board/xes/xpedite5170/u-boot.lds @@ -50,12 +50,12 @@ SECTIONS .plt : { *(.plt) } .text : { - cpu/mpc86xx/start.o (.text) - cpu/mpc86xx/traps.o (.text) - cpu/mpc86xx/interrupts.o (.text) - cpu/mpc86xx/cpu_init.o (.text) - cpu/mpc86xx/cpu.o (.text) - cpu/mpc86xx/speed.o (.text) + arch/ppc/cpu/mpc86xx/start.o (.text) + arch/ppc/cpu/mpc86xx/traps.o (.text) + arch/ppc/cpu/mpc86xx/interrupts.o (.text) + arch/ppc/cpu/mpc86xx/cpu_init.o (.text) + arch/ppc/cpu/mpc86xx/cpu.o (.text) + arch/ppc/cpu/mpc86xx/speed.o (.text) common/dlmalloc.o (.text) lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) diff --git a/board/xilinx/ppc405-generic/u-boot-rom.lds b/board/xilinx/ppc405-generic/u-boot-rom.lds index 02044e43d..8fafbd59c 100644 --- a/board/xilinx/ppc405-generic/u-boot-rom.lds +++ b/board/xilinx/ppc405-generic/u-boot-rom.lds @@ -33,7 +33,7 @@ SECTIONS .bootpg 0xFFFFF000 : { - cpu/ppc4xx/start.o (.bootpg) + arch/ppc/cpu/ppc4xx/start.o (.bootpg) } = 0xffff /* Read-only sections, merged into text segment: */ diff --git a/board/xilinx/ppc440-generic/u-boot-rom.lds b/board/xilinx/ppc440-generic/u-boot-rom.lds index 57c809e4c..0cbed8ea5 100644 --- a/board/xilinx/ppc440-generic/u-boot-rom.lds +++ b/board/xilinx/ppc440-generic/u-boot-rom.lds @@ -33,7 +33,7 @@ SECTIONS .bootpg 0xFFFFF000 : { - cpu/ppc4xx/start.o (.bootpg) + arch/ppc/cpu/ppc4xx/start.o (.bootpg) } = 0xffff /* Read-only sections, merged into text segment: */ diff --git a/config.mk b/config.mk index 85b524ead..73b5195cb 100644 --- a/config.mk +++ b/config.mk @@ -112,7 +112,12 @@ sinclude $(OBJTREE)/include/autoconf.mk # Some architecture config.mk files need to know what CPUDIR is set to, # so calculate CPUDIR before including ARCH/SOC/CPU config.mk files. -CPUDIR=cpu/$(CPU) +# Check if arch/$ARCH/cpu/$CPU exists, otherwise assume arch/$ARCH/cpu contains +# CPU-specific code. +CPUDIR=arch/$(ARCH)/cpu/$(CPU) +ifneq ($(SRCTREE)/$(CPUDIR),$(wildcard $(SRCTREE)/$(CPUDIR))) +CPUDIR=arch/$(ARCH)/cpu +endif sinclude $(TOPDIR)/arch/$(ARCH)/config.mk # include architecture dependend rules sinclude $(TOPDIR)/$(CPUDIR)/config.mk # include CPU specific rules diff --git a/doc/README.PIP405 b/doc/README.PIP405 index d8b3f9c01..e8a654128 100644 --- a/doc/README.PIP405 +++ b/doc/README.PIP405 @@ -17,11 +17,11 @@ Changed files: added console settings from environment - common/devices.c added ISA keyboard init - common/main.c corrected the read of bootdelay -- cpu/ppc4xx/405gp_pci.c excluded file from PIP405 -- cpu/ppc4xx/i2c.c added 16bit read write I2C support +- arch/ppc/cpu/ppc4xx/405gp_pci.c excluded file from PIP405 +- arch/ppc/cpu/ppc4xx/i2c.c added 16bit read write I2C support added page write -- cpu/ppc4xx/speed.c added get_PCI_freq -- cpu/ppc4xx/start.S added CONFIG_IDENT_STRING +- arch/ppc/cpu/ppc4xx/speed.c added get_PCI_freq +- arch/ppc/cpu/ppc4xx/start.S added CONFIG_IDENT_STRING - disk/Makefile added part_iso for CD support - disk/part.c changed to work with block device description added ISO CD support @@ -275,7 +275,7 @@ Added the config variable CONFIG_IDENT_STRING which will be added to the "U_BOOT_VERSION __TIME__ DATE___ " String, to allows to identify intermidiate and custom versions. Changed files: -- cpu/ppc4xx/start.s +- arch/ppc/cpu/ppc4xx/start.s Firmware Image: --------------- @@ -288,11 +288,11 @@ Changed files: Correct PCI Frequency for PPC405: --------------------------------- -Added function (in cpu/ppc4xx/speed.c) to get the PCI frequency for PPC405 CPU. +Added function (in arch/ppc/cpu/ppc4xx/speed.c) to get the PCI frequency for PPC405 CPU. The PCI Frequency will now be set correct in the board description in common/board.c. (was set to the busfreq before). Changed files: -- cpu/ppc4xx/speed.c +- arch/ppc/cpu/ppc4xx/speed.c - common/board.c I2C Stuff: @@ -301,7 +301,7 @@ Added defined(CONFIG_PIP405) at several points in common/cmd_i2c.c. Added 16bit read/write support for I2C (PPC405), and page write to I2C EEPROM if defined CONFIG_SYS_EEPROM_PAGE_WRITE_ENABLE. Changed files: -- cpu/ppc4xx/i2c.c +- arch/ppc/cpu/ppc4xx/i2c.c - common/cmd_i2c.c Environment / Console: diff --git a/doc/README.POST b/doc/README.POST index a81e07926..0d5e20e97 100644 --- a/doc/README.POST +++ b/doc/README.POST @@ -713,7 +713,7 @@ use external loopback for testing. That will need appropriate reconfiguration of the physical interface chip. The test routines for the SCC ethernet tests will be located in -cpu/mpc8xx/scc.c. +arch/ppc/cpu/mpc8xx/scc.c. 2.2.3.2. UART tests (SMC/SCC) @@ -725,7 +725,7 @@ will be transmitted. These tests may be enhanced to make to perform test will be executed manually. The test routine for the SMC/SCC UART tests will be located in -cpu/mpc8xx/serial.c. +arch/ppc/cpu/mpc8xx/serial.c. 2.2.3.3. USB test diff --git a/doc/README.RPXlite b/doc/README.RPXlite index c0238ae21..0aa4d1130 100644 --- a/doc/README.RPXlite +++ b/doc/README.RPXlite @@ -116,7 +116,7 @@ board/RPXLITE/RPXLITE.c /* DRAM-related routines */ board/RPXLITE/flash.c /* flash-related routines */ board/RPXLITE/config.mk /* set text base address */ - cpu/mpc8xx/serial.c /* board specific register setting */ + arch/ppc/cpu/mpc8xx/serial.c /* board specific register setting */ include/config_RPXLITE.h /* board specific registers */ See 'reg_config.txt' for register values in detail. diff --git a/doc/README.TQM8260 b/doc/README.TQM8260 index b93a1cb94..e64e64a3e 100644 --- a/doc/README.TQM8260 +++ b/doc/README.TQM8260 @@ -14,10 +14,10 @@ The following common files have been modified by this project: MAKEALL - TQM8260 entry added Makefile - TQM8260_config entry added -cpu/mpc8260/Makefile - soft_i2c.o module added -cpu/mpc8260/ether_scc.c - TQM8260-specific definitions added, an obvious +arch/ppc/cpu/mpc8260/Makefile - soft_i2c.o module added +arch/ppc/cpu/mpc8260/ether_scc.c - TQM8260-specific definitions added, an obvious bug fixed (fcr -> scr) -cpu/mpc8260/ether_fcc.c - TQM8260-specific definitions added +arch/ppc/cpu/mpc8260/ether_fcc.c - TQM8260-specific definitions added include/flash.h - added definitions for the AM29LV640D Flash chip @@ -33,7 +33,7 @@ board/tqm8260/config.mk - config file board/tqm8260/flash.c - flash driver (for AM29LV640D) board/tqm8260/ppcboot.lds - linker script board/tqm8260/tqm8260.c - ioport and memory initialization -cpu/mpc8260/soft_i2c.c - software i2c EEPROM driver +arch/ppc/cpu/mpc8260/soft_i2c.c - software i2c EEPROM driver include/config_TQM8260.h - main configuration file diff --git a/doc/README.alaska8220 b/doc/README.alaska8220 index 279dac69f..9249cfb31 100644 --- a/doc/README.alaska8220 +++ b/doc/README.alaska8220 @@ -37,24 +37,24 @@ Added files: - board/alaska/config.mk config make - board/alaska/u-boot.lds Linker description -- cpu/mpc8220/dma.h multi-channel dma header file -- cpu/mpc8220/dramSetup.h dram setup header file -- cpu/mpc8220/fec.h MPC8220 FEC header file -- cpu/mpc8220/cpu.c cpu specific code -- cpu/mpc8220/cpu_init.c Flexbus ChipSelect and Mux pins setup -- cpu/mpc8220/dramSetup.c MPC8220 DDR SDRAM setup -- cpu/mpc8220/fec.c MPC8220 FEC driver -- cpu/mpc8220/i2c.c MPC8220 I2C driver -- cpu/mpc8220/interrupts.c interrupt support (not enable) -- cpu/mpc8220/loadtask.c load dma -- cpu/mpc8220/speed.c system, pci, flexbus, pev, and cpu clock -- cpu/mpc8220/traps.c exception -- cpu/mpc8220/uart.c MPC8220 UART driver -- cpu/mpc8220/Makefile Makefile -- cpu/mpc8220/config.mk config make -- cpu/mpc8220/fec_dma_task.S MPC8220 FEC multi-channel dma program -- cpu/mpc8220/io.S io functions -- cpu/mpc8220/start.S start up +- arch/ppc/cpu/mpc8220/dma.h multi-channel dma header file +- arch/ppc/cpu/mpc8220/dramSetup.h dram setup header file +- arch/ppc/cpu/mpc8220/fec.h MPC8220 FEC header file +- arch/ppc/cpu/mpc8220/cpu.c cpu specific code +- arch/ppc/cpu/mpc8220/cpu_init.c Flexbus ChipSelect and Mux pins setup +- arch/ppc/cpu/mpc8220/dramSetup.c MPC8220 DDR SDRAM setup +- arch/ppc/cpu/mpc8220/fec.c MPC8220 FEC driver +- arch/ppc/cpu/mpc8220/i2c.c MPC8220 I2C driver +- arch/ppc/cpu/mpc8220/interrupts.c interrupt support (not enable) +- arch/ppc/cpu/mpc8220/loadtask.c load dma +- arch/ppc/cpu/mpc8220/speed.c system, pci, flexbus, pev, and cpu clock +- arch/ppc/cpu/mpc8220/traps.c exception +- arch/ppc/cpu/mpc8220/uart.c MPC8220 UART driver +- arch/ppc/cpu/mpc8220/Makefile Makefile +- arch/ppc/cpu/mpc8220/config.mk config make +- arch/ppc/cpu/mpc8220/fec_dma_task.S MPC8220 FEC multi-channel dma program +- arch/ppc/cpu/mpc8220/io.S io functions +- arch/ppc/cpu/mpc8220/start.S start up - include/mpc8220.h diff --git a/doc/README.bedbug b/doc/README.bedbug index 2616acc65..4c1e6c4d5 100644 --- a/doc/README.bedbug +++ b/doc/README.bedbug @@ -18,15 +18,15 @@ can be easily implemented. ./common/board.c Added call to initialize debugger on startup. -./cpu/ppc4xx/Makefile +./arch/ppc/cpu/ppc4xx/Makefile Added bedbug_405.c to the Makefile. -./cpu/ppc4xx/start.S +./arch/ppc/cpu/ppc4xx/start.S Added code to handle the debug exception (0x2000) on the 405. Also added code to handle critical exceptions since the debug is treated as critical on the 405. -./cpu/ppc4xx/traps.c +./arch/ppc/cpu/ppc4xx/traps.c Added more detailed output for the program exception to tell if it is an illegal instruction, privileged instruction or a trap. Also added debug trap handler. @@ -51,7 +51,7 @@ can be easily implemented. hardware breakpoints and stepping through code. These routines are common to all PowerPC processors. -./cpu/ppc4xx/bedbug_405.c +./arch/ppc/cpu/ppc4xx/bedbug_405.c AMCC PPC405 specific debugger routines. @@ -63,16 +63,16 @@ Changes: common/cmd_bedbug.c Added call to initialize 860 debugger. - cpu/mpc8xx/Makefile + arch/ppc/cpu/mpc8xx/Makefile Added new file "bedbug_860.c" to the makefile - cpu/mpc8xx/start.S + arch/ppc/cpu/mpc8xx/start.S Added handler for InstructionBreakpoint (0xfd00) - cpu/mpc8xx/traps.c + arch/ppc/cpu/mpc8xx/traps.c Added new routine DebugException() New Files: - cpu/mpc8xx/bedbug_860.c + arch/ppc/cpu/mpc8xx/bedbug_860.c CPU-specific routines for 860 debug registers. diff --git a/doc/README.mpc5xx b/doc/README.mpc5xx index 2e121746d..26fb0c27d 100644 --- a/doc/README.mpc5xx +++ b/doc/README.mpc5xx @@ -25,7 +25,7 @@ Added or Changed Files: u-boot-0.2.0/common/cmd_boot.c u-boot-0.2.0/common/cmd_reginfo.c u-boot-0.2.0/common/environment.c -u-boot-0.2.0/cpu/mpc5xx/* +u-boot-0.2.0/arch/ppc/cpu/mpc5xx/* u-boot-0.2.0/include/cmd_reginfo.h u-boot-0.2.0/include/common.h u-boot-0.2.0/include/ppc_asm.tmpl diff --git a/drivers/qe/uec_phy.c b/drivers/qe/uec_phy.c index c4214d9a0..c1cc23bfc 100644 --- a/drivers/qe/uec_phy.c +++ b/drivers/qe/uec_phy.c @@ -47,7 +47,7 @@ /*--------------------------------------------------------------------+ * Fixed PHY (PHY-less) support for Ethernet Ports. * - * Copied from cpu/ppc4xx/4xx_enet.c + * Copied from arch/ppc/cpu/ppc4xx/4xx_enet.c *--------------------------------------------------------------------*/ /* diff --git a/drivers/spi/mpc8xxx_spi.c b/drivers/spi/mpc8xxx_spi.c index c4b36f06c..687ffe6ac 100644 --- a/drivers/spi/mpc8xxx_spi.c +++ b/drivers/spi/mpc8xxx_spi.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2006 Ben Warren, Qstreams Networks Inc. - * With help from the common/soft_spi and cpu/mpc8260 drivers + * With help from the common/soft_spi and arch/ppc/cpu/mpc8260 drivers * * See file CREDITS for list of people who contributed to this * project. diff --git a/examples/standalone/mem_to_mem_idma2intr.c b/examples/standalone/mem_to_mem_idma2intr.c index 15779d0a1..eeff5f5f2 100644 --- a/examples/standalone/mem_to_mem_idma2intr.c +++ b/examples/standalone/mem_to_mem_idma2intr.c @@ -1,5 +1,5 @@ /* The dpalloc function used and implemented in this file was derieved - * from PPCBoot/U-Boot file "cpu/mpc8260/commproc.c". + * from PPCBoot/U-Boot file "arch/ppc/cpu/mpc8260/commproc.c". */ /* Author: Arun Dharankar diff --git a/include/configs/aria.h b/include/configs/aria.h index f89fc570a..06763c5d9 100644 --- a/include/configs/aria.h +++ b/include/configs/aria.h @@ -190,7 +190,7 @@ /* * Backward compatible definitions, - * so we do not have to change cpu/mpc512x/fixed_sdram.c + * so we do not have to change arch/ppc/cpu/mpc512x/fixed_sdram.c */ #define CONFIG_SYS_DDRCMD_EM2 (CONFIG_SYS_MICRON_EMR2) #define CONFIG_SYS_DDRCMD_EM3 (CONFIG_SYS_MICRON_EMR3) diff --git a/include/configs/galaxy5200.h b/include/configs/galaxy5200.h index 4be28b26a..44669ea44 100644 --- a/include/configs/galaxy5200.h +++ b/include/configs/galaxy5200.h @@ -141,7 +141,7 @@ #define CONFIG_SYS_FLASH_BASE 0xfe000000 /* - * The flash size is autoconfigured, but cpu/mpc5xxx/cpu_init.c needs this + * The flash size is autoconfigured, but arch/ppc/cpu/mpc5xxx/cpu_init.c needs this * variable defined */ #define CONFIG_SYS_FLASH_SIZE 0x02000000 diff --git a/include/configs/kilauea.h b/include/configs/kilauea.h index a79feec16..e5537da4a 100644 --- a/include/configs/kilauea.h +++ b/include/configs/kilauea.h @@ -230,7 +230,7 @@ * SDRAM Controller DDR autocalibration values and takes a lot longer * to run than Method_B. * (See the Method_A and Method_B algorithm discription in the file: - * cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c) + * arch/ppc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c) * Define CONFIG_PPC4xx_DDR_METHOD_A to use DDR autocalibration Method_A * * DDR Autocalibration Method_B is the default. diff --git a/include/configs/linkstation.h b/include/configs/linkstation.h index 16b464cf6..3958d09eb 100644 --- a/include/configs/linkstation.h +++ b/include/configs/linkstation.h @@ -290,7 +290,7 @@ * taken from the orignal Linkstation boot code * * Most of the low level configuration setttings are normally used - * in cpu/mpc824x/cpu_init.c which is NOT used by this implementation. + * in arch/ppc/cpu/mpc824x/cpu_init.c which is NOT used by this implementation. * Low level initialisation is done in board/linkstation/early_init.S * The values below are included for reference purpose only */ diff --git a/include/configs/quad100hd.h b/include/configs/quad100hd.h index 403837e14..247218752 100644 --- a/include/configs/quad100hd.h +++ b/include/configs/quad100hd.h @@ -233,7 +233,7 @@ * Definitions for initial stack pointer and data area (in data cache) */ /* use on chip memory (OCM) for temperary stack until sdram is tested */ -/* see ./cpu/ppc4xx/start.S */ +/* see ./arch/ppc/cpu/ppc4xx/start.S */ #define CONFIG_SYS_TEMP_STACK_OCM 1 /* On Chip Memory location */ @@ -251,7 +251,7 @@ * Taken from PPCBoot board/icecube/icecube.h */ -/* see ./cpu/ppc4xx/cpu_init.c ./cpu/ppc4xx/ndfc.c */ +/* see ./arch/ppc/cpu/ppc4xx/cpu_init.c ./cpu/ppc4xx/ndfc.c */ #define CONFIG_SYS_EBC_PB0AP 0x04002480 /* AMD NOR flash - this corresponds to FLASH_BASE so may be correct */ #define CONFIG_SYS_EBC_PB0CR 0xFFC5A000 @@ -269,7 +269,7 @@ * * Taken in part from PPCBoot board/icecube/icecube.h */ -/* see ./cpu/ppc4xx/cpu_init.c ./cpu/ppc4xx/start.S */ +/* see ./arch/ppc/cpu/ppc4xx/cpu_init.c ./cpu/ppc4xx/start.S */ #define CONFIG_SYS_GPIO0_OSRH 0x55555550 #define CONFIG_SYS_GPIO0_OSRL 0x00000110 #define CONFIG_SYS_GPIO0_ISR1H 0x00000000 diff --git a/include/configs/sc3.h b/include/configs/sc3.h index d00f2480c..7423663a2 100644 --- a/include/configs/sc3.h +++ b/include/configs/sc3.h @@ -456,7 +456,7 @@ * - internal SRAM (OCM=On Chip Memory) is placed to CONFIG_SYS_OCM_DATA_ADDR * - Stackpointer will be located to * (CONFIG_SYS_INIT_RAM_ADDR&0xFFFF0000) | (CONFIG_SYS_INIT_SP_OFFSET&0x0000FFFF) - * in cpu/ppc4xx/start.S + * in arch/ppc/cpu/ppc4xx/start.S */ #undef CONFIG_SYS_INIT_DCACHE_CS @@ -495,7 +495,7 @@ #define BOOTFLAG_WARM 0x02 /* Software reboot */ /* ################################################################################### */ -/* These defines will be used in cpu/ppc4xx/cpu_init.c to setup external chip selects */ +/* These defines will be used in arch/ppc/cpu/ppc4xx/cpu_init.c to setup external chip selects */ /* They are currently undefined cause they are initiaized in board/solidcard3/init.S */ /* This chip select accesses the boot device */ diff --git a/nand_spl/board/amcc/acadia/Makefile b/nand_spl/board/amcc/acadia/Makefile index f37425eba..fce4582c2 100644 --- a/nand_spl/board/amcc/acadia/Makefile +++ b/nand_spl/board/amcc/acadia/Makefile @@ -68,11 +68,11 @@ $(nandobj)u-boot.lds: $(LDSCRIPT) # from cpu directory $(obj)cache.S: @rm -f $(obj)cache.S - ln -s $(SRCTREE)/cpu/ppc4xx/cache.S $(obj)cache.S + ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/cache.S $(obj)cache.S $(obj)gpio.c: @rm -f $(obj)gpio.c - ln -s $(SRCTREE)/cpu/ppc4xx/gpio.c $(obj)gpio.c + ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/gpio.c $(obj)gpio.c $(obj)ndfc.c: @rm -f $(obj)ndfc.c @@ -80,11 +80,11 @@ $(obj)ndfc.c: $(obj)resetvec.S: @rm -f $(obj)resetvec.S - ln -s $(SRCTREE)/cpu/ppc4xx/resetvec.S $(obj)resetvec.S + ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/resetvec.S $(obj)resetvec.S $(obj)start.S: @rm -f $(obj)start.S - ln -s $(SRCTREE)/cpu/ppc4xx/start.S $(obj)start.S + ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/start.S $(obj)start.S # from board directory $(obj)memory.c: diff --git a/nand_spl/board/amcc/bamboo/Makefile b/nand_spl/board/amcc/bamboo/Makefile index 5fcf2905a..48fde1d1d 100644 --- a/nand_spl/board/amcc/bamboo/Makefile +++ b/nand_spl/board/amcc/bamboo/Makefile @@ -66,11 +66,11 @@ $(obj)ndfc.c: $(obj)resetvec.S: @rm -f $(obj)resetvec.S - ln -s $(SRCTREE)/cpu/ppc4xx/resetvec.S $(obj)resetvec.S + ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/resetvec.S $(obj)resetvec.S $(obj)start.S: @rm -f $(obj)start.S - ln -s $(SRCTREE)/cpu/ppc4xx/start.S $(obj)start.S + ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/start.S $(obj)start.S # from board directory $(obj)init.S: diff --git a/nand_spl/board/amcc/canyonlands/Makefile b/nand_spl/board/amcc/canyonlands/Makefile index f77e45944..0012a9c99 100644 --- a/nand_spl/board/amcc/canyonlands/Makefile +++ b/nand_spl/board/amcc/canyonlands/Makefile @@ -71,11 +71,11 @@ $(obj)ndfc.c: $(obj)resetvec.S: @rm -f $(obj)resetvec.S - ln -s $(SRCTREE)/cpu/ppc4xx/resetvec.S $(obj)resetvec.S + ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/resetvec.S $(obj)resetvec.S $(obj)start.S: @rm -f $(obj)start.S - ln -s $(SRCTREE)/cpu/ppc4xx/start.S $(obj)start.S + ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/start.S $(obj)start.S # from board directory $(obj)init.S: diff --git a/nand_spl/board/amcc/kilauea/Makefile b/nand_spl/board/amcc/kilauea/Makefile index bc2174401..de4980a55 100644 --- a/nand_spl/board/amcc/kilauea/Makefile +++ b/nand_spl/board/amcc/kilauea/Makefile @@ -62,15 +62,15 @@ $(nandobj)u-boot.lds: $(LDSCRIPT) # from cpu directory $(obj)44x_spd_ddr2.c: $(obj)ecc.h @rm -f $(obj)44x_spd_ddr2.c - ln -s $(SRCTREE)/cpu/ppc4xx/44x_spd_ddr2.c $(obj)44x_spd_ddr2.c + ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/44x_spd_ddr2.c $(obj)44x_spd_ddr2.c $(obj)cache.S: @rm -f $(obj)cache.S - ln -s $(SRCTREE)/cpu/ppc4xx/cache.S $(obj)cache.S + ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/cache.S $(obj)cache.S $(obj)ecc.h: @rm -f $(obj)ecc.h - ln -s $(SRCTREE)/cpu/ppc4xx/ecc.h $(obj)ecc.h + ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/ecc.h $(obj)ecc.h $(obj)ndfc.c: @rm -f $(obj)ndfc.c @@ -78,11 +78,11 @@ $(obj)ndfc.c: $(obj)resetvec.S: @rm -f $(obj)resetvec.S - ln -s $(SRCTREE)/cpu/ppc4xx/resetvec.S $(obj)resetvec.S + ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/resetvec.S $(obj)resetvec.S $(obj)start.S: @rm -f $(obj)start.S - ln -s $(SRCTREE)/cpu/ppc4xx/start.S $(obj)start.S + ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/start.S $(obj)start.S # from nand_spl directory $(obj)nand_boot.c: diff --git a/nand_spl/board/amcc/sequoia/Makefile b/nand_spl/board/amcc/sequoia/Makefile index 54ea7c7e5..e6f96fd3b 100644 --- a/nand_spl/board/amcc/sequoia/Makefile +++ b/nand_spl/board/amcc/sequoia/Makefile @@ -62,7 +62,7 @@ $(nandobj)u-boot.lds: $(LDSCRIPT) # from cpu directory $(obj)denali_data_eye.c: @rm -f $(obj)denali_data_eye.c - ln -s $(SRCTREE)/cpu/ppc4xx/denali_data_eye.c $(obj)denali_data_eye.c + ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/denali_data_eye.c $(obj)denali_data_eye.c $(obj)ndfc.c: @rm -f $(obj)ndfc.c @@ -70,11 +70,11 @@ $(obj)ndfc.c: $(obj)resetvec.S: @rm -f $(obj)resetvec.S - ln -s $(SRCTREE)/cpu/ppc4xx/resetvec.S $(obj)resetvec.S + ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/resetvec.S $(obj)resetvec.S $(obj)start.S: @rm -f $(obj)start.S - ln -s $(SRCTREE)/cpu/ppc4xx/start.S $(obj)start.S + ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/start.S $(obj)start.S # from board directory $(obj)init.S: diff --git a/nand_spl/board/freescale/mpc8313erdb/Makefile b/nand_spl/board/freescale/mpc8313erdb/Makefile index ee1dc4b29..a23176c78 100644 --- a/nand_spl/board/freescale/mpc8313erdb/Makefile +++ b/nand_spl/board/freescale/mpc8313erdb/Makefile @@ -65,7 +65,7 @@ $(nandobj)u-boot.lds: $(LDSCRIPT) # create symbolic links for common files $(obj)start.S: - ln -sf $(SRCTREE)/cpu/mpc83xx/start.S $(obj)start.S + ln -sf $(SRCTREE)/arch/ppc/cpu/mpc83xx/start.S $(obj)start.S $(obj)nand_boot_fsl_elbc.c: ln -sf $(SRCTREE)/nand_spl/nand_boot_fsl_elbc.c \ @@ -81,7 +81,7 @@ $(obj)ns16550.c: ln -sf $(SRCTREE)/drivers/serial/ns16550.c $(obj)ns16550.c $(obj)nand_init.c: - ln -sf $(SRCTREE)/cpu/mpc83xx/nand_init.c $(obj)nand_init.c + ln -sf $(SRCTREE)/arch/ppc/cpu/mpc83xx/nand_init.c $(obj)nand_init.c $(obj)cache.c: ln -sf $(SRCTREE)/arch/ppc/lib/cache.c $(obj)cache.c diff --git a/nand_spl/board/freescale/mpc8315erdb/Makefile b/nand_spl/board/freescale/mpc8315erdb/Makefile index ee1dc4b29..a23176c78 100644 --- a/nand_spl/board/freescale/mpc8315erdb/Makefile +++ b/nand_spl/board/freescale/mpc8315erdb/Makefile @@ -65,7 +65,7 @@ $(nandobj)u-boot.lds: $(LDSCRIPT) # create symbolic links for common files $(obj)start.S: - ln -sf $(SRCTREE)/cpu/mpc83xx/start.S $(obj)start.S + ln -sf $(SRCTREE)/arch/ppc/cpu/mpc83xx/start.S $(obj)start.S $(obj)nand_boot_fsl_elbc.c: ln -sf $(SRCTREE)/nand_spl/nand_boot_fsl_elbc.c \ @@ -81,7 +81,7 @@ $(obj)ns16550.c: ln -sf $(SRCTREE)/drivers/serial/ns16550.c $(obj)ns16550.c $(obj)nand_init.c: - ln -sf $(SRCTREE)/cpu/mpc83xx/nand_init.c $(obj)nand_init.c + ln -sf $(SRCTREE)/arch/ppc/cpu/mpc83xx/nand_init.c $(obj)nand_init.c $(obj)cache.c: ln -sf $(SRCTREE)/arch/ppc/lib/cache.c $(obj)cache.c diff --git a/nand_spl/board/freescale/mpc8536ds/Makefile b/nand_spl/board/freescale/mpc8536ds/Makefile index ff8b8be6a..7f75afcb5 100644 --- a/nand_spl/board/freescale/mpc8536ds/Makefile +++ b/nand_spl/board/freescale/mpc8536ds/Makefile @@ -68,11 +68,11 @@ $(obj)cache.c: $(obj)cpu_init_early.c: @rm -f $(obj)cpu_init_early.c - ln -sf $(SRCTREE)/cpu/mpc85xx/cpu_init_early.c $(obj)cpu_init_early.c + ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/cpu_init_early.c $(obj)cpu_init_early.c $(obj)cpu_init_nand.c: @rm -f $(obj)cpu_init_nand.c - ln -sf $(SRCTREE)/cpu/mpc85xx/cpu_init_nand.c $(obj)cpu_init_nand.c + ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/cpu_init_nand.c $(obj)cpu_init_nand.c $(obj)fsl_law.c: @rm -f $(obj)fsl_law.c @@ -97,15 +97,15 @@ $(obj)resetvec.S: $(obj)fixed_ivor.S: @rm -f $(obj)fixed_ivor.S - ln -sf $(SRCTREE)/cpu/mpc85xx/fixed_ivor.S $(obj)fixed_ivor.S + ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/fixed_ivor.S $(obj)fixed_ivor.S $(obj)start.S: $(obj)fixed_ivor.S @rm -f $(obj)start.S - ln -sf $(SRCTREE)/cpu/mpc85xx/start.S $(obj)start.S + ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/start.S $(obj)start.S $(obj)tlb.c: @rm -f $(obj)tlb.c - ln -sf $(SRCTREE)/cpu/mpc85xx/tlb.c $(obj)tlb.c + ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/tlb.c $(obj)tlb.c $(obj)tlb_table.c: @rm -f $(obj)tlb_table.c diff --git a/nand_spl/board/freescale/mpc8569mds/Makefile b/nand_spl/board/freescale/mpc8569mds/Makefile index ff8b8be6a..7f75afcb5 100644 --- a/nand_spl/board/freescale/mpc8569mds/Makefile +++ b/nand_spl/board/freescale/mpc8569mds/Makefile @@ -68,11 +68,11 @@ $(obj)cache.c: $(obj)cpu_init_early.c: @rm -f $(obj)cpu_init_early.c - ln -sf $(SRCTREE)/cpu/mpc85xx/cpu_init_early.c $(obj)cpu_init_early.c + ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/cpu_init_early.c $(obj)cpu_init_early.c $(obj)cpu_init_nand.c: @rm -f $(obj)cpu_init_nand.c - ln -sf $(SRCTREE)/cpu/mpc85xx/cpu_init_nand.c $(obj)cpu_init_nand.c + ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/cpu_init_nand.c $(obj)cpu_init_nand.c $(obj)fsl_law.c: @rm -f $(obj)fsl_law.c @@ -97,15 +97,15 @@ $(obj)resetvec.S: $(obj)fixed_ivor.S: @rm -f $(obj)fixed_ivor.S - ln -sf $(SRCTREE)/cpu/mpc85xx/fixed_ivor.S $(obj)fixed_ivor.S + ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/fixed_ivor.S $(obj)fixed_ivor.S $(obj)start.S: $(obj)fixed_ivor.S @rm -f $(obj)start.S - ln -sf $(SRCTREE)/cpu/mpc85xx/start.S $(obj)start.S + ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/start.S $(obj)start.S $(obj)tlb.c: @rm -f $(obj)tlb.c - ln -sf $(SRCTREE)/cpu/mpc85xx/tlb.c $(obj)tlb.c + ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/tlb.c $(obj)tlb.c $(obj)tlb_table.c: @rm -f $(obj)tlb_table.c diff --git a/nand_spl/board/freescale/p1_p2_rdb/Makefile b/nand_spl/board/freescale/p1_p2_rdb/Makefile index ff8b8be6a..7f75afcb5 100644 --- a/nand_spl/board/freescale/p1_p2_rdb/Makefile +++ b/nand_spl/board/freescale/p1_p2_rdb/Makefile @@ -68,11 +68,11 @@ $(obj)cache.c: $(obj)cpu_init_early.c: @rm -f $(obj)cpu_init_early.c - ln -sf $(SRCTREE)/cpu/mpc85xx/cpu_init_early.c $(obj)cpu_init_early.c + ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/cpu_init_early.c $(obj)cpu_init_early.c $(obj)cpu_init_nand.c: @rm -f $(obj)cpu_init_nand.c - ln -sf $(SRCTREE)/cpu/mpc85xx/cpu_init_nand.c $(obj)cpu_init_nand.c + ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/cpu_init_nand.c $(obj)cpu_init_nand.c $(obj)fsl_law.c: @rm -f $(obj)fsl_law.c @@ -97,15 +97,15 @@ $(obj)resetvec.S: $(obj)fixed_ivor.S: @rm -f $(obj)fixed_ivor.S - ln -sf $(SRCTREE)/cpu/mpc85xx/fixed_ivor.S $(obj)fixed_ivor.S + ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/fixed_ivor.S $(obj)fixed_ivor.S $(obj)start.S: $(obj)fixed_ivor.S @rm -f $(obj)start.S - ln -sf $(SRCTREE)/cpu/mpc85xx/start.S $(obj)start.S + ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/start.S $(obj)start.S $(obj)tlb.c: @rm -f $(obj)tlb.c - ln -sf $(SRCTREE)/cpu/mpc85xx/tlb.c $(obj)tlb.c + ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/tlb.c $(obj)tlb.c $(obj)tlb_table.c: @rm -f $(obj)tlb_table.c diff --git a/nand_spl/board/sheldon/simpc8313/Makefile b/nand_spl/board/sheldon/simpc8313/Makefile index 48c22f84b..3ad6250db 100644 --- a/nand_spl/board/sheldon/simpc8313/Makefile +++ b/nand_spl/board/sheldon/simpc8313/Makefile @@ -66,7 +66,7 @@ $(nandobj)u-boot.lds: $(LDSCRIPT) $(obj)start.S: @rm -f $@ - ln -s $(SRCTREE)/cpu/mpc83xx/start.S $@ + ln -s $(SRCTREE)/arch/ppc/cpu/mpc83xx/start.S $@ $(obj)nand_boot_fsl_elbc.c: @rm -f $@ @@ -86,7 +86,7 @@ $(obj)ns16550.c: $(obj)nand_init.c: @rm -f $@ - ln -s $(SRCTREE)/cpu/mpc83xx/nand_init.c $@ + ln -s $(SRCTREE)/arch/ppc/cpu/mpc83xx/nand_init.c $@ $(obj)cache.c: @rm -f $@ diff --git a/post/cpu/ppc4xx/spr.c b/post/cpu/ppc4xx/spr.c index ecb87b53a..6ff5c79aa 100644 --- a/post/cpu/ppc4xx/spr.c +++ b/post/cpu/ppc4xx/spr.c @@ -69,7 +69,7 @@ static struct { /* Additional Special-Purpose Registers. * The values must match the initialization - * values from cpu/ppc4xx/start.S + * values from arch/ppc/cpu/ppc4xx/start.S */ {0x30, "PID", 0x00000000, 0x00000000}, {0x3a, "CSRR0", 0x00000000, 0x00000000}, From 8f0fec74ac6d0f3a7134ccebafa1ed9bd8c712ba Mon Sep 17 00:00:00 2001 From: Peter Tyser Date: Mon, 12 Apr 2010 22:28:10 -0500 Subject: [PATCH 140/164] sh: Move cpu/$CPU to arch/sh/cpu/$CPU Signed-off-by: Peter Tyser --- {cpu => arch/sh/cpu}/sh2/Makefile | 0 {cpu => arch/sh/cpu}/sh2/cache.c | 0 {cpu => arch/sh/cpu}/sh2/config.mk | 0 {cpu => arch/sh/cpu}/sh2/cpu.c | 0 {cpu => arch/sh/cpu}/sh2/interrupts.c | 0 {cpu => arch/sh/cpu}/sh2/start.S | 0 {cpu => arch/sh/cpu}/sh2/u-boot.lds | 2 +- {cpu => arch/sh/cpu}/sh2/watchdog.c | 0 {cpu => arch/sh/cpu}/sh3/Makefile | 0 {cpu => arch/sh/cpu}/sh3/cache.c | 0 {cpu => arch/sh/cpu}/sh3/config.mk | 0 {cpu => arch/sh/cpu}/sh3/cpu.c | 0 {cpu => arch/sh/cpu}/sh3/interrupts.c | 0 {cpu => arch/sh/cpu}/sh3/start.S | 0 {cpu => arch/sh/cpu}/sh3/u-boot.lds | 2 +- {cpu => arch/sh/cpu}/sh3/watchdog.c | 0 {cpu => arch/sh/cpu}/sh4/Makefile | 0 {cpu => arch/sh/cpu}/sh4/cache.c | 0 {cpu => arch/sh/cpu}/sh4/config.mk | 0 {cpu => arch/sh/cpu}/sh4/cpu.c | 0 {cpu => arch/sh/cpu}/sh4/interrupts.c | 0 {cpu => arch/sh/cpu}/sh4/start.S | 0 {cpu => arch/sh/cpu}/sh4/u-boot.lds | 2 +- {cpu => arch/sh/cpu}/sh4/watchdog.c | 0 drivers/pci/pci_sh4.c | 2 +- 25 files changed, 4 insertions(+), 4 deletions(-) rename {cpu => arch/sh/cpu}/sh2/Makefile (100%) rename {cpu => arch/sh/cpu}/sh2/cache.c (100%) rename {cpu => arch/sh/cpu}/sh2/config.mk (100%) rename {cpu => arch/sh/cpu}/sh2/cpu.c (100%) rename {cpu => arch/sh/cpu}/sh2/interrupts.c (100%) rename {cpu => arch/sh/cpu}/sh2/start.S (100%) rename {cpu => arch/sh/cpu}/sh2/u-boot.lds (98%) rename {cpu => arch/sh/cpu}/sh2/watchdog.c (100%) rename {cpu => arch/sh/cpu}/sh3/Makefile (100%) rename {cpu => arch/sh/cpu}/sh3/cache.c (100%) rename {cpu => arch/sh/cpu}/sh3/config.mk (100%) rename {cpu => arch/sh/cpu}/sh3/cpu.c (100%) rename {cpu => arch/sh/cpu}/sh3/interrupts.c (100%) rename {cpu => arch/sh/cpu}/sh3/start.S (100%) rename {cpu => arch/sh/cpu}/sh3/u-boot.lds (98%) rename {cpu => arch/sh/cpu}/sh3/watchdog.c (100%) rename {cpu => arch/sh/cpu}/sh4/Makefile (100%) rename {cpu => arch/sh/cpu}/sh4/cache.c (100%) rename {cpu => arch/sh/cpu}/sh4/config.mk (100%) rename {cpu => arch/sh/cpu}/sh4/cpu.c (100%) rename {cpu => arch/sh/cpu}/sh4/interrupts.c (100%) rename {cpu => arch/sh/cpu}/sh4/start.S (100%) rename {cpu => arch/sh/cpu}/sh4/u-boot.lds (98%) rename {cpu => arch/sh/cpu}/sh4/watchdog.c (100%) diff --git a/cpu/sh2/Makefile b/arch/sh/cpu/sh2/Makefile similarity index 100% rename from cpu/sh2/Makefile rename to arch/sh/cpu/sh2/Makefile diff --git a/cpu/sh2/cache.c b/arch/sh/cpu/sh2/cache.c similarity index 100% rename from cpu/sh2/cache.c rename to arch/sh/cpu/sh2/cache.c diff --git a/cpu/sh2/config.mk b/arch/sh/cpu/sh2/config.mk similarity index 100% rename from cpu/sh2/config.mk rename to arch/sh/cpu/sh2/config.mk diff --git a/cpu/sh2/cpu.c b/arch/sh/cpu/sh2/cpu.c similarity index 100% rename from cpu/sh2/cpu.c rename to arch/sh/cpu/sh2/cpu.c diff --git a/cpu/sh2/interrupts.c b/arch/sh/cpu/sh2/interrupts.c similarity index 100% rename from cpu/sh2/interrupts.c rename to arch/sh/cpu/sh2/interrupts.c diff --git a/cpu/sh2/start.S b/arch/sh/cpu/sh2/start.S similarity index 100% rename from cpu/sh2/start.S rename to arch/sh/cpu/sh2/start.S diff --git a/cpu/sh2/u-boot.lds b/arch/sh/cpu/sh2/u-boot.lds similarity index 98% rename from cpu/sh2/u-boot.lds rename to arch/sh/cpu/sh2/u-boot.lds index 6db5a0091..e4e8b6069 100644 --- a/cpu/sh2/u-boot.lds +++ b/arch/sh/cpu/sh2/u-boot.lds @@ -38,7 +38,7 @@ SECTIONS .text : { - cpu/sh2/start.o (.text) + arch/sh/cpu/sh2/start.o (.text) . = ALIGN(8192); common/env_embedded.o (.ppcenv) . = ALIGN(8192); diff --git a/cpu/sh2/watchdog.c b/arch/sh/cpu/sh2/watchdog.c similarity index 100% rename from cpu/sh2/watchdog.c rename to arch/sh/cpu/sh2/watchdog.c diff --git a/cpu/sh3/Makefile b/arch/sh/cpu/sh3/Makefile similarity index 100% rename from cpu/sh3/Makefile rename to arch/sh/cpu/sh3/Makefile diff --git a/cpu/sh3/cache.c b/arch/sh/cpu/sh3/cache.c similarity index 100% rename from cpu/sh3/cache.c rename to arch/sh/cpu/sh3/cache.c diff --git a/cpu/sh3/config.mk b/arch/sh/cpu/sh3/config.mk similarity index 100% rename from cpu/sh3/config.mk rename to arch/sh/cpu/sh3/config.mk diff --git a/cpu/sh3/cpu.c b/arch/sh/cpu/sh3/cpu.c similarity index 100% rename from cpu/sh3/cpu.c rename to arch/sh/cpu/sh3/cpu.c diff --git a/cpu/sh3/interrupts.c b/arch/sh/cpu/sh3/interrupts.c similarity index 100% rename from cpu/sh3/interrupts.c rename to arch/sh/cpu/sh3/interrupts.c diff --git a/cpu/sh3/start.S b/arch/sh/cpu/sh3/start.S similarity index 100% rename from cpu/sh3/start.S rename to arch/sh/cpu/sh3/start.S diff --git a/cpu/sh3/u-boot.lds b/arch/sh/cpu/sh3/u-boot.lds similarity index 98% rename from cpu/sh3/u-boot.lds rename to arch/sh/cpu/sh3/u-boot.lds index 1e55b832f..8afe1603e 100644 --- a/cpu/sh3/u-boot.lds +++ b/arch/sh/cpu/sh3/u-boot.lds @@ -44,7 +44,7 @@ SECTIONS .text : { - cpu/sh3/start.o (.text) + arch/sh/cpu/sh3/start.o (.text) . = ALIGN(8192); common/env_embedded.o (.ppcenv) . = ALIGN(8192); diff --git a/cpu/sh3/watchdog.c b/arch/sh/cpu/sh3/watchdog.c similarity index 100% rename from cpu/sh3/watchdog.c rename to arch/sh/cpu/sh3/watchdog.c diff --git a/cpu/sh4/Makefile b/arch/sh/cpu/sh4/Makefile similarity index 100% rename from cpu/sh4/Makefile rename to arch/sh/cpu/sh4/Makefile diff --git a/cpu/sh4/cache.c b/arch/sh/cpu/sh4/cache.c similarity index 100% rename from cpu/sh4/cache.c rename to arch/sh/cpu/sh4/cache.c diff --git a/cpu/sh4/config.mk b/arch/sh/cpu/sh4/config.mk similarity index 100% rename from cpu/sh4/config.mk rename to arch/sh/cpu/sh4/config.mk diff --git a/cpu/sh4/cpu.c b/arch/sh/cpu/sh4/cpu.c similarity index 100% rename from cpu/sh4/cpu.c rename to arch/sh/cpu/sh4/cpu.c diff --git a/cpu/sh4/interrupts.c b/arch/sh/cpu/sh4/interrupts.c similarity index 100% rename from cpu/sh4/interrupts.c rename to arch/sh/cpu/sh4/interrupts.c diff --git a/cpu/sh4/start.S b/arch/sh/cpu/sh4/start.S similarity index 100% rename from cpu/sh4/start.S rename to arch/sh/cpu/sh4/start.S diff --git a/cpu/sh4/u-boot.lds b/arch/sh/cpu/sh4/u-boot.lds similarity index 98% rename from cpu/sh4/u-boot.lds rename to arch/sh/cpu/sh4/u-boot.lds index bff9f43c1..d3719df54 100644 --- a/cpu/sh4/u-boot.lds +++ b/arch/sh/cpu/sh4/u-boot.lds @@ -41,7 +41,7 @@ SECTIONS .text : { - cpu/sh4/start.o (.text) + arch/sh/cpu/sh4/start.o (.text) . = ALIGN(8192); common/env_embedded.o (.ppcenv) . = ALIGN(8192); diff --git a/cpu/sh4/watchdog.c b/arch/sh/cpu/sh4/watchdog.c similarity index 100% rename from cpu/sh4/watchdog.c rename to arch/sh/cpu/sh4/watchdog.c diff --git a/drivers/pci/pci_sh4.c b/drivers/pci/pci_sh4.c index c7963ed8a..62915b6df 100644 --- a/drivers/pci/pci_sh4.c +++ b/drivers/pci/pci_sh4.c @@ -4,7 +4,7 @@ * (C) 2007,2008 Nobuhiro Iwamatsu * (C) 2008 Yusuke Goda * - * u-boot/cpu/sh4/pci-sh4.c + * u-boot/arch/sh/cpu/sh4/pci-sh4.c * * See file CREDITS for list of people who contributed to this * project. From 84ad688473bec2875e171b71040eb9e033c6c206 Mon Sep 17 00:00:00 2001 From: Peter Tyser Date: Mon, 12 Apr 2010 22:28:11 -0500 Subject: [PATCH 141/164] arm: Move cpu/$CPU to arch/arm/cpu/$CPU Signed-off-by: Peter Tyser --- Makefile | 2 +- {cpu => arch/arm/cpu}/arm1136/Makefile | 0 {cpu => arch/arm/cpu}/arm1136/config.mk | 0 {cpu => arch/arm/cpu}/arm1136/cpu.c | 0 {cpu => arch/arm/cpu}/arm1136/mx31/Makefile | 0 {cpu => arch/arm/cpu}/arm1136/mx31/devices.c | 0 {cpu => arch/arm/cpu}/arm1136/mx31/generic.c | 0 {cpu => arch/arm/cpu}/arm1136/mx31/timer.c | 0 {cpu => arch/arm/cpu}/arm1136/omap24xx/Makefile | 0 {cpu => arch/arm/cpu}/arm1136/omap24xx/reset.S | 0 {cpu => arch/arm/cpu}/arm1136/omap24xx/timer.c | 0 {cpu => arch/arm/cpu}/arm1136/start.S | 0 {cpu => arch/arm/cpu}/arm1136/u-boot.lds | 2 +- {cpu => arch/arm/cpu}/arm1176/Makefile | 0 {cpu => arch/arm/cpu}/arm1176/config.mk | 0 {cpu => arch/arm/cpu}/arm1176/cpu.c | 0 {cpu => arch/arm/cpu}/arm1176/s3c64xx/Makefile | 0 {cpu => arch/arm/cpu}/arm1176/s3c64xx/config.mk | 0 {cpu => arch/arm/cpu}/arm1176/s3c64xx/cpu_init.S | 0 {cpu => arch/arm/cpu}/arm1176/s3c64xx/reset.S | 0 {cpu => arch/arm/cpu}/arm1176/s3c64xx/speed.c | 0 {cpu => arch/arm/cpu}/arm1176/s3c64xx/timer.c | 0 {cpu => arch/arm/cpu}/arm1176/start.S | 0 {cpu => arch/arm/cpu}/arm1176/u-boot.lds | 2 +- {cpu => arch/arm/cpu}/arm720t/Makefile | 0 {cpu => arch/arm/cpu}/arm720t/config.mk | 0 {cpu => arch/arm/cpu}/arm720t/cpu.c | 0 {cpu => arch/arm/cpu}/arm720t/interrupts.c | 0 {cpu => arch/arm/cpu}/arm720t/lpc2292/Makefile | 0 {cpu => arch/arm/cpu}/arm720t/lpc2292/flash.c | 0 {cpu => arch/arm/cpu}/arm720t/lpc2292/iap_entry.S | 0 {cpu => arch/arm/cpu}/arm720t/lpc2292/mmc.c | 0 {cpu => arch/arm/cpu}/arm720t/lpc2292/mmc_hw.c | 0 {cpu => arch/arm/cpu}/arm720t/lpc2292/mmc_hw.h | 0 {cpu => arch/arm/cpu}/arm720t/lpc2292/spi.c | 0 {cpu => arch/arm/cpu}/arm720t/s3c4510b/Makefile | 0 {cpu => arch/arm/cpu}/arm720t/s3c4510b/cache.c | 0 {cpu => arch/arm/cpu}/arm720t/start.S | 0 {cpu => arch/arm/cpu}/arm720t/u-boot.lds | 2 +- {cpu => arch/arm/cpu}/arm920t/Makefile | 0 {cpu => arch/arm/cpu}/arm920t/a320/Makefile | 0 {cpu => arch/arm/cpu}/arm920t/a320/ftsmc020.c | 0 {cpu => arch/arm/cpu}/arm920t/a320/reset.S | 0 {cpu => arch/arm/cpu}/arm920t/a320/timer.c | 0 {cpu => arch/arm/cpu}/arm920t/at91/Makefile | 0 {cpu => arch/arm/cpu}/arm920t/at91/lowlevel_init.S | 0 {cpu => arch/arm/cpu}/arm920t/at91/reset.c | 0 {cpu => arch/arm/cpu}/arm920t/at91/timer.c | 0 {cpu => arch/arm/cpu}/arm920t/at91rm9200/Makefile | 0 {cpu => arch/arm/cpu}/arm920t/at91rm9200/bcm5221.c | 0 {cpu => arch/arm/cpu}/arm920t/at91rm9200/dm9161.c | 0 {cpu => arch/arm/cpu}/arm920t/at91rm9200/ether.c | 0 {cpu => arch/arm/cpu}/arm920t/at91rm9200/i2c.c | 0 {cpu => arch/arm/cpu}/arm920t/at91rm9200/ks8721.c | 0 {cpu => arch/arm/cpu}/arm920t/at91rm9200/lowlevel_init.S | 0 {cpu => arch/arm/cpu}/arm920t/at91rm9200/lxt972.c | 0 {cpu => arch/arm/cpu}/arm920t/at91rm9200/reset.c | 0 {cpu => arch/arm/cpu}/arm920t/at91rm9200/spi.c | 0 {cpu => arch/arm/cpu}/arm920t/at91rm9200/timer.c | 0 {cpu => arch/arm/cpu}/arm920t/at91rm9200/usb.c | 0 {cpu => arch/arm/cpu}/arm920t/config.mk | 0 {cpu => arch/arm/cpu}/arm920t/cpu.c | 0 {cpu => arch/arm/cpu}/arm920t/ep93xx/Makefile | 0 {cpu => arch/arm/cpu}/arm920t/ep93xx/cpu.c | 0 {cpu => arch/arm/cpu}/arm920t/ep93xx/led.c | 0 {cpu => arch/arm/cpu}/arm920t/ep93xx/lowlevel_init.S | 0 {cpu => arch/arm/cpu}/arm920t/ep93xx/speed.c | 0 {cpu => arch/arm/cpu}/arm920t/ep93xx/timer.c | 0 {cpu => arch/arm/cpu}/arm920t/ep93xx/u-boot.lds | 2 +- {cpu => arch/arm/cpu}/arm920t/imx/Makefile | 0 {cpu => arch/arm/cpu}/arm920t/imx/generic.c | 0 {cpu => arch/arm/cpu}/arm920t/imx/speed.c | 0 {cpu => arch/arm/cpu}/arm920t/imx/timer.c | 0 {cpu => arch/arm/cpu}/arm920t/interrupts.c | 0 {cpu => arch/arm/cpu}/arm920t/ks8695/Makefile | 0 {cpu => arch/arm/cpu}/arm920t/ks8695/lowlevel_init.S | 0 {cpu => arch/arm/cpu}/arm920t/ks8695/timer.c | 0 {cpu => arch/arm/cpu}/arm920t/s3c24x0/Makefile | 0 {cpu => arch/arm/cpu}/arm920t/s3c24x0/interrupts.c | 0 {cpu => arch/arm/cpu}/arm920t/s3c24x0/speed.c | 0 {cpu => arch/arm/cpu}/arm920t/s3c24x0/timer.c | 0 {cpu => arch/arm/cpu}/arm920t/s3c24x0/usb.c | 0 {cpu => arch/arm/cpu}/arm920t/s3c24x0/usb_ohci.c | 0 {cpu => arch/arm/cpu}/arm920t/s3c24x0/usb_ohci.h | 0 {cpu => arch/arm/cpu}/arm920t/start.S | 0 {cpu => arch/arm/cpu}/arm920t/u-boot.lds | 2 +- {cpu => arch/arm/cpu}/arm925t/Makefile | 0 {cpu => arch/arm/cpu}/arm925t/config.mk | 0 {cpu => arch/arm/cpu}/arm925t/cpu.c | 0 {cpu => arch/arm/cpu}/arm925t/omap925.c | 0 {cpu => arch/arm/cpu}/arm925t/start.S | 0 {cpu => arch/arm/cpu}/arm925t/timer.c | 0 {cpu => arch/arm/cpu}/arm925t/u-boot.lds | 2 +- {cpu => arch/arm/cpu}/arm926ejs/Makefile | 0 {cpu => arch/arm/cpu}/arm926ejs/at91/Makefile | 0 {cpu => arch/arm/cpu}/arm926ejs/at91/at91cap9_devices.c | 0 {cpu => arch/arm/cpu}/arm926ejs/at91/at91sam9260_devices.c | 0 {cpu => arch/arm/cpu}/arm926ejs/at91/at91sam9261_devices.c | 0 {cpu => arch/arm/cpu}/arm926ejs/at91/at91sam9263_devices.c | 0 .../arm/cpu}/arm926ejs/at91/at91sam9m10g45_devices.c | 0 {cpu => arch/arm/cpu}/arm926ejs/at91/at91sam9rl_devices.c | 0 {cpu => arch/arm/cpu}/arm926ejs/at91/clock.c | 0 {cpu => arch/arm/cpu}/arm926ejs/at91/config.mk | 0 {cpu => arch/arm/cpu}/arm926ejs/at91/cpu.c | 0 {cpu => arch/arm/cpu}/arm926ejs/at91/led.c | 0 {cpu => arch/arm/cpu}/arm926ejs/at91/lowlevel_init.S | 0 {cpu => arch/arm/cpu}/arm926ejs/at91/reset.c | 0 {cpu => arch/arm/cpu}/arm926ejs/at91/timer.c | 0 {cpu => arch/arm/cpu}/arm926ejs/config.mk | 0 {cpu => arch/arm/cpu}/arm926ejs/cpu.c | 0 {cpu => arch/arm/cpu}/arm926ejs/davinci/Makefile | 0 {cpu => arch/arm/cpu}/arm926ejs/davinci/config.mk | 0 {cpu => arch/arm/cpu}/arm926ejs/davinci/cpu.c | 0 {cpu => arch/arm/cpu}/arm926ejs/davinci/dm355.c | 0 {cpu => arch/arm/cpu}/arm926ejs/davinci/dm365.c | 0 {cpu => arch/arm/cpu}/arm926ejs/davinci/dm644x.c | 0 {cpu => arch/arm/cpu}/arm926ejs/davinci/dm646x.c | 0 {cpu => arch/arm/cpu}/arm926ejs/davinci/dp83848.c | 0 {cpu => arch/arm/cpu}/arm926ejs/davinci/lowlevel_init.S | 0 {cpu => arch/arm/cpu}/arm926ejs/davinci/lxt972.c | 0 {cpu => arch/arm/cpu}/arm926ejs/davinci/psc.c | 0 {cpu => arch/arm/cpu}/arm926ejs/davinci/reset.S | 0 {cpu => arch/arm/cpu}/arm926ejs/davinci/timer.c | 0 {cpu => arch/arm/cpu}/arm926ejs/kirkwood/Makefile | 0 {cpu => arch/arm/cpu}/arm926ejs/kirkwood/cpu.c | 0 {cpu => arch/arm/cpu}/arm926ejs/kirkwood/dram.c | 0 {cpu => arch/arm/cpu}/arm926ejs/kirkwood/mpp.c | 0 {cpu => arch/arm/cpu}/arm926ejs/kirkwood/timer.c | 0 {cpu => arch/arm/cpu}/arm926ejs/mx25/Makefile | 2 +- {cpu => arch/arm/cpu}/arm926ejs/mx25/generic.c | 0 {cpu => arch/arm/cpu}/arm926ejs/mx25/reset.c | 0 {cpu => arch/arm/cpu}/arm926ejs/mx25/timer.c | 0 {cpu => arch/arm/cpu}/arm926ejs/mx27/Makefile | 0 {cpu => arch/arm/cpu}/arm926ejs/mx27/generic.c | 0 {cpu => arch/arm/cpu}/arm926ejs/mx27/reset.c | 0 {cpu => arch/arm/cpu}/arm926ejs/mx27/timer.c | 0 {cpu => arch/arm/cpu}/arm926ejs/nomadik/Makefile | 0 {cpu => arch/arm/cpu}/arm926ejs/nomadik/gpio.c | 0 {cpu => arch/arm/cpu}/arm926ejs/nomadik/reset.S | 0 {cpu => arch/arm/cpu}/arm926ejs/nomadik/timer.c | 0 {cpu => arch/arm/cpu}/arm926ejs/omap/Makefile | 0 {cpu => arch/arm/cpu}/arm926ejs/omap/cpuinfo.c | 0 {cpu => arch/arm/cpu}/arm926ejs/omap/reset.S | 0 {cpu => arch/arm/cpu}/arm926ejs/omap/timer.c | 0 {cpu => arch/arm/cpu}/arm926ejs/spear/Makefile | 0 {cpu => arch/arm/cpu}/arm926ejs/spear/reset.c | 0 {cpu => arch/arm/cpu}/arm926ejs/spear/timer.c | 0 {cpu => arch/arm/cpu}/arm926ejs/start.S | 0 {cpu => arch/arm/cpu}/arm926ejs/u-boot.lds | 2 +- {cpu => arch/arm/cpu}/arm926ejs/versatile/Makefile | 0 {cpu => arch/arm/cpu}/arm926ejs/versatile/reset.S | 0 {cpu => arch/arm/cpu}/arm926ejs/versatile/timer.c | 0 {cpu => arch/arm/cpu}/arm946es/Makefile | 0 {cpu => arch/arm/cpu}/arm946es/config.mk | 0 {cpu => arch/arm/cpu}/arm946es/cpu.c | 0 {cpu => arch/arm/cpu}/arm946es/start.S | 0 {cpu => arch/arm/cpu}/arm946es/u-boot.lds | 2 +- {cpu => arch/arm/cpu}/arm_cortexa8/Makefile | 0 {cpu => arch/arm/cpu}/arm_cortexa8/config.mk | 0 {cpu => arch/arm/cpu}/arm_cortexa8/cpu.c | 0 {cpu => arch/arm/cpu}/arm_cortexa8/mx51/Makefile | 0 {cpu => arch/arm/cpu}/arm_cortexa8/mx51/clock.c | 0 {cpu => arch/arm/cpu}/arm_cortexa8/mx51/iomux.c | 0 {cpu => arch/arm/cpu}/arm_cortexa8/mx51/lowlevel_init.S | 0 {cpu => arch/arm/cpu}/arm_cortexa8/mx51/soc.c | 0 {cpu => arch/arm/cpu}/arm_cortexa8/mx51/speed.c | 0 {cpu => arch/arm/cpu}/arm_cortexa8/mx51/timer.c | 0 {cpu => arch/arm/cpu}/arm_cortexa8/mx51/u-boot.lds | 2 +- {cpu => arch/arm/cpu}/arm_cortexa8/omap3/Makefile | 0 {cpu => arch/arm/cpu}/arm_cortexa8/omap3/board.c | 0 {cpu => arch/arm/cpu}/arm_cortexa8/omap3/cache.S | 0 {cpu => arch/arm/cpu}/arm_cortexa8/omap3/clock.c | 0 {cpu => arch/arm/cpu}/arm_cortexa8/omap3/gpio.c | 0 {cpu => arch/arm/cpu}/arm_cortexa8/omap3/lowlevel_init.S | 0 {cpu => arch/arm/cpu}/arm_cortexa8/omap3/mem.c | 0 {cpu => arch/arm/cpu}/arm_cortexa8/omap3/reset.S | 0 {cpu => arch/arm/cpu}/arm_cortexa8/omap3/sys_info.c | 0 {cpu => arch/arm/cpu}/arm_cortexa8/omap3/syslib.c | 0 {cpu => arch/arm/cpu}/arm_cortexa8/omap3/timer.c | 0 {cpu => arch/arm/cpu}/arm_cortexa8/s5pc1xx/Makefile | 0 {cpu => arch/arm/cpu}/arm_cortexa8/s5pc1xx/cache.S | 2 +- {cpu => arch/arm/cpu}/arm_cortexa8/s5pc1xx/clock.c | 0 {cpu => arch/arm/cpu}/arm_cortexa8/s5pc1xx/cpu_info.c | 0 {cpu => arch/arm/cpu}/arm_cortexa8/s5pc1xx/gpio.c | 0 {cpu => arch/arm/cpu}/arm_cortexa8/s5pc1xx/reset.S | 0 {cpu => arch/arm/cpu}/arm_cortexa8/s5pc1xx/sromc.c | 0 {cpu => arch/arm/cpu}/arm_cortexa8/s5pc1xx/timer.c | 0 {cpu => arch/arm/cpu}/arm_cortexa8/start.S | 0 {cpu => arch/arm/cpu}/arm_cortexa8/u-boot.lds | 2 +- {cpu => arch/arm/cpu}/arm_intcm/Makefile | 0 {cpu => arch/arm/cpu}/arm_intcm/config.mk | 0 {cpu => arch/arm/cpu}/arm_intcm/cpu.c | 0 {cpu => arch/arm/cpu}/arm_intcm/start.S | 0 {cpu => arch/arm/cpu}/arm_intcm/u-boot.lds | 2 +- {cpu => arch/arm/cpu}/ixp/Makefile | 0 {cpu => arch/arm/cpu}/ixp/config.mk | 0 {cpu => arch/arm/cpu}/ixp/cpu.c | 0 {cpu => arch/arm/cpu}/ixp/interrupts.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxEthAcc.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxEthAccCommon.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxEthAccControlInterface.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxEthAccDataPlane.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxEthAccMac.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxEthAccMii.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxEthDBAPI.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxEthDBAPISupport.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxEthDBCore.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxEthDBEvents.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxEthDBFeatures.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxEthDBFirewall.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxEthDBHashtable.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxEthDBLearning.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxEthDBMem.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxEthDBNPEAdaptor.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxEthDBPortUpdate.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxEthDBReports.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxEthDBSearch.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxEthDBSpanningTree.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxEthDBUtil.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxEthDBVlan.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxEthDBWiFi.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxEthMii.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxFeatureCtrl.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxNpeDl.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxNpeDlImageMgr.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxNpeDlNpeMgr.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxNpeDlNpeMgrUtils.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxNpeMh.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxNpeMhConfig.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxNpeMhReceive.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxNpeMhSend.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxNpeMhSolicitedCbMgr.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxNpeMhUnsolicitedCbMgr.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxOsalBufferMgt.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxOsalIoMem.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxOsalOsCacheMMU.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxOsalOsMsgQ.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxOsalOsSemaphore.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxOsalOsServices.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxOsalOsThread.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxQMgrAqmIf.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxQMgrDispatcher.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxQMgrInit.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxQMgrQAccess.c | 0 {cpu => arch/arm/cpu}/ixp/npe/IxQMgrQCfg.c | 0 {cpu => arch/arm/cpu}/ixp/npe/Makefile | 2 +- {cpu => arch/arm/cpu}/ixp/npe/include/IxAssert.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxAtmSch.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxAtmTypes.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxAtmdAcc.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxAtmdAccCtrl.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxAtmm.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxDmaAcc.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxEthAcc.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxEthAccDataPlane_p.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxEthAccMac_p.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxEthAccMii_p.h | 0 .../arm/cpu}/ixp/npe/include/IxEthAccQueueAssign_p.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxEthAcc_p.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxEthDB.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxEthDBLocks_p.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxEthDBLog_p.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxEthDBMessages_p.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxEthDBPortDefs.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxEthDBQoS.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxEthDB_p.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxEthMii.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxEthMii_p.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxEthNpe.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxFeatureCtrl.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxHssAcc.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxI2cDrv.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxNpeA.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxNpeDl.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxNpeDlImageMgr_p.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxNpeDlMacros_p.h | 0 .../arm/cpu}/ixp/npe/include/IxNpeDlNpeMgrEcRegisters_p.h | 0 .../arm/cpu}/ixp/npe/include/IxNpeDlNpeMgrUtils_p.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxNpeDlNpeMgr_p.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxNpeMh.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxNpeMhConfig_p.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxNpeMhMacros_p.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxNpeMhReceive_p.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxNpeMhSend_p.h | 0 .../arm/cpu}/ixp/npe/include/IxNpeMhSolicitedCbMgr_p.h | 0 .../arm/cpu}/ixp/npe/include/IxNpeMhUnsolicitedCbMgr_p.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxNpeMicrocode.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxOsBufLib.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxOsBuffMgt.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxOsBuffPoolMgt.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxOsCacheMMU.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxOsPrintf.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxOsServices.h | 0 .../arm/cpu}/ixp/npe/include/IxOsServicesComponents.h | 0 .../arm/cpu}/ixp/npe/include/IxOsServicesEndianess.h | 0 .../arm/cpu}/ixp/npe/include/IxOsServicesMemAccess.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxOsServicesMemMap.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxOsal.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalAssert.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalBackward.h | 0 .../arm/cpu}/ixp/npe/include/IxOsalBackwardAssert.h | 0 .../arm/cpu}/ixp/npe/include/IxOsalBackwardBufferMgt.h | 0 .../arm/cpu}/ixp/npe/include/IxOsalBackwardCacheMMU.h | 0 .../arm/cpu}/ixp/npe/include/IxOsalBackwardMemMap.h | 0 .../arm/cpu}/ixp/npe/include/IxOsalBackwardOsServices.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalBackwardOssl.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalBufferMgt.h | 0 .../arm/cpu}/ixp/npe/include/IxOsalBufferMgtDefault.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalConfig.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalEndianess.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalIoMem.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalMemAccess.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalOem.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalOs.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalOsAssert.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalOsBufferMgt.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalOsIxp400.h | 0 .../cpu}/ixp/npe/include/IxOsalOsIxp400CustomizedMapping.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalOsTypes.h | 0 .../arm/cpu}/ixp/npe/include/IxOsalOsUtilitySymbols.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalTypes.h | 0 .../arm/cpu}/ixp/npe/include/IxOsalUtilitySymbols.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxParityENAcc.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxPerfProfAcc.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxQMgr.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxQMgrAqmIf_p.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxQMgrDefines_p.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxQMgrDispatcher_p.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxQMgrLog_p.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxQMgrQAccess_p.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxQMgrQCfg_p.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxQueueAssignments.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxSspAcc.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxTimeSyncAcc.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxTimerCtrl.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxTypes.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxUART.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/IxVersionId.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/ix_error.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/ix_macros.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/ix_os_type.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/ix_ossl.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/ix_symbols.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/ix_types.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/npe.h | 0 {cpu => arch/arm/cpu}/ixp/npe/include/os_datatypes.h | 0 {cpu => arch/arm/cpu}/ixp/npe/miiphy.c | 0 {cpu => arch/arm/cpu}/ixp/npe/npe.c | 0 {cpu => arch/arm/cpu}/ixp/start.S | 0 {cpu => arch/arm/cpu}/ixp/timer.c | 0 {cpu => arch/arm/cpu}/ixp/u-boot.lds | 2 +- {cpu => arch/arm/cpu}/lh7a40x/Makefile | 0 {cpu => arch/arm/cpu}/lh7a40x/config.mk | 0 {cpu => arch/arm/cpu}/lh7a40x/cpu.c | 0 {cpu => arch/arm/cpu}/lh7a40x/speed.c | 0 {cpu => arch/arm/cpu}/lh7a40x/start.S | 0 {cpu => arch/arm/cpu}/lh7a40x/timer.c | 0 {cpu => arch/arm/cpu}/lh7a40x/u-boot.lds | 2 +- {cpu => arch/arm/cpu}/pxa/Makefile | 0 {cpu => arch/arm/cpu}/pxa/config.mk | 0 {cpu => arch/arm/cpu}/pxa/cpu.c | 0 {cpu => arch/arm/cpu}/pxa/i2c.c | 0 {cpu => arch/arm/cpu}/pxa/pxafb.c | 0 {cpu => arch/arm/cpu}/pxa/start.S | 0 {cpu => arch/arm/cpu}/pxa/timer.c | 0 {cpu => arch/arm/cpu}/pxa/u-boot.lds | 2 +- {cpu => arch/arm/cpu}/pxa/usb.c | 0 {cpu => arch/arm/cpu}/s3c44b0/Makefile | 0 {cpu => arch/arm/cpu}/s3c44b0/cache.c | 0 {cpu => arch/arm/cpu}/s3c44b0/config.mk | 0 {cpu => arch/arm/cpu}/s3c44b0/cpu.c | 0 {cpu => arch/arm/cpu}/s3c44b0/start.S | 0 {cpu => arch/arm/cpu}/s3c44b0/timer.c | 0 {cpu => arch/arm/cpu}/s3c44b0/u-boot.lds | 2 +- {cpu => arch/arm/cpu}/sa1100/Makefile | 0 {cpu => arch/arm/cpu}/sa1100/config.mk | 0 {cpu => arch/arm/cpu}/sa1100/cpu.c | 0 {cpu => arch/arm/cpu}/sa1100/start.S | 0 {cpu => arch/arm/cpu}/sa1100/timer.c | 0 {cpu => arch/arm/cpu}/sa1100/u-boot.lds | 2 +- arch/arm/include/asm/arch-mx51/asm-offsets.h | 2 +- board/actux1/config.mk | 2 +- board/actux1/u-boot.lds | 4 ++-- board/actux2/config.mk | 2 +- board/actux2/u-boot.lds | 4 ++-- board/actux3/config.mk | 2 +- board/actux3/u-boot.lds | 4 ++-- board/actux4/config.mk | 2 +- board/davinci/dvevm/board_init.S | 2 +- board/davinci/schmoogie/board_init.S | 2 +- board/davinci/sffsdr/board_init.S | 2 +- board/davinci/sonata/board_init.S | 2 +- board/edb93xx/config.mk | 2 +- board/freescale/mx31ads/u-boot.lds | 2 +- board/logicpd/zoom2/zoom2.c | 2 +- board/lpc2292sodimm/flash.c | 2 +- board/samsung/smdk6400/u-boot-nand.lds | 4 ++-- board/siemens/SMN42/flash.c | 2 +- board/trab/rs485.c | 2 +- board/trab/rs485.h | 2 +- board/trab/u-boot.lds | 2 +- doc/README-integrator | 2 +- doc/README.ARM-SoC | 6 +++--- doc/README.modnet50 | 2 +- nand_spl/board/freescale/mx31pdk/Makefile | 4 ++-- nand_spl/board/karo/tx25/Makefile | 4 ++-- nand_spl/board/samsung/smdk6400/Makefile | 4 ++-- 407 files changed, 56 insertions(+), 56 deletions(-) rename {cpu => arch/arm/cpu}/arm1136/Makefile (100%) rename {cpu => arch/arm/cpu}/arm1136/config.mk (100%) rename {cpu => arch/arm/cpu}/arm1136/cpu.c (100%) rename {cpu => arch/arm/cpu}/arm1136/mx31/Makefile (100%) rename {cpu => arch/arm/cpu}/arm1136/mx31/devices.c (100%) rename {cpu => arch/arm/cpu}/arm1136/mx31/generic.c (100%) rename {cpu => arch/arm/cpu}/arm1136/mx31/timer.c (100%) rename {cpu => arch/arm/cpu}/arm1136/omap24xx/Makefile (100%) rename {cpu => arch/arm/cpu}/arm1136/omap24xx/reset.S (100%) rename {cpu => arch/arm/cpu}/arm1136/omap24xx/timer.c (100%) rename {cpu => arch/arm/cpu}/arm1136/start.S (100%) rename {cpu => arch/arm/cpu}/arm1136/u-boot.lds (97%) rename {cpu => arch/arm/cpu}/arm1176/Makefile (100%) rename {cpu => arch/arm/cpu}/arm1176/config.mk (100%) rename {cpu => arch/arm/cpu}/arm1176/cpu.c (100%) rename {cpu => arch/arm/cpu}/arm1176/s3c64xx/Makefile (100%) rename {cpu => arch/arm/cpu}/arm1176/s3c64xx/config.mk (100%) rename {cpu => arch/arm/cpu}/arm1176/s3c64xx/cpu_init.S (100%) rename {cpu => arch/arm/cpu}/arm1176/s3c64xx/reset.S (100%) rename {cpu => arch/arm/cpu}/arm1176/s3c64xx/speed.c (100%) rename {cpu => arch/arm/cpu}/arm1176/s3c64xx/timer.c (100%) rename {cpu => arch/arm/cpu}/arm1176/start.S (100%) rename {cpu => arch/arm/cpu}/arm1176/u-boot.lds (97%) rename {cpu => arch/arm/cpu}/arm720t/Makefile (100%) rename {cpu => arch/arm/cpu}/arm720t/config.mk (100%) rename {cpu => arch/arm/cpu}/arm720t/cpu.c (100%) rename {cpu => arch/arm/cpu}/arm720t/interrupts.c (100%) rename {cpu => arch/arm/cpu}/arm720t/lpc2292/Makefile (100%) rename {cpu => arch/arm/cpu}/arm720t/lpc2292/flash.c (100%) rename {cpu => arch/arm/cpu}/arm720t/lpc2292/iap_entry.S (100%) rename {cpu => arch/arm/cpu}/arm720t/lpc2292/mmc.c (100%) rename {cpu => arch/arm/cpu}/arm720t/lpc2292/mmc_hw.c (100%) rename {cpu => arch/arm/cpu}/arm720t/lpc2292/mmc_hw.h (100%) rename {cpu => arch/arm/cpu}/arm720t/lpc2292/spi.c (100%) rename {cpu => arch/arm/cpu}/arm720t/s3c4510b/Makefile (100%) rename {cpu => arch/arm/cpu}/arm720t/s3c4510b/cache.c (100%) rename {cpu => arch/arm/cpu}/arm720t/start.S (100%) rename {cpu => arch/arm/cpu}/arm720t/u-boot.lds (97%) rename {cpu => arch/arm/cpu}/arm920t/Makefile (100%) rename {cpu => arch/arm/cpu}/arm920t/a320/Makefile (100%) rename {cpu => arch/arm/cpu}/arm920t/a320/ftsmc020.c (100%) rename {cpu => arch/arm/cpu}/arm920t/a320/reset.S (100%) rename {cpu => arch/arm/cpu}/arm920t/a320/timer.c (100%) rename {cpu => arch/arm/cpu}/arm920t/at91/Makefile (100%) rename {cpu => arch/arm/cpu}/arm920t/at91/lowlevel_init.S (100%) rename {cpu => arch/arm/cpu}/arm920t/at91/reset.c (100%) rename {cpu => arch/arm/cpu}/arm920t/at91/timer.c (100%) rename {cpu => arch/arm/cpu}/arm920t/at91rm9200/Makefile (100%) rename {cpu => arch/arm/cpu}/arm920t/at91rm9200/bcm5221.c (100%) rename {cpu => arch/arm/cpu}/arm920t/at91rm9200/dm9161.c (100%) rename {cpu => arch/arm/cpu}/arm920t/at91rm9200/ether.c (100%) rename {cpu => arch/arm/cpu}/arm920t/at91rm9200/i2c.c (100%) rename {cpu => arch/arm/cpu}/arm920t/at91rm9200/ks8721.c (100%) rename {cpu => arch/arm/cpu}/arm920t/at91rm9200/lowlevel_init.S (100%) rename {cpu => arch/arm/cpu}/arm920t/at91rm9200/lxt972.c (100%) rename {cpu => arch/arm/cpu}/arm920t/at91rm9200/reset.c (100%) rename {cpu => arch/arm/cpu}/arm920t/at91rm9200/spi.c (100%) rename {cpu => arch/arm/cpu}/arm920t/at91rm9200/timer.c (100%) rename {cpu => arch/arm/cpu}/arm920t/at91rm9200/usb.c (100%) rename {cpu => arch/arm/cpu}/arm920t/config.mk (100%) rename {cpu => arch/arm/cpu}/arm920t/cpu.c (100%) rename {cpu => arch/arm/cpu}/arm920t/ep93xx/Makefile (100%) rename {cpu => arch/arm/cpu}/arm920t/ep93xx/cpu.c (100%) rename {cpu => arch/arm/cpu}/arm920t/ep93xx/led.c (100%) rename {cpu => arch/arm/cpu}/arm920t/ep93xx/lowlevel_init.S (100%) rename {cpu => arch/arm/cpu}/arm920t/ep93xx/speed.c (100%) rename {cpu => arch/arm/cpu}/arm920t/ep93xx/timer.c (100%) rename {cpu => arch/arm/cpu}/arm920t/ep93xx/u-boot.lds (97%) rename {cpu => arch/arm/cpu}/arm920t/imx/Makefile (100%) rename {cpu => arch/arm/cpu}/arm920t/imx/generic.c (100%) rename {cpu => arch/arm/cpu}/arm920t/imx/speed.c (100%) rename {cpu => arch/arm/cpu}/arm920t/imx/timer.c (100%) rename {cpu => arch/arm/cpu}/arm920t/interrupts.c (100%) rename {cpu => arch/arm/cpu}/arm920t/ks8695/Makefile (100%) rename {cpu => arch/arm/cpu}/arm920t/ks8695/lowlevel_init.S (100%) rename {cpu => arch/arm/cpu}/arm920t/ks8695/timer.c (100%) rename {cpu => arch/arm/cpu}/arm920t/s3c24x0/Makefile (100%) rename {cpu => arch/arm/cpu}/arm920t/s3c24x0/interrupts.c (100%) rename {cpu => arch/arm/cpu}/arm920t/s3c24x0/speed.c (100%) rename {cpu => arch/arm/cpu}/arm920t/s3c24x0/timer.c (100%) rename {cpu => arch/arm/cpu}/arm920t/s3c24x0/usb.c (100%) rename {cpu => arch/arm/cpu}/arm920t/s3c24x0/usb_ohci.c (100%) rename {cpu => arch/arm/cpu}/arm920t/s3c24x0/usb_ohci.h (100%) rename {cpu => arch/arm/cpu}/arm920t/start.S (100%) rename {cpu => arch/arm/cpu}/arm920t/u-boot.lds (97%) rename {cpu => arch/arm/cpu}/arm925t/Makefile (100%) rename {cpu => arch/arm/cpu}/arm925t/config.mk (100%) rename {cpu => arch/arm/cpu}/arm925t/cpu.c (100%) rename {cpu => arch/arm/cpu}/arm925t/omap925.c (100%) rename {cpu => arch/arm/cpu}/arm925t/start.S (100%) rename {cpu => arch/arm/cpu}/arm925t/timer.c (100%) rename {cpu => arch/arm/cpu}/arm925t/u-boot.lds (97%) rename {cpu => arch/arm/cpu}/arm926ejs/Makefile (100%) rename {cpu => arch/arm/cpu}/arm926ejs/at91/Makefile (100%) rename {cpu => arch/arm/cpu}/arm926ejs/at91/at91cap9_devices.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/at91/at91sam9260_devices.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/at91/at91sam9261_devices.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/at91/at91sam9263_devices.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/at91/at91sam9m10g45_devices.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/at91/at91sam9rl_devices.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/at91/clock.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/at91/config.mk (100%) rename {cpu => arch/arm/cpu}/arm926ejs/at91/cpu.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/at91/led.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/at91/lowlevel_init.S (100%) rename {cpu => arch/arm/cpu}/arm926ejs/at91/reset.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/at91/timer.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/config.mk (100%) rename {cpu => arch/arm/cpu}/arm926ejs/cpu.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/davinci/Makefile (100%) rename {cpu => arch/arm/cpu}/arm926ejs/davinci/config.mk (100%) rename {cpu => arch/arm/cpu}/arm926ejs/davinci/cpu.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/davinci/dm355.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/davinci/dm365.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/davinci/dm644x.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/davinci/dm646x.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/davinci/dp83848.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/davinci/lowlevel_init.S (100%) rename {cpu => arch/arm/cpu}/arm926ejs/davinci/lxt972.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/davinci/psc.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/davinci/reset.S (100%) rename {cpu => arch/arm/cpu}/arm926ejs/davinci/timer.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/kirkwood/Makefile (100%) rename {cpu => arch/arm/cpu}/arm926ejs/kirkwood/cpu.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/kirkwood/dram.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/kirkwood/mpp.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/kirkwood/timer.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/mx25/Makefile (94%) rename {cpu => arch/arm/cpu}/arm926ejs/mx25/generic.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/mx25/reset.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/mx25/timer.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/mx27/Makefile (100%) rename {cpu => arch/arm/cpu}/arm926ejs/mx27/generic.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/mx27/reset.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/mx27/timer.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/nomadik/Makefile (100%) rename {cpu => arch/arm/cpu}/arm926ejs/nomadik/gpio.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/nomadik/reset.S (100%) rename {cpu => arch/arm/cpu}/arm926ejs/nomadik/timer.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/omap/Makefile (100%) rename {cpu => arch/arm/cpu}/arm926ejs/omap/cpuinfo.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/omap/reset.S (100%) rename {cpu => arch/arm/cpu}/arm926ejs/omap/timer.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/spear/Makefile (100%) rename {cpu => arch/arm/cpu}/arm926ejs/spear/reset.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/spear/timer.c (100%) rename {cpu => arch/arm/cpu}/arm926ejs/start.S (100%) rename {cpu => arch/arm/cpu}/arm926ejs/u-boot.lds (97%) rename {cpu => arch/arm/cpu}/arm926ejs/versatile/Makefile (100%) rename {cpu => arch/arm/cpu}/arm926ejs/versatile/reset.S (100%) rename {cpu => arch/arm/cpu}/arm926ejs/versatile/timer.c (100%) rename {cpu => arch/arm/cpu}/arm946es/Makefile (100%) rename {cpu => arch/arm/cpu}/arm946es/config.mk (100%) rename {cpu => arch/arm/cpu}/arm946es/cpu.c (100%) rename {cpu => arch/arm/cpu}/arm946es/start.S (100%) rename {cpu => arch/arm/cpu}/arm946es/u-boot.lds (97%) rename {cpu => arch/arm/cpu}/arm_cortexa8/Makefile (100%) rename {cpu => arch/arm/cpu}/arm_cortexa8/config.mk (100%) rename {cpu => arch/arm/cpu}/arm_cortexa8/cpu.c (100%) rename {cpu => arch/arm/cpu}/arm_cortexa8/mx51/Makefile (100%) rename {cpu => arch/arm/cpu}/arm_cortexa8/mx51/clock.c (100%) rename {cpu => arch/arm/cpu}/arm_cortexa8/mx51/iomux.c (100%) rename {cpu => arch/arm/cpu}/arm_cortexa8/mx51/lowlevel_init.S (100%) rename {cpu => arch/arm/cpu}/arm_cortexa8/mx51/soc.c (100%) rename {cpu => arch/arm/cpu}/arm_cortexa8/mx51/speed.c (100%) rename {cpu => arch/arm/cpu}/arm_cortexa8/mx51/timer.c (100%) rename {cpu => arch/arm/cpu}/arm_cortexa8/mx51/u-boot.lds (97%) rename {cpu => arch/arm/cpu}/arm_cortexa8/omap3/Makefile (100%) rename {cpu => arch/arm/cpu}/arm_cortexa8/omap3/board.c (100%) rename {cpu => arch/arm/cpu}/arm_cortexa8/omap3/cache.S (100%) rename {cpu => arch/arm/cpu}/arm_cortexa8/omap3/clock.c (100%) rename {cpu => arch/arm/cpu}/arm_cortexa8/omap3/gpio.c (100%) rename {cpu => arch/arm/cpu}/arm_cortexa8/omap3/lowlevel_init.S (100%) rename {cpu => arch/arm/cpu}/arm_cortexa8/omap3/mem.c (100%) rename {cpu => arch/arm/cpu}/arm_cortexa8/omap3/reset.S (100%) rename {cpu => arch/arm/cpu}/arm_cortexa8/omap3/sys_info.c (100%) rename {cpu => arch/arm/cpu}/arm_cortexa8/omap3/syslib.c (100%) rename {cpu => arch/arm/cpu}/arm_cortexa8/omap3/timer.c (100%) rename {cpu => arch/arm/cpu}/arm_cortexa8/s5pc1xx/Makefile (100%) rename {cpu => arch/arm/cpu}/arm_cortexa8/s5pc1xx/cache.S (98%) rename {cpu => arch/arm/cpu}/arm_cortexa8/s5pc1xx/clock.c (100%) rename {cpu => arch/arm/cpu}/arm_cortexa8/s5pc1xx/cpu_info.c (100%) rename {cpu => arch/arm/cpu}/arm_cortexa8/s5pc1xx/gpio.c (100%) rename {cpu => arch/arm/cpu}/arm_cortexa8/s5pc1xx/reset.S (100%) rename {cpu => arch/arm/cpu}/arm_cortexa8/s5pc1xx/sromc.c (100%) rename {cpu => arch/arm/cpu}/arm_cortexa8/s5pc1xx/timer.c (100%) rename {cpu => arch/arm/cpu}/arm_cortexa8/start.S (100%) rename {cpu => arch/arm/cpu}/arm_cortexa8/u-boot.lds (97%) rename {cpu => arch/arm/cpu}/arm_intcm/Makefile (100%) rename {cpu => arch/arm/cpu}/arm_intcm/config.mk (100%) rename {cpu => arch/arm/cpu}/arm_intcm/cpu.c (100%) rename {cpu => arch/arm/cpu}/arm_intcm/start.S (100%) rename {cpu => arch/arm/cpu}/arm_intcm/u-boot.lds (97%) rename {cpu => arch/arm/cpu}/ixp/Makefile (100%) rename {cpu => arch/arm/cpu}/ixp/config.mk (100%) rename {cpu => arch/arm/cpu}/ixp/cpu.c (100%) rename {cpu => arch/arm/cpu}/ixp/interrupts.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxEthAcc.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxEthAccCommon.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxEthAccControlInterface.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxEthAccDataPlane.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxEthAccMac.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxEthAccMii.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxEthDBAPI.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxEthDBAPISupport.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxEthDBCore.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxEthDBEvents.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxEthDBFeatures.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxEthDBFirewall.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxEthDBHashtable.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxEthDBLearning.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxEthDBMem.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxEthDBNPEAdaptor.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxEthDBPortUpdate.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxEthDBReports.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxEthDBSearch.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxEthDBSpanningTree.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxEthDBUtil.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxEthDBVlan.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxEthDBWiFi.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxEthMii.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxFeatureCtrl.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxNpeDl.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxNpeDlImageMgr.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxNpeDlNpeMgr.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxNpeDlNpeMgrUtils.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxNpeMh.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxNpeMhConfig.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxNpeMhReceive.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxNpeMhSend.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxNpeMhSolicitedCbMgr.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxNpeMhUnsolicitedCbMgr.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxOsalBufferMgt.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxOsalIoMem.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxOsalOsCacheMMU.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxOsalOsMsgQ.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxOsalOsSemaphore.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxOsalOsServices.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxOsalOsThread.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxQMgrAqmIf.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxQMgrDispatcher.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxQMgrInit.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxQMgrQAccess.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/IxQMgrQCfg.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/Makefile (95%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxAssert.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxAtmSch.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxAtmTypes.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxAtmdAcc.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxAtmdAccCtrl.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxAtmm.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxDmaAcc.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxEthAcc.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxEthAccDataPlane_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxEthAccMac_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxEthAccMii_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxEthAccQueueAssign_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxEthAcc_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxEthDB.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxEthDBLocks_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxEthDBLog_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxEthDBMessages_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxEthDBPortDefs.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxEthDBQoS.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxEthDB_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxEthMii.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxEthMii_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxEthNpe.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxFeatureCtrl.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxHssAcc.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxI2cDrv.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxNpeA.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxNpeDl.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxNpeDlImageMgr_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxNpeDlMacros_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxNpeDlNpeMgrEcRegisters_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxNpeDlNpeMgrUtils_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxNpeDlNpeMgr_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxNpeMh.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxNpeMhConfig_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxNpeMhMacros_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxNpeMhReceive_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxNpeMhSend_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxNpeMhSolicitedCbMgr_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxNpeMhUnsolicitedCbMgr_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxNpeMicrocode.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsBufLib.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsBuffMgt.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsBuffPoolMgt.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsCacheMMU.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsPrintf.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsServices.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsServicesComponents.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsServicesEndianess.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsServicesMemAccess.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsServicesMemMap.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsal.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalAssert.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalBackward.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalBackwardAssert.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalBackwardBufferMgt.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalBackwardCacheMMU.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalBackwardMemMap.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalBackwardOsServices.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalBackwardOssl.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalBufferMgt.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalBufferMgtDefault.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalConfig.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalEndianess.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalIoMem.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalMemAccess.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalOem.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalOs.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalOsAssert.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalOsBufferMgt.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalOsIxp400.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalOsIxp400CustomizedMapping.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalOsTypes.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalOsUtilitySymbols.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalTypes.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxOsalUtilitySymbols.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxParityENAcc.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxPerfProfAcc.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxQMgr.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxQMgrAqmIf_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxQMgrDefines_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxQMgrDispatcher_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxQMgrLog_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxQMgrQAccess_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxQMgrQCfg_p.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxQueueAssignments.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxSspAcc.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxTimeSyncAcc.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxTimerCtrl.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxTypes.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxUART.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/IxVersionId.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/ix_error.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/ix_macros.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/ix_os_type.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/ix_ossl.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/ix_symbols.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/ix_types.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/npe.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/include/os_datatypes.h (100%) rename {cpu => arch/arm/cpu}/ixp/npe/miiphy.c (100%) rename {cpu => arch/arm/cpu}/ixp/npe/npe.c (100%) rename {cpu => arch/arm/cpu}/ixp/start.S (100%) rename {cpu => arch/arm/cpu}/ixp/timer.c (100%) rename {cpu => arch/arm/cpu}/ixp/u-boot.lds (97%) rename {cpu => arch/arm/cpu}/lh7a40x/Makefile (100%) rename {cpu => arch/arm/cpu}/lh7a40x/config.mk (100%) rename {cpu => arch/arm/cpu}/lh7a40x/cpu.c (100%) rename {cpu => arch/arm/cpu}/lh7a40x/speed.c (100%) rename {cpu => arch/arm/cpu}/lh7a40x/start.S (100%) rename {cpu => arch/arm/cpu}/lh7a40x/timer.c (100%) rename {cpu => arch/arm/cpu}/lh7a40x/u-boot.lds (97%) rename {cpu => arch/arm/cpu}/pxa/Makefile (100%) rename {cpu => arch/arm/cpu}/pxa/config.mk (100%) rename {cpu => arch/arm/cpu}/pxa/cpu.c (100%) rename {cpu => arch/arm/cpu}/pxa/i2c.c (100%) rename {cpu => arch/arm/cpu}/pxa/pxafb.c (100%) rename {cpu => arch/arm/cpu}/pxa/start.S (100%) rename {cpu => arch/arm/cpu}/pxa/timer.c (100%) rename {cpu => arch/arm/cpu}/pxa/u-boot.lds (97%) rename {cpu => arch/arm/cpu}/pxa/usb.c (100%) rename {cpu => arch/arm/cpu}/s3c44b0/Makefile (100%) rename {cpu => arch/arm/cpu}/s3c44b0/cache.c (100%) rename {cpu => arch/arm/cpu}/s3c44b0/config.mk (100%) rename {cpu => arch/arm/cpu}/s3c44b0/cpu.c (100%) rename {cpu => arch/arm/cpu}/s3c44b0/start.S (100%) rename {cpu => arch/arm/cpu}/s3c44b0/timer.c (100%) rename {cpu => arch/arm/cpu}/s3c44b0/u-boot.lds (97%) rename {cpu => arch/arm/cpu}/sa1100/Makefile (100%) rename {cpu => arch/arm/cpu}/sa1100/config.mk (100%) rename {cpu => arch/arm/cpu}/sa1100/cpu.c (100%) rename {cpu => arch/arm/cpu}/sa1100/start.S (100%) rename {cpu => arch/arm/cpu}/sa1100/timer.c (100%) rename {cpu => arch/arm/cpu}/sa1100/u-boot.lds (97%) diff --git a/Makefile b/Makefile index ddfe73c06..e922ec3a7 100644 --- a/Makefile +++ b/Makefile @@ -193,7 +193,7 @@ ifdef SOC LIBS += $(CPUDIR)/$(SOC)/lib$(SOC).a endif ifeq ($(CPU),ixp) -LIBS += cpu/ixp/npe/libnpe.a +LIBS += arch/arm/cpu/ixp/npe/libnpe.a endif LIBS += arch/$(ARCH)/lib/lib$(ARCH).a LIBS += fs/cramfs/libcramfs.a fs/fat/libfat.a fs/fdos/libfdos.a fs/jffs2/libjffs2.a \ diff --git a/cpu/arm1136/Makefile b/arch/arm/cpu/arm1136/Makefile similarity index 100% rename from cpu/arm1136/Makefile rename to arch/arm/cpu/arm1136/Makefile diff --git a/cpu/arm1136/config.mk b/arch/arm/cpu/arm1136/config.mk similarity index 100% rename from cpu/arm1136/config.mk rename to arch/arm/cpu/arm1136/config.mk diff --git a/cpu/arm1136/cpu.c b/arch/arm/cpu/arm1136/cpu.c similarity index 100% rename from cpu/arm1136/cpu.c rename to arch/arm/cpu/arm1136/cpu.c diff --git a/cpu/arm1136/mx31/Makefile b/arch/arm/cpu/arm1136/mx31/Makefile similarity index 100% rename from cpu/arm1136/mx31/Makefile rename to arch/arm/cpu/arm1136/mx31/Makefile diff --git a/cpu/arm1136/mx31/devices.c b/arch/arm/cpu/arm1136/mx31/devices.c similarity index 100% rename from cpu/arm1136/mx31/devices.c rename to arch/arm/cpu/arm1136/mx31/devices.c diff --git a/cpu/arm1136/mx31/generic.c b/arch/arm/cpu/arm1136/mx31/generic.c similarity index 100% rename from cpu/arm1136/mx31/generic.c rename to arch/arm/cpu/arm1136/mx31/generic.c diff --git a/cpu/arm1136/mx31/timer.c b/arch/arm/cpu/arm1136/mx31/timer.c similarity index 100% rename from cpu/arm1136/mx31/timer.c rename to arch/arm/cpu/arm1136/mx31/timer.c diff --git a/cpu/arm1136/omap24xx/Makefile b/arch/arm/cpu/arm1136/omap24xx/Makefile similarity index 100% rename from cpu/arm1136/omap24xx/Makefile rename to arch/arm/cpu/arm1136/omap24xx/Makefile diff --git a/cpu/arm1136/omap24xx/reset.S b/arch/arm/cpu/arm1136/omap24xx/reset.S similarity index 100% rename from cpu/arm1136/omap24xx/reset.S rename to arch/arm/cpu/arm1136/omap24xx/reset.S diff --git a/cpu/arm1136/omap24xx/timer.c b/arch/arm/cpu/arm1136/omap24xx/timer.c similarity index 100% rename from cpu/arm1136/omap24xx/timer.c rename to arch/arm/cpu/arm1136/omap24xx/timer.c diff --git a/cpu/arm1136/start.S b/arch/arm/cpu/arm1136/start.S similarity index 100% rename from cpu/arm1136/start.S rename to arch/arm/cpu/arm1136/start.S diff --git a/cpu/arm1136/u-boot.lds b/arch/arm/cpu/arm1136/u-boot.lds similarity index 97% rename from cpu/arm1136/u-boot.lds rename to arch/arm/cpu/arm1136/u-boot.lds index 7181a569e..e7eefc972 100644 --- a/cpu/arm1136/u-boot.lds +++ b/arch/arm/cpu/arm1136/u-boot.lds @@ -39,7 +39,7 @@ SECTIONS . = ALIGN(4); .text : { - cpu/arm1136/start.o (.text) + arch/arm/cpu/arm1136/start.o (.text) *(.text) } diff --git a/cpu/arm1176/Makefile b/arch/arm/cpu/arm1176/Makefile similarity index 100% rename from cpu/arm1176/Makefile rename to arch/arm/cpu/arm1176/Makefile diff --git a/cpu/arm1176/config.mk b/arch/arm/cpu/arm1176/config.mk similarity index 100% rename from cpu/arm1176/config.mk rename to arch/arm/cpu/arm1176/config.mk diff --git a/cpu/arm1176/cpu.c b/arch/arm/cpu/arm1176/cpu.c similarity index 100% rename from cpu/arm1176/cpu.c rename to arch/arm/cpu/arm1176/cpu.c diff --git a/cpu/arm1176/s3c64xx/Makefile b/arch/arm/cpu/arm1176/s3c64xx/Makefile similarity index 100% rename from cpu/arm1176/s3c64xx/Makefile rename to arch/arm/cpu/arm1176/s3c64xx/Makefile diff --git a/cpu/arm1176/s3c64xx/config.mk b/arch/arm/cpu/arm1176/s3c64xx/config.mk similarity index 100% rename from cpu/arm1176/s3c64xx/config.mk rename to arch/arm/cpu/arm1176/s3c64xx/config.mk diff --git a/cpu/arm1176/s3c64xx/cpu_init.S b/arch/arm/cpu/arm1176/s3c64xx/cpu_init.S similarity index 100% rename from cpu/arm1176/s3c64xx/cpu_init.S rename to arch/arm/cpu/arm1176/s3c64xx/cpu_init.S diff --git a/cpu/arm1176/s3c64xx/reset.S b/arch/arm/cpu/arm1176/s3c64xx/reset.S similarity index 100% rename from cpu/arm1176/s3c64xx/reset.S rename to arch/arm/cpu/arm1176/s3c64xx/reset.S diff --git a/cpu/arm1176/s3c64xx/speed.c b/arch/arm/cpu/arm1176/s3c64xx/speed.c similarity index 100% rename from cpu/arm1176/s3c64xx/speed.c rename to arch/arm/cpu/arm1176/s3c64xx/speed.c diff --git a/cpu/arm1176/s3c64xx/timer.c b/arch/arm/cpu/arm1176/s3c64xx/timer.c similarity index 100% rename from cpu/arm1176/s3c64xx/timer.c rename to arch/arm/cpu/arm1176/s3c64xx/timer.c diff --git a/cpu/arm1176/start.S b/arch/arm/cpu/arm1176/start.S similarity index 100% rename from cpu/arm1176/start.S rename to arch/arm/cpu/arm1176/start.S diff --git a/cpu/arm1176/u-boot.lds b/arch/arm/cpu/arm1176/u-boot.lds similarity index 97% rename from cpu/arm1176/u-boot.lds rename to arch/arm/cpu/arm1176/u-boot.lds index cc682f54d..8969587e8 100644 --- a/cpu/arm1176/u-boot.lds +++ b/arch/arm/cpu/arm1176/u-boot.lds @@ -31,7 +31,7 @@ SECTIONS . = ALIGN(4); .text : { - cpu/arm1176/start.o (.text) + arch/arm/cpu/arm1176/start.o (.text) *(.text) } diff --git a/cpu/arm720t/Makefile b/arch/arm/cpu/arm720t/Makefile similarity index 100% rename from cpu/arm720t/Makefile rename to arch/arm/cpu/arm720t/Makefile diff --git a/cpu/arm720t/config.mk b/arch/arm/cpu/arm720t/config.mk similarity index 100% rename from cpu/arm720t/config.mk rename to arch/arm/cpu/arm720t/config.mk diff --git a/cpu/arm720t/cpu.c b/arch/arm/cpu/arm720t/cpu.c similarity index 100% rename from cpu/arm720t/cpu.c rename to arch/arm/cpu/arm720t/cpu.c diff --git a/cpu/arm720t/interrupts.c b/arch/arm/cpu/arm720t/interrupts.c similarity index 100% rename from cpu/arm720t/interrupts.c rename to arch/arm/cpu/arm720t/interrupts.c diff --git a/cpu/arm720t/lpc2292/Makefile b/arch/arm/cpu/arm720t/lpc2292/Makefile similarity index 100% rename from cpu/arm720t/lpc2292/Makefile rename to arch/arm/cpu/arm720t/lpc2292/Makefile diff --git a/cpu/arm720t/lpc2292/flash.c b/arch/arm/cpu/arm720t/lpc2292/flash.c similarity index 100% rename from cpu/arm720t/lpc2292/flash.c rename to arch/arm/cpu/arm720t/lpc2292/flash.c diff --git a/cpu/arm720t/lpc2292/iap_entry.S b/arch/arm/cpu/arm720t/lpc2292/iap_entry.S similarity index 100% rename from cpu/arm720t/lpc2292/iap_entry.S rename to arch/arm/cpu/arm720t/lpc2292/iap_entry.S diff --git a/cpu/arm720t/lpc2292/mmc.c b/arch/arm/cpu/arm720t/lpc2292/mmc.c similarity index 100% rename from cpu/arm720t/lpc2292/mmc.c rename to arch/arm/cpu/arm720t/lpc2292/mmc.c diff --git a/cpu/arm720t/lpc2292/mmc_hw.c b/arch/arm/cpu/arm720t/lpc2292/mmc_hw.c similarity index 100% rename from cpu/arm720t/lpc2292/mmc_hw.c rename to arch/arm/cpu/arm720t/lpc2292/mmc_hw.c diff --git a/cpu/arm720t/lpc2292/mmc_hw.h b/arch/arm/cpu/arm720t/lpc2292/mmc_hw.h similarity index 100% rename from cpu/arm720t/lpc2292/mmc_hw.h rename to arch/arm/cpu/arm720t/lpc2292/mmc_hw.h diff --git a/cpu/arm720t/lpc2292/spi.c b/arch/arm/cpu/arm720t/lpc2292/spi.c similarity index 100% rename from cpu/arm720t/lpc2292/spi.c rename to arch/arm/cpu/arm720t/lpc2292/spi.c diff --git a/cpu/arm720t/s3c4510b/Makefile b/arch/arm/cpu/arm720t/s3c4510b/Makefile similarity index 100% rename from cpu/arm720t/s3c4510b/Makefile rename to arch/arm/cpu/arm720t/s3c4510b/Makefile diff --git a/cpu/arm720t/s3c4510b/cache.c b/arch/arm/cpu/arm720t/s3c4510b/cache.c similarity index 100% rename from cpu/arm720t/s3c4510b/cache.c rename to arch/arm/cpu/arm720t/s3c4510b/cache.c diff --git a/cpu/arm720t/start.S b/arch/arm/cpu/arm720t/start.S similarity index 100% rename from cpu/arm720t/start.S rename to arch/arm/cpu/arm720t/start.S diff --git a/cpu/arm720t/u-boot.lds b/arch/arm/cpu/arm720t/u-boot.lds similarity index 97% rename from cpu/arm720t/u-boot.lds rename to arch/arm/cpu/arm720t/u-boot.lds index 111c3f5a6..c975fc3d5 100644 --- a/cpu/arm720t/u-boot.lds +++ b/arch/arm/cpu/arm720t/u-boot.lds @@ -31,7 +31,7 @@ SECTIONS . = ALIGN(4); .text : { - cpu/arm720t/start.o (.text) + arch/arm/cpu/arm720t/start.o (.text) *(.text) } diff --git a/cpu/arm920t/Makefile b/arch/arm/cpu/arm920t/Makefile similarity index 100% rename from cpu/arm920t/Makefile rename to arch/arm/cpu/arm920t/Makefile diff --git a/cpu/arm920t/a320/Makefile b/arch/arm/cpu/arm920t/a320/Makefile similarity index 100% rename from cpu/arm920t/a320/Makefile rename to arch/arm/cpu/arm920t/a320/Makefile diff --git a/cpu/arm920t/a320/ftsmc020.c b/arch/arm/cpu/arm920t/a320/ftsmc020.c similarity index 100% rename from cpu/arm920t/a320/ftsmc020.c rename to arch/arm/cpu/arm920t/a320/ftsmc020.c diff --git a/cpu/arm920t/a320/reset.S b/arch/arm/cpu/arm920t/a320/reset.S similarity index 100% rename from cpu/arm920t/a320/reset.S rename to arch/arm/cpu/arm920t/a320/reset.S diff --git a/cpu/arm920t/a320/timer.c b/arch/arm/cpu/arm920t/a320/timer.c similarity index 100% rename from cpu/arm920t/a320/timer.c rename to arch/arm/cpu/arm920t/a320/timer.c diff --git a/cpu/arm920t/at91/Makefile b/arch/arm/cpu/arm920t/at91/Makefile similarity index 100% rename from cpu/arm920t/at91/Makefile rename to arch/arm/cpu/arm920t/at91/Makefile diff --git a/cpu/arm920t/at91/lowlevel_init.S b/arch/arm/cpu/arm920t/at91/lowlevel_init.S similarity index 100% rename from cpu/arm920t/at91/lowlevel_init.S rename to arch/arm/cpu/arm920t/at91/lowlevel_init.S diff --git a/cpu/arm920t/at91/reset.c b/arch/arm/cpu/arm920t/at91/reset.c similarity index 100% rename from cpu/arm920t/at91/reset.c rename to arch/arm/cpu/arm920t/at91/reset.c diff --git a/cpu/arm920t/at91/timer.c b/arch/arm/cpu/arm920t/at91/timer.c similarity index 100% rename from cpu/arm920t/at91/timer.c rename to arch/arm/cpu/arm920t/at91/timer.c diff --git a/cpu/arm920t/at91rm9200/Makefile b/arch/arm/cpu/arm920t/at91rm9200/Makefile similarity index 100% rename from cpu/arm920t/at91rm9200/Makefile rename to arch/arm/cpu/arm920t/at91rm9200/Makefile diff --git a/cpu/arm920t/at91rm9200/bcm5221.c b/arch/arm/cpu/arm920t/at91rm9200/bcm5221.c similarity index 100% rename from cpu/arm920t/at91rm9200/bcm5221.c rename to arch/arm/cpu/arm920t/at91rm9200/bcm5221.c diff --git a/cpu/arm920t/at91rm9200/dm9161.c b/arch/arm/cpu/arm920t/at91rm9200/dm9161.c similarity index 100% rename from cpu/arm920t/at91rm9200/dm9161.c rename to arch/arm/cpu/arm920t/at91rm9200/dm9161.c diff --git a/cpu/arm920t/at91rm9200/ether.c b/arch/arm/cpu/arm920t/at91rm9200/ether.c similarity index 100% rename from cpu/arm920t/at91rm9200/ether.c rename to arch/arm/cpu/arm920t/at91rm9200/ether.c diff --git a/cpu/arm920t/at91rm9200/i2c.c b/arch/arm/cpu/arm920t/at91rm9200/i2c.c similarity index 100% rename from cpu/arm920t/at91rm9200/i2c.c rename to arch/arm/cpu/arm920t/at91rm9200/i2c.c diff --git a/cpu/arm920t/at91rm9200/ks8721.c b/arch/arm/cpu/arm920t/at91rm9200/ks8721.c similarity index 100% rename from cpu/arm920t/at91rm9200/ks8721.c rename to arch/arm/cpu/arm920t/at91rm9200/ks8721.c diff --git a/cpu/arm920t/at91rm9200/lowlevel_init.S b/arch/arm/cpu/arm920t/at91rm9200/lowlevel_init.S similarity index 100% rename from cpu/arm920t/at91rm9200/lowlevel_init.S rename to arch/arm/cpu/arm920t/at91rm9200/lowlevel_init.S diff --git a/cpu/arm920t/at91rm9200/lxt972.c b/arch/arm/cpu/arm920t/at91rm9200/lxt972.c similarity index 100% rename from cpu/arm920t/at91rm9200/lxt972.c rename to arch/arm/cpu/arm920t/at91rm9200/lxt972.c diff --git a/cpu/arm920t/at91rm9200/reset.c b/arch/arm/cpu/arm920t/at91rm9200/reset.c similarity index 100% rename from cpu/arm920t/at91rm9200/reset.c rename to arch/arm/cpu/arm920t/at91rm9200/reset.c diff --git a/cpu/arm920t/at91rm9200/spi.c b/arch/arm/cpu/arm920t/at91rm9200/spi.c similarity index 100% rename from cpu/arm920t/at91rm9200/spi.c rename to arch/arm/cpu/arm920t/at91rm9200/spi.c diff --git a/cpu/arm920t/at91rm9200/timer.c b/arch/arm/cpu/arm920t/at91rm9200/timer.c similarity index 100% rename from cpu/arm920t/at91rm9200/timer.c rename to arch/arm/cpu/arm920t/at91rm9200/timer.c diff --git a/cpu/arm920t/at91rm9200/usb.c b/arch/arm/cpu/arm920t/at91rm9200/usb.c similarity index 100% rename from cpu/arm920t/at91rm9200/usb.c rename to arch/arm/cpu/arm920t/at91rm9200/usb.c diff --git a/cpu/arm920t/config.mk b/arch/arm/cpu/arm920t/config.mk similarity index 100% rename from cpu/arm920t/config.mk rename to arch/arm/cpu/arm920t/config.mk diff --git a/cpu/arm920t/cpu.c b/arch/arm/cpu/arm920t/cpu.c similarity index 100% rename from cpu/arm920t/cpu.c rename to arch/arm/cpu/arm920t/cpu.c diff --git a/cpu/arm920t/ep93xx/Makefile b/arch/arm/cpu/arm920t/ep93xx/Makefile similarity index 100% rename from cpu/arm920t/ep93xx/Makefile rename to arch/arm/cpu/arm920t/ep93xx/Makefile diff --git a/cpu/arm920t/ep93xx/cpu.c b/arch/arm/cpu/arm920t/ep93xx/cpu.c similarity index 100% rename from cpu/arm920t/ep93xx/cpu.c rename to arch/arm/cpu/arm920t/ep93xx/cpu.c diff --git a/cpu/arm920t/ep93xx/led.c b/arch/arm/cpu/arm920t/ep93xx/led.c similarity index 100% rename from cpu/arm920t/ep93xx/led.c rename to arch/arm/cpu/arm920t/ep93xx/led.c diff --git a/cpu/arm920t/ep93xx/lowlevel_init.S b/arch/arm/cpu/arm920t/ep93xx/lowlevel_init.S similarity index 100% rename from cpu/arm920t/ep93xx/lowlevel_init.S rename to arch/arm/cpu/arm920t/ep93xx/lowlevel_init.S diff --git a/cpu/arm920t/ep93xx/speed.c b/arch/arm/cpu/arm920t/ep93xx/speed.c similarity index 100% rename from cpu/arm920t/ep93xx/speed.c rename to arch/arm/cpu/arm920t/ep93xx/speed.c diff --git a/cpu/arm920t/ep93xx/timer.c b/arch/arm/cpu/arm920t/ep93xx/timer.c similarity index 100% rename from cpu/arm920t/ep93xx/timer.c rename to arch/arm/cpu/arm920t/ep93xx/timer.c diff --git a/cpu/arm920t/ep93xx/u-boot.lds b/arch/arm/cpu/arm920t/ep93xx/u-boot.lds similarity index 97% rename from cpu/arm920t/ep93xx/u-boot.lds rename to arch/arm/cpu/arm920t/ep93xx/u-boot.lds index 737c9d8c1..5bfcb0231 100644 --- a/cpu/arm920t/ep93xx/u-boot.lds +++ b/arch/arm/cpu/arm920t/ep93xx/u-boot.lds @@ -31,7 +31,7 @@ SECTIONS . = ALIGN(4); .text : { - cpu/arm920t/start.o (.text) + arch/arm/cpu/arm920t/start.o (.text) /* the EP93xx expects to find the pattern 'CRUS' at 0x1000 */ . = 0x1000; LONG(0x53555243) diff --git a/cpu/arm920t/imx/Makefile b/arch/arm/cpu/arm920t/imx/Makefile similarity index 100% rename from cpu/arm920t/imx/Makefile rename to arch/arm/cpu/arm920t/imx/Makefile diff --git a/cpu/arm920t/imx/generic.c b/arch/arm/cpu/arm920t/imx/generic.c similarity index 100% rename from cpu/arm920t/imx/generic.c rename to arch/arm/cpu/arm920t/imx/generic.c diff --git a/cpu/arm920t/imx/speed.c b/arch/arm/cpu/arm920t/imx/speed.c similarity index 100% rename from cpu/arm920t/imx/speed.c rename to arch/arm/cpu/arm920t/imx/speed.c diff --git a/cpu/arm920t/imx/timer.c b/arch/arm/cpu/arm920t/imx/timer.c similarity index 100% rename from cpu/arm920t/imx/timer.c rename to arch/arm/cpu/arm920t/imx/timer.c diff --git a/cpu/arm920t/interrupts.c b/arch/arm/cpu/arm920t/interrupts.c similarity index 100% rename from cpu/arm920t/interrupts.c rename to arch/arm/cpu/arm920t/interrupts.c diff --git a/cpu/arm920t/ks8695/Makefile b/arch/arm/cpu/arm920t/ks8695/Makefile similarity index 100% rename from cpu/arm920t/ks8695/Makefile rename to arch/arm/cpu/arm920t/ks8695/Makefile diff --git a/cpu/arm920t/ks8695/lowlevel_init.S b/arch/arm/cpu/arm920t/ks8695/lowlevel_init.S similarity index 100% rename from cpu/arm920t/ks8695/lowlevel_init.S rename to arch/arm/cpu/arm920t/ks8695/lowlevel_init.S diff --git a/cpu/arm920t/ks8695/timer.c b/arch/arm/cpu/arm920t/ks8695/timer.c similarity index 100% rename from cpu/arm920t/ks8695/timer.c rename to arch/arm/cpu/arm920t/ks8695/timer.c diff --git a/cpu/arm920t/s3c24x0/Makefile b/arch/arm/cpu/arm920t/s3c24x0/Makefile similarity index 100% rename from cpu/arm920t/s3c24x0/Makefile rename to arch/arm/cpu/arm920t/s3c24x0/Makefile diff --git a/cpu/arm920t/s3c24x0/interrupts.c b/arch/arm/cpu/arm920t/s3c24x0/interrupts.c similarity index 100% rename from cpu/arm920t/s3c24x0/interrupts.c rename to arch/arm/cpu/arm920t/s3c24x0/interrupts.c diff --git a/cpu/arm920t/s3c24x0/speed.c b/arch/arm/cpu/arm920t/s3c24x0/speed.c similarity index 100% rename from cpu/arm920t/s3c24x0/speed.c rename to arch/arm/cpu/arm920t/s3c24x0/speed.c diff --git a/cpu/arm920t/s3c24x0/timer.c b/arch/arm/cpu/arm920t/s3c24x0/timer.c similarity index 100% rename from cpu/arm920t/s3c24x0/timer.c rename to arch/arm/cpu/arm920t/s3c24x0/timer.c diff --git a/cpu/arm920t/s3c24x0/usb.c b/arch/arm/cpu/arm920t/s3c24x0/usb.c similarity index 100% rename from cpu/arm920t/s3c24x0/usb.c rename to arch/arm/cpu/arm920t/s3c24x0/usb.c diff --git a/cpu/arm920t/s3c24x0/usb_ohci.c b/arch/arm/cpu/arm920t/s3c24x0/usb_ohci.c similarity index 100% rename from cpu/arm920t/s3c24x0/usb_ohci.c rename to arch/arm/cpu/arm920t/s3c24x0/usb_ohci.c diff --git a/cpu/arm920t/s3c24x0/usb_ohci.h b/arch/arm/cpu/arm920t/s3c24x0/usb_ohci.h similarity index 100% rename from cpu/arm920t/s3c24x0/usb_ohci.h rename to arch/arm/cpu/arm920t/s3c24x0/usb_ohci.h diff --git a/cpu/arm920t/start.S b/arch/arm/cpu/arm920t/start.S similarity index 100% rename from cpu/arm920t/start.S rename to arch/arm/cpu/arm920t/start.S diff --git a/cpu/arm920t/u-boot.lds b/arch/arm/cpu/arm920t/u-boot.lds similarity index 97% rename from cpu/arm920t/u-boot.lds rename to arch/arm/cpu/arm920t/u-boot.lds index d9bfbee73..a7decfcd7 100644 --- a/cpu/arm920t/u-boot.lds +++ b/arch/arm/cpu/arm920t/u-boot.lds @@ -39,7 +39,7 @@ SECTIONS . = ALIGN(4); .text : { - cpu/arm920t/start.o (.text) + arch/arm/cpu/arm920t/start.o (.text) *(.text) } diff --git a/cpu/arm925t/Makefile b/arch/arm/cpu/arm925t/Makefile similarity index 100% rename from cpu/arm925t/Makefile rename to arch/arm/cpu/arm925t/Makefile diff --git a/cpu/arm925t/config.mk b/arch/arm/cpu/arm925t/config.mk similarity index 100% rename from cpu/arm925t/config.mk rename to arch/arm/cpu/arm925t/config.mk diff --git a/cpu/arm925t/cpu.c b/arch/arm/cpu/arm925t/cpu.c similarity index 100% rename from cpu/arm925t/cpu.c rename to arch/arm/cpu/arm925t/cpu.c diff --git a/cpu/arm925t/omap925.c b/arch/arm/cpu/arm925t/omap925.c similarity index 100% rename from cpu/arm925t/omap925.c rename to arch/arm/cpu/arm925t/omap925.c diff --git a/cpu/arm925t/start.S b/arch/arm/cpu/arm925t/start.S similarity index 100% rename from cpu/arm925t/start.S rename to arch/arm/cpu/arm925t/start.S diff --git a/cpu/arm925t/timer.c b/arch/arm/cpu/arm925t/timer.c similarity index 100% rename from cpu/arm925t/timer.c rename to arch/arm/cpu/arm925t/timer.c diff --git a/cpu/arm925t/u-boot.lds b/arch/arm/cpu/arm925t/u-boot.lds similarity index 97% rename from cpu/arm925t/u-boot.lds rename to arch/arm/cpu/arm925t/u-boot.lds index 694780eba..e21d6dc5a 100644 --- a/cpu/arm925t/u-boot.lds +++ b/arch/arm/cpu/arm925t/u-boot.lds @@ -34,7 +34,7 @@ SECTIONS . = ALIGN(4); .text : { - cpu/arm925t/start.o (.text) + arch/arm/cpu/arm925t/start.o (.text) *(.text) } diff --git a/cpu/arm926ejs/Makefile b/arch/arm/cpu/arm926ejs/Makefile similarity index 100% rename from cpu/arm926ejs/Makefile rename to arch/arm/cpu/arm926ejs/Makefile diff --git a/cpu/arm926ejs/at91/Makefile b/arch/arm/cpu/arm926ejs/at91/Makefile similarity index 100% rename from cpu/arm926ejs/at91/Makefile rename to arch/arm/cpu/arm926ejs/at91/Makefile diff --git a/cpu/arm926ejs/at91/at91cap9_devices.c b/arch/arm/cpu/arm926ejs/at91/at91cap9_devices.c similarity index 100% rename from cpu/arm926ejs/at91/at91cap9_devices.c rename to arch/arm/cpu/arm926ejs/at91/at91cap9_devices.c diff --git a/cpu/arm926ejs/at91/at91sam9260_devices.c b/arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c similarity index 100% rename from cpu/arm926ejs/at91/at91sam9260_devices.c rename to arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c diff --git a/cpu/arm926ejs/at91/at91sam9261_devices.c b/arch/arm/cpu/arm926ejs/at91/at91sam9261_devices.c similarity index 100% rename from cpu/arm926ejs/at91/at91sam9261_devices.c rename to arch/arm/cpu/arm926ejs/at91/at91sam9261_devices.c diff --git a/cpu/arm926ejs/at91/at91sam9263_devices.c b/arch/arm/cpu/arm926ejs/at91/at91sam9263_devices.c similarity index 100% rename from cpu/arm926ejs/at91/at91sam9263_devices.c rename to arch/arm/cpu/arm926ejs/at91/at91sam9263_devices.c diff --git a/cpu/arm926ejs/at91/at91sam9m10g45_devices.c b/arch/arm/cpu/arm926ejs/at91/at91sam9m10g45_devices.c similarity index 100% rename from cpu/arm926ejs/at91/at91sam9m10g45_devices.c rename to arch/arm/cpu/arm926ejs/at91/at91sam9m10g45_devices.c diff --git a/cpu/arm926ejs/at91/at91sam9rl_devices.c b/arch/arm/cpu/arm926ejs/at91/at91sam9rl_devices.c similarity index 100% rename from cpu/arm926ejs/at91/at91sam9rl_devices.c rename to arch/arm/cpu/arm926ejs/at91/at91sam9rl_devices.c diff --git a/cpu/arm926ejs/at91/clock.c b/arch/arm/cpu/arm926ejs/at91/clock.c similarity index 100% rename from cpu/arm926ejs/at91/clock.c rename to arch/arm/cpu/arm926ejs/at91/clock.c diff --git a/cpu/arm926ejs/at91/config.mk b/arch/arm/cpu/arm926ejs/at91/config.mk similarity index 100% rename from cpu/arm926ejs/at91/config.mk rename to arch/arm/cpu/arm926ejs/at91/config.mk diff --git a/cpu/arm926ejs/at91/cpu.c b/arch/arm/cpu/arm926ejs/at91/cpu.c similarity index 100% rename from cpu/arm926ejs/at91/cpu.c rename to arch/arm/cpu/arm926ejs/at91/cpu.c diff --git a/cpu/arm926ejs/at91/led.c b/arch/arm/cpu/arm926ejs/at91/led.c similarity index 100% rename from cpu/arm926ejs/at91/led.c rename to arch/arm/cpu/arm926ejs/at91/led.c diff --git a/cpu/arm926ejs/at91/lowlevel_init.S b/arch/arm/cpu/arm926ejs/at91/lowlevel_init.S similarity index 100% rename from cpu/arm926ejs/at91/lowlevel_init.S rename to arch/arm/cpu/arm926ejs/at91/lowlevel_init.S diff --git a/cpu/arm926ejs/at91/reset.c b/arch/arm/cpu/arm926ejs/at91/reset.c similarity index 100% rename from cpu/arm926ejs/at91/reset.c rename to arch/arm/cpu/arm926ejs/at91/reset.c diff --git a/cpu/arm926ejs/at91/timer.c b/arch/arm/cpu/arm926ejs/at91/timer.c similarity index 100% rename from cpu/arm926ejs/at91/timer.c rename to arch/arm/cpu/arm926ejs/at91/timer.c diff --git a/cpu/arm926ejs/config.mk b/arch/arm/cpu/arm926ejs/config.mk similarity index 100% rename from cpu/arm926ejs/config.mk rename to arch/arm/cpu/arm926ejs/config.mk diff --git a/cpu/arm926ejs/cpu.c b/arch/arm/cpu/arm926ejs/cpu.c similarity index 100% rename from cpu/arm926ejs/cpu.c rename to arch/arm/cpu/arm926ejs/cpu.c diff --git a/cpu/arm926ejs/davinci/Makefile b/arch/arm/cpu/arm926ejs/davinci/Makefile similarity index 100% rename from cpu/arm926ejs/davinci/Makefile rename to arch/arm/cpu/arm926ejs/davinci/Makefile diff --git a/cpu/arm926ejs/davinci/config.mk b/arch/arm/cpu/arm926ejs/davinci/config.mk similarity index 100% rename from cpu/arm926ejs/davinci/config.mk rename to arch/arm/cpu/arm926ejs/davinci/config.mk diff --git a/cpu/arm926ejs/davinci/cpu.c b/arch/arm/cpu/arm926ejs/davinci/cpu.c similarity index 100% rename from cpu/arm926ejs/davinci/cpu.c rename to arch/arm/cpu/arm926ejs/davinci/cpu.c diff --git a/cpu/arm926ejs/davinci/dm355.c b/arch/arm/cpu/arm926ejs/davinci/dm355.c similarity index 100% rename from cpu/arm926ejs/davinci/dm355.c rename to arch/arm/cpu/arm926ejs/davinci/dm355.c diff --git a/cpu/arm926ejs/davinci/dm365.c b/arch/arm/cpu/arm926ejs/davinci/dm365.c similarity index 100% rename from cpu/arm926ejs/davinci/dm365.c rename to arch/arm/cpu/arm926ejs/davinci/dm365.c diff --git a/cpu/arm926ejs/davinci/dm644x.c b/arch/arm/cpu/arm926ejs/davinci/dm644x.c similarity index 100% rename from cpu/arm926ejs/davinci/dm644x.c rename to arch/arm/cpu/arm926ejs/davinci/dm644x.c diff --git a/cpu/arm926ejs/davinci/dm646x.c b/arch/arm/cpu/arm926ejs/davinci/dm646x.c similarity index 100% rename from cpu/arm926ejs/davinci/dm646x.c rename to arch/arm/cpu/arm926ejs/davinci/dm646x.c diff --git a/cpu/arm926ejs/davinci/dp83848.c b/arch/arm/cpu/arm926ejs/davinci/dp83848.c similarity index 100% rename from cpu/arm926ejs/davinci/dp83848.c rename to arch/arm/cpu/arm926ejs/davinci/dp83848.c diff --git a/cpu/arm926ejs/davinci/lowlevel_init.S b/arch/arm/cpu/arm926ejs/davinci/lowlevel_init.S similarity index 100% rename from cpu/arm926ejs/davinci/lowlevel_init.S rename to arch/arm/cpu/arm926ejs/davinci/lowlevel_init.S diff --git a/cpu/arm926ejs/davinci/lxt972.c b/arch/arm/cpu/arm926ejs/davinci/lxt972.c similarity index 100% rename from cpu/arm926ejs/davinci/lxt972.c rename to arch/arm/cpu/arm926ejs/davinci/lxt972.c diff --git a/cpu/arm926ejs/davinci/psc.c b/arch/arm/cpu/arm926ejs/davinci/psc.c similarity index 100% rename from cpu/arm926ejs/davinci/psc.c rename to arch/arm/cpu/arm926ejs/davinci/psc.c diff --git a/cpu/arm926ejs/davinci/reset.S b/arch/arm/cpu/arm926ejs/davinci/reset.S similarity index 100% rename from cpu/arm926ejs/davinci/reset.S rename to arch/arm/cpu/arm926ejs/davinci/reset.S diff --git a/cpu/arm926ejs/davinci/timer.c b/arch/arm/cpu/arm926ejs/davinci/timer.c similarity index 100% rename from cpu/arm926ejs/davinci/timer.c rename to arch/arm/cpu/arm926ejs/davinci/timer.c diff --git a/cpu/arm926ejs/kirkwood/Makefile b/arch/arm/cpu/arm926ejs/kirkwood/Makefile similarity index 100% rename from cpu/arm926ejs/kirkwood/Makefile rename to arch/arm/cpu/arm926ejs/kirkwood/Makefile diff --git a/cpu/arm926ejs/kirkwood/cpu.c b/arch/arm/cpu/arm926ejs/kirkwood/cpu.c similarity index 100% rename from cpu/arm926ejs/kirkwood/cpu.c rename to arch/arm/cpu/arm926ejs/kirkwood/cpu.c diff --git a/cpu/arm926ejs/kirkwood/dram.c b/arch/arm/cpu/arm926ejs/kirkwood/dram.c similarity index 100% rename from cpu/arm926ejs/kirkwood/dram.c rename to arch/arm/cpu/arm926ejs/kirkwood/dram.c diff --git a/cpu/arm926ejs/kirkwood/mpp.c b/arch/arm/cpu/arm926ejs/kirkwood/mpp.c similarity index 100% rename from cpu/arm926ejs/kirkwood/mpp.c rename to arch/arm/cpu/arm926ejs/kirkwood/mpp.c diff --git a/cpu/arm926ejs/kirkwood/timer.c b/arch/arm/cpu/arm926ejs/kirkwood/timer.c similarity index 100% rename from cpu/arm926ejs/kirkwood/timer.c rename to arch/arm/cpu/arm926ejs/kirkwood/timer.c diff --git a/cpu/arm926ejs/mx25/Makefile b/arch/arm/cpu/arm926ejs/mx25/Makefile similarity index 94% rename from cpu/arm926ejs/mx25/Makefile rename to arch/arm/cpu/arm926ejs/mx25/Makefile index 55c1e899b..76f01791a 100644 --- a/cpu/arm926ejs/mx25/Makefile +++ b/arch/arm/cpu/arm926ejs/mx25/Makefile @@ -28,7 +28,7 @@ COBJS = generic.o timer.o MX27OBJS = reset.o SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) -SRCS += $(addprefix $(SRCTREE)/cpu/arm926ejs/mx27/,$(MX27OBJS:.o=.c)) +SRCS += $(addprefix $(SRCTREE)/arch/arm/cpu/arm926ejs/mx27/,$(MX27OBJS:.o=.c)) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS) $(MX27OBJS)) all: $(obj).depend $(LIB) diff --git a/cpu/arm926ejs/mx25/generic.c b/arch/arm/cpu/arm926ejs/mx25/generic.c similarity index 100% rename from cpu/arm926ejs/mx25/generic.c rename to arch/arm/cpu/arm926ejs/mx25/generic.c diff --git a/cpu/arm926ejs/mx25/reset.c b/arch/arm/cpu/arm926ejs/mx25/reset.c similarity index 100% rename from cpu/arm926ejs/mx25/reset.c rename to arch/arm/cpu/arm926ejs/mx25/reset.c diff --git a/cpu/arm926ejs/mx25/timer.c b/arch/arm/cpu/arm926ejs/mx25/timer.c similarity index 100% rename from cpu/arm926ejs/mx25/timer.c rename to arch/arm/cpu/arm926ejs/mx25/timer.c diff --git a/cpu/arm926ejs/mx27/Makefile b/arch/arm/cpu/arm926ejs/mx27/Makefile similarity index 100% rename from cpu/arm926ejs/mx27/Makefile rename to arch/arm/cpu/arm926ejs/mx27/Makefile diff --git a/cpu/arm926ejs/mx27/generic.c b/arch/arm/cpu/arm926ejs/mx27/generic.c similarity index 100% rename from cpu/arm926ejs/mx27/generic.c rename to arch/arm/cpu/arm926ejs/mx27/generic.c diff --git a/cpu/arm926ejs/mx27/reset.c b/arch/arm/cpu/arm926ejs/mx27/reset.c similarity index 100% rename from cpu/arm926ejs/mx27/reset.c rename to arch/arm/cpu/arm926ejs/mx27/reset.c diff --git a/cpu/arm926ejs/mx27/timer.c b/arch/arm/cpu/arm926ejs/mx27/timer.c similarity index 100% rename from cpu/arm926ejs/mx27/timer.c rename to arch/arm/cpu/arm926ejs/mx27/timer.c diff --git a/cpu/arm926ejs/nomadik/Makefile b/arch/arm/cpu/arm926ejs/nomadik/Makefile similarity index 100% rename from cpu/arm926ejs/nomadik/Makefile rename to arch/arm/cpu/arm926ejs/nomadik/Makefile diff --git a/cpu/arm926ejs/nomadik/gpio.c b/arch/arm/cpu/arm926ejs/nomadik/gpio.c similarity index 100% rename from cpu/arm926ejs/nomadik/gpio.c rename to arch/arm/cpu/arm926ejs/nomadik/gpio.c diff --git a/cpu/arm926ejs/nomadik/reset.S b/arch/arm/cpu/arm926ejs/nomadik/reset.S similarity index 100% rename from cpu/arm926ejs/nomadik/reset.S rename to arch/arm/cpu/arm926ejs/nomadik/reset.S diff --git a/cpu/arm926ejs/nomadik/timer.c b/arch/arm/cpu/arm926ejs/nomadik/timer.c similarity index 100% rename from cpu/arm926ejs/nomadik/timer.c rename to arch/arm/cpu/arm926ejs/nomadik/timer.c diff --git a/cpu/arm926ejs/omap/Makefile b/arch/arm/cpu/arm926ejs/omap/Makefile similarity index 100% rename from cpu/arm926ejs/omap/Makefile rename to arch/arm/cpu/arm926ejs/omap/Makefile diff --git a/cpu/arm926ejs/omap/cpuinfo.c b/arch/arm/cpu/arm926ejs/omap/cpuinfo.c similarity index 100% rename from cpu/arm926ejs/omap/cpuinfo.c rename to arch/arm/cpu/arm926ejs/omap/cpuinfo.c diff --git a/cpu/arm926ejs/omap/reset.S b/arch/arm/cpu/arm926ejs/omap/reset.S similarity index 100% rename from cpu/arm926ejs/omap/reset.S rename to arch/arm/cpu/arm926ejs/omap/reset.S diff --git a/cpu/arm926ejs/omap/timer.c b/arch/arm/cpu/arm926ejs/omap/timer.c similarity index 100% rename from cpu/arm926ejs/omap/timer.c rename to arch/arm/cpu/arm926ejs/omap/timer.c diff --git a/cpu/arm926ejs/spear/Makefile b/arch/arm/cpu/arm926ejs/spear/Makefile similarity index 100% rename from cpu/arm926ejs/spear/Makefile rename to arch/arm/cpu/arm926ejs/spear/Makefile diff --git a/cpu/arm926ejs/spear/reset.c b/arch/arm/cpu/arm926ejs/spear/reset.c similarity index 100% rename from cpu/arm926ejs/spear/reset.c rename to arch/arm/cpu/arm926ejs/spear/reset.c diff --git a/cpu/arm926ejs/spear/timer.c b/arch/arm/cpu/arm926ejs/spear/timer.c similarity index 100% rename from cpu/arm926ejs/spear/timer.c rename to arch/arm/cpu/arm926ejs/spear/timer.c diff --git a/cpu/arm926ejs/start.S b/arch/arm/cpu/arm926ejs/start.S similarity index 100% rename from cpu/arm926ejs/start.S rename to arch/arm/cpu/arm926ejs/start.S diff --git a/cpu/arm926ejs/u-boot.lds b/arch/arm/cpu/arm926ejs/u-boot.lds similarity index 97% rename from cpu/arm926ejs/u-boot.lds rename to arch/arm/cpu/arm926ejs/u-boot.lds index ee5eeb590..ecbc58c7c 100644 --- a/cpu/arm926ejs/u-boot.lds +++ b/arch/arm/cpu/arm926ejs/u-boot.lds @@ -31,7 +31,7 @@ SECTIONS . = ALIGN(4); .text : { - cpu/arm926ejs/start.o (.text) + arch/arm/cpu/arm926ejs/start.o (.text) *(.text) } diff --git a/cpu/arm926ejs/versatile/Makefile b/arch/arm/cpu/arm926ejs/versatile/Makefile similarity index 100% rename from cpu/arm926ejs/versatile/Makefile rename to arch/arm/cpu/arm926ejs/versatile/Makefile diff --git a/cpu/arm926ejs/versatile/reset.S b/arch/arm/cpu/arm926ejs/versatile/reset.S similarity index 100% rename from cpu/arm926ejs/versatile/reset.S rename to arch/arm/cpu/arm926ejs/versatile/reset.S diff --git a/cpu/arm926ejs/versatile/timer.c b/arch/arm/cpu/arm926ejs/versatile/timer.c similarity index 100% rename from cpu/arm926ejs/versatile/timer.c rename to arch/arm/cpu/arm926ejs/versatile/timer.c diff --git a/cpu/arm946es/Makefile b/arch/arm/cpu/arm946es/Makefile similarity index 100% rename from cpu/arm946es/Makefile rename to arch/arm/cpu/arm946es/Makefile diff --git a/cpu/arm946es/config.mk b/arch/arm/cpu/arm946es/config.mk similarity index 100% rename from cpu/arm946es/config.mk rename to arch/arm/cpu/arm946es/config.mk diff --git a/cpu/arm946es/cpu.c b/arch/arm/cpu/arm946es/cpu.c similarity index 100% rename from cpu/arm946es/cpu.c rename to arch/arm/cpu/arm946es/cpu.c diff --git a/cpu/arm946es/start.S b/arch/arm/cpu/arm946es/start.S similarity index 100% rename from cpu/arm946es/start.S rename to arch/arm/cpu/arm946es/start.S diff --git a/cpu/arm946es/u-boot.lds b/arch/arm/cpu/arm946es/u-boot.lds similarity index 97% rename from cpu/arm946es/u-boot.lds rename to arch/arm/cpu/arm946es/u-boot.lds index 5bd4390fb..fef21c758 100644 --- a/cpu/arm946es/u-boot.lds +++ b/arch/arm/cpu/arm946es/u-boot.lds @@ -31,7 +31,7 @@ SECTIONS . = ALIGN(4); .text : { - cpu/arm946es/start.o (.text) + arch/arm/cpu/arm946es/start.o (.text) *(.text) } diff --git a/cpu/arm_cortexa8/Makefile b/arch/arm/cpu/arm_cortexa8/Makefile similarity index 100% rename from cpu/arm_cortexa8/Makefile rename to arch/arm/cpu/arm_cortexa8/Makefile diff --git a/cpu/arm_cortexa8/config.mk b/arch/arm/cpu/arm_cortexa8/config.mk similarity index 100% rename from cpu/arm_cortexa8/config.mk rename to arch/arm/cpu/arm_cortexa8/config.mk diff --git a/cpu/arm_cortexa8/cpu.c b/arch/arm/cpu/arm_cortexa8/cpu.c similarity index 100% rename from cpu/arm_cortexa8/cpu.c rename to arch/arm/cpu/arm_cortexa8/cpu.c diff --git a/cpu/arm_cortexa8/mx51/Makefile b/arch/arm/cpu/arm_cortexa8/mx51/Makefile similarity index 100% rename from cpu/arm_cortexa8/mx51/Makefile rename to arch/arm/cpu/arm_cortexa8/mx51/Makefile diff --git a/cpu/arm_cortexa8/mx51/clock.c b/arch/arm/cpu/arm_cortexa8/mx51/clock.c similarity index 100% rename from cpu/arm_cortexa8/mx51/clock.c rename to arch/arm/cpu/arm_cortexa8/mx51/clock.c diff --git a/cpu/arm_cortexa8/mx51/iomux.c b/arch/arm/cpu/arm_cortexa8/mx51/iomux.c similarity index 100% rename from cpu/arm_cortexa8/mx51/iomux.c rename to arch/arm/cpu/arm_cortexa8/mx51/iomux.c diff --git a/cpu/arm_cortexa8/mx51/lowlevel_init.S b/arch/arm/cpu/arm_cortexa8/mx51/lowlevel_init.S similarity index 100% rename from cpu/arm_cortexa8/mx51/lowlevel_init.S rename to arch/arm/cpu/arm_cortexa8/mx51/lowlevel_init.S diff --git a/cpu/arm_cortexa8/mx51/soc.c b/arch/arm/cpu/arm_cortexa8/mx51/soc.c similarity index 100% rename from cpu/arm_cortexa8/mx51/soc.c rename to arch/arm/cpu/arm_cortexa8/mx51/soc.c diff --git a/cpu/arm_cortexa8/mx51/speed.c b/arch/arm/cpu/arm_cortexa8/mx51/speed.c similarity index 100% rename from cpu/arm_cortexa8/mx51/speed.c rename to arch/arm/cpu/arm_cortexa8/mx51/speed.c diff --git a/cpu/arm_cortexa8/mx51/timer.c b/arch/arm/cpu/arm_cortexa8/mx51/timer.c similarity index 100% rename from cpu/arm_cortexa8/mx51/timer.c rename to arch/arm/cpu/arm_cortexa8/mx51/timer.c diff --git a/cpu/arm_cortexa8/mx51/u-boot.lds b/arch/arm/cpu/arm_cortexa8/mx51/u-boot.lds similarity index 97% rename from cpu/arm_cortexa8/mx51/u-boot.lds rename to arch/arm/cpu/arm_cortexa8/mx51/u-boot.lds index 84c173ac7..2953b9363 100644 --- a/cpu/arm_cortexa8/mx51/u-boot.lds +++ b/arch/arm/cpu/arm_cortexa8/mx51/u-boot.lds @@ -36,7 +36,7 @@ SECTIONS . = ALIGN(4); .text : { - cpu/arm_cortexa8/start.o + arch/arm/cpu/arm_cortexa8/start.o *(.text) } diff --git a/cpu/arm_cortexa8/omap3/Makefile b/arch/arm/cpu/arm_cortexa8/omap3/Makefile similarity index 100% rename from cpu/arm_cortexa8/omap3/Makefile rename to arch/arm/cpu/arm_cortexa8/omap3/Makefile diff --git a/cpu/arm_cortexa8/omap3/board.c b/arch/arm/cpu/arm_cortexa8/omap3/board.c similarity index 100% rename from cpu/arm_cortexa8/omap3/board.c rename to arch/arm/cpu/arm_cortexa8/omap3/board.c diff --git a/cpu/arm_cortexa8/omap3/cache.S b/arch/arm/cpu/arm_cortexa8/omap3/cache.S similarity index 100% rename from cpu/arm_cortexa8/omap3/cache.S rename to arch/arm/cpu/arm_cortexa8/omap3/cache.S diff --git a/cpu/arm_cortexa8/omap3/clock.c b/arch/arm/cpu/arm_cortexa8/omap3/clock.c similarity index 100% rename from cpu/arm_cortexa8/omap3/clock.c rename to arch/arm/cpu/arm_cortexa8/omap3/clock.c diff --git a/cpu/arm_cortexa8/omap3/gpio.c b/arch/arm/cpu/arm_cortexa8/omap3/gpio.c similarity index 100% rename from cpu/arm_cortexa8/omap3/gpio.c rename to arch/arm/cpu/arm_cortexa8/omap3/gpio.c diff --git a/cpu/arm_cortexa8/omap3/lowlevel_init.S b/arch/arm/cpu/arm_cortexa8/omap3/lowlevel_init.S similarity index 100% rename from cpu/arm_cortexa8/omap3/lowlevel_init.S rename to arch/arm/cpu/arm_cortexa8/omap3/lowlevel_init.S diff --git a/cpu/arm_cortexa8/omap3/mem.c b/arch/arm/cpu/arm_cortexa8/omap3/mem.c similarity index 100% rename from cpu/arm_cortexa8/omap3/mem.c rename to arch/arm/cpu/arm_cortexa8/omap3/mem.c diff --git a/cpu/arm_cortexa8/omap3/reset.S b/arch/arm/cpu/arm_cortexa8/omap3/reset.S similarity index 100% rename from cpu/arm_cortexa8/omap3/reset.S rename to arch/arm/cpu/arm_cortexa8/omap3/reset.S diff --git a/cpu/arm_cortexa8/omap3/sys_info.c b/arch/arm/cpu/arm_cortexa8/omap3/sys_info.c similarity index 100% rename from cpu/arm_cortexa8/omap3/sys_info.c rename to arch/arm/cpu/arm_cortexa8/omap3/sys_info.c diff --git a/cpu/arm_cortexa8/omap3/syslib.c b/arch/arm/cpu/arm_cortexa8/omap3/syslib.c similarity index 100% rename from cpu/arm_cortexa8/omap3/syslib.c rename to arch/arm/cpu/arm_cortexa8/omap3/syslib.c diff --git a/cpu/arm_cortexa8/omap3/timer.c b/arch/arm/cpu/arm_cortexa8/omap3/timer.c similarity index 100% rename from cpu/arm_cortexa8/omap3/timer.c rename to arch/arm/cpu/arm_cortexa8/omap3/timer.c diff --git a/cpu/arm_cortexa8/s5pc1xx/Makefile b/arch/arm/cpu/arm_cortexa8/s5pc1xx/Makefile similarity index 100% rename from cpu/arm_cortexa8/s5pc1xx/Makefile rename to arch/arm/cpu/arm_cortexa8/s5pc1xx/Makefile diff --git a/cpu/arm_cortexa8/s5pc1xx/cache.S b/arch/arm/cpu/arm_cortexa8/s5pc1xx/cache.S similarity index 98% rename from cpu/arm_cortexa8/s5pc1xx/cache.S rename to arch/arm/cpu/arm_cortexa8/s5pc1xx/cache.S index 23f527a48..906118d82 100644 --- a/cpu/arm_cortexa8/s5pc1xx/cache.S +++ b/arch/arm/cpu/arm_cortexa8/s5pc1xx/cache.S @@ -2,7 +2,7 @@ * Copyright (C) 2009 Samsung Electronics * Minkyu Kang * - * based on cpu/arm_cortexa8/omap3/cache.S + * based on arch/arm/cpu/arm_cortexa8/omap3/cache.S * * See file CREDITS for list of people who contributed to this * project. diff --git a/cpu/arm_cortexa8/s5pc1xx/clock.c b/arch/arm/cpu/arm_cortexa8/s5pc1xx/clock.c similarity index 100% rename from cpu/arm_cortexa8/s5pc1xx/clock.c rename to arch/arm/cpu/arm_cortexa8/s5pc1xx/clock.c diff --git a/cpu/arm_cortexa8/s5pc1xx/cpu_info.c b/arch/arm/cpu/arm_cortexa8/s5pc1xx/cpu_info.c similarity index 100% rename from cpu/arm_cortexa8/s5pc1xx/cpu_info.c rename to arch/arm/cpu/arm_cortexa8/s5pc1xx/cpu_info.c diff --git a/cpu/arm_cortexa8/s5pc1xx/gpio.c b/arch/arm/cpu/arm_cortexa8/s5pc1xx/gpio.c similarity index 100% rename from cpu/arm_cortexa8/s5pc1xx/gpio.c rename to arch/arm/cpu/arm_cortexa8/s5pc1xx/gpio.c diff --git a/cpu/arm_cortexa8/s5pc1xx/reset.S b/arch/arm/cpu/arm_cortexa8/s5pc1xx/reset.S similarity index 100% rename from cpu/arm_cortexa8/s5pc1xx/reset.S rename to arch/arm/cpu/arm_cortexa8/s5pc1xx/reset.S diff --git a/cpu/arm_cortexa8/s5pc1xx/sromc.c b/arch/arm/cpu/arm_cortexa8/s5pc1xx/sromc.c similarity index 100% rename from cpu/arm_cortexa8/s5pc1xx/sromc.c rename to arch/arm/cpu/arm_cortexa8/s5pc1xx/sromc.c diff --git a/cpu/arm_cortexa8/s5pc1xx/timer.c b/arch/arm/cpu/arm_cortexa8/s5pc1xx/timer.c similarity index 100% rename from cpu/arm_cortexa8/s5pc1xx/timer.c rename to arch/arm/cpu/arm_cortexa8/s5pc1xx/timer.c diff --git a/cpu/arm_cortexa8/start.S b/arch/arm/cpu/arm_cortexa8/start.S similarity index 100% rename from cpu/arm_cortexa8/start.S rename to arch/arm/cpu/arm_cortexa8/start.S diff --git a/cpu/arm_cortexa8/u-boot.lds b/arch/arm/cpu/arm_cortexa8/u-boot.lds similarity index 97% rename from cpu/arm_cortexa8/u-boot.lds rename to arch/arm/cpu/arm_cortexa8/u-boot.lds index 4f1711cca..820e3a104 100644 --- a/cpu/arm_cortexa8/u-boot.lds +++ b/arch/arm/cpu/arm_cortexa8/u-boot.lds @@ -34,7 +34,7 @@ SECTIONS . = ALIGN(4); .text : { - cpu/arm_cortexa8/start.o (.text) + arch/arm/cpu/arm_cortexa8/start.o (.text) *(.text) } diff --git a/cpu/arm_intcm/Makefile b/arch/arm/cpu/arm_intcm/Makefile similarity index 100% rename from cpu/arm_intcm/Makefile rename to arch/arm/cpu/arm_intcm/Makefile diff --git a/cpu/arm_intcm/config.mk b/arch/arm/cpu/arm_intcm/config.mk similarity index 100% rename from cpu/arm_intcm/config.mk rename to arch/arm/cpu/arm_intcm/config.mk diff --git a/cpu/arm_intcm/cpu.c b/arch/arm/cpu/arm_intcm/cpu.c similarity index 100% rename from cpu/arm_intcm/cpu.c rename to arch/arm/cpu/arm_intcm/cpu.c diff --git a/cpu/arm_intcm/start.S b/arch/arm/cpu/arm_intcm/start.S similarity index 100% rename from cpu/arm_intcm/start.S rename to arch/arm/cpu/arm_intcm/start.S diff --git a/cpu/arm_intcm/u-boot.lds b/arch/arm/cpu/arm_intcm/u-boot.lds similarity index 97% rename from cpu/arm_intcm/u-boot.lds rename to arch/arm/cpu/arm_intcm/u-boot.lds index 5eb87fbee..4ed7d8906 100644 --- a/cpu/arm_intcm/u-boot.lds +++ b/arch/arm/cpu/arm_intcm/u-boot.lds @@ -31,7 +31,7 @@ SECTIONS . = ALIGN(4); .text : { - cpu/arm_intcm/start.o (.text) + arch/arm/cpu/arm_intcm/start.o (.text) *(.text) } diff --git a/cpu/ixp/Makefile b/arch/arm/cpu/ixp/Makefile similarity index 100% rename from cpu/ixp/Makefile rename to arch/arm/cpu/ixp/Makefile diff --git a/cpu/ixp/config.mk b/arch/arm/cpu/ixp/config.mk similarity index 100% rename from cpu/ixp/config.mk rename to arch/arm/cpu/ixp/config.mk diff --git a/cpu/ixp/cpu.c b/arch/arm/cpu/ixp/cpu.c similarity index 100% rename from cpu/ixp/cpu.c rename to arch/arm/cpu/ixp/cpu.c diff --git a/cpu/ixp/interrupts.c b/arch/arm/cpu/ixp/interrupts.c similarity index 100% rename from cpu/ixp/interrupts.c rename to arch/arm/cpu/ixp/interrupts.c diff --git a/cpu/ixp/npe/IxEthAcc.c b/arch/arm/cpu/ixp/npe/IxEthAcc.c similarity index 100% rename from cpu/ixp/npe/IxEthAcc.c rename to arch/arm/cpu/ixp/npe/IxEthAcc.c diff --git a/cpu/ixp/npe/IxEthAccCommon.c b/arch/arm/cpu/ixp/npe/IxEthAccCommon.c similarity index 100% rename from cpu/ixp/npe/IxEthAccCommon.c rename to arch/arm/cpu/ixp/npe/IxEthAccCommon.c diff --git a/cpu/ixp/npe/IxEthAccControlInterface.c b/arch/arm/cpu/ixp/npe/IxEthAccControlInterface.c similarity index 100% rename from cpu/ixp/npe/IxEthAccControlInterface.c rename to arch/arm/cpu/ixp/npe/IxEthAccControlInterface.c diff --git a/cpu/ixp/npe/IxEthAccDataPlane.c b/arch/arm/cpu/ixp/npe/IxEthAccDataPlane.c similarity index 100% rename from cpu/ixp/npe/IxEthAccDataPlane.c rename to arch/arm/cpu/ixp/npe/IxEthAccDataPlane.c diff --git a/cpu/ixp/npe/IxEthAccMac.c b/arch/arm/cpu/ixp/npe/IxEthAccMac.c similarity index 100% rename from cpu/ixp/npe/IxEthAccMac.c rename to arch/arm/cpu/ixp/npe/IxEthAccMac.c diff --git a/cpu/ixp/npe/IxEthAccMii.c b/arch/arm/cpu/ixp/npe/IxEthAccMii.c similarity index 100% rename from cpu/ixp/npe/IxEthAccMii.c rename to arch/arm/cpu/ixp/npe/IxEthAccMii.c diff --git a/cpu/ixp/npe/IxEthDBAPI.c b/arch/arm/cpu/ixp/npe/IxEthDBAPI.c similarity index 100% rename from cpu/ixp/npe/IxEthDBAPI.c rename to arch/arm/cpu/ixp/npe/IxEthDBAPI.c diff --git a/cpu/ixp/npe/IxEthDBAPISupport.c b/arch/arm/cpu/ixp/npe/IxEthDBAPISupport.c similarity index 100% rename from cpu/ixp/npe/IxEthDBAPISupport.c rename to arch/arm/cpu/ixp/npe/IxEthDBAPISupport.c diff --git a/cpu/ixp/npe/IxEthDBCore.c b/arch/arm/cpu/ixp/npe/IxEthDBCore.c similarity index 100% rename from cpu/ixp/npe/IxEthDBCore.c rename to arch/arm/cpu/ixp/npe/IxEthDBCore.c diff --git a/cpu/ixp/npe/IxEthDBEvents.c b/arch/arm/cpu/ixp/npe/IxEthDBEvents.c similarity index 100% rename from cpu/ixp/npe/IxEthDBEvents.c rename to arch/arm/cpu/ixp/npe/IxEthDBEvents.c diff --git a/cpu/ixp/npe/IxEthDBFeatures.c b/arch/arm/cpu/ixp/npe/IxEthDBFeatures.c similarity index 100% rename from cpu/ixp/npe/IxEthDBFeatures.c rename to arch/arm/cpu/ixp/npe/IxEthDBFeatures.c diff --git a/cpu/ixp/npe/IxEthDBFirewall.c b/arch/arm/cpu/ixp/npe/IxEthDBFirewall.c similarity index 100% rename from cpu/ixp/npe/IxEthDBFirewall.c rename to arch/arm/cpu/ixp/npe/IxEthDBFirewall.c diff --git a/cpu/ixp/npe/IxEthDBHashtable.c b/arch/arm/cpu/ixp/npe/IxEthDBHashtable.c similarity index 100% rename from cpu/ixp/npe/IxEthDBHashtable.c rename to arch/arm/cpu/ixp/npe/IxEthDBHashtable.c diff --git a/cpu/ixp/npe/IxEthDBLearning.c b/arch/arm/cpu/ixp/npe/IxEthDBLearning.c similarity index 100% rename from cpu/ixp/npe/IxEthDBLearning.c rename to arch/arm/cpu/ixp/npe/IxEthDBLearning.c diff --git a/cpu/ixp/npe/IxEthDBMem.c b/arch/arm/cpu/ixp/npe/IxEthDBMem.c similarity index 100% rename from cpu/ixp/npe/IxEthDBMem.c rename to arch/arm/cpu/ixp/npe/IxEthDBMem.c diff --git a/cpu/ixp/npe/IxEthDBNPEAdaptor.c b/arch/arm/cpu/ixp/npe/IxEthDBNPEAdaptor.c similarity index 100% rename from cpu/ixp/npe/IxEthDBNPEAdaptor.c rename to arch/arm/cpu/ixp/npe/IxEthDBNPEAdaptor.c diff --git a/cpu/ixp/npe/IxEthDBPortUpdate.c b/arch/arm/cpu/ixp/npe/IxEthDBPortUpdate.c similarity index 100% rename from cpu/ixp/npe/IxEthDBPortUpdate.c rename to arch/arm/cpu/ixp/npe/IxEthDBPortUpdate.c diff --git a/cpu/ixp/npe/IxEthDBReports.c b/arch/arm/cpu/ixp/npe/IxEthDBReports.c similarity index 100% rename from cpu/ixp/npe/IxEthDBReports.c rename to arch/arm/cpu/ixp/npe/IxEthDBReports.c diff --git a/cpu/ixp/npe/IxEthDBSearch.c b/arch/arm/cpu/ixp/npe/IxEthDBSearch.c similarity index 100% rename from cpu/ixp/npe/IxEthDBSearch.c rename to arch/arm/cpu/ixp/npe/IxEthDBSearch.c diff --git a/cpu/ixp/npe/IxEthDBSpanningTree.c b/arch/arm/cpu/ixp/npe/IxEthDBSpanningTree.c similarity index 100% rename from cpu/ixp/npe/IxEthDBSpanningTree.c rename to arch/arm/cpu/ixp/npe/IxEthDBSpanningTree.c diff --git a/cpu/ixp/npe/IxEthDBUtil.c b/arch/arm/cpu/ixp/npe/IxEthDBUtil.c similarity index 100% rename from cpu/ixp/npe/IxEthDBUtil.c rename to arch/arm/cpu/ixp/npe/IxEthDBUtil.c diff --git a/cpu/ixp/npe/IxEthDBVlan.c b/arch/arm/cpu/ixp/npe/IxEthDBVlan.c similarity index 100% rename from cpu/ixp/npe/IxEthDBVlan.c rename to arch/arm/cpu/ixp/npe/IxEthDBVlan.c diff --git a/cpu/ixp/npe/IxEthDBWiFi.c b/arch/arm/cpu/ixp/npe/IxEthDBWiFi.c similarity index 100% rename from cpu/ixp/npe/IxEthDBWiFi.c rename to arch/arm/cpu/ixp/npe/IxEthDBWiFi.c diff --git a/cpu/ixp/npe/IxEthMii.c b/arch/arm/cpu/ixp/npe/IxEthMii.c similarity index 100% rename from cpu/ixp/npe/IxEthMii.c rename to arch/arm/cpu/ixp/npe/IxEthMii.c diff --git a/cpu/ixp/npe/IxFeatureCtrl.c b/arch/arm/cpu/ixp/npe/IxFeatureCtrl.c similarity index 100% rename from cpu/ixp/npe/IxFeatureCtrl.c rename to arch/arm/cpu/ixp/npe/IxFeatureCtrl.c diff --git a/cpu/ixp/npe/IxNpeDl.c b/arch/arm/cpu/ixp/npe/IxNpeDl.c similarity index 100% rename from cpu/ixp/npe/IxNpeDl.c rename to arch/arm/cpu/ixp/npe/IxNpeDl.c diff --git a/cpu/ixp/npe/IxNpeDlImageMgr.c b/arch/arm/cpu/ixp/npe/IxNpeDlImageMgr.c similarity index 100% rename from cpu/ixp/npe/IxNpeDlImageMgr.c rename to arch/arm/cpu/ixp/npe/IxNpeDlImageMgr.c diff --git a/cpu/ixp/npe/IxNpeDlNpeMgr.c b/arch/arm/cpu/ixp/npe/IxNpeDlNpeMgr.c similarity index 100% rename from cpu/ixp/npe/IxNpeDlNpeMgr.c rename to arch/arm/cpu/ixp/npe/IxNpeDlNpeMgr.c diff --git a/cpu/ixp/npe/IxNpeDlNpeMgrUtils.c b/arch/arm/cpu/ixp/npe/IxNpeDlNpeMgrUtils.c similarity index 100% rename from cpu/ixp/npe/IxNpeDlNpeMgrUtils.c rename to arch/arm/cpu/ixp/npe/IxNpeDlNpeMgrUtils.c diff --git a/cpu/ixp/npe/IxNpeMh.c b/arch/arm/cpu/ixp/npe/IxNpeMh.c similarity index 100% rename from cpu/ixp/npe/IxNpeMh.c rename to arch/arm/cpu/ixp/npe/IxNpeMh.c diff --git a/cpu/ixp/npe/IxNpeMhConfig.c b/arch/arm/cpu/ixp/npe/IxNpeMhConfig.c similarity index 100% rename from cpu/ixp/npe/IxNpeMhConfig.c rename to arch/arm/cpu/ixp/npe/IxNpeMhConfig.c diff --git a/cpu/ixp/npe/IxNpeMhReceive.c b/arch/arm/cpu/ixp/npe/IxNpeMhReceive.c similarity index 100% rename from cpu/ixp/npe/IxNpeMhReceive.c rename to arch/arm/cpu/ixp/npe/IxNpeMhReceive.c diff --git a/cpu/ixp/npe/IxNpeMhSend.c b/arch/arm/cpu/ixp/npe/IxNpeMhSend.c similarity index 100% rename from cpu/ixp/npe/IxNpeMhSend.c rename to arch/arm/cpu/ixp/npe/IxNpeMhSend.c diff --git a/cpu/ixp/npe/IxNpeMhSolicitedCbMgr.c b/arch/arm/cpu/ixp/npe/IxNpeMhSolicitedCbMgr.c similarity index 100% rename from cpu/ixp/npe/IxNpeMhSolicitedCbMgr.c rename to arch/arm/cpu/ixp/npe/IxNpeMhSolicitedCbMgr.c diff --git a/cpu/ixp/npe/IxNpeMhUnsolicitedCbMgr.c b/arch/arm/cpu/ixp/npe/IxNpeMhUnsolicitedCbMgr.c similarity index 100% rename from cpu/ixp/npe/IxNpeMhUnsolicitedCbMgr.c rename to arch/arm/cpu/ixp/npe/IxNpeMhUnsolicitedCbMgr.c diff --git a/cpu/ixp/npe/IxOsalBufferMgt.c b/arch/arm/cpu/ixp/npe/IxOsalBufferMgt.c similarity index 100% rename from cpu/ixp/npe/IxOsalBufferMgt.c rename to arch/arm/cpu/ixp/npe/IxOsalBufferMgt.c diff --git a/cpu/ixp/npe/IxOsalIoMem.c b/arch/arm/cpu/ixp/npe/IxOsalIoMem.c similarity index 100% rename from cpu/ixp/npe/IxOsalIoMem.c rename to arch/arm/cpu/ixp/npe/IxOsalIoMem.c diff --git a/cpu/ixp/npe/IxOsalOsCacheMMU.c b/arch/arm/cpu/ixp/npe/IxOsalOsCacheMMU.c similarity index 100% rename from cpu/ixp/npe/IxOsalOsCacheMMU.c rename to arch/arm/cpu/ixp/npe/IxOsalOsCacheMMU.c diff --git a/cpu/ixp/npe/IxOsalOsMsgQ.c b/arch/arm/cpu/ixp/npe/IxOsalOsMsgQ.c similarity index 100% rename from cpu/ixp/npe/IxOsalOsMsgQ.c rename to arch/arm/cpu/ixp/npe/IxOsalOsMsgQ.c diff --git a/cpu/ixp/npe/IxOsalOsSemaphore.c b/arch/arm/cpu/ixp/npe/IxOsalOsSemaphore.c similarity index 100% rename from cpu/ixp/npe/IxOsalOsSemaphore.c rename to arch/arm/cpu/ixp/npe/IxOsalOsSemaphore.c diff --git a/cpu/ixp/npe/IxOsalOsServices.c b/arch/arm/cpu/ixp/npe/IxOsalOsServices.c similarity index 100% rename from cpu/ixp/npe/IxOsalOsServices.c rename to arch/arm/cpu/ixp/npe/IxOsalOsServices.c diff --git a/cpu/ixp/npe/IxOsalOsThread.c b/arch/arm/cpu/ixp/npe/IxOsalOsThread.c similarity index 100% rename from cpu/ixp/npe/IxOsalOsThread.c rename to arch/arm/cpu/ixp/npe/IxOsalOsThread.c diff --git a/cpu/ixp/npe/IxQMgrAqmIf.c b/arch/arm/cpu/ixp/npe/IxQMgrAqmIf.c similarity index 100% rename from cpu/ixp/npe/IxQMgrAqmIf.c rename to arch/arm/cpu/ixp/npe/IxQMgrAqmIf.c diff --git a/cpu/ixp/npe/IxQMgrDispatcher.c b/arch/arm/cpu/ixp/npe/IxQMgrDispatcher.c similarity index 100% rename from cpu/ixp/npe/IxQMgrDispatcher.c rename to arch/arm/cpu/ixp/npe/IxQMgrDispatcher.c diff --git a/cpu/ixp/npe/IxQMgrInit.c b/arch/arm/cpu/ixp/npe/IxQMgrInit.c similarity index 100% rename from cpu/ixp/npe/IxQMgrInit.c rename to arch/arm/cpu/ixp/npe/IxQMgrInit.c diff --git a/cpu/ixp/npe/IxQMgrQAccess.c b/arch/arm/cpu/ixp/npe/IxQMgrQAccess.c similarity index 100% rename from cpu/ixp/npe/IxQMgrQAccess.c rename to arch/arm/cpu/ixp/npe/IxQMgrQAccess.c diff --git a/cpu/ixp/npe/IxQMgrQCfg.c b/arch/arm/cpu/ixp/npe/IxQMgrQCfg.c similarity index 100% rename from cpu/ixp/npe/IxQMgrQCfg.c rename to arch/arm/cpu/ixp/npe/IxQMgrQCfg.c diff --git a/cpu/ixp/npe/Makefile b/arch/arm/cpu/ixp/npe/Makefile similarity index 95% rename from cpu/ixp/npe/Makefile rename to arch/arm/cpu/ixp/npe/Makefile index 8fefd29eb..e1f970062 100644 --- a/cpu/ixp/npe/Makefile +++ b/arch/arm/cpu/ixp/npe/Makefile @@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk LIB := $(obj)libnpe.a -LOCAL_CFLAGS += -I$(TOPDIR)/cpu/ixp/npe/include -DCONFIG_IXP425_COMPONENT_ETHDB -D__linux +LOCAL_CFLAGS += -I$(TOPDIR)/arch/arm/cpu/ixp/npe/include -DCONFIG_IXP425_COMPONENT_ETHDB -D__linux CFLAGS += $(LOCAL_CFLAGS) HOSTCFLAGS += $(LOCAL_CFLAGS) diff --git a/cpu/ixp/npe/include/IxAssert.h b/arch/arm/cpu/ixp/npe/include/IxAssert.h similarity index 100% rename from cpu/ixp/npe/include/IxAssert.h rename to arch/arm/cpu/ixp/npe/include/IxAssert.h diff --git a/cpu/ixp/npe/include/IxAtmSch.h b/arch/arm/cpu/ixp/npe/include/IxAtmSch.h similarity index 100% rename from cpu/ixp/npe/include/IxAtmSch.h rename to arch/arm/cpu/ixp/npe/include/IxAtmSch.h diff --git a/cpu/ixp/npe/include/IxAtmTypes.h b/arch/arm/cpu/ixp/npe/include/IxAtmTypes.h similarity index 100% rename from cpu/ixp/npe/include/IxAtmTypes.h rename to arch/arm/cpu/ixp/npe/include/IxAtmTypes.h diff --git a/cpu/ixp/npe/include/IxAtmdAcc.h b/arch/arm/cpu/ixp/npe/include/IxAtmdAcc.h similarity index 100% rename from cpu/ixp/npe/include/IxAtmdAcc.h rename to arch/arm/cpu/ixp/npe/include/IxAtmdAcc.h diff --git a/cpu/ixp/npe/include/IxAtmdAccCtrl.h b/arch/arm/cpu/ixp/npe/include/IxAtmdAccCtrl.h similarity index 100% rename from cpu/ixp/npe/include/IxAtmdAccCtrl.h rename to arch/arm/cpu/ixp/npe/include/IxAtmdAccCtrl.h diff --git a/cpu/ixp/npe/include/IxAtmm.h b/arch/arm/cpu/ixp/npe/include/IxAtmm.h similarity index 100% rename from cpu/ixp/npe/include/IxAtmm.h rename to arch/arm/cpu/ixp/npe/include/IxAtmm.h diff --git a/cpu/ixp/npe/include/IxDmaAcc.h b/arch/arm/cpu/ixp/npe/include/IxDmaAcc.h similarity index 100% rename from cpu/ixp/npe/include/IxDmaAcc.h rename to arch/arm/cpu/ixp/npe/include/IxDmaAcc.h diff --git a/cpu/ixp/npe/include/IxEthAcc.h b/arch/arm/cpu/ixp/npe/include/IxEthAcc.h similarity index 100% rename from cpu/ixp/npe/include/IxEthAcc.h rename to arch/arm/cpu/ixp/npe/include/IxEthAcc.h diff --git a/cpu/ixp/npe/include/IxEthAccDataPlane_p.h b/arch/arm/cpu/ixp/npe/include/IxEthAccDataPlane_p.h similarity index 100% rename from cpu/ixp/npe/include/IxEthAccDataPlane_p.h rename to arch/arm/cpu/ixp/npe/include/IxEthAccDataPlane_p.h diff --git a/cpu/ixp/npe/include/IxEthAccMac_p.h b/arch/arm/cpu/ixp/npe/include/IxEthAccMac_p.h similarity index 100% rename from cpu/ixp/npe/include/IxEthAccMac_p.h rename to arch/arm/cpu/ixp/npe/include/IxEthAccMac_p.h diff --git a/cpu/ixp/npe/include/IxEthAccMii_p.h b/arch/arm/cpu/ixp/npe/include/IxEthAccMii_p.h similarity index 100% rename from cpu/ixp/npe/include/IxEthAccMii_p.h rename to arch/arm/cpu/ixp/npe/include/IxEthAccMii_p.h diff --git a/cpu/ixp/npe/include/IxEthAccQueueAssign_p.h b/arch/arm/cpu/ixp/npe/include/IxEthAccQueueAssign_p.h similarity index 100% rename from cpu/ixp/npe/include/IxEthAccQueueAssign_p.h rename to arch/arm/cpu/ixp/npe/include/IxEthAccQueueAssign_p.h diff --git a/cpu/ixp/npe/include/IxEthAcc_p.h b/arch/arm/cpu/ixp/npe/include/IxEthAcc_p.h similarity index 100% rename from cpu/ixp/npe/include/IxEthAcc_p.h rename to arch/arm/cpu/ixp/npe/include/IxEthAcc_p.h diff --git a/cpu/ixp/npe/include/IxEthDB.h b/arch/arm/cpu/ixp/npe/include/IxEthDB.h similarity index 100% rename from cpu/ixp/npe/include/IxEthDB.h rename to arch/arm/cpu/ixp/npe/include/IxEthDB.h diff --git a/cpu/ixp/npe/include/IxEthDBLocks_p.h b/arch/arm/cpu/ixp/npe/include/IxEthDBLocks_p.h similarity index 100% rename from cpu/ixp/npe/include/IxEthDBLocks_p.h rename to arch/arm/cpu/ixp/npe/include/IxEthDBLocks_p.h diff --git a/cpu/ixp/npe/include/IxEthDBLog_p.h b/arch/arm/cpu/ixp/npe/include/IxEthDBLog_p.h similarity index 100% rename from cpu/ixp/npe/include/IxEthDBLog_p.h rename to arch/arm/cpu/ixp/npe/include/IxEthDBLog_p.h diff --git a/cpu/ixp/npe/include/IxEthDBMessages_p.h b/arch/arm/cpu/ixp/npe/include/IxEthDBMessages_p.h similarity index 100% rename from cpu/ixp/npe/include/IxEthDBMessages_p.h rename to arch/arm/cpu/ixp/npe/include/IxEthDBMessages_p.h diff --git a/cpu/ixp/npe/include/IxEthDBPortDefs.h b/arch/arm/cpu/ixp/npe/include/IxEthDBPortDefs.h similarity index 100% rename from cpu/ixp/npe/include/IxEthDBPortDefs.h rename to arch/arm/cpu/ixp/npe/include/IxEthDBPortDefs.h diff --git a/cpu/ixp/npe/include/IxEthDBQoS.h b/arch/arm/cpu/ixp/npe/include/IxEthDBQoS.h similarity index 100% rename from cpu/ixp/npe/include/IxEthDBQoS.h rename to arch/arm/cpu/ixp/npe/include/IxEthDBQoS.h diff --git a/cpu/ixp/npe/include/IxEthDB_p.h b/arch/arm/cpu/ixp/npe/include/IxEthDB_p.h similarity index 100% rename from cpu/ixp/npe/include/IxEthDB_p.h rename to arch/arm/cpu/ixp/npe/include/IxEthDB_p.h diff --git a/cpu/ixp/npe/include/IxEthMii.h b/arch/arm/cpu/ixp/npe/include/IxEthMii.h similarity index 100% rename from cpu/ixp/npe/include/IxEthMii.h rename to arch/arm/cpu/ixp/npe/include/IxEthMii.h diff --git a/cpu/ixp/npe/include/IxEthMii_p.h b/arch/arm/cpu/ixp/npe/include/IxEthMii_p.h similarity index 100% rename from cpu/ixp/npe/include/IxEthMii_p.h rename to arch/arm/cpu/ixp/npe/include/IxEthMii_p.h diff --git a/cpu/ixp/npe/include/IxEthNpe.h b/arch/arm/cpu/ixp/npe/include/IxEthNpe.h similarity index 100% rename from cpu/ixp/npe/include/IxEthNpe.h rename to arch/arm/cpu/ixp/npe/include/IxEthNpe.h diff --git a/cpu/ixp/npe/include/IxFeatureCtrl.h b/arch/arm/cpu/ixp/npe/include/IxFeatureCtrl.h similarity index 100% rename from cpu/ixp/npe/include/IxFeatureCtrl.h rename to arch/arm/cpu/ixp/npe/include/IxFeatureCtrl.h diff --git a/cpu/ixp/npe/include/IxHssAcc.h b/arch/arm/cpu/ixp/npe/include/IxHssAcc.h similarity index 100% rename from cpu/ixp/npe/include/IxHssAcc.h rename to arch/arm/cpu/ixp/npe/include/IxHssAcc.h diff --git a/cpu/ixp/npe/include/IxI2cDrv.h b/arch/arm/cpu/ixp/npe/include/IxI2cDrv.h similarity index 100% rename from cpu/ixp/npe/include/IxI2cDrv.h rename to arch/arm/cpu/ixp/npe/include/IxI2cDrv.h diff --git a/cpu/ixp/npe/include/IxNpeA.h b/arch/arm/cpu/ixp/npe/include/IxNpeA.h similarity index 100% rename from cpu/ixp/npe/include/IxNpeA.h rename to arch/arm/cpu/ixp/npe/include/IxNpeA.h diff --git a/cpu/ixp/npe/include/IxNpeDl.h b/arch/arm/cpu/ixp/npe/include/IxNpeDl.h similarity index 100% rename from cpu/ixp/npe/include/IxNpeDl.h rename to arch/arm/cpu/ixp/npe/include/IxNpeDl.h diff --git a/cpu/ixp/npe/include/IxNpeDlImageMgr_p.h b/arch/arm/cpu/ixp/npe/include/IxNpeDlImageMgr_p.h similarity index 100% rename from cpu/ixp/npe/include/IxNpeDlImageMgr_p.h rename to arch/arm/cpu/ixp/npe/include/IxNpeDlImageMgr_p.h diff --git a/cpu/ixp/npe/include/IxNpeDlMacros_p.h b/arch/arm/cpu/ixp/npe/include/IxNpeDlMacros_p.h similarity index 100% rename from cpu/ixp/npe/include/IxNpeDlMacros_p.h rename to arch/arm/cpu/ixp/npe/include/IxNpeDlMacros_p.h diff --git a/cpu/ixp/npe/include/IxNpeDlNpeMgrEcRegisters_p.h b/arch/arm/cpu/ixp/npe/include/IxNpeDlNpeMgrEcRegisters_p.h similarity index 100% rename from cpu/ixp/npe/include/IxNpeDlNpeMgrEcRegisters_p.h rename to arch/arm/cpu/ixp/npe/include/IxNpeDlNpeMgrEcRegisters_p.h diff --git a/cpu/ixp/npe/include/IxNpeDlNpeMgrUtils_p.h b/arch/arm/cpu/ixp/npe/include/IxNpeDlNpeMgrUtils_p.h similarity index 100% rename from cpu/ixp/npe/include/IxNpeDlNpeMgrUtils_p.h rename to arch/arm/cpu/ixp/npe/include/IxNpeDlNpeMgrUtils_p.h diff --git a/cpu/ixp/npe/include/IxNpeDlNpeMgr_p.h b/arch/arm/cpu/ixp/npe/include/IxNpeDlNpeMgr_p.h similarity index 100% rename from cpu/ixp/npe/include/IxNpeDlNpeMgr_p.h rename to arch/arm/cpu/ixp/npe/include/IxNpeDlNpeMgr_p.h diff --git a/cpu/ixp/npe/include/IxNpeMh.h b/arch/arm/cpu/ixp/npe/include/IxNpeMh.h similarity index 100% rename from cpu/ixp/npe/include/IxNpeMh.h rename to arch/arm/cpu/ixp/npe/include/IxNpeMh.h diff --git a/cpu/ixp/npe/include/IxNpeMhConfig_p.h b/arch/arm/cpu/ixp/npe/include/IxNpeMhConfig_p.h similarity index 100% rename from cpu/ixp/npe/include/IxNpeMhConfig_p.h rename to arch/arm/cpu/ixp/npe/include/IxNpeMhConfig_p.h diff --git a/cpu/ixp/npe/include/IxNpeMhMacros_p.h b/arch/arm/cpu/ixp/npe/include/IxNpeMhMacros_p.h similarity index 100% rename from cpu/ixp/npe/include/IxNpeMhMacros_p.h rename to arch/arm/cpu/ixp/npe/include/IxNpeMhMacros_p.h diff --git a/cpu/ixp/npe/include/IxNpeMhReceive_p.h b/arch/arm/cpu/ixp/npe/include/IxNpeMhReceive_p.h similarity index 100% rename from cpu/ixp/npe/include/IxNpeMhReceive_p.h rename to arch/arm/cpu/ixp/npe/include/IxNpeMhReceive_p.h diff --git a/cpu/ixp/npe/include/IxNpeMhSend_p.h b/arch/arm/cpu/ixp/npe/include/IxNpeMhSend_p.h similarity index 100% rename from cpu/ixp/npe/include/IxNpeMhSend_p.h rename to arch/arm/cpu/ixp/npe/include/IxNpeMhSend_p.h diff --git a/cpu/ixp/npe/include/IxNpeMhSolicitedCbMgr_p.h b/arch/arm/cpu/ixp/npe/include/IxNpeMhSolicitedCbMgr_p.h similarity index 100% rename from cpu/ixp/npe/include/IxNpeMhSolicitedCbMgr_p.h rename to arch/arm/cpu/ixp/npe/include/IxNpeMhSolicitedCbMgr_p.h diff --git a/cpu/ixp/npe/include/IxNpeMhUnsolicitedCbMgr_p.h b/arch/arm/cpu/ixp/npe/include/IxNpeMhUnsolicitedCbMgr_p.h similarity index 100% rename from cpu/ixp/npe/include/IxNpeMhUnsolicitedCbMgr_p.h rename to arch/arm/cpu/ixp/npe/include/IxNpeMhUnsolicitedCbMgr_p.h diff --git a/cpu/ixp/npe/include/IxNpeMicrocode.h b/arch/arm/cpu/ixp/npe/include/IxNpeMicrocode.h similarity index 100% rename from cpu/ixp/npe/include/IxNpeMicrocode.h rename to arch/arm/cpu/ixp/npe/include/IxNpeMicrocode.h diff --git a/cpu/ixp/npe/include/IxOsBufLib.h b/arch/arm/cpu/ixp/npe/include/IxOsBufLib.h similarity index 100% rename from cpu/ixp/npe/include/IxOsBufLib.h rename to arch/arm/cpu/ixp/npe/include/IxOsBufLib.h diff --git a/cpu/ixp/npe/include/IxOsBuffMgt.h b/arch/arm/cpu/ixp/npe/include/IxOsBuffMgt.h similarity index 100% rename from cpu/ixp/npe/include/IxOsBuffMgt.h rename to arch/arm/cpu/ixp/npe/include/IxOsBuffMgt.h diff --git a/cpu/ixp/npe/include/IxOsBuffPoolMgt.h b/arch/arm/cpu/ixp/npe/include/IxOsBuffPoolMgt.h similarity index 100% rename from cpu/ixp/npe/include/IxOsBuffPoolMgt.h rename to arch/arm/cpu/ixp/npe/include/IxOsBuffPoolMgt.h diff --git a/cpu/ixp/npe/include/IxOsCacheMMU.h b/arch/arm/cpu/ixp/npe/include/IxOsCacheMMU.h similarity index 100% rename from cpu/ixp/npe/include/IxOsCacheMMU.h rename to arch/arm/cpu/ixp/npe/include/IxOsCacheMMU.h diff --git a/cpu/ixp/npe/include/IxOsPrintf.h b/arch/arm/cpu/ixp/npe/include/IxOsPrintf.h similarity index 100% rename from cpu/ixp/npe/include/IxOsPrintf.h rename to arch/arm/cpu/ixp/npe/include/IxOsPrintf.h diff --git a/cpu/ixp/npe/include/IxOsServices.h b/arch/arm/cpu/ixp/npe/include/IxOsServices.h similarity index 100% rename from cpu/ixp/npe/include/IxOsServices.h rename to arch/arm/cpu/ixp/npe/include/IxOsServices.h diff --git a/cpu/ixp/npe/include/IxOsServicesComponents.h b/arch/arm/cpu/ixp/npe/include/IxOsServicesComponents.h similarity index 100% rename from cpu/ixp/npe/include/IxOsServicesComponents.h rename to arch/arm/cpu/ixp/npe/include/IxOsServicesComponents.h diff --git a/cpu/ixp/npe/include/IxOsServicesEndianess.h b/arch/arm/cpu/ixp/npe/include/IxOsServicesEndianess.h similarity index 100% rename from cpu/ixp/npe/include/IxOsServicesEndianess.h rename to arch/arm/cpu/ixp/npe/include/IxOsServicesEndianess.h diff --git a/cpu/ixp/npe/include/IxOsServicesMemAccess.h b/arch/arm/cpu/ixp/npe/include/IxOsServicesMemAccess.h similarity index 100% rename from cpu/ixp/npe/include/IxOsServicesMemAccess.h rename to arch/arm/cpu/ixp/npe/include/IxOsServicesMemAccess.h diff --git a/cpu/ixp/npe/include/IxOsServicesMemMap.h b/arch/arm/cpu/ixp/npe/include/IxOsServicesMemMap.h similarity index 100% rename from cpu/ixp/npe/include/IxOsServicesMemMap.h rename to arch/arm/cpu/ixp/npe/include/IxOsServicesMemMap.h diff --git a/cpu/ixp/npe/include/IxOsal.h b/arch/arm/cpu/ixp/npe/include/IxOsal.h similarity index 100% rename from cpu/ixp/npe/include/IxOsal.h rename to arch/arm/cpu/ixp/npe/include/IxOsal.h diff --git a/cpu/ixp/npe/include/IxOsalAssert.h b/arch/arm/cpu/ixp/npe/include/IxOsalAssert.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalAssert.h rename to arch/arm/cpu/ixp/npe/include/IxOsalAssert.h diff --git a/cpu/ixp/npe/include/IxOsalBackward.h b/arch/arm/cpu/ixp/npe/include/IxOsalBackward.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalBackward.h rename to arch/arm/cpu/ixp/npe/include/IxOsalBackward.h diff --git a/cpu/ixp/npe/include/IxOsalBackwardAssert.h b/arch/arm/cpu/ixp/npe/include/IxOsalBackwardAssert.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalBackwardAssert.h rename to arch/arm/cpu/ixp/npe/include/IxOsalBackwardAssert.h diff --git a/cpu/ixp/npe/include/IxOsalBackwardBufferMgt.h b/arch/arm/cpu/ixp/npe/include/IxOsalBackwardBufferMgt.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalBackwardBufferMgt.h rename to arch/arm/cpu/ixp/npe/include/IxOsalBackwardBufferMgt.h diff --git a/cpu/ixp/npe/include/IxOsalBackwardCacheMMU.h b/arch/arm/cpu/ixp/npe/include/IxOsalBackwardCacheMMU.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalBackwardCacheMMU.h rename to arch/arm/cpu/ixp/npe/include/IxOsalBackwardCacheMMU.h diff --git a/cpu/ixp/npe/include/IxOsalBackwardMemMap.h b/arch/arm/cpu/ixp/npe/include/IxOsalBackwardMemMap.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalBackwardMemMap.h rename to arch/arm/cpu/ixp/npe/include/IxOsalBackwardMemMap.h diff --git a/cpu/ixp/npe/include/IxOsalBackwardOsServices.h b/arch/arm/cpu/ixp/npe/include/IxOsalBackwardOsServices.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalBackwardOsServices.h rename to arch/arm/cpu/ixp/npe/include/IxOsalBackwardOsServices.h diff --git a/cpu/ixp/npe/include/IxOsalBackwardOssl.h b/arch/arm/cpu/ixp/npe/include/IxOsalBackwardOssl.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalBackwardOssl.h rename to arch/arm/cpu/ixp/npe/include/IxOsalBackwardOssl.h diff --git a/cpu/ixp/npe/include/IxOsalBufferMgt.h b/arch/arm/cpu/ixp/npe/include/IxOsalBufferMgt.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalBufferMgt.h rename to arch/arm/cpu/ixp/npe/include/IxOsalBufferMgt.h diff --git a/cpu/ixp/npe/include/IxOsalBufferMgtDefault.h b/arch/arm/cpu/ixp/npe/include/IxOsalBufferMgtDefault.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalBufferMgtDefault.h rename to arch/arm/cpu/ixp/npe/include/IxOsalBufferMgtDefault.h diff --git a/cpu/ixp/npe/include/IxOsalConfig.h b/arch/arm/cpu/ixp/npe/include/IxOsalConfig.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalConfig.h rename to arch/arm/cpu/ixp/npe/include/IxOsalConfig.h diff --git a/cpu/ixp/npe/include/IxOsalEndianess.h b/arch/arm/cpu/ixp/npe/include/IxOsalEndianess.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalEndianess.h rename to arch/arm/cpu/ixp/npe/include/IxOsalEndianess.h diff --git a/cpu/ixp/npe/include/IxOsalIoMem.h b/arch/arm/cpu/ixp/npe/include/IxOsalIoMem.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalIoMem.h rename to arch/arm/cpu/ixp/npe/include/IxOsalIoMem.h diff --git a/cpu/ixp/npe/include/IxOsalMemAccess.h b/arch/arm/cpu/ixp/npe/include/IxOsalMemAccess.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalMemAccess.h rename to arch/arm/cpu/ixp/npe/include/IxOsalMemAccess.h diff --git a/cpu/ixp/npe/include/IxOsalOem.h b/arch/arm/cpu/ixp/npe/include/IxOsalOem.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalOem.h rename to arch/arm/cpu/ixp/npe/include/IxOsalOem.h diff --git a/cpu/ixp/npe/include/IxOsalOs.h b/arch/arm/cpu/ixp/npe/include/IxOsalOs.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalOs.h rename to arch/arm/cpu/ixp/npe/include/IxOsalOs.h diff --git a/cpu/ixp/npe/include/IxOsalOsAssert.h b/arch/arm/cpu/ixp/npe/include/IxOsalOsAssert.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalOsAssert.h rename to arch/arm/cpu/ixp/npe/include/IxOsalOsAssert.h diff --git a/cpu/ixp/npe/include/IxOsalOsBufferMgt.h b/arch/arm/cpu/ixp/npe/include/IxOsalOsBufferMgt.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalOsBufferMgt.h rename to arch/arm/cpu/ixp/npe/include/IxOsalOsBufferMgt.h diff --git a/cpu/ixp/npe/include/IxOsalOsIxp400.h b/arch/arm/cpu/ixp/npe/include/IxOsalOsIxp400.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalOsIxp400.h rename to arch/arm/cpu/ixp/npe/include/IxOsalOsIxp400.h diff --git a/cpu/ixp/npe/include/IxOsalOsIxp400CustomizedMapping.h b/arch/arm/cpu/ixp/npe/include/IxOsalOsIxp400CustomizedMapping.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalOsIxp400CustomizedMapping.h rename to arch/arm/cpu/ixp/npe/include/IxOsalOsIxp400CustomizedMapping.h diff --git a/cpu/ixp/npe/include/IxOsalOsTypes.h b/arch/arm/cpu/ixp/npe/include/IxOsalOsTypes.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalOsTypes.h rename to arch/arm/cpu/ixp/npe/include/IxOsalOsTypes.h diff --git a/cpu/ixp/npe/include/IxOsalOsUtilitySymbols.h b/arch/arm/cpu/ixp/npe/include/IxOsalOsUtilitySymbols.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalOsUtilitySymbols.h rename to arch/arm/cpu/ixp/npe/include/IxOsalOsUtilitySymbols.h diff --git a/cpu/ixp/npe/include/IxOsalTypes.h b/arch/arm/cpu/ixp/npe/include/IxOsalTypes.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalTypes.h rename to arch/arm/cpu/ixp/npe/include/IxOsalTypes.h diff --git a/cpu/ixp/npe/include/IxOsalUtilitySymbols.h b/arch/arm/cpu/ixp/npe/include/IxOsalUtilitySymbols.h similarity index 100% rename from cpu/ixp/npe/include/IxOsalUtilitySymbols.h rename to arch/arm/cpu/ixp/npe/include/IxOsalUtilitySymbols.h diff --git a/cpu/ixp/npe/include/IxParityENAcc.h b/arch/arm/cpu/ixp/npe/include/IxParityENAcc.h similarity index 100% rename from cpu/ixp/npe/include/IxParityENAcc.h rename to arch/arm/cpu/ixp/npe/include/IxParityENAcc.h diff --git a/cpu/ixp/npe/include/IxPerfProfAcc.h b/arch/arm/cpu/ixp/npe/include/IxPerfProfAcc.h similarity index 100% rename from cpu/ixp/npe/include/IxPerfProfAcc.h rename to arch/arm/cpu/ixp/npe/include/IxPerfProfAcc.h diff --git a/cpu/ixp/npe/include/IxQMgr.h b/arch/arm/cpu/ixp/npe/include/IxQMgr.h similarity index 100% rename from cpu/ixp/npe/include/IxQMgr.h rename to arch/arm/cpu/ixp/npe/include/IxQMgr.h diff --git a/cpu/ixp/npe/include/IxQMgrAqmIf_p.h b/arch/arm/cpu/ixp/npe/include/IxQMgrAqmIf_p.h similarity index 100% rename from cpu/ixp/npe/include/IxQMgrAqmIf_p.h rename to arch/arm/cpu/ixp/npe/include/IxQMgrAqmIf_p.h diff --git a/cpu/ixp/npe/include/IxQMgrDefines_p.h b/arch/arm/cpu/ixp/npe/include/IxQMgrDefines_p.h similarity index 100% rename from cpu/ixp/npe/include/IxQMgrDefines_p.h rename to arch/arm/cpu/ixp/npe/include/IxQMgrDefines_p.h diff --git a/cpu/ixp/npe/include/IxQMgrDispatcher_p.h b/arch/arm/cpu/ixp/npe/include/IxQMgrDispatcher_p.h similarity index 100% rename from cpu/ixp/npe/include/IxQMgrDispatcher_p.h rename to arch/arm/cpu/ixp/npe/include/IxQMgrDispatcher_p.h diff --git a/cpu/ixp/npe/include/IxQMgrLog_p.h b/arch/arm/cpu/ixp/npe/include/IxQMgrLog_p.h similarity index 100% rename from cpu/ixp/npe/include/IxQMgrLog_p.h rename to arch/arm/cpu/ixp/npe/include/IxQMgrLog_p.h diff --git a/cpu/ixp/npe/include/IxQMgrQAccess_p.h b/arch/arm/cpu/ixp/npe/include/IxQMgrQAccess_p.h similarity index 100% rename from cpu/ixp/npe/include/IxQMgrQAccess_p.h rename to arch/arm/cpu/ixp/npe/include/IxQMgrQAccess_p.h diff --git a/cpu/ixp/npe/include/IxQMgrQCfg_p.h b/arch/arm/cpu/ixp/npe/include/IxQMgrQCfg_p.h similarity index 100% rename from cpu/ixp/npe/include/IxQMgrQCfg_p.h rename to arch/arm/cpu/ixp/npe/include/IxQMgrQCfg_p.h diff --git a/cpu/ixp/npe/include/IxQueueAssignments.h b/arch/arm/cpu/ixp/npe/include/IxQueueAssignments.h similarity index 100% rename from cpu/ixp/npe/include/IxQueueAssignments.h rename to arch/arm/cpu/ixp/npe/include/IxQueueAssignments.h diff --git a/cpu/ixp/npe/include/IxSspAcc.h b/arch/arm/cpu/ixp/npe/include/IxSspAcc.h similarity index 100% rename from cpu/ixp/npe/include/IxSspAcc.h rename to arch/arm/cpu/ixp/npe/include/IxSspAcc.h diff --git a/cpu/ixp/npe/include/IxTimeSyncAcc.h b/arch/arm/cpu/ixp/npe/include/IxTimeSyncAcc.h similarity index 100% rename from cpu/ixp/npe/include/IxTimeSyncAcc.h rename to arch/arm/cpu/ixp/npe/include/IxTimeSyncAcc.h diff --git a/cpu/ixp/npe/include/IxTimerCtrl.h b/arch/arm/cpu/ixp/npe/include/IxTimerCtrl.h similarity index 100% rename from cpu/ixp/npe/include/IxTimerCtrl.h rename to arch/arm/cpu/ixp/npe/include/IxTimerCtrl.h diff --git a/cpu/ixp/npe/include/IxTypes.h b/arch/arm/cpu/ixp/npe/include/IxTypes.h similarity index 100% rename from cpu/ixp/npe/include/IxTypes.h rename to arch/arm/cpu/ixp/npe/include/IxTypes.h diff --git a/cpu/ixp/npe/include/IxUART.h b/arch/arm/cpu/ixp/npe/include/IxUART.h similarity index 100% rename from cpu/ixp/npe/include/IxUART.h rename to arch/arm/cpu/ixp/npe/include/IxUART.h diff --git a/cpu/ixp/npe/include/IxVersionId.h b/arch/arm/cpu/ixp/npe/include/IxVersionId.h similarity index 100% rename from cpu/ixp/npe/include/IxVersionId.h rename to arch/arm/cpu/ixp/npe/include/IxVersionId.h diff --git a/cpu/ixp/npe/include/ix_error.h b/arch/arm/cpu/ixp/npe/include/ix_error.h similarity index 100% rename from cpu/ixp/npe/include/ix_error.h rename to arch/arm/cpu/ixp/npe/include/ix_error.h diff --git a/cpu/ixp/npe/include/ix_macros.h b/arch/arm/cpu/ixp/npe/include/ix_macros.h similarity index 100% rename from cpu/ixp/npe/include/ix_macros.h rename to arch/arm/cpu/ixp/npe/include/ix_macros.h diff --git a/cpu/ixp/npe/include/ix_os_type.h b/arch/arm/cpu/ixp/npe/include/ix_os_type.h similarity index 100% rename from cpu/ixp/npe/include/ix_os_type.h rename to arch/arm/cpu/ixp/npe/include/ix_os_type.h diff --git a/cpu/ixp/npe/include/ix_ossl.h b/arch/arm/cpu/ixp/npe/include/ix_ossl.h similarity index 100% rename from cpu/ixp/npe/include/ix_ossl.h rename to arch/arm/cpu/ixp/npe/include/ix_ossl.h diff --git a/cpu/ixp/npe/include/ix_symbols.h b/arch/arm/cpu/ixp/npe/include/ix_symbols.h similarity index 100% rename from cpu/ixp/npe/include/ix_symbols.h rename to arch/arm/cpu/ixp/npe/include/ix_symbols.h diff --git a/cpu/ixp/npe/include/ix_types.h b/arch/arm/cpu/ixp/npe/include/ix_types.h similarity index 100% rename from cpu/ixp/npe/include/ix_types.h rename to arch/arm/cpu/ixp/npe/include/ix_types.h diff --git a/cpu/ixp/npe/include/npe.h b/arch/arm/cpu/ixp/npe/include/npe.h similarity index 100% rename from cpu/ixp/npe/include/npe.h rename to arch/arm/cpu/ixp/npe/include/npe.h diff --git a/cpu/ixp/npe/include/os_datatypes.h b/arch/arm/cpu/ixp/npe/include/os_datatypes.h similarity index 100% rename from cpu/ixp/npe/include/os_datatypes.h rename to arch/arm/cpu/ixp/npe/include/os_datatypes.h diff --git a/cpu/ixp/npe/miiphy.c b/arch/arm/cpu/ixp/npe/miiphy.c similarity index 100% rename from cpu/ixp/npe/miiphy.c rename to arch/arm/cpu/ixp/npe/miiphy.c diff --git a/cpu/ixp/npe/npe.c b/arch/arm/cpu/ixp/npe/npe.c similarity index 100% rename from cpu/ixp/npe/npe.c rename to arch/arm/cpu/ixp/npe/npe.c diff --git a/cpu/ixp/start.S b/arch/arm/cpu/ixp/start.S similarity index 100% rename from cpu/ixp/start.S rename to arch/arm/cpu/ixp/start.S diff --git a/cpu/ixp/timer.c b/arch/arm/cpu/ixp/timer.c similarity index 100% rename from cpu/ixp/timer.c rename to arch/arm/cpu/ixp/timer.c diff --git a/cpu/ixp/u-boot.lds b/arch/arm/cpu/ixp/u-boot.lds similarity index 97% rename from cpu/ixp/u-boot.lds rename to arch/arm/cpu/ixp/u-boot.lds index 85209caf7..b8ff2eed5 100644 --- a/cpu/ixp/u-boot.lds +++ b/arch/arm/cpu/ixp/u-boot.lds @@ -31,7 +31,7 @@ SECTIONS . = ALIGN(4); .text : { - cpu/ixp/start.o(.text) + arch/arm/cpu/ixp/start.o(.text) *(.text) } diff --git a/cpu/lh7a40x/Makefile b/arch/arm/cpu/lh7a40x/Makefile similarity index 100% rename from cpu/lh7a40x/Makefile rename to arch/arm/cpu/lh7a40x/Makefile diff --git a/cpu/lh7a40x/config.mk b/arch/arm/cpu/lh7a40x/config.mk similarity index 100% rename from cpu/lh7a40x/config.mk rename to arch/arm/cpu/lh7a40x/config.mk diff --git a/cpu/lh7a40x/cpu.c b/arch/arm/cpu/lh7a40x/cpu.c similarity index 100% rename from cpu/lh7a40x/cpu.c rename to arch/arm/cpu/lh7a40x/cpu.c diff --git a/cpu/lh7a40x/speed.c b/arch/arm/cpu/lh7a40x/speed.c similarity index 100% rename from cpu/lh7a40x/speed.c rename to arch/arm/cpu/lh7a40x/speed.c diff --git a/cpu/lh7a40x/start.S b/arch/arm/cpu/lh7a40x/start.S similarity index 100% rename from cpu/lh7a40x/start.S rename to arch/arm/cpu/lh7a40x/start.S diff --git a/cpu/lh7a40x/timer.c b/arch/arm/cpu/lh7a40x/timer.c similarity index 100% rename from cpu/lh7a40x/timer.c rename to arch/arm/cpu/lh7a40x/timer.c diff --git a/cpu/lh7a40x/u-boot.lds b/arch/arm/cpu/lh7a40x/u-boot.lds similarity index 97% rename from cpu/lh7a40x/u-boot.lds rename to arch/arm/cpu/lh7a40x/u-boot.lds index e7543c97c..5a8ccf588 100644 --- a/cpu/lh7a40x/u-boot.lds +++ b/arch/arm/cpu/lh7a40x/u-boot.lds @@ -31,7 +31,7 @@ SECTIONS . = ALIGN(4); .text : { - cpu/lh7a40x/start.o (.text) + arch/arm/cpu/lh7a40x/start.o (.text) *(.text) } diff --git a/cpu/pxa/Makefile b/arch/arm/cpu/pxa/Makefile similarity index 100% rename from cpu/pxa/Makefile rename to arch/arm/cpu/pxa/Makefile diff --git a/cpu/pxa/config.mk b/arch/arm/cpu/pxa/config.mk similarity index 100% rename from cpu/pxa/config.mk rename to arch/arm/cpu/pxa/config.mk diff --git a/cpu/pxa/cpu.c b/arch/arm/cpu/pxa/cpu.c similarity index 100% rename from cpu/pxa/cpu.c rename to arch/arm/cpu/pxa/cpu.c diff --git a/cpu/pxa/i2c.c b/arch/arm/cpu/pxa/i2c.c similarity index 100% rename from cpu/pxa/i2c.c rename to arch/arm/cpu/pxa/i2c.c diff --git a/cpu/pxa/pxafb.c b/arch/arm/cpu/pxa/pxafb.c similarity index 100% rename from cpu/pxa/pxafb.c rename to arch/arm/cpu/pxa/pxafb.c diff --git a/cpu/pxa/start.S b/arch/arm/cpu/pxa/start.S similarity index 100% rename from cpu/pxa/start.S rename to arch/arm/cpu/pxa/start.S diff --git a/cpu/pxa/timer.c b/arch/arm/cpu/pxa/timer.c similarity index 100% rename from cpu/pxa/timer.c rename to arch/arm/cpu/pxa/timer.c diff --git a/cpu/pxa/u-boot.lds b/arch/arm/cpu/pxa/u-boot.lds similarity index 97% rename from cpu/pxa/u-boot.lds rename to arch/arm/cpu/pxa/u-boot.lds index 77ab3c902..d4e85ef55 100644 --- a/cpu/pxa/u-boot.lds +++ b/arch/arm/cpu/pxa/u-boot.lds @@ -31,7 +31,7 @@ SECTIONS . = ALIGN(4); .text : { - cpu/pxa/start.o (.text) + arch/arm/cpu/pxa/start.o (.text) *(.text) } diff --git a/cpu/pxa/usb.c b/arch/arm/cpu/pxa/usb.c similarity index 100% rename from cpu/pxa/usb.c rename to arch/arm/cpu/pxa/usb.c diff --git a/cpu/s3c44b0/Makefile b/arch/arm/cpu/s3c44b0/Makefile similarity index 100% rename from cpu/s3c44b0/Makefile rename to arch/arm/cpu/s3c44b0/Makefile diff --git a/cpu/s3c44b0/cache.c b/arch/arm/cpu/s3c44b0/cache.c similarity index 100% rename from cpu/s3c44b0/cache.c rename to arch/arm/cpu/s3c44b0/cache.c diff --git a/cpu/s3c44b0/config.mk b/arch/arm/cpu/s3c44b0/config.mk similarity index 100% rename from cpu/s3c44b0/config.mk rename to arch/arm/cpu/s3c44b0/config.mk diff --git a/cpu/s3c44b0/cpu.c b/arch/arm/cpu/s3c44b0/cpu.c similarity index 100% rename from cpu/s3c44b0/cpu.c rename to arch/arm/cpu/s3c44b0/cpu.c diff --git a/cpu/s3c44b0/start.S b/arch/arm/cpu/s3c44b0/start.S similarity index 100% rename from cpu/s3c44b0/start.S rename to arch/arm/cpu/s3c44b0/start.S diff --git a/cpu/s3c44b0/timer.c b/arch/arm/cpu/s3c44b0/timer.c similarity index 100% rename from cpu/s3c44b0/timer.c rename to arch/arm/cpu/s3c44b0/timer.c diff --git a/cpu/s3c44b0/u-boot.lds b/arch/arm/cpu/s3c44b0/u-boot.lds similarity index 97% rename from cpu/s3c44b0/u-boot.lds rename to arch/arm/cpu/s3c44b0/u-boot.lds index 41ca3b4e8..267d94c08 100644 --- a/cpu/s3c44b0/u-boot.lds +++ b/arch/arm/cpu/s3c44b0/u-boot.lds @@ -31,7 +31,7 @@ SECTIONS . = ALIGN(4); .text : { - cpu/s3c44b0/start.o (.text) + arch/arm/cpu/s3c44b0/start.o (.text) *(.text) } diff --git a/cpu/sa1100/Makefile b/arch/arm/cpu/sa1100/Makefile similarity index 100% rename from cpu/sa1100/Makefile rename to arch/arm/cpu/sa1100/Makefile diff --git a/cpu/sa1100/config.mk b/arch/arm/cpu/sa1100/config.mk similarity index 100% rename from cpu/sa1100/config.mk rename to arch/arm/cpu/sa1100/config.mk diff --git a/cpu/sa1100/cpu.c b/arch/arm/cpu/sa1100/cpu.c similarity index 100% rename from cpu/sa1100/cpu.c rename to arch/arm/cpu/sa1100/cpu.c diff --git a/cpu/sa1100/start.S b/arch/arm/cpu/sa1100/start.S similarity index 100% rename from cpu/sa1100/start.S rename to arch/arm/cpu/sa1100/start.S diff --git a/cpu/sa1100/timer.c b/arch/arm/cpu/sa1100/timer.c similarity index 100% rename from cpu/sa1100/timer.c rename to arch/arm/cpu/sa1100/timer.c diff --git a/cpu/sa1100/u-boot.lds b/arch/arm/cpu/sa1100/u-boot.lds similarity index 97% rename from cpu/sa1100/u-boot.lds rename to arch/arm/cpu/sa1100/u-boot.lds index 0c02e76e7..f6197acd8 100644 --- a/cpu/sa1100/u-boot.lds +++ b/arch/arm/cpu/sa1100/u-boot.lds @@ -34,7 +34,7 @@ SECTIONS . = ALIGN(4); .text : { - cpu/sa1100/start.o (.text) + arch/arm/cpu/sa1100/start.o (.text) *(.text) } diff --git a/arch/arm/include/asm/arch-mx51/asm-offsets.h b/arch/arm/include/asm/arch-mx51/asm-offsets.h index 3a83fa07a..fbba412aa 100644 --- a/arch/arm/include/asm/arch-mx51/asm-offsets.h +++ b/arch/arm/include/asm/arch-mx51/asm-offsets.h @@ -1,5 +1,5 @@ /* - * needed for cpu/arm_cortexa8/mx51/lowlevel_init.S + * needed for arch/arm/cpu/arm_cortexa8/mx51/lowlevel_init.S * * These should be auto-generated */ diff --git a/board/actux1/config.mk b/board/actux1/config.mk index 119140d8c..a0dbe0bc4 100644 --- a/board/actux1/config.mk +++ b/board/actux1/config.mk @@ -1,6 +1,6 @@ TEXT_BASE = 0x00e00000 # include NPE ethernet driver -BOARDLIBS = cpu/ixp/npe/libnpe.a +BOARDLIBS = arch/arm/cpu/ixp/npe/libnpe.a LDSCRIPT := $(SRCTREE)/board/$(BOARDDIR)/u-boot.lds diff --git a/board/actux1/u-boot.lds b/board/actux1/u-boot.lds index 40b5ef3bd..5c1ece79c 100644 --- a/board/actux1/u-boot.lds +++ b/board/actux1/u-boot.lds @@ -30,12 +30,12 @@ SECTIONS . = ALIGN (4); .text : { - cpu/ixp/start.o(.text) + arch/arm/cpu/ixp/start.o(.text) lib/string.o(.text) lib/vsprintf.o(.text) arch/arm/lib/board.o(.text) common/dlmalloc.o(.text) - cpu/ixp/cpu.o(.text) + arch/arm/cpu/ixp/cpu.o(.text) . = env_offset; common/env_embedded.o(.ppcenv) * (.text) diff --git a/board/actux2/config.mk b/board/actux2/config.mk index 119140d8c..a0dbe0bc4 100644 --- a/board/actux2/config.mk +++ b/board/actux2/config.mk @@ -1,6 +1,6 @@ TEXT_BASE = 0x00e00000 # include NPE ethernet driver -BOARDLIBS = cpu/ixp/npe/libnpe.a +BOARDLIBS = arch/arm/cpu/ixp/npe/libnpe.a LDSCRIPT := $(SRCTREE)/board/$(BOARDDIR)/u-boot.lds diff --git a/board/actux2/u-boot.lds b/board/actux2/u-boot.lds index f9ab281bc..707c027ab 100644 --- a/board/actux2/u-boot.lds +++ b/board/actux2/u-boot.lds @@ -30,12 +30,12 @@ SECTIONS . = ALIGN (4); .text : { - cpu/ixp/start.o(.text) + arch/arm/cpu/ixp/start.o(.text) lib/string.o(.text) lib/vsprintf.o(.text) arch/arm/lib/board.o(.text) common/dlmalloc.o(.text) - cpu/ixp/cpu.o(.text) + arch/arm/cpu/ixp/cpu.o(.text) . = env_offset; common/env_embedded.o (.ppcenv) diff --git a/board/actux3/config.mk b/board/actux3/config.mk index 119140d8c..a0dbe0bc4 100644 --- a/board/actux3/config.mk +++ b/board/actux3/config.mk @@ -1,6 +1,6 @@ TEXT_BASE = 0x00e00000 # include NPE ethernet driver -BOARDLIBS = cpu/ixp/npe/libnpe.a +BOARDLIBS = arch/arm/cpu/ixp/npe/libnpe.a LDSCRIPT := $(SRCTREE)/board/$(BOARDDIR)/u-boot.lds diff --git a/board/actux3/u-boot.lds b/board/actux3/u-boot.lds index 2fc379615..497ab9769 100644 --- a/board/actux3/u-boot.lds +++ b/board/actux3/u-boot.lds @@ -30,12 +30,12 @@ SECTIONS . = ALIGN (4); .text : { - cpu/ixp/start.o (.text) + arch/arm/cpu/ixp/start.o (.text) lib/string.o (.text) lib/vsprintf.o (.text) arch/arm/lib/board.o (.text) common/dlmalloc.o (.text) - cpu/ixp/cpu.o (.text) + arch/arm/cpu/ixp/cpu.o (.text) . = env_offset; common/env_embedded.o (.ppcenv) diff --git a/board/actux4/config.mk b/board/actux4/config.mk index 9a634cdff..f2b5fc911 100644 --- a/board/actux4/config.mk +++ b/board/actux4/config.mk @@ -1,4 +1,4 @@ TEXT_BASE = 0x00e00000 # include NPE ethernet driver -BOARDLIBS = cpu/ixp/npe/libnpe.a +BOARDLIBS = arch/arm/cpu/ixp/npe/libnpe.a diff --git a/board/davinci/dvevm/board_init.S b/board/davinci/dvevm/board_init.S index 22d8adc18..81b23d043 100644 --- a/board/davinci/dvevm/board_init.S +++ b/board/davinci/dvevm/board_init.S @@ -2,7 +2,7 @@ * Copyright (C) 2007 Sergey Kubushyn * * Board-specific low level initialization code. Called at the very end - * of cpu/arm926ejs/davinci/lowlevel_init.S. Just returns if there is no + * of arch/arm/cpu/arm926ejs/davinci/lowlevel_init.S. Just returns if there is no * initialization required. * * This program is free software; you can redistribute it and/or diff --git a/board/davinci/schmoogie/board_init.S b/board/davinci/schmoogie/board_init.S index 22d8adc18..81b23d043 100644 --- a/board/davinci/schmoogie/board_init.S +++ b/board/davinci/schmoogie/board_init.S @@ -2,7 +2,7 @@ * Copyright (C) 2007 Sergey Kubushyn * * Board-specific low level initialization code. Called at the very end - * of cpu/arm926ejs/davinci/lowlevel_init.S. Just returns if there is no + * of arch/arm/cpu/arm926ejs/davinci/lowlevel_init.S. Just returns if there is no * initialization required. * * This program is free software; you can redistribute it and/or diff --git a/board/davinci/sffsdr/board_init.S b/board/davinci/sffsdr/board_init.S index 22d8adc18..81b23d043 100644 --- a/board/davinci/sffsdr/board_init.S +++ b/board/davinci/sffsdr/board_init.S @@ -2,7 +2,7 @@ * Copyright (C) 2007 Sergey Kubushyn * * Board-specific low level initialization code. Called at the very end - * of cpu/arm926ejs/davinci/lowlevel_init.S. Just returns if there is no + * of arch/arm/cpu/arm926ejs/davinci/lowlevel_init.S. Just returns if there is no * initialization required. * * This program is free software; you can redistribute it and/or diff --git a/board/davinci/sonata/board_init.S b/board/davinci/sonata/board_init.S index fbb9ea73e..3e4c7a2c5 100644 --- a/board/davinci/sonata/board_init.S +++ b/board/davinci/sonata/board_init.S @@ -2,7 +2,7 @@ * Copyright (C) 2007 Sergey Kubushyn * * Board-specific low level initialization code. Called at the very end - * of cpu/arm926ejs/davinci/lowlevel_init.S. Just returns if there is no + * of arch/arm/cpu/arm926ejs/davinci/lowlevel_init.S. Just returns if there is no * initialization required. * * For _OLDER_ Sonata boards sets up GPIO4 to control NAND WP line. Newer diff --git a/board/edb93xx/config.mk b/board/edb93xx/config.mk index b2fc6fac3..b627869c2 100644 --- a/board/edb93xx/config.mk +++ b/board/edb93xx/config.mk @@ -1,4 +1,4 @@ -LDSCRIPT := $(SRCTREE)/cpu/arm920t/ep93xx/u-boot.lds +LDSCRIPT := $(SRCTREE)/arch/arm/cpu/arm920t/ep93xx/u-boot.lds ifdef CONFIG_EDB9301 TEXT_BASE = 0x05700000 diff --git a/board/freescale/mx31ads/u-boot.lds b/board/freescale/mx31ads/u-boot.lds index 6f5bda457..273129457 100644 --- a/board/freescale/mx31ads/u-boot.lds +++ b/board/freescale/mx31ads/u-boot.lds @@ -37,7 +37,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/arm1136/start.o (.text) + arch/arm/cpu/arm1136/start.o (.text) board/freescale/mx31ads/libmx31ads.a (.text) arch/arm/lib/libarm.a (.text) net/libnet.a (.text) diff --git a/board/logicpd/zoom2/zoom2.c b/board/logicpd/zoom2/zoom2.c index 387ed2d39..6455d1dc3 100644 --- a/board/logicpd/zoom2/zoom2.c +++ b/board/logicpd/zoom2/zoom2.c @@ -46,7 +46,7 @@ /* * This the the zoom2, board specific, gpmc configuration for the * quad uart on the debug board. The more general gpmc configurations - * are setup at the cpu level in cpu/arm_cortexa8/omap3/mem.c + * are setup at the cpu level in arch/arm/cpu/arm_cortexa8/omap3/mem.c * * The details of the setting of the serial gpmc setup are not available. * The values were provided by another party. diff --git a/board/lpc2292sodimm/flash.c b/board/lpc2292sodimm/flash.c index a7e175d8e..fd5389fb9 100644 --- a/board/lpc2292sodimm/flash.c +++ b/board/lpc2292sodimm/flash.c @@ -1,7 +1,7 @@ /* * (C) Copyright 2006 Embedded Artists AB * - * Modified to use the routines in cpu/arm720t/lpc2292/flash.c by + * Modified to use the routines in arch/arm/cpu/arm720t/lpc2292/flash.c by * Gary Jennejohn * * This program is free software; you can redistribute it and/or diff --git a/board/samsung/smdk6400/u-boot-nand.lds b/board/samsung/smdk6400/u-boot-nand.lds index a074420c1..29a4f61e3 100644 --- a/board/samsung/smdk6400/u-boot-nand.lds +++ b/board/samsung/smdk6400/u-boot-nand.lds @@ -34,8 +34,8 @@ SECTIONS . = ALIGN(4); .text : { - cpu/arm1176/start.o (.text) - cpu/arm1176/s3c64xx/cpu_init.o (.text) + arch/arm/cpu/arm1176/start.o (.text) + arch/arm/cpu/arm1176/s3c64xx/cpu_init.o (.text) *(.text) } diff --git a/board/siemens/SMN42/flash.c b/board/siemens/SMN42/flash.c index 8cf17b857..fc91574f8 100644 --- a/board/siemens/SMN42/flash.c +++ b/board/siemens/SMN42/flash.c @@ -2,7 +2,7 @@ * (C) Copyright 2006 Embedded Artists AB * * (C) Copyright 2007 Gary Jennejohn garyj@denx.de - * Modified to use the routines in cpu/arm720t/lpc2292/flash.c. + * Modified to use the routines in arch/arm/cpu/arm720t/lpc2292/flash.c. * Heavily modified to support the SMN42 board from Siemens * * This program is free software; you can redistribute it and/or diff --git a/board/trab/rs485.c b/board/trab/rs485.c index ad0c13665..6a3a4cda9 100644 --- a/board/trab/rs485.c +++ b/board/trab/rs485.c @@ -2,7 +2,7 @@ * (C) Copyright 2003 * Martin Krause, TQ-Systems GmbH, * - * Based on cpu/arm920t/serial.c, by Gary Jennejohn + * Based on arch/arm/cpu/arm920t/serial.c, by Gary Jennejohn * (C) Copyright 2002 Gary Jennejohn, DENX Software Engineering, * * This program is free software; you can redistribute it and/or modify diff --git a/board/trab/rs485.h b/board/trab/rs485.h index 16d69bbd5..19e32446c 100644 --- a/board/trab/rs485.h +++ b/board/trab/rs485.h @@ -2,7 +2,7 @@ * (C) Copyright 2003 * Martin Krause, TQ-Systems GmbH, * - * Based on cpu/arm920t/serial.c, by Gary Jennejohn + * Based on arch/arm/cpu/arm920t/serial.c, by Gary Jennejohn * (C) Copyright 2002 Gary Jennejohn, DENX Software Engineering, * * This program is free software; you can redistribute it and/or modify diff --git a/board/trab/u-boot.lds b/board/trab/u-boot.lds index 05b929f56..cd50e8524 100644 --- a/board/trab/u-boot.lds +++ b/board/trab/u-boot.lds @@ -32,7 +32,7 @@ SECTIONS . = ALIGN(4); .text : { - cpu/arm920t/start.o (.text) + arch/arm/cpu/arm920t/start.o (.text) lib/zlib.o (.text) lib/crc32.o (.text) lib/string.o (.text) diff --git a/doc/README-integrator b/doc/README-integrator index 4daf3413a..5a0e93492 100644 --- a/doc/README-integrator +++ b/doc/README-integrator @@ -52,7 +52,7 @@ cpu/arm<>/start.S so that it may be used by other boards. However, to avoid duplicating code through all processor files, a generic core for ARM Integrator CMs has been added - cpu/arm_intcm + arch/arm/cpu/arm_intcm Otherwise. for example, the standard CM reset via the CM control register would need placing in each CM processor file...... diff --git a/doc/README.ARM-SoC b/doc/README.ARM-SoC index 15f065dfb..d6bd62488 100644 --- a/doc/README.ARM-SoC +++ b/doc/README.ARM-SoC @@ -1,7 +1,7 @@ [By Steven Scholz , 16 Aug 2004] Since the cpu/ directory gets clobbered with peripheral driver code I -started cleaning up cpu/arm920t. +started cleaning up arch/arm/cpu/arm920t. I introduced the concept of Soc (system on a chip) into the ./cpu directory. That means that code that is cpu (i.e. core) specific @@ -17,8 +17,8 @@ peripherals around the core) is moved into Thus a library/archive "$(CPUDIR)/$(SOC)/lib$(SOC).a" will be build and linked. Examples will be - cpu/arm920t/imx/ - cpu/arm920t/s3c24x0 + arch/arm/cpu/arm920t/imx/ + arch/arm/cpu/arm920t/s3c24x0 One can select an SoC by passing the name of it to ./mkconfig just like diff --git a/doc/README.modnet50 b/doc/README.modnet50 index f7bb254e1..2ac3c8fbe 100644 --- a/doc/README.modnet50 +++ b/doc/README.modnet50 @@ -45,7 +45,7 @@ flash. Files: -cpu/arm720t/serial_netarm.c .. serial I/O for the cpu +arch/arm/cpu/arm720t/serial_netarm.c .. serial I/O for the cpu board/modnet50/lowlevel_init.S .. memory setup for ModNET50 board/modnet50/flash.c .. flash routines diff --git a/nand_spl/board/freescale/mx31pdk/Makefile b/nand_spl/board/freescale/mx31pdk/Makefile index 0e13d5de2..c1dcf05f3 100644 --- a/nand_spl/board/freescale/mx31pdk/Makefile +++ b/nand_spl/board/freescale/mx31pdk/Makefile @@ -12,7 +12,7 @@ SOBJS = start.o lowlevel_init.o COBJS = nand_boot_fsl_nfc.o SRCS := $(SRCTREE)/nand_spl/nand_boot_fsl_nfc.c -SRCS += $(SRCTREE)/cpu/arm1136/start.S +SRCS += $(SRCTREE)/arch/arm/cpu/arm1136/start.S SRCS += $(SRCTREE)/board/freescale/mx31pdk/lowlevel_init.S OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) __OBJS := $(SOBJS) $(COBJS) @@ -40,7 +40,7 @@ $(nandobj)u-boot.lds: $(LDSCRIPT) ######################################################################### -$(obj)%.o: $(SRCTREE)/cpu/arm1136/%.S +$(obj)%.o: $(SRCTREE)/arch/arm/cpu/arm1136/%.S $(CC) $(AFLAGS) -c -o $@ $< $(obj)%.o: $(SRCTREE)/board/freescale/mx31pdk/%.S diff --git a/nand_spl/board/karo/tx25/Makefile b/nand_spl/board/karo/tx25/Makefile index ae71f6695..62aa58351 100644 --- a/nand_spl/board/karo/tx25/Makefile +++ b/nand_spl/board/karo/tx25/Makefile @@ -33,7 +33,7 @@ SOBJS = start.o lowlevel_init.o COBJS = nand_boot_fsl_nfc.o SRCS := $(SRCTREE)/nand_spl/nand_boot_fsl_nfc.c -SRCS += $(SRCTREE)/cpu/arm926ejs/start.S +SRCS += $(SRCTREE)/arch/arm/cpu/arm926ejs/start.S SRCS += $(SRCTREE)/board/karo/tx25/lowlevel_init.S OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) __OBJS := $(SOBJS) $(COBJS) @@ -61,7 +61,7 @@ $(nandobj)u-boot.lds: $(LDSCRIPT) ######################################################################### -$(obj)%.o: $(SRCTREE)/cpu/arm926ejs/%.S +$(obj)%.o: $(SRCTREE)/arch/arm/cpu/arm926ejs/%.S $(CC) $(AFLAGS) -c -o $@ $< $(obj)%.o: $(SRCTREE)/board/karo/tx25/%.S diff --git a/nand_spl/board/samsung/smdk6400/Makefile b/nand_spl/board/samsung/smdk6400/Makefile index 0fdda25ac..9cb485331 100644 --- a/nand_spl/board/samsung/smdk6400/Makefile +++ b/nand_spl/board/samsung/smdk6400/Makefile @@ -67,12 +67,12 @@ $(nandobj)u-boot.lds: $(LDSCRIPT) # from cpu directory $(obj)start.S: @rm -f $@ - @ln -s $(TOPDIR)/cpu/arm1176/start.S $@ + @ln -s $(TOPDIR)/arch/arm/cpu/arm1176/start.S $@ # from SoC directory $(obj)cpu_init.S: @rm -f $@ - @ln -s $(TOPDIR)/cpu/arm1176/s3c64xx/cpu_init.S $@ + @ln -s $(TOPDIR)/arch/arm/cpu/arm1176/s3c64xx/cpu_init.S $@ # from board directory $(obj)lowlevel_init.S: From a4145534851bf74619cb373a942613a74547bb82 Mon Sep 17 00:00:00 2001 From: Peter Tyser Date: Mon, 12 Apr 2010 22:28:12 -0500 Subject: [PATCH 142/164] m68k: Move cpu/$CPU to arch/m68k/cpu/$CPU Signed-off-by: Peter Tyser --- {cpu => arch/m68k/cpu}/mcf5227x/Makefile | 0 {cpu => arch/m68k/cpu}/mcf5227x/config.mk | 0 {cpu => arch/m68k/cpu}/mcf5227x/cpu.c | 0 {cpu => arch/m68k/cpu}/mcf5227x/cpu_init.c | 0 {cpu => arch/m68k/cpu}/mcf5227x/interrupts.c | 0 {cpu => arch/m68k/cpu}/mcf5227x/speed.c | 0 {cpu => arch/m68k/cpu}/mcf5227x/start.S | 0 {cpu => arch/m68k/cpu}/mcf523x/Makefile | 0 {cpu => arch/m68k/cpu}/mcf523x/config.mk | 0 {cpu => arch/m68k/cpu}/mcf523x/cpu.c | 0 {cpu => arch/m68k/cpu}/mcf523x/cpu_init.c | 0 {cpu => arch/m68k/cpu}/mcf523x/interrupts.c | 0 {cpu => arch/m68k/cpu}/mcf523x/speed.c | 0 {cpu => arch/m68k/cpu}/mcf523x/start.S | 0 {cpu => arch/m68k/cpu}/mcf52x2/Makefile | 0 {cpu => arch/m68k/cpu}/mcf52x2/config.mk | 0 {cpu => arch/m68k/cpu}/mcf52x2/cpu.c | 0 {cpu => arch/m68k/cpu}/mcf52x2/cpu.h | 0 {cpu => arch/m68k/cpu}/mcf52x2/cpu_init.c | 0 {cpu => arch/m68k/cpu}/mcf52x2/interrupts.c | 0 {cpu => arch/m68k/cpu}/mcf52x2/speed.c | 0 {cpu => arch/m68k/cpu}/mcf52x2/start.S | 0 {cpu => arch/m68k/cpu}/mcf532x/Makefile | 0 {cpu => arch/m68k/cpu}/mcf532x/config.mk | 0 {cpu => arch/m68k/cpu}/mcf532x/cpu.c | 0 {cpu => arch/m68k/cpu}/mcf532x/cpu_init.c | 0 {cpu => arch/m68k/cpu}/mcf532x/interrupts.c | 0 {cpu => arch/m68k/cpu}/mcf532x/speed.c | 0 {cpu => arch/m68k/cpu}/mcf532x/start.S | 0 {cpu => arch/m68k/cpu}/mcf5445x/Makefile | 0 {cpu => arch/m68k/cpu}/mcf5445x/config.mk | 0 {cpu => arch/m68k/cpu}/mcf5445x/cpu.c | 0 {cpu => arch/m68k/cpu}/mcf5445x/cpu_init.c | 0 {cpu => arch/m68k/cpu}/mcf5445x/interrupts.c | 0 {cpu => arch/m68k/cpu}/mcf5445x/pci.c | 0 {cpu => arch/m68k/cpu}/mcf5445x/speed.c | 0 {cpu => arch/m68k/cpu}/mcf5445x/start.S | 0 {cpu => arch/m68k/cpu}/mcf547x_8x/Makefile | 0 {cpu => arch/m68k/cpu}/mcf547x_8x/config.mk | 0 {cpu => arch/m68k/cpu}/mcf547x_8x/cpu.c | 0 {cpu => arch/m68k/cpu}/mcf547x_8x/cpu_init.c | 0 {cpu => arch/m68k/cpu}/mcf547x_8x/interrupts.c | 0 {cpu => arch/m68k/cpu}/mcf547x_8x/pci.c | 0 {cpu => arch/m68k/cpu}/mcf547x_8x/slicetimer.c | 0 {cpu => arch/m68k/cpu}/mcf547x_8x/speed.c | 0 {cpu => arch/m68k/cpu}/mcf547x_8x/start.S | 0 board/BuS/EB+MCF-EV123/u-boot.lds | 2 +- board/astro/mcf5373l/u-boot.lds | 2 +- board/cobra5272/u-boot.lds | 6 +++--- board/esd/tasreg/u-boot.lds | 4 ++-- board/freescale/m5208evbe/u-boot.lds | 4 ++-- board/freescale/m52277evb/u-boot.spa | 4 ++-- board/freescale/m52277evb/u-boot.stm | 2 +- board/freescale/m5235evb/u-boot.16 | 4 ++-- board/freescale/m5235evb/u-boot.32 | 10 +++++----- board/freescale/m5249evb/u-boot.lds | 4 ++-- board/freescale/m5253demo/u-boot.lds | 4 ++-- board/freescale/m5253evbe/u-boot.lds | 4 ++-- board/freescale/m5271evb/u-boot.lds | 4 ++-- board/freescale/m5272c3/u-boot.lds | 4 ++-- board/freescale/m5275evb/u-boot.lds | 2 +- board/freescale/m5282evb/u-boot.lds | 2 +- board/freescale/m53017evb/u-boot.lds | 4 ++-- board/freescale/m5329evb/u-boot.lds | 2 +- board/freescale/m5373evb/u-boot.lds | 2 +- board/freescale/m54451evb/u-boot.spa | 4 ++-- board/freescale/m54451evb/u-boot.stm | 12 ++++++------ board/freescale/m54455evb/u-boot.atm | 2 +- board/freescale/m54455evb/u-boot.int | 2 +- board/freescale/m54455evb/u-boot.stm | 2 +- board/freescale/m547xevb/u-boot.lds | 2 +- board/freescale/m548xevb/u-boot.lds | 2 +- board/idmr/u-boot.lds | 4 ++-- doc/README.m52277evb | 14 +++++++------- doc/README.m53017evb | 14 +++++++------- doc/README.m5373evb | 14 +++++++------- doc/README.m54455evb | 14 +++++++------- doc/README.m5475evb | 16 ++++++++-------- doc/README.m68k | 4 ++-- 79 files changed, 88 insertions(+), 88 deletions(-) rename {cpu => arch/m68k/cpu}/mcf5227x/Makefile (100%) rename {cpu => arch/m68k/cpu}/mcf5227x/config.mk (100%) rename {cpu => arch/m68k/cpu}/mcf5227x/cpu.c (100%) rename {cpu => arch/m68k/cpu}/mcf5227x/cpu_init.c (100%) rename {cpu => arch/m68k/cpu}/mcf5227x/interrupts.c (100%) rename {cpu => arch/m68k/cpu}/mcf5227x/speed.c (100%) rename {cpu => arch/m68k/cpu}/mcf5227x/start.S (100%) rename {cpu => arch/m68k/cpu}/mcf523x/Makefile (100%) rename {cpu => arch/m68k/cpu}/mcf523x/config.mk (100%) rename {cpu => arch/m68k/cpu}/mcf523x/cpu.c (100%) rename {cpu => arch/m68k/cpu}/mcf523x/cpu_init.c (100%) rename {cpu => arch/m68k/cpu}/mcf523x/interrupts.c (100%) rename {cpu => arch/m68k/cpu}/mcf523x/speed.c (100%) rename {cpu => arch/m68k/cpu}/mcf523x/start.S (100%) rename {cpu => arch/m68k/cpu}/mcf52x2/Makefile (100%) rename {cpu => arch/m68k/cpu}/mcf52x2/config.mk (100%) rename {cpu => arch/m68k/cpu}/mcf52x2/cpu.c (100%) rename {cpu => arch/m68k/cpu}/mcf52x2/cpu.h (100%) rename {cpu => arch/m68k/cpu}/mcf52x2/cpu_init.c (100%) rename {cpu => arch/m68k/cpu}/mcf52x2/interrupts.c (100%) rename {cpu => arch/m68k/cpu}/mcf52x2/speed.c (100%) rename {cpu => arch/m68k/cpu}/mcf52x2/start.S (100%) rename {cpu => arch/m68k/cpu}/mcf532x/Makefile (100%) rename {cpu => arch/m68k/cpu}/mcf532x/config.mk (100%) rename {cpu => arch/m68k/cpu}/mcf532x/cpu.c (100%) rename {cpu => arch/m68k/cpu}/mcf532x/cpu_init.c (100%) rename {cpu => arch/m68k/cpu}/mcf532x/interrupts.c (100%) rename {cpu => arch/m68k/cpu}/mcf532x/speed.c (100%) rename {cpu => arch/m68k/cpu}/mcf532x/start.S (100%) rename {cpu => arch/m68k/cpu}/mcf5445x/Makefile (100%) rename {cpu => arch/m68k/cpu}/mcf5445x/config.mk (100%) rename {cpu => arch/m68k/cpu}/mcf5445x/cpu.c (100%) rename {cpu => arch/m68k/cpu}/mcf5445x/cpu_init.c (100%) rename {cpu => arch/m68k/cpu}/mcf5445x/interrupts.c (100%) rename {cpu => arch/m68k/cpu}/mcf5445x/pci.c (100%) rename {cpu => arch/m68k/cpu}/mcf5445x/speed.c (100%) rename {cpu => arch/m68k/cpu}/mcf5445x/start.S (100%) rename {cpu => arch/m68k/cpu}/mcf547x_8x/Makefile (100%) rename {cpu => arch/m68k/cpu}/mcf547x_8x/config.mk (100%) rename {cpu => arch/m68k/cpu}/mcf547x_8x/cpu.c (100%) rename {cpu => arch/m68k/cpu}/mcf547x_8x/cpu_init.c (100%) rename {cpu => arch/m68k/cpu}/mcf547x_8x/interrupts.c (100%) rename {cpu => arch/m68k/cpu}/mcf547x_8x/pci.c (100%) rename {cpu => arch/m68k/cpu}/mcf547x_8x/slicetimer.c (100%) rename {cpu => arch/m68k/cpu}/mcf547x_8x/speed.c (100%) rename {cpu => arch/m68k/cpu}/mcf547x_8x/start.S (100%) diff --git a/cpu/mcf5227x/Makefile b/arch/m68k/cpu/mcf5227x/Makefile similarity index 100% rename from cpu/mcf5227x/Makefile rename to arch/m68k/cpu/mcf5227x/Makefile diff --git a/cpu/mcf5227x/config.mk b/arch/m68k/cpu/mcf5227x/config.mk similarity index 100% rename from cpu/mcf5227x/config.mk rename to arch/m68k/cpu/mcf5227x/config.mk diff --git a/cpu/mcf5227x/cpu.c b/arch/m68k/cpu/mcf5227x/cpu.c similarity index 100% rename from cpu/mcf5227x/cpu.c rename to arch/m68k/cpu/mcf5227x/cpu.c diff --git a/cpu/mcf5227x/cpu_init.c b/arch/m68k/cpu/mcf5227x/cpu_init.c similarity index 100% rename from cpu/mcf5227x/cpu_init.c rename to arch/m68k/cpu/mcf5227x/cpu_init.c diff --git a/cpu/mcf5227x/interrupts.c b/arch/m68k/cpu/mcf5227x/interrupts.c similarity index 100% rename from cpu/mcf5227x/interrupts.c rename to arch/m68k/cpu/mcf5227x/interrupts.c diff --git a/cpu/mcf5227x/speed.c b/arch/m68k/cpu/mcf5227x/speed.c similarity index 100% rename from cpu/mcf5227x/speed.c rename to arch/m68k/cpu/mcf5227x/speed.c diff --git a/cpu/mcf5227x/start.S b/arch/m68k/cpu/mcf5227x/start.S similarity index 100% rename from cpu/mcf5227x/start.S rename to arch/m68k/cpu/mcf5227x/start.S diff --git a/cpu/mcf523x/Makefile b/arch/m68k/cpu/mcf523x/Makefile similarity index 100% rename from cpu/mcf523x/Makefile rename to arch/m68k/cpu/mcf523x/Makefile diff --git a/cpu/mcf523x/config.mk b/arch/m68k/cpu/mcf523x/config.mk similarity index 100% rename from cpu/mcf523x/config.mk rename to arch/m68k/cpu/mcf523x/config.mk diff --git a/cpu/mcf523x/cpu.c b/arch/m68k/cpu/mcf523x/cpu.c similarity index 100% rename from cpu/mcf523x/cpu.c rename to arch/m68k/cpu/mcf523x/cpu.c diff --git a/cpu/mcf523x/cpu_init.c b/arch/m68k/cpu/mcf523x/cpu_init.c similarity index 100% rename from cpu/mcf523x/cpu_init.c rename to arch/m68k/cpu/mcf523x/cpu_init.c diff --git a/cpu/mcf523x/interrupts.c b/arch/m68k/cpu/mcf523x/interrupts.c similarity index 100% rename from cpu/mcf523x/interrupts.c rename to arch/m68k/cpu/mcf523x/interrupts.c diff --git a/cpu/mcf523x/speed.c b/arch/m68k/cpu/mcf523x/speed.c similarity index 100% rename from cpu/mcf523x/speed.c rename to arch/m68k/cpu/mcf523x/speed.c diff --git a/cpu/mcf523x/start.S b/arch/m68k/cpu/mcf523x/start.S similarity index 100% rename from cpu/mcf523x/start.S rename to arch/m68k/cpu/mcf523x/start.S diff --git a/cpu/mcf52x2/Makefile b/arch/m68k/cpu/mcf52x2/Makefile similarity index 100% rename from cpu/mcf52x2/Makefile rename to arch/m68k/cpu/mcf52x2/Makefile diff --git a/cpu/mcf52x2/config.mk b/arch/m68k/cpu/mcf52x2/config.mk similarity index 100% rename from cpu/mcf52x2/config.mk rename to arch/m68k/cpu/mcf52x2/config.mk diff --git a/cpu/mcf52x2/cpu.c b/arch/m68k/cpu/mcf52x2/cpu.c similarity index 100% rename from cpu/mcf52x2/cpu.c rename to arch/m68k/cpu/mcf52x2/cpu.c diff --git a/cpu/mcf52x2/cpu.h b/arch/m68k/cpu/mcf52x2/cpu.h similarity index 100% rename from cpu/mcf52x2/cpu.h rename to arch/m68k/cpu/mcf52x2/cpu.h diff --git a/cpu/mcf52x2/cpu_init.c b/arch/m68k/cpu/mcf52x2/cpu_init.c similarity index 100% rename from cpu/mcf52x2/cpu_init.c rename to arch/m68k/cpu/mcf52x2/cpu_init.c diff --git a/cpu/mcf52x2/interrupts.c b/arch/m68k/cpu/mcf52x2/interrupts.c similarity index 100% rename from cpu/mcf52x2/interrupts.c rename to arch/m68k/cpu/mcf52x2/interrupts.c diff --git a/cpu/mcf52x2/speed.c b/arch/m68k/cpu/mcf52x2/speed.c similarity index 100% rename from cpu/mcf52x2/speed.c rename to arch/m68k/cpu/mcf52x2/speed.c diff --git a/cpu/mcf52x2/start.S b/arch/m68k/cpu/mcf52x2/start.S similarity index 100% rename from cpu/mcf52x2/start.S rename to arch/m68k/cpu/mcf52x2/start.S diff --git a/cpu/mcf532x/Makefile b/arch/m68k/cpu/mcf532x/Makefile similarity index 100% rename from cpu/mcf532x/Makefile rename to arch/m68k/cpu/mcf532x/Makefile diff --git a/cpu/mcf532x/config.mk b/arch/m68k/cpu/mcf532x/config.mk similarity index 100% rename from cpu/mcf532x/config.mk rename to arch/m68k/cpu/mcf532x/config.mk diff --git a/cpu/mcf532x/cpu.c b/arch/m68k/cpu/mcf532x/cpu.c similarity index 100% rename from cpu/mcf532x/cpu.c rename to arch/m68k/cpu/mcf532x/cpu.c diff --git a/cpu/mcf532x/cpu_init.c b/arch/m68k/cpu/mcf532x/cpu_init.c similarity index 100% rename from cpu/mcf532x/cpu_init.c rename to arch/m68k/cpu/mcf532x/cpu_init.c diff --git a/cpu/mcf532x/interrupts.c b/arch/m68k/cpu/mcf532x/interrupts.c similarity index 100% rename from cpu/mcf532x/interrupts.c rename to arch/m68k/cpu/mcf532x/interrupts.c diff --git a/cpu/mcf532x/speed.c b/arch/m68k/cpu/mcf532x/speed.c similarity index 100% rename from cpu/mcf532x/speed.c rename to arch/m68k/cpu/mcf532x/speed.c diff --git a/cpu/mcf532x/start.S b/arch/m68k/cpu/mcf532x/start.S similarity index 100% rename from cpu/mcf532x/start.S rename to arch/m68k/cpu/mcf532x/start.S diff --git a/cpu/mcf5445x/Makefile b/arch/m68k/cpu/mcf5445x/Makefile similarity index 100% rename from cpu/mcf5445x/Makefile rename to arch/m68k/cpu/mcf5445x/Makefile diff --git a/cpu/mcf5445x/config.mk b/arch/m68k/cpu/mcf5445x/config.mk similarity index 100% rename from cpu/mcf5445x/config.mk rename to arch/m68k/cpu/mcf5445x/config.mk diff --git a/cpu/mcf5445x/cpu.c b/arch/m68k/cpu/mcf5445x/cpu.c similarity index 100% rename from cpu/mcf5445x/cpu.c rename to arch/m68k/cpu/mcf5445x/cpu.c diff --git a/cpu/mcf5445x/cpu_init.c b/arch/m68k/cpu/mcf5445x/cpu_init.c similarity index 100% rename from cpu/mcf5445x/cpu_init.c rename to arch/m68k/cpu/mcf5445x/cpu_init.c diff --git a/cpu/mcf5445x/interrupts.c b/arch/m68k/cpu/mcf5445x/interrupts.c similarity index 100% rename from cpu/mcf5445x/interrupts.c rename to arch/m68k/cpu/mcf5445x/interrupts.c diff --git a/cpu/mcf5445x/pci.c b/arch/m68k/cpu/mcf5445x/pci.c similarity index 100% rename from cpu/mcf5445x/pci.c rename to arch/m68k/cpu/mcf5445x/pci.c diff --git a/cpu/mcf5445x/speed.c b/arch/m68k/cpu/mcf5445x/speed.c similarity index 100% rename from cpu/mcf5445x/speed.c rename to arch/m68k/cpu/mcf5445x/speed.c diff --git a/cpu/mcf5445x/start.S b/arch/m68k/cpu/mcf5445x/start.S similarity index 100% rename from cpu/mcf5445x/start.S rename to arch/m68k/cpu/mcf5445x/start.S diff --git a/cpu/mcf547x_8x/Makefile b/arch/m68k/cpu/mcf547x_8x/Makefile similarity index 100% rename from cpu/mcf547x_8x/Makefile rename to arch/m68k/cpu/mcf547x_8x/Makefile diff --git a/cpu/mcf547x_8x/config.mk b/arch/m68k/cpu/mcf547x_8x/config.mk similarity index 100% rename from cpu/mcf547x_8x/config.mk rename to arch/m68k/cpu/mcf547x_8x/config.mk diff --git a/cpu/mcf547x_8x/cpu.c b/arch/m68k/cpu/mcf547x_8x/cpu.c similarity index 100% rename from cpu/mcf547x_8x/cpu.c rename to arch/m68k/cpu/mcf547x_8x/cpu.c diff --git a/cpu/mcf547x_8x/cpu_init.c b/arch/m68k/cpu/mcf547x_8x/cpu_init.c similarity index 100% rename from cpu/mcf547x_8x/cpu_init.c rename to arch/m68k/cpu/mcf547x_8x/cpu_init.c diff --git a/cpu/mcf547x_8x/interrupts.c b/arch/m68k/cpu/mcf547x_8x/interrupts.c similarity index 100% rename from cpu/mcf547x_8x/interrupts.c rename to arch/m68k/cpu/mcf547x_8x/interrupts.c diff --git a/cpu/mcf547x_8x/pci.c b/arch/m68k/cpu/mcf547x_8x/pci.c similarity index 100% rename from cpu/mcf547x_8x/pci.c rename to arch/m68k/cpu/mcf547x_8x/pci.c diff --git a/cpu/mcf547x_8x/slicetimer.c b/arch/m68k/cpu/mcf547x_8x/slicetimer.c similarity index 100% rename from cpu/mcf547x_8x/slicetimer.c rename to arch/m68k/cpu/mcf547x_8x/slicetimer.c diff --git a/cpu/mcf547x_8x/speed.c b/arch/m68k/cpu/mcf547x_8x/speed.c similarity index 100% rename from cpu/mcf547x_8x/speed.c rename to arch/m68k/cpu/mcf547x_8x/speed.c diff --git a/cpu/mcf547x_8x/start.S b/arch/m68k/cpu/mcf547x_8x/start.S similarity index 100% rename from cpu/mcf547x_8x/start.S rename to arch/m68k/cpu/mcf547x_8x/start.S diff --git a/board/BuS/EB+MCF-EV123/u-boot.lds b/board/BuS/EB+MCF-EV123/u-boot.lds index b05eacf1a..0fa633a1f 100644 --- a/board/BuS/EB+MCF-EV123/u-boot.lds +++ b/board/BuS/EB+MCF-EV123/u-boot.lds @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mcf52x2/start.o (.text) + arch/m68k/cpu/mcf52x2/start.o (.text) common/dlmalloc.o (.text) lib/string.o (.text) lib/vsprintf.o (.text) diff --git a/board/astro/mcf5373l/u-boot.lds b/board/astro/mcf5373l/u-boot.lds index 73e031015..167a0a3f1 100644 --- a/board/astro/mcf5373l/u-boot.lds +++ b/board/astro/mcf5373l/u-boot.lds @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mcf532x/start.o (.text) + arch/m68k/cpu/mcf532x/start.o (.text) arch/m68k/lib/traps.o (.text) arch/m68k/lib/interrupts.o (.text) common/dlmalloc.o (.text) diff --git a/board/cobra5272/u-boot.lds b/board/cobra5272/u-boot.lds index aacc0894d..ec0f5e9fa 100644 --- a/board/cobra5272/u-boot.lds +++ b/board/cobra5272/u-boot.lds @@ -54,10 +54,10 @@ SECTIONS { /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mcf52x2/start.o (.text) - cpu/mcf52x2/cpu_init.o (.text) + arch/m68k/cpu/mcf52x2/start.o (.text) + arch/m68k/cpu/mcf52x2/cpu_init.o (.text) arch/m68k/lib/traps.o (.text) - cpu/mcf52x2/interrupts.o (.text) + arch/m68k/cpu/mcf52x2/interrupts.o (.text) common/dlmalloc.o (.text) lib/zlib.o (.text) diff --git a/board/esd/tasreg/u-boot.lds b/board/esd/tasreg/u-boot.lds index f87d3cb72..d4fd705ce 100644 --- a/board/esd/tasreg/u-boot.lds +++ b/board/esd/tasreg/u-boot.lds @@ -55,9 +55,9 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mcf52x2/start.o (.text) + arch/m68k/cpu/mcf52x2/start.o (.text) arch/m68k/lib/traps.o (.text) - cpu/mcf52x2/interrupts.o (.text) + arch/m68k/cpu/mcf52x2/interrupts.o (.text) common/dlmalloc.o (.text) lib/zlib.o (.text) diff --git a/board/freescale/m5208evbe/u-boot.lds b/board/freescale/m5208evbe/u-boot.lds index 3877527d8..507e21a03 100644 --- a/board/freescale/m5208evbe/u-boot.lds +++ b/board/freescale/m5208evbe/u-boot.lds @@ -55,8 +55,8 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mcf52x2/start.o (.text) - cpu/mcf52x2/libmcf52x2.a (.text) + arch/m68k/cpu/mcf52x2/start.o (.text) + arch/m68k/cpu/mcf52x2/libmcf52x2.a (.text) arch/m68k/lib/libm68k.a (.text) common/dlmalloc.o (.text) diff --git a/board/freescale/m52277evb/u-boot.spa b/board/freescale/m52277evb/u-boot.spa index 6d916d84f..4591196e6 100644 --- a/board/freescale/m52277evb/u-boot.spa +++ b/board/freescale/m52277evb/u-boot.spa @@ -55,8 +55,8 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mcf5227x/start.o (.text) - cpu/mcf5227x/libmcf5227x.a (.text) + arch/m68k/cpu/mcf5227x/start.o (.text) + arch/m68k/cpu/mcf5227x/libmcf5227x.a (.text) arch/m68k/lib/libm68k.a (.text) lib/libgeneric.a (.text) common/cmd_mem.o (.text) diff --git a/board/freescale/m52277evb/u-boot.stm b/board/freescale/m52277evb/u-boot.stm index 03ff53296..1ec83e949 100644 --- a/board/freescale/m52277evb/u-boot.stm +++ b/board/freescale/m52277evb/u-boot.stm @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mcf5227x/start.o (.text) + arch/m68k/cpu/mcf5227x/start.o (.text) *(.text) *(.fixup) diff --git a/board/freescale/m5235evb/u-boot.16 b/board/freescale/m5235evb/u-boot.16 index 4e70efb2f..d7bd10fd9 100644 --- a/board/freescale/m5235evb/u-boot.16 +++ b/board/freescale/m5235evb/u-boot.16 @@ -55,8 +55,8 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mcf523x/start.o (.text) - cpu/mcf523x/cpu_init.o (.text) + arch/m68k/cpu/mcf523x/start.o (.text) + arch/m68k/cpu/mcf523x/cpu_init.o (.text) arch/m68k/lib/traps.o (.text) arch/m68k/lib/interrupts.o (.text) common/dlmalloc.o (.text) diff --git a/board/freescale/m5235evb/u-boot.32 b/board/freescale/m5235evb/u-boot.32 index cbf224925..45ff15890 100644 --- a/board/freescale/m5235evb/u-boot.32 +++ b/board/freescale/m5235evb/u-boot.32 @@ -55,11 +55,11 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mcf523x/start.o (.text) - cpu/mcf523x/cpu.o (.text) - cpu/mcf523x/cpu_init.o (.text) - cpu/mcf523x/interrupts.o (.text) - cpu/mcf523x/speed.o (.text) + arch/m68k/cpu/mcf523x/start.o (.text) + arch/m68k/cpu/mcf523x/cpu.o (.text) + arch/m68k/cpu/mcf523x/cpu_init.o (.text) + arch/m68k/cpu/mcf523x/interrupts.o (.text) + arch/m68k/cpu/mcf523x/speed.o (.text) arch/m68k/lib/libm68k.a (.text) common/dlmalloc.o (.text) common/cmd_bootm.o (.text) diff --git a/board/freescale/m5249evb/u-boot.lds b/board/freescale/m5249evb/u-boot.lds index f87d3cb72..d4fd705ce 100644 --- a/board/freescale/m5249evb/u-boot.lds +++ b/board/freescale/m5249evb/u-boot.lds @@ -55,9 +55,9 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mcf52x2/start.o (.text) + arch/m68k/cpu/mcf52x2/start.o (.text) arch/m68k/lib/traps.o (.text) - cpu/mcf52x2/interrupts.o (.text) + arch/m68k/cpu/mcf52x2/interrupts.o (.text) common/dlmalloc.o (.text) lib/zlib.o (.text) diff --git a/board/freescale/m5253demo/u-boot.lds b/board/freescale/m5253demo/u-boot.lds index 455e9b8fd..4f8bb20d4 100644 --- a/board/freescale/m5253demo/u-boot.lds +++ b/board/freescale/m5253demo/u-boot.lds @@ -55,9 +55,9 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mcf52x2/start.o (.text) + arch/m68k/cpu/mcf52x2/start.o (.text) arch/m68k/lib/traps.o (.text) - cpu/mcf52x2/interrupts.o (.text) + arch/m68k/cpu/mcf52x2/interrupts.o (.text) common/dlmalloc.o (.text) lib/zlib.o (.text) diff --git a/board/freescale/m5253evbe/u-boot.lds b/board/freescale/m5253evbe/u-boot.lds index 99c125cb9..797c83785 100644 --- a/board/freescale/m5253evbe/u-boot.lds +++ b/board/freescale/m5253evbe/u-boot.lds @@ -55,9 +55,9 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mcf52x2/start.o (.text) + arch/m68k/cpu/mcf52x2/start.o (.text) arch/m68k/lib/traps.o (.text) - cpu/mcf52x2/interrupts.o (.text) + arch/m68k/cpu/mcf52x2/interrupts.o (.text) common/dlmalloc.o (.text) lib/zlib.o (.text) diff --git a/board/freescale/m5271evb/u-boot.lds b/board/freescale/m5271evb/u-boot.lds index 588a12847..ca41232c6 100644 --- a/board/freescale/m5271evb/u-boot.lds +++ b/board/freescale/m5271evb/u-boot.lds @@ -56,9 +56,9 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mcf52x2/start.o (.text) + arch/m68k/cpu/mcf52x2/start.o (.text) arch/m68k/lib/traps.o (.text) - cpu/mcf52x2/interrupts.o (.text) + arch/m68k/cpu/mcf52x2/interrupts.o (.text) common/dlmalloc.o (.text) lib/zlib.o (.text) diff --git a/board/freescale/m5272c3/u-boot.lds b/board/freescale/m5272c3/u-boot.lds index aaba5a368..8b011df53 100644 --- a/board/freescale/m5272c3/u-boot.lds +++ b/board/freescale/m5272c3/u-boot.lds @@ -55,9 +55,9 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mcf52x2/start.o (.text) + arch/m68k/cpu/mcf52x2/start.o (.text) arch/m68k/lib/traps.o (.text) - cpu/mcf52x2/interrupts.o (.text) + arch/m68k/cpu/mcf52x2/interrupts.o (.text) common/dlmalloc.o (.text) lib/zlib.o (.text) diff --git a/board/freescale/m5275evb/u-boot.lds b/board/freescale/m5275evb/u-boot.lds index 700b9f509..cd17b0abf 100644 --- a/board/freescale/m5275evb/u-boot.lds +++ b/board/freescale/m5275evb/u-boot.lds @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mcf52x2/start.o (.text) + arch/m68k/cpu/mcf52x2/start.o (.text) common/dlmalloc.o (.text) lib/string.o (.text) lib/zlib.o (.text) diff --git a/board/freescale/m5282evb/u-boot.lds b/board/freescale/m5282evb/u-boot.lds index e936adff1..5ad0fad68 100644 --- a/board/freescale/m5282evb/u-boot.lds +++ b/board/freescale/m5282evb/u-boot.lds @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mcf52x2/start.o (.text) + arch/m68k/cpu/mcf52x2/start.o (.text) common/dlmalloc.o (.text) lib/string.o (.text) lib/vsprintf.o (.text) diff --git a/board/freescale/m53017evb/u-boot.lds b/board/freescale/m53017evb/u-boot.lds index a725da15e..6577299c2 100644 --- a/board/freescale/m53017evb/u-boot.lds +++ b/board/freescale/m53017evb/u-boot.lds @@ -55,8 +55,8 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mcf532x/start.o (.text) - cpu/mcf532x/libmcf532x.a (.text) + arch/m68k/cpu/mcf532x/start.o (.text) + arch/m68k/cpu/mcf532x/libmcf532x.a (.text) arch/m68k/lib/libm68k.a (.text) common/dlmalloc.o (.text) lib/zlib.o (.text) diff --git a/board/freescale/m5329evb/u-boot.lds b/board/freescale/m5329evb/u-boot.lds index bf4f1889c..ba7ca2773 100644 --- a/board/freescale/m5329evb/u-boot.lds +++ b/board/freescale/m5329evb/u-boot.lds @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mcf532x/start.o (.text) + arch/m68k/cpu/mcf532x/start.o (.text) arch/m68k/lib/traps.o (.text) arch/m68k/lib/interrupts.o (.text) common/dlmalloc.o (.text) diff --git a/board/freescale/m5373evb/u-boot.lds b/board/freescale/m5373evb/u-boot.lds index c129ac268..a2540bbc7 100644 --- a/board/freescale/m5373evb/u-boot.lds +++ b/board/freescale/m5373evb/u-boot.lds @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mcf532x/start.o (.text) + arch/m68k/cpu/mcf532x/start.o (.text) arch/m68k/lib/traps.o (.text) arch/m68k/lib/interrupts.o (.text) common/dlmalloc.o (.text) diff --git a/board/freescale/m54451evb/u-boot.spa b/board/freescale/m54451evb/u-boot.spa index e63b1f2e9..09ac481dd 100644 --- a/board/freescale/m54451evb/u-boot.spa +++ b/board/freescale/m54451evb/u-boot.spa @@ -55,8 +55,8 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mcf5445x/start.o (.text) - cpu/mcf5445x/libmcf5445x.a (.text) + arch/m68k/cpu/mcf5445x/start.o (.text) + arch/m68k/cpu/mcf5445x/libmcf5445x.a (.text) arch/m68k/lib/libm68k.a (.text) common/cmd_flash.o (.text) common/dlmalloc.o (.text) diff --git a/board/freescale/m54451evb/u-boot.stm b/board/freescale/m54451evb/u-boot.stm index 7c3f0684c..e64a56c59 100644 --- a/board/freescale/m54451evb/u-boot.stm +++ b/board/freescale/m54451evb/u-boot.stm @@ -55,12 +55,12 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mcf5445x/start.o (.text) -/* cpu/mcf5445x/cpu_init.o (.text) - cpu/mcf5445x/cpu.o (.text) - cpu/mcf5445x/dspi.o (.text) - cpu/mcf5445x/interrupt.o (.text) - cpu/mcf5445x/speed.o (.text) + arch/m68k/cpu/mcf5445x/start.o (.text) +/* arch/m68k/cpu/mcf5445x/cpu_init.o (.text) + arch/m68k/cpu/mcf5445x/cpu.o (.text) + arch/m68k/cpu/mcf5445x/dspi.o (.text) + arch/m68k/cpu/mcf5445x/interrupt.o (.text) + arch/m68k/cpu/mcf5445x/speed.o (.text) arch/m68k/lib/board.o (.text) common/serial.o (.text) common/console.o (.text) diff --git a/board/freescale/m54455evb/u-boot.atm b/board/freescale/m54455evb/u-boot.atm index 2dd8a2318..ebf801ac7 100644 --- a/board/freescale/m54455evb/u-boot.atm +++ b/board/freescale/m54455evb/u-boot.atm @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mcf5445x/start.o (.text) + arch/m68k/cpu/mcf5445x/start.o (.text) arch/m68k/lib/traps.o (.text) arch/m68k/lib/interrupts.o (.text) common/dlmalloc.o (.text) diff --git a/board/freescale/m54455evb/u-boot.int b/board/freescale/m54455evb/u-boot.int index 8e54d7918..153556fe9 100644 --- a/board/freescale/m54455evb/u-boot.int +++ b/board/freescale/m54455evb/u-boot.int @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mcf5445x/start.o (.text) + arch/m68k/cpu/mcf5445x/start.o (.text) arch/m68k/lib/traps.o (.text) arch/m68k/lib/interrupts.o (.text) common/dlmalloc.o (.text) diff --git a/board/freescale/m54455evb/u-boot.stm b/board/freescale/m54455evb/u-boot.stm index 3dd9a6b04..9cda1029d 100644 --- a/board/freescale/m54455evb/u-boot.stm +++ b/board/freescale/m54455evb/u-boot.stm @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mcf5445x/start.o (.text) + arch/m68k/cpu/mcf5445x/start.o (.text) *(.text) *(.fixup) diff --git a/board/freescale/m547xevb/u-boot.lds b/board/freescale/m547xevb/u-boot.lds index 5f28a10ba..54bf2785a 100644 --- a/board/freescale/m547xevb/u-boot.lds +++ b/board/freescale/m547xevb/u-boot.lds @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mcf547x_8x/start.o (.text) + arch/m68k/cpu/mcf547x_8x/start.o (.text) arch/m68k/lib/traps.o (.text) arch/m68k/lib/interrupts.o (.text) common/dlmalloc.o (.text) diff --git a/board/freescale/m548xevb/u-boot.lds b/board/freescale/m548xevb/u-boot.lds index 5f28a10ba..54bf2785a 100644 --- a/board/freescale/m548xevb/u-boot.lds +++ b/board/freescale/m548xevb/u-boot.lds @@ -55,7 +55,7 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mcf547x_8x/start.o (.text) + arch/m68k/cpu/mcf547x_8x/start.o (.text) arch/m68k/lib/traps.o (.text) arch/m68k/lib/interrupts.o (.text) common/dlmalloc.o (.text) diff --git a/board/idmr/u-boot.lds b/board/idmr/u-boot.lds index 588a12847..ca41232c6 100644 --- a/board/idmr/u-boot.lds +++ b/board/idmr/u-boot.lds @@ -56,9 +56,9 @@ SECTIONS /* WARNING - the following is hand-optimized to fit within */ /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/mcf52x2/start.o (.text) + arch/m68k/cpu/mcf52x2/start.o (.text) arch/m68k/lib/traps.o (.text) - cpu/mcf52x2/interrupts.o (.text) + arch/m68k/cpu/mcf52x2/interrupts.o (.text) common/dlmalloc.o (.text) lib/zlib.o (.text) diff --git a/doc/README.m52277evb b/doc/README.m52277evb index f30b45e1c..b6e955bca 100644 --- a/doc/README.m52277evb +++ b/doc/README.m52277evb @@ -14,13 +14,13 @@ Changed files: - board/freescale/m52277evb/config.mk config make - board/freescale/m52277evb/u-boot.lds Linker description -- cpu/mcf5227x/cpu.c cpu specific code -- cpu/mcf5227x/cpu_init.c FBCS, Mux pins, icache and RTC extra regs -- cpu/mcf5227x/interrupts.c cpu specific interrupt support -- cpu/mcf5227x/speed.c system, flexbus, and cpu clock -- cpu/mcf5227x/Makefile Makefile -- cpu/mcf5227x/config.mk config make -- cpu/mcf5227x/start.S start up assembly code +- arch/m68k/cpu/mcf5227x/cpu.c cpu specific code +- arch/m68k/cpu/mcf5227x/cpu_init.c FBCS, Mux pins, icache and RTC extra regs +- arch/m68k/cpu/mcf5227x/interrupts.c cpu specific interrupt support +- arch/m68k/cpu/mcf5227x/speed.c system, flexbus, and cpu clock +- arch/m68k/cpu/mcf5227x/Makefile Makefile +- arch/m68k/cpu/mcf5227x/config.mk config make +- arch/m68k/cpu/mcf5227x/start.S start up assembly code - doc/README.m52277evb This readme file diff --git a/doc/README.m53017evb b/doc/README.m53017evb index 780a8038a..42798c200 100644 --- a/doc/README.m53017evb +++ b/doc/README.m53017evb @@ -15,13 +15,13 @@ Changed files: - board/freescale/m53017evb/config.mk config make - board/freescale/m53017evb/u-boot.lds Linker description -- cpu/mcf532x/cpu.c cpu specific code -- cpu/mcf532x/cpu_init.c FBCS, Mux pins, icache and RTC extra regs -- cpu/mcf532x/interrupts.c cpu specific interrupt support -- cpu/mcf532x/speed.c system, flexbus, and cpu clock -- cpu/mcf532x/Makefile Makefile -- cpu/mcf532x/config.mk config make -- cpu/mcf532x/start.S start up assembly code +- arch/m68k/cpu/mcf532x/cpu.c cpu specific code +- arch/m68k/cpu/mcf532x/cpu_init.c FBCS, Mux pins, icache and RTC extra regs +- arch/m68k/cpu/mcf532x/interrupts.c cpu specific interrupt support +- arch/m68k/cpu/mcf532x/speed.c system, flexbus, and cpu clock +- arch/m68k/cpu/mcf532x/Makefile Makefile +- arch/m68k/cpu/mcf532x/config.mk config make +- arch/m68k/cpu/mcf532x/start.S start up assembly code - doc/README.m53017evb This readme file diff --git a/doc/README.m5373evb b/doc/README.m5373evb index 24a659b18..e90a320ee 100644 --- a/doc/README.m5373evb +++ b/doc/README.m5373evb @@ -15,13 +15,13 @@ Changed files: - board/freescale/m5373evb/config.mk config make - board/freescale/m5373evb/u-boot.lds Linker description -- cpu/mcf532x/cpu.c cpu specific code -- cpu/mcf532x/cpu_init.c FBCS, Mux pins, icache and RTC extra regs -- cpu/mcf532x/interrupts.c cpu specific interrupt support -- cpu/mcf532x/speed.c system, pci, flexbus, and cpu clock -- cpu/mcf532x/Makefile Makefile -- cpu/mcf532x/config.mk config make -- cpu/mcf532x/start.S start up assembly code +- arch/m68k/cpu/mcf532x/cpu.c cpu specific code +- arch/m68k/cpu/mcf532x/cpu_init.c FBCS, Mux pins, icache and RTC extra regs +- arch/m68k/cpu/mcf532x/interrupts.c cpu specific interrupt support +- arch/m68k/cpu/mcf532x/speed.c system, pci, flexbus, and cpu clock +- arch/m68k/cpu/mcf532x/Makefile Makefile +- arch/m68k/cpu/mcf532x/config.mk config make +- arch/m68k/cpu/mcf532x/start.S start up assembly code - doc/README.m5373evb This readme file diff --git a/doc/README.m54455evb b/doc/README.m54455evb index 257bcd5a1..918a746eb 100644 --- a/doc/README.m54455evb +++ b/doc/README.m54455evb @@ -18,13 +18,13 @@ Changed files: - common/cmd_bdinfo.c Clock frequencies output - common/cmd_mii.c mii support -- cpu/mcf5445x/cpu.c cpu specific code -- cpu/mcf5445x/cpu_init.c Flexbus ChipSelect, Mux pins setup, icache and RTC extra regs -- cpu/mcf5445x/interrupts.c cpu specific interrupt support -- cpu/mcf5445x/speed.c system, pci, flexbus, and cpu clock -- cpu/mcf5445x/Makefile Makefile -- cpu/mcf5445x/config.mk config make -- cpu/mcf5445x/start.S start up assembly code +- arch/m68k/cpu/mcf5445x/cpu.c cpu specific code +- arch/m68k/cpu/mcf5445x/cpu_init.c Flexbus ChipSelect, Mux pins setup, icache and RTC extra regs +- arch/m68k/cpu/mcf5445x/interrupts.c cpu specific interrupt support +- arch/m68k/cpu/mcf5445x/speed.c system, pci, flexbus, and cpu clock +- arch/m68k/cpu/mcf5445x/Makefile Makefile +- arch/m68k/cpu/mcf5445x/config.mk config make +- arch/m68k/cpu/mcf5445x/start.S start up assembly code - doc/README.m54455evb This readme file diff --git a/doc/README.m5475evb b/doc/README.m5475evb index b61dfba3c..f5658ea48 100644 --- a/doc/README.m5475evb +++ b/doc/README.m5475evb @@ -15,14 +15,14 @@ Changed files: - board/freescale/m547xevb/config.mk config make - board/freescale/m547xevb/u-boot.lds Linker description -- cpu/mcf547x_8x/cpu.c cpu specific code -- cpu/mcf547x_8x/cpu_init.c Flexbus ChipSelect, Mux pins setup, icache and RTC extra regs -- cpu/mcf547x_8x/interrupts.c cpu specific interrupt support -- cpu/mcf547x_8x/slicetimer.c Timer support -- cpu/mcf547x_8x/speed.c system, pci, flexbus, and cpu clock -- cpu/mcf547x_8x/Makefile Makefile -- cpu/mcf547x_8x/config.mk config make -- cpu/mcf547x_8x/start.S start up assembly code +- arch/m68k/cpu/mcf547x_8x/cpu.c cpu specific code +- arch/m68k/cpu/mcf547x_8x/cpu_init.c Flexbus ChipSelect, Mux pins setup, icache and RTC extra regs +- arch/m68k/cpu/mcf547x_8x/interrupts.c cpu specific interrupt support +- arch/m68k/cpu/mcf547x_8x/slicetimer.c Timer support +- arch/m68k/cpu/mcf547x_8x/speed.c system, pci, flexbus, and cpu clock +- arch/m68k/cpu/mcf547x_8x/Makefile Makefile +- arch/m68k/cpu/mcf547x_8x/config.mk config make +- arch/m68k/cpu/mcf547x_8x/start.S start up assembly code - doc/README.m5475evb This readme file diff --git a/doc/README.m68k b/doc/README.m68k index e6c33a7d9..a00ab69b6 100644 --- a/doc/README.m68k +++ b/doc/README.m68k @@ -31,12 +31,12 @@ hopefully added soon! 2.1 Motorola Coldfire MCF5272 ----------------------------- -CPU specific code is located in: cpu/mcf52x2 +CPU specific code is located in: arch/m68k/cpu/mcf52x2 2.1 Motorola Coldfire MCF5282 ----------------------------- -CPU specific code is located in: cpu/mcf52x2 +CPU specific code is located in: arch/m68k/cpu/mcf52x2 The MCF5282 Port no longer needs a preloader and can place in external or internal FLASH. From c6fb83d21729321426308c3acff2a3dfb20d250b Mon Sep 17 00:00:00 2001 From: Peter Tyser Date: Mon, 12 Apr 2010 22:28:13 -0500 Subject: [PATCH 143/164] blackfin: Move cpu/blackfin/* to arch/blackfin/cpu/* Signed-off-by: Peter Tyser --- Makefile | 2 +- {cpu/blackfin => arch/blackfin/cpu}/.gitignore | 0 {cpu/blackfin => arch/blackfin/cpu}/Makefile | 0 {cpu/blackfin => arch/blackfin/cpu}/bootrom-asm-offsets.awk | 0 .../blackfin => arch/blackfin/cpu}/bootrom-asm-offsets.c.in | 0 {cpu/blackfin => arch/blackfin/cpu}/cache.S | 0 {cpu/blackfin => arch/blackfin/cpu}/cpu.c | 0 {cpu/blackfin => arch/blackfin/cpu}/cpu.h | 0 {cpu/blackfin => arch/blackfin/cpu}/initcode.c | 0 {cpu/blackfin => arch/blackfin/cpu}/interrupt.S | 0 {cpu/blackfin => arch/blackfin/cpu}/interrupts.c | 0 {cpu/blackfin => arch/blackfin/cpu}/jtag-console.c | 0 {cpu/blackfin => arch/blackfin/cpu}/os_log.c | 0 {cpu/blackfin => arch/blackfin/cpu}/reset.c | 0 {cpu/blackfin => arch/blackfin/cpu}/serial.c | 0 {cpu/blackfin => arch/blackfin/cpu}/serial.h | 0 {cpu/blackfin => arch/blackfin/cpu}/start.S | 0 {cpu/blackfin => arch/blackfin/cpu}/traps.c | 0 {cpu/blackfin => arch/blackfin/cpu}/watchdog.c | 0 arch/blackfin/lib/u-boot.lds.S | 4 ++-- include/configs/bf533-stamp.h | 6 +++--- include/configs/bf537-pnav.h | 6 +++--- include/configs/bf537-stamp.h | 6 +++--- include/configs/bf538f-ezkit.h | 6 +++--- include/configs/bf561-ezkit.h | 6 +++--- include/configs/cm-bf537e.h | 6 +++--- include/configs/cm-bf537u.h | 6 +++--- include/configs/ibf-dsp561.h | 6 +++--- include/configs/tcm-bf537.h | 6 +++--- 29 files changed, 30 insertions(+), 30 deletions(-) rename {cpu/blackfin => arch/blackfin/cpu}/.gitignore (100%) rename {cpu/blackfin => arch/blackfin/cpu}/Makefile (100%) rename {cpu/blackfin => arch/blackfin/cpu}/bootrom-asm-offsets.awk (100%) rename {cpu/blackfin => arch/blackfin/cpu}/bootrom-asm-offsets.c.in (100%) rename {cpu/blackfin => arch/blackfin/cpu}/cache.S (100%) rename {cpu/blackfin => arch/blackfin/cpu}/cpu.c (100%) rename {cpu/blackfin => arch/blackfin/cpu}/cpu.h (100%) rename {cpu/blackfin => arch/blackfin/cpu}/initcode.c (100%) rename {cpu/blackfin => arch/blackfin/cpu}/interrupt.S (100%) rename {cpu/blackfin => arch/blackfin/cpu}/interrupts.c (100%) rename {cpu/blackfin => arch/blackfin/cpu}/jtag-console.c (100%) rename {cpu/blackfin => arch/blackfin/cpu}/os_log.c (100%) rename {cpu/blackfin => arch/blackfin/cpu}/reset.c (100%) rename {cpu/blackfin => arch/blackfin/cpu}/serial.c (100%) rename {cpu/blackfin => arch/blackfin/cpu}/serial.h (100%) rename {cpu/blackfin => arch/blackfin/cpu}/start.S (100%) rename {cpu/blackfin => arch/blackfin/cpu}/traps.c (100%) rename {cpu/blackfin => arch/blackfin/cpu}/watchdog.c (100%) diff --git a/Makefile b/Makefile index e922ec3a7..0381c8110 100644 --- a/Makefile +++ b/Makefile @@ -3745,7 +3745,7 @@ clean: $(obj)board/armltd/{integratorap,integratorcp}/u-boot.lds \ $(obj)arch/blackfin/lib/u-boot.lds \ $(obj)u-boot.lds \ - $(obj)cpu/blackfin/bootrom-asm-offsets.[chs] + $(obj)arch/blackfin/cpu/bootrom-asm-offsets.[chs] @rm -f $(obj)include/bmp_logo.h @rm -f $(obj)nand_spl/{u-boot.lds,u-boot-spl,u-boot-spl.map,System.map} @rm -f $(obj)onenand_ipl/onenand-{ipl,ipl.bin,ipl.map} diff --git a/cpu/blackfin/.gitignore b/arch/blackfin/cpu/.gitignore similarity index 100% rename from cpu/blackfin/.gitignore rename to arch/blackfin/cpu/.gitignore diff --git a/cpu/blackfin/Makefile b/arch/blackfin/cpu/Makefile similarity index 100% rename from cpu/blackfin/Makefile rename to arch/blackfin/cpu/Makefile diff --git a/cpu/blackfin/bootrom-asm-offsets.awk b/arch/blackfin/cpu/bootrom-asm-offsets.awk similarity index 100% rename from cpu/blackfin/bootrom-asm-offsets.awk rename to arch/blackfin/cpu/bootrom-asm-offsets.awk diff --git a/cpu/blackfin/bootrom-asm-offsets.c.in b/arch/blackfin/cpu/bootrom-asm-offsets.c.in similarity index 100% rename from cpu/blackfin/bootrom-asm-offsets.c.in rename to arch/blackfin/cpu/bootrom-asm-offsets.c.in diff --git a/cpu/blackfin/cache.S b/arch/blackfin/cpu/cache.S similarity index 100% rename from cpu/blackfin/cache.S rename to arch/blackfin/cpu/cache.S diff --git a/cpu/blackfin/cpu.c b/arch/blackfin/cpu/cpu.c similarity index 100% rename from cpu/blackfin/cpu.c rename to arch/blackfin/cpu/cpu.c diff --git a/cpu/blackfin/cpu.h b/arch/blackfin/cpu/cpu.h similarity index 100% rename from cpu/blackfin/cpu.h rename to arch/blackfin/cpu/cpu.h diff --git a/cpu/blackfin/initcode.c b/arch/blackfin/cpu/initcode.c similarity index 100% rename from cpu/blackfin/initcode.c rename to arch/blackfin/cpu/initcode.c diff --git a/cpu/blackfin/interrupt.S b/arch/blackfin/cpu/interrupt.S similarity index 100% rename from cpu/blackfin/interrupt.S rename to arch/blackfin/cpu/interrupt.S diff --git a/cpu/blackfin/interrupts.c b/arch/blackfin/cpu/interrupts.c similarity index 100% rename from cpu/blackfin/interrupts.c rename to arch/blackfin/cpu/interrupts.c diff --git a/cpu/blackfin/jtag-console.c b/arch/blackfin/cpu/jtag-console.c similarity index 100% rename from cpu/blackfin/jtag-console.c rename to arch/blackfin/cpu/jtag-console.c diff --git a/cpu/blackfin/os_log.c b/arch/blackfin/cpu/os_log.c similarity index 100% rename from cpu/blackfin/os_log.c rename to arch/blackfin/cpu/os_log.c diff --git a/cpu/blackfin/reset.c b/arch/blackfin/cpu/reset.c similarity index 100% rename from cpu/blackfin/reset.c rename to arch/blackfin/cpu/reset.c diff --git a/cpu/blackfin/serial.c b/arch/blackfin/cpu/serial.c similarity index 100% rename from cpu/blackfin/serial.c rename to arch/blackfin/cpu/serial.c diff --git a/cpu/blackfin/serial.h b/arch/blackfin/cpu/serial.h similarity index 100% rename from cpu/blackfin/serial.h rename to arch/blackfin/cpu/serial.h diff --git a/cpu/blackfin/start.S b/arch/blackfin/cpu/start.S similarity index 100% rename from cpu/blackfin/start.S rename to arch/blackfin/cpu/start.S diff --git a/cpu/blackfin/traps.c b/arch/blackfin/cpu/traps.c similarity index 100% rename from cpu/blackfin/traps.c rename to arch/blackfin/cpu/traps.c diff --git a/cpu/blackfin/watchdog.c b/arch/blackfin/cpu/watchdog.c similarity index 100% rename from cpu/blackfin/watchdog.c rename to arch/blackfin/cpu/watchdog.c diff --git a/arch/blackfin/lib/u-boot.lds.S b/arch/blackfin/lib/u-boot.lds.S index 2b23d8ba6..9163d20c2 100644 --- a/arch/blackfin/lib/u-boot.lds.S +++ b/arch/blackfin/lib/u-boot.lds.S @@ -73,14 +73,14 @@ SECTIONS { .text.pre : { - cpu/blackfin/start.o (.text .text.*) + arch/blackfin/cpu/start.o (.text .text.*) LDS_BOARD_TEXT } >ram_code .text.init : { - cpu/blackfin/initcode.o (.text .text.*) + arch/blackfin/cpu/initcode.o (.text .text.*) } >ram_code __initcode_lma = LOADADDR(.text.init); __initcode_len = SIZEOF(.text.init); diff --git a/include/configs/bf533-stamp.h b/include/configs/bf533-stamp.h index 0b94f559f..80c48847e 100644 --- a/include/configs/bf533-stamp.h +++ b/include/configs/bf533-stamp.h @@ -126,9 +126,9 @@ * it linked after the configuration sector. */ # define LDS_BOARD_TEXT \ - cpu/blackfin/traps.o (.text .text.*); \ - cpu/blackfin/interrupt.o (.text .text.*); \ - cpu/blackfin/serial.o (.text .text.*); \ + arch/blackfin/cpu/traps.o (.text .text.*); \ + arch/blackfin/cpu/interrupt.o (.text .text.*); \ + arch/blackfin/cpu/serial.o (.text .text.*); \ common/dlmalloc.o (.text .text.*); \ lib/crc32.o (.text .text.*); \ . = DEFINED(env_offset) ? env_offset : .; \ diff --git a/include/configs/bf537-pnav.h b/include/configs/bf537-pnav.h index 8038c40de..cf40d06b8 100644 --- a/include/configs/bf537-pnav.h +++ b/include/configs/bf537-pnav.h @@ -112,9 +112,9 @@ * it linked after the configuration sector. */ # define LDS_BOARD_TEXT \ - cpu/blackfin/traps.o (.text .text.*); \ - cpu/blackfin/interrupt.o (.text .text.*); \ - cpu/blackfin/serial.o (.text .text.*); \ + arch/blackfin/cpu/traps.o (.text .text.*); \ + arch/blackfin/cpu/interrupt.o (.text .text.*); \ + arch/blackfin/cpu/serial.o (.text .text.*); \ common/dlmalloc.o (.text .text.*); \ lib/crc32.o (.text .text.*); \ . = DEFINED(env_offset) ? env_offset : .; \ diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h index 0f8679b57..92ceb3815 100644 --- a/include/configs/bf537-stamp.h +++ b/include/configs/bf537-stamp.h @@ -122,9 +122,9 @@ * it linked after the configuration sector. */ # define LDS_BOARD_TEXT \ - cpu/blackfin/traps.o (.text .text.*); \ - cpu/blackfin/interrupt.o (.text .text.*); \ - cpu/blackfin/serial.o (.text .text.*); \ + arch/blackfin/cpu/traps.o (.text .text.*); \ + arch/blackfin/cpu/interrupt.o (.text .text.*); \ + arch/blackfin/cpu/serial.o (.text .text.*); \ common/dlmalloc.o (.text .text.*); \ lib/crc32.o (.text .text.*); \ . = DEFINED(env_offset) ? env_offset : .; \ diff --git a/include/configs/bf538f-ezkit.h b/include/configs/bf538f-ezkit.h index 696fe29d2..59e05650e 100644 --- a/include/configs/bf538f-ezkit.h +++ b/include/configs/bf538f-ezkit.h @@ -119,9 +119,9 @@ * it linked after the configuration sector. */ # define LDS_BOARD_TEXT \ - cpu/blackfin/traps.o (.text .text.*); \ - cpu/blackfin/interrupt.o (.text .text.*); \ - cpu/blackfin/serial.o (.text .text.*); \ + arch/blackfin/cpu/traps.o (.text .text.*); \ + arch/blackfin/cpu/interrupt.o (.text .text.*); \ + arch/blackfin/cpu/serial.o (.text .text.*); \ common/dlmalloc.o (.text .text.*); \ lib/crc32.o (.text .text.*); \ . = DEFINED(env_offset) ? env_offset : .; \ diff --git a/include/configs/bf561-ezkit.h b/include/configs/bf561-ezkit.h index fca6e43b4..1e3fdef64 100644 --- a/include/configs/bf561-ezkit.h +++ b/include/configs/bf561-ezkit.h @@ -96,9 +96,9 @@ * it linked after the configuration sector. */ # define LDS_BOARD_TEXT \ - cpu/blackfin/traps.o (.text .text.*); \ - cpu/blackfin/interrupt.o (.text .text.*); \ - cpu/blackfin/serial.o (.text .text.*); \ + arch/blackfin/cpu/traps.o (.text .text.*); \ + arch/blackfin/cpu/interrupt.o (.text .text.*); \ + arch/blackfin/cpu/serial.o (.text .text.*); \ common/dlmalloc.o (.text .text.*); \ lib/crc32.o (.text .text.*); \ lib/zlib.o (.text .text.*); \ diff --git a/include/configs/cm-bf537e.h b/include/configs/cm-bf537e.h index d86409fcd..8d0bc1232 100644 --- a/include/configs/cm-bf537e.h +++ b/include/configs/cm-bf537e.h @@ -104,9 +104,9 @@ * it linked after the configuration sector. */ # define LDS_BOARD_TEXT \ - cpu/blackfin/traps.o (.text .text.*); \ - cpu/blackfin/interrupt.o (.text .text.*); \ - cpu/blackfin/serial.o (.text .text.*); \ + arch/blackfin/cpu/traps.o (.text .text.*); \ + arch/blackfin/cpu/interrupt.o (.text .text.*); \ + arch/blackfin/cpu/serial.o (.text .text.*); \ common/dlmalloc.o (.text .text.*); \ lib/crc32.o (.text .text.*); \ . = DEFINED(env_offset) ? env_offset : .; \ diff --git a/include/configs/cm-bf537u.h b/include/configs/cm-bf537u.h index 6be9dbad8..bbea3ab00 100644 --- a/include/configs/cm-bf537u.h +++ b/include/configs/cm-bf537u.h @@ -105,9 +105,9 @@ * it linked after the configuration sector. */ # define LDS_BOARD_TEXT \ - cpu/blackfin/traps.o (.text .text.*); \ - cpu/blackfin/interrupt.o (.text .text.*); \ - cpu/blackfin/serial.o (.text .text.*); \ + arch/blackfin/cpu/traps.o (.text .text.*); \ + arch/blackfin/cpu/interrupt.o (.text .text.*); \ + arch/blackfin/cpu/serial.o (.text .text.*); \ common/dlmalloc.o (.text .text.*); \ lib/crc32.o (.text .text.*); \ . = DEFINED(env_offset) ? env_offset : .; \ diff --git a/include/configs/ibf-dsp561.h b/include/configs/ibf-dsp561.h index 6fa8cf7a9..2eef5efa7 100644 --- a/include/configs/ibf-dsp561.h +++ b/include/configs/ibf-dsp561.h @@ -84,9 +84,9 @@ * it linked after the configuration sector. */ # define LDS_BOARD_TEXT \ - cpu/blackfin/traps.o (.text .text.*); \ - cpu/blackfin/interrupt.o (.text .text.*); \ - cpu/blackfin/serial.o (.text .text.*); \ + arch/blackfin/cpu/traps.o (.text .text.*); \ + arch/blackfin/cpu/interrupt.o (.text .text.*); \ + arch/blackfin/cpu/serial.o (.text .text.*); \ common/dlmalloc.o (.text .text.*); \ lib/crc32.o (.text .text.*); \ lib/zlib.o (.text .text.*); \ diff --git a/include/configs/tcm-bf537.h b/include/configs/tcm-bf537.h index e9dfcc95f..409a042d0 100644 --- a/include/configs/tcm-bf537.h +++ b/include/configs/tcm-bf537.h @@ -105,9 +105,9 @@ * it linked after the configuration sector. */ # define LDS_BOARD_TEXT \ - cpu/blackfin/traps.o (.text .text.*); \ - cpu/blackfin/interrupt.o (.text .text.*); \ - cpu/blackfin/serial.o (.text .text.*); \ + arch/blackfin/cpu/traps.o (.text .text.*); \ + arch/blackfin/cpu/interrupt.o (.text .text.*); \ + arch/blackfin/cpu/serial.o (.text .text.*); \ common/dlmalloc.o (.text .text.*); \ lib/crc32.o (.text .text.*); \ . = DEFINED(env_offset) ? env_offset : .; \ From 1e3827d9cf9442e188604fd1099ac38375135125 Mon Sep 17 00:00:00 2001 From: Peter Tyser Date: Mon, 12 Apr 2010 22:28:14 -0500 Subject: [PATCH 144/164] mips: Move cpu/mips/* to arch/mips/cpu/* Signed-off-by: Peter Tyser --- {cpu/mips => arch/mips/cpu}/Makefile | 0 {cpu/mips => arch/mips/cpu}/asc_serial.c | 0 {cpu/mips => arch/mips/cpu}/asc_serial.h | 0 {cpu/mips => arch/mips/cpu}/au1x00_eth.c | 0 {cpu/mips => arch/mips/cpu}/au1x00_serial.c | 0 {cpu/mips => arch/mips/cpu}/au1x00_usb_ohci.c | 0 {cpu/mips => arch/mips/cpu}/au1x00_usb_ohci.h | 0 {cpu/mips => arch/mips/cpu}/cache.S | 0 {cpu/mips => arch/mips/cpu}/config.mk | 0 {cpu/mips => arch/mips/cpu}/cpu.c | 0 {cpu/mips => arch/mips/cpu}/incaip_clock.c | 0 {cpu/mips => arch/mips/cpu}/incaip_wdt.S | 0 {cpu/mips => arch/mips/cpu}/interrupts.c | 0 {cpu/mips => arch/mips/cpu}/start.S | 0 board/dbau1x00/dbau1x00.c | 2 +- board/gth2/gth2.c | 2 +- board/pb1x00/pb1x00.c | 2 +- board/purple/u-boot.lds | 4 ++-- drivers/usb/host/isp116x-hcd.c | 2 +- 19 files changed, 6 insertions(+), 6 deletions(-) rename {cpu/mips => arch/mips/cpu}/Makefile (100%) rename {cpu/mips => arch/mips/cpu}/asc_serial.c (100%) rename {cpu/mips => arch/mips/cpu}/asc_serial.h (100%) rename {cpu/mips => arch/mips/cpu}/au1x00_eth.c (100%) rename {cpu/mips => arch/mips/cpu}/au1x00_serial.c (100%) rename {cpu/mips => arch/mips/cpu}/au1x00_usb_ohci.c (100%) rename {cpu/mips => arch/mips/cpu}/au1x00_usb_ohci.h (100%) rename {cpu/mips => arch/mips/cpu}/cache.S (100%) rename {cpu/mips => arch/mips/cpu}/config.mk (100%) rename {cpu/mips => arch/mips/cpu}/cpu.c (100%) rename {cpu/mips => arch/mips/cpu}/incaip_clock.c (100%) rename {cpu/mips => arch/mips/cpu}/incaip_wdt.S (100%) rename {cpu/mips => arch/mips/cpu}/interrupts.c (100%) rename {cpu/mips => arch/mips/cpu}/start.S (100%) diff --git a/cpu/mips/Makefile b/arch/mips/cpu/Makefile similarity index 100% rename from cpu/mips/Makefile rename to arch/mips/cpu/Makefile diff --git a/cpu/mips/asc_serial.c b/arch/mips/cpu/asc_serial.c similarity index 100% rename from cpu/mips/asc_serial.c rename to arch/mips/cpu/asc_serial.c diff --git a/cpu/mips/asc_serial.h b/arch/mips/cpu/asc_serial.h similarity index 100% rename from cpu/mips/asc_serial.h rename to arch/mips/cpu/asc_serial.h diff --git a/cpu/mips/au1x00_eth.c b/arch/mips/cpu/au1x00_eth.c similarity index 100% rename from cpu/mips/au1x00_eth.c rename to arch/mips/cpu/au1x00_eth.c diff --git a/cpu/mips/au1x00_serial.c b/arch/mips/cpu/au1x00_serial.c similarity index 100% rename from cpu/mips/au1x00_serial.c rename to arch/mips/cpu/au1x00_serial.c diff --git a/cpu/mips/au1x00_usb_ohci.c b/arch/mips/cpu/au1x00_usb_ohci.c similarity index 100% rename from cpu/mips/au1x00_usb_ohci.c rename to arch/mips/cpu/au1x00_usb_ohci.c diff --git a/cpu/mips/au1x00_usb_ohci.h b/arch/mips/cpu/au1x00_usb_ohci.h similarity index 100% rename from cpu/mips/au1x00_usb_ohci.h rename to arch/mips/cpu/au1x00_usb_ohci.h diff --git a/cpu/mips/cache.S b/arch/mips/cpu/cache.S similarity index 100% rename from cpu/mips/cache.S rename to arch/mips/cpu/cache.S diff --git a/cpu/mips/config.mk b/arch/mips/cpu/config.mk similarity index 100% rename from cpu/mips/config.mk rename to arch/mips/cpu/config.mk diff --git a/cpu/mips/cpu.c b/arch/mips/cpu/cpu.c similarity index 100% rename from cpu/mips/cpu.c rename to arch/mips/cpu/cpu.c diff --git a/cpu/mips/incaip_clock.c b/arch/mips/cpu/incaip_clock.c similarity index 100% rename from cpu/mips/incaip_clock.c rename to arch/mips/cpu/incaip_clock.c diff --git a/cpu/mips/incaip_wdt.S b/arch/mips/cpu/incaip_wdt.S similarity index 100% rename from cpu/mips/incaip_wdt.S rename to arch/mips/cpu/incaip_wdt.S diff --git a/cpu/mips/interrupts.c b/arch/mips/cpu/interrupts.c similarity index 100% rename from cpu/mips/interrupts.c rename to arch/mips/cpu/interrupts.c diff --git a/cpu/mips/start.S b/arch/mips/cpu/start.S similarity index 100% rename from cpu/mips/start.S rename to arch/mips/cpu/start.S diff --git a/board/dbau1x00/dbau1x00.c b/board/dbau1x00/dbau1x00.c index 42756f5b8..b3c6d512e 100644 --- a/board/dbau1x00/dbau1x00.c +++ b/board/dbau1x00/dbau1x00.c @@ -37,7 +37,7 @@ phys_size_t initdram(int board_type) #define BCSR_PCMCIA_PC0DRVEN 0x0010 #define BCSR_PCMCIA_PC0RST 0x0080 -/* In cpu/mips/cpu.c */ +/* In arch/mips/cpu/cpu.c */ void write_one_tlb( int index, u32 pagemask, u32 hi, u32 low0, u32 low1 ); int checkboard (void) diff --git a/board/gth2/gth2.c b/board/gth2/gth2.c index 59873d5ef..8c3b55af4 100644 --- a/board/gth2/gth2.c +++ b/board/gth2/gth2.c @@ -93,7 +93,7 @@ phys_size_t initdram(int board_type) return (SDRAM_SIZE); } -/* In cpu/mips/cpu.c */ +/* In arch/mips/cpu/cpu.c */ void write_one_tlb( int index, u32 pagemask, u32 hi, u32 low0, u32 low1 ); void set_ledcard(u32 value){ diff --git a/board/pb1x00/pb1x00.c b/board/pb1x00/pb1x00.c index 773e446c0..2510ddfd6 100644 --- a/board/pb1x00/pb1x00.c +++ b/board/pb1x00/pb1x00.c @@ -37,7 +37,7 @@ phys_size_t initdram(int board_type) #define BCSR_PCMCIA_PC0DRVEN 0x0010 #define BCSR_PCMCIA_PC0RST 0x0080 -/* In cpu/mips/cpu.c */ +/* In arch/mips/cpu/cpu.c */ void write_one_tlb( int index, u32 pagemask, u32 hi, u32 low0, u32 low1 ); int checkboard (void) diff --git a/board/purple/u-boot.lds b/board/purple/u-boot.lds index 236ece478..1881e651c 100644 --- a/board/purple/u-boot.lds +++ b/board/purple/u-boot.lds @@ -34,9 +34,9 @@ SECTIONS . = ALIGN(4); .text : { - cpu/mips/start.o (.text) + arch/mips/cpu/start.o (.text) board/purple/lowlevel_init.o (.text) - cpu/mips/cache.o (.text) + arch/mips/cpu/cache.o (.text) common/main.o (.text) common/dlmalloc.o (.text) common/cmd_boot.o (.text) diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c index 7aff54bce..abdcbb4b2 100644 --- a/drivers/usb/host/isp116x-hcd.c +++ b/drivers/usb/host/isp116x-hcd.c @@ -42,7 +42,7 @@ * * [[GNU/GPL disclaimer]] * - * and in part from AU1x00 OHCI HCD driver "u-boot/cpu/mips/au1x00_usb_ohci.c" + * and in part from AU1x00 OHCI HCD driver "u-boot/arch/mips/cpu/au1x00_usb_ohci.c" * (original copyright message follows): * * URB OHCI HCD (Host Controller Driver) for USB on the AU1x00. From 8a15c2d10b0b784f0cfba1240f06a4d933b975fa Mon Sep 17 00:00:00 2001 From: Peter Tyser Date: Mon, 12 Apr 2010 22:28:15 -0500 Subject: [PATCH 145/164] avr32: Move cpu/at32ap/* to arch/avr32/cpu/* Signed-off-by: Peter Tyser --- {cpu/at32ap => arch/avr32/cpu}/Makefile | 0 {cpu/at32ap => arch/avr32/cpu}/at32ap700x/Makefile | 0 {cpu/at32ap => arch/avr32/cpu}/at32ap700x/clk.c | 0 {cpu/at32ap => arch/avr32/cpu}/at32ap700x/portmux.c | 0 {cpu/at32ap => arch/avr32/cpu}/at32ap700x/sm.h | 0 {cpu/at32ap => arch/avr32/cpu}/cache.c | 0 {cpu/at32ap => arch/avr32/cpu}/config.mk | 0 {cpu/at32ap => arch/avr32/cpu}/cpu.c | 0 {cpu/at32ap => arch/avr32/cpu}/exception.c | 0 {cpu/at32ap => arch/avr32/cpu}/hsdramc.c | 0 {cpu/at32ap => arch/avr32/cpu}/hsdramc1.h | 0 {cpu/at32ap => arch/avr32/cpu}/hsmc3.h | 0 {cpu/at32ap => arch/avr32/cpu}/interrupts.c | 0 {cpu/at32ap => arch/avr32/cpu}/pio2.h | 0 {cpu/at32ap => arch/avr32/cpu}/portmux-gpio.c | 0 {cpu/at32ap => arch/avr32/cpu}/portmux-pio.c | 0 {cpu/at32ap => arch/avr32/cpu}/start.S | 0 board/mimc/mimc200/mimc200.c | 2 +- 18 files changed, 1 insertion(+), 1 deletion(-) rename {cpu/at32ap => arch/avr32/cpu}/Makefile (100%) rename {cpu/at32ap => arch/avr32/cpu}/at32ap700x/Makefile (100%) rename {cpu/at32ap => arch/avr32/cpu}/at32ap700x/clk.c (100%) rename {cpu/at32ap => arch/avr32/cpu}/at32ap700x/portmux.c (100%) rename {cpu/at32ap => arch/avr32/cpu}/at32ap700x/sm.h (100%) rename {cpu/at32ap => arch/avr32/cpu}/cache.c (100%) rename {cpu/at32ap => arch/avr32/cpu}/config.mk (100%) rename {cpu/at32ap => arch/avr32/cpu}/cpu.c (100%) rename {cpu/at32ap => arch/avr32/cpu}/exception.c (100%) rename {cpu/at32ap => arch/avr32/cpu}/hsdramc.c (100%) rename {cpu/at32ap => arch/avr32/cpu}/hsdramc1.h (100%) rename {cpu/at32ap => arch/avr32/cpu}/hsmc3.h (100%) rename {cpu/at32ap => arch/avr32/cpu}/interrupts.c (100%) rename {cpu/at32ap => arch/avr32/cpu}/pio2.h (100%) rename {cpu/at32ap => arch/avr32/cpu}/portmux-gpio.c (100%) rename {cpu/at32ap => arch/avr32/cpu}/portmux-pio.c (100%) rename {cpu/at32ap => arch/avr32/cpu}/start.S (100%) diff --git a/cpu/at32ap/Makefile b/arch/avr32/cpu/Makefile similarity index 100% rename from cpu/at32ap/Makefile rename to arch/avr32/cpu/Makefile diff --git a/cpu/at32ap/at32ap700x/Makefile b/arch/avr32/cpu/at32ap700x/Makefile similarity index 100% rename from cpu/at32ap/at32ap700x/Makefile rename to arch/avr32/cpu/at32ap700x/Makefile diff --git a/cpu/at32ap/at32ap700x/clk.c b/arch/avr32/cpu/at32ap700x/clk.c similarity index 100% rename from cpu/at32ap/at32ap700x/clk.c rename to arch/avr32/cpu/at32ap700x/clk.c diff --git a/cpu/at32ap/at32ap700x/portmux.c b/arch/avr32/cpu/at32ap700x/portmux.c similarity index 100% rename from cpu/at32ap/at32ap700x/portmux.c rename to arch/avr32/cpu/at32ap700x/portmux.c diff --git a/cpu/at32ap/at32ap700x/sm.h b/arch/avr32/cpu/at32ap700x/sm.h similarity index 100% rename from cpu/at32ap/at32ap700x/sm.h rename to arch/avr32/cpu/at32ap700x/sm.h diff --git a/cpu/at32ap/cache.c b/arch/avr32/cpu/cache.c similarity index 100% rename from cpu/at32ap/cache.c rename to arch/avr32/cpu/cache.c diff --git a/cpu/at32ap/config.mk b/arch/avr32/cpu/config.mk similarity index 100% rename from cpu/at32ap/config.mk rename to arch/avr32/cpu/config.mk diff --git a/cpu/at32ap/cpu.c b/arch/avr32/cpu/cpu.c similarity index 100% rename from cpu/at32ap/cpu.c rename to arch/avr32/cpu/cpu.c diff --git a/cpu/at32ap/exception.c b/arch/avr32/cpu/exception.c similarity index 100% rename from cpu/at32ap/exception.c rename to arch/avr32/cpu/exception.c diff --git a/cpu/at32ap/hsdramc.c b/arch/avr32/cpu/hsdramc.c similarity index 100% rename from cpu/at32ap/hsdramc.c rename to arch/avr32/cpu/hsdramc.c diff --git a/cpu/at32ap/hsdramc1.h b/arch/avr32/cpu/hsdramc1.h similarity index 100% rename from cpu/at32ap/hsdramc1.h rename to arch/avr32/cpu/hsdramc1.h diff --git a/cpu/at32ap/hsmc3.h b/arch/avr32/cpu/hsmc3.h similarity index 100% rename from cpu/at32ap/hsmc3.h rename to arch/avr32/cpu/hsmc3.h diff --git a/cpu/at32ap/interrupts.c b/arch/avr32/cpu/interrupts.c similarity index 100% rename from cpu/at32ap/interrupts.c rename to arch/avr32/cpu/interrupts.c diff --git a/cpu/at32ap/pio2.h b/arch/avr32/cpu/pio2.h similarity index 100% rename from cpu/at32ap/pio2.h rename to arch/avr32/cpu/pio2.h diff --git a/cpu/at32ap/portmux-gpio.c b/arch/avr32/cpu/portmux-gpio.c similarity index 100% rename from cpu/at32ap/portmux-gpio.c rename to arch/avr32/cpu/portmux-gpio.c diff --git a/cpu/at32ap/portmux-pio.c b/arch/avr32/cpu/portmux-pio.c similarity index 100% rename from cpu/at32ap/portmux-pio.c rename to arch/avr32/cpu/portmux-pio.c diff --git a/cpu/at32ap/start.S b/arch/avr32/cpu/start.S similarity index 100% rename from cpu/at32ap/start.S rename to arch/avr32/cpu/start.S diff --git a/board/mimc/mimc200/mimc200.c b/board/mimc/mimc200/mimc200.c index 0dcacb9f1..cc0f13712 100644 --- a/board/mimc/mimc200/mimc200.c +++ b/board/mimc/mimc200/mimc200.c @@ -31,7 +31,7 @@ #include #include -#include "../../../cpu/at32ap/hsmc3.h" +#include "../../../arch/avr32/cpu/hsmc3.h" #if defined(CONFIG_LCD) /* 480x272x16 @ 72 Hz */ From 6260fb0458d94c83aa5b180745b1946c0c94d364 Mon Sep 17 00:00:00 2001 From: Peter Tyser Date: Mon, 12 Apr 2010 22:28:16 -0500 Subject: [PATCH 146/164] microblaze: Move cpu/microblaze/* to arch/microblaze/cpu/* Signed-off-by: Peter Tyser --- {cpu/microblaze => arch/microblaze/cpu}/Makefile | 0 {cpu/microblaze => arch/microblaze/cpu}/cache.c | 0 {cpu/microblaze => arch/microblaze/cpu}/cpu.c | 0 {cpu/microblaze => arch/microblaze/cpu}/exception.c | 0 {cpu/microblaze => arch/microblaze/cpu}/interrupts.c | 0 {cpu/microblaze => arch/microblaze/cpu}/irq.S | 0 {cpu/microblaze => arch/microblaze/cpu}/start.S | 0 {cpu/microblaze => arch/microblaze/cpu}/timer.c | 0 board/xilinx/microblaze-generic/u-boot.lds | 2 +- 9 files changed, 1 insertion(+), 1 deletion(-) rename {cpu/microblaze => arch/microblaze/cpu}/Makefile (100%) rename {cpu/microblaze => arch/microblaze/cpu}/cache.c (100%) rename {cpu/microblaze => arch/microblaze/cpu}/cpu.c (100%) rename {cpu/microblaze => arch/microblaze/cpu}/exception.c (100%) rename {cpu/microblaze => arch/microblaze/cpu}/interrupts.c (100%) rename {cpu/microblaze => arch/microblaze/cpu}/irq.S (100%) rename {cpu/microblaze => arch/microblaze/cpu}/start.S (100%) rename {cpu/microblaze => arch/microblaze/cpu}/timer.c (100%) diff --git a/cpu/microblaze/Makefile b/arch/microblaze/cpu/Makefile similarity index 100% rename from cpu/microblaze/Makefile rename to arch/microblaze/cpu/Makefile diff --git a/cpu/microblaze/cache.c b/arch/microblaze/cpu/cache.c similarity index 100% rename from cpu/microblaze/cache.c rename to arch/microblaze/cpu/cache.c diff --git a/cpu/microblaze/cpu.c b/arch/microblaze/cpu/cpu.c similarity index 100% rename from cpu/microblaze/cpu.c rename to arch/microblaze/cpu/cpu.c diff --git a/cpu/microblaze/exception.c b/arch/microblaze/cpu/exception.c similarity index 100% rename from cpu/microblaze/exception.c rename to arch/microblaze/cpu/exception.c diff --git a/cpu/microblaze/interrupts.c b/arch/microblaze/cpu/interrupts.c similarity index 100% rename from cpu/microblaze/interrupts.c rename to arch/microblaze/cpu/interrupts.c diff --git a/cpu/microblaze/irq.S b/arch/microblaze/cpu/irq.S similarity index 100% rename from cpu/microblaze/irq.S rename to arch/microblaze/cpu/irq.S diff --git a/cpu/microblaze/start.S b/arch/microblaze/cpu/start.S similarity index 100% rename from cpu/microblaze/start.S rename to arch/microblaze/cpu/start.S diff --git a/cpu/microblaze/timer.c b/arch/microblaze/cpu/timer.c similarity index 100% rename from cpu/microblaze/timer.c rename to arch/microblaze/cpu/timer.c diff --git a/board/xilinx/microblaze-generic/u-boot.lds b/board/xilinx/microblaze-generic/u-boot.lds index c20c6dd1d..ee41145bb 100644 --- a/board/xilinx/microblaze-generic/u-boot.lds +++ b/board/xilinx/microblaze-generic/u-boot.lds @@ -30,7 +30,7 @@ SECTIONS .text ALIGN(0x4): { __text_start = .; - cpu/microblaze/start.o (.text) + arch/microblaze/cpu/start.o (.text) *(.text) __text_end = .; } From e9a882803eb59f482ca4aa6ffd6fa21e4c53d618 Mon Sep 17 00:00:00 2001 From: Peter Tyser Date: Mon, 12 Apr 2010 22:28:17 -0500 Subject: [PATCH 147/164] i386: Move cpu/i386/* to arch/i386/cpu/* Signed-off-by: Peter Tyser --- {cpu/i386 => arch/i386/cpu}/Makefile | 0 {cpu/i386 => arch/i386/cpu}/config.mk | 0 {cpu/i386 => arch/i386/cpu}/cpu.c | 0 {cpu/i386 => arch/i386/cpu}/interrupts.c | 0 {cpu/i386 => arch/i386/cpu}/resetvec.S | 0 {cpu/i386 => arch/i386/cpu}/sc520/Makefile | 0 {cpu/i386 => arch/i386/cpu}/sc520/sc520.c | 0 {cpu/i386 => arch/i386/cpu}/sc520/sc520_asm.S | 0 {cpu/i386 => arch/i386/cpu}/sc520/sc520_pci.c | 0 {cpu/i386 => arch/i386/cpu}/sc520/sc520_ssi.c | 0 {cpu/i386 => arch/i386/cpu}/sc520/sc520_timer.c | 0 {cpu/i386 => arch/i386/cpu}/serial.c | 0 {cpu/i386 => arch/i386/cpu}/start.S | 0 {cpu/i386 => arch/i386/cpu}/start16.S | 0 arch/i386/include/asm/interrupt.h | 2 +- arch/i386/include/asm/u-boot-i386.h | 2 +- doc/TODO-i386 | 4 ++-- 17 files changed, 4 insertions(+), 4 deletions(-) rename {cpu/i386 => arch/i386/cpu}/Makefile (100%) rename {cpu/i386 => arch/i386/cpu}/config.mk (100%) rename {cpu/i386 => arch/i386/cpu}/cpu.c (100%) rename {cpu/i386 => arch/i386/cpu}/interrupts.c (100%) rename {cpu/i386 => arch/i386/cpu}/resetvec.S (100%) rename {cpu/i386 => arch/i386/cpu}/sc520/Makefile (100%) rename {cpu/i386 => arch/i386/cpu}/sc520/sc520.c (100%) rename {cpu/i386 => arch/i386/cpu}/sc520/sc520_asm.S (100%) rename {cpu/i386 => arch/i386/cpu}/sc520/sc520_pci.c (100%) rename {cpu/i386 => arch/i386/cpu}/sc520/sc520_ssi.c (100%) rename {cpu/i386 => arch/i386/cpu}/sc520/sc520_timer.c (100%) rename {cpu/i386 => arch/i386/cpu}/serial.c (100%) rename {cpu/i386 => arch/i386/cpu}/start.S (100%) rename {cpu/i386 => arch/i386/cpu}/start16.S (100%) diff --git a/cpu/i386/Makefile b/arch/i386/cpu/Makefile similarity index 100% rename from cpu/i386/Makefile rename to arch/i386/cpu/Makefile diff --git a/cpu/i386/config.mk b/arch/i386/cpu/config.mk similarity index 100% rename from cpu/i386/config.mk rename to arch/i386/cpu/config.mk diff --git a/cpu/i386/cpu.c b/arch/i386/cpu/cpu.c similarity index 100% rename from cpu/i386/cpu.c rename to arch/i386/cpu/cpu.c diff --git a/cpu/i386/interrupts.c b/arch/i386/cpu/interrupts.c similarity index 100% rename from cpu/i386/interrupts.c rename to arch/i386/cpu/interrupts.c diff --git a/cpu/i386/resetvec.S b/arch/i386/cpu/resetvec.S similarity index 100% rename from cpu/i386/resetvec.S rename to arch/i386/cpu/resetvec.S diff --git a/cpu/i386/sc520/Makefile b/arch/i386/cpu/sc520/Makefile similarity index 100% rename from cpu/i386/sc520/Makefile rename to arch/i386/cpu/sc520/Makefile diff --git a/cpu/i386/sc520/sc520.c b/arch/i386/cpu/sc520/sc520.c similarity index 100% rename from cpu/i386/sc520/sc520.c rename to arch/i386/cpu/sc520/sc520.c diff --git a/cpu/i386/sc520/sc520_asm.S b/arch/i386/cpu/sc520/sc520_asm.S similarity index 100% rename from cpu/i386/sc520/sc520_asm.S rename to arch/i386/cpu/sc520/sc520_asm.S diff --git a/cpu/i386/sc520/sc520_pci.c b/arch/i386/cpu/sc520/sc520_pci.c similarity index 100% rename from cpu/i386/sc520/sc520_pci.c rename to arch/i386/cpu/sc520/sc520_pci.c diff --git a/cpu/i386/sc520/sc520_ssi.c b/arch/i386/cpu/sc520/sc520_ssi.c similarity index 100% rename from cpu/i386/sc520/sc520_ssi.c rename to arch/i386/cpu/sc520/sc520_ssi.c diff --git a/cpu/i386/sc520/sc520_timer.c b/arch/i386/cpu/sc520/sc520_timer.c similarity index 100% rename from cpu/i386/sc520/sc520_timer.c rename to arch/i386/cpu/sc520/sc520_timer.c diff --git a/cpu/i386/serial.c b/arch/i386/cpu/serial.c similarity index 100% rename from cpu/i386/serial.c rename to arch/i386/cpu/serial.c diff --git a/cpu/i386/start.S b/arch/i386/cpu/start.S similarity index 100% rename from cpu/i386/start.S rename to arch/i386/cpu/start.S diff --git a/cpu/i386/start16.S b/arch/i386/cpu/start16.S similarity index 100% rename from cpu/i386/start16.S rename to arch/i386/cpu/start16.S diff --git a/arch/i386/include/asm/interrupt.h b/arch/i386/include/asm/interrupt.h index 8d324d9f3..07426fe6a 100644 --- a/arch/i386/include/asm/interrupt.h +++ b/arch/i386/include/asm/interrupt.h @@ -27,7 +27,7 @@ #ifndef __ASM_INTERRUPT_H_ #define __ASM_INTERRUPT_H_ 1 -/* cpu/i386/interrupts.c */ +/* arch/i386/cpu/interrupts.c */ void set_vector(u8 intnum, void *routine); /* arch/i386/lib/interupts.c */ diff --git a/arch/i386/include/asm/u-boot-i386.h b/arch/i386/include/asm/u-boot-i386.h index a08632d2d..521fd352b 100644 --- a/arch/i386/include/asm/u-boot-i386.h +++ b/arch/i386/include/asm/u-boot-i386.h @@ -33,7 +33,7 @@ void timer_isr(void *); typedef void (timer_fnc_t) (void); int register_timer_isr (timer_fnc_t *isr_func); -/* Architecture specific - can be in cpu/i386/, arch/i386/lib/, or $(BOARD)/ */ +/* Architecture specific - can be in arch/i386/cpu/, arch/i386/lib/, or $(BOARD)/ */ int timer_init(void); /* cpu/.../interrupts.c */ diff --git a/doc/TODO-i386 b/doc/TODO-i386 index 2261f4a1f..9b6c5d41a 100644 --- a/doc/TODO-i386 +++ b/doc/TODO-i386 @@ -4,11 +4,11 @@ i386 port missing features: * setup the BIOS data area and BIOS equipment word to reflect machine config. * Make reset work (from Linux and from the boot prompt) * DMA, FDC, RTC, KBC initialization -* split of part of cpu/i386/interrupt.c to cpu/i385/entry.c? +* split of part of arch/i386/cpu/interrupt.c to cpu/i385/entry.c? * re-entry of protected mode from real mode, should be added to realmode_switch.S (and used by INT 10h and INT 16h handlers for console I/O during early linux boot...) -* missing functions in arch/i386/lib and cpu/i386 +* missing functions in arch/i386/lib and arch/i386/cpu * speaker beep interface From 1e9c26578ebbeecbaf3d8fb574957405eff17c86 Mon Sep 17 00:00:00 2001 From: Peter Tyser Date: Mon, 12 Apr 2010 22:28:18 -0500 Subject: [PATCH 148/164] sparc: Move cpu/leon[23] to arch/sparc/cpu/leon[23] Signed-off-by: Peter Tyser --- {cpu => arch/sparc/cpu}/leon2/Makefile | 0 {cpu => arch/sparc/cpu}/leon2/config.mk | 0 {cpu => arch/sparc/cpu}/leon2/cpu.c | 0 {cpu => arch/sparc/cpu}/leon2/cpu_init.c | 0 {cpu => arch/sparc/cpu}/leon2/interrupts.c | 0 {cpu => arch/sparc/cpu}/leon2/prom.c | 0 {cpu => arch/sparc/cpu}/leon2/serial.c | 0 {cpu => arch/sparc/cpu}/leon2/start.S | 0 {cpu => arch/sparc/cpu}/leon3/Makefile | 0 {cpu => arch/sparc/cpu}/leon3/ambapp.c | 0 {cpu => arch/sparc/cpu}/leon3/config.mk | 0 {cpu => arch/sparc/cpu}/leon3/cpu.c | 0 {cpu => arch/sparc/cpu}/leon3/cpu_init.c | 0 {cpu => arch/sparc/cpu}/leon3/interrupts.c | 0 {cpu => arch/sparc/cpu}/leon3/prom.c | 0 {cpu => arch/sparc/cpu}/leon3/serial.c | 0 {cpu => arch/sparc/cpu}/leon3/start.S | 0 {cpu => arch/sparc/cpu}/leon3/usb_uhci.c | 0 {cpu => arch/sparc/cpu}/leon3/usb_uhci.h | 0 board/gaisler/gr_cpci_ax2000/u-boot.lds | 2 +- board/gaisler/gr_ep2s60/u-boot.lds | 2 +- board/gaisler/gr_xc3s_1500/u-boot.lds | 2 +- board/gaisler/grsim/u-boot.lds | 2 +- board/gaisler/grsim_leon2/u-boot.lds | 2 +- 24 files changed, 5 insertions(+), 5 deletions(-) rename {cpu => arch/sparc/cpu}/leon2/Makefile (100%) rename {cpu => arch/sparc/cpu}/leon2/config.mk (100%) rename {cpu => arch/sparc/cpu}/leon2/cpu.c (100%) rename {cpu => arch/sparc/cpu}/leon2/cpu_init.c (100%) rename {cpu => arch/sparc/cpu}/leon2/interrupts.c (100%) rename {cpu => arch/sparc/cpu}/leon2/prom.c (100%) rename {cpu => arch/sparc/cpu}/leon2/serial.c (100%) rename {cpu => arch/sparc/cpu}/leon2/start.S (100%) rename {cpu => arch/sparc/cpu}/leon3/Makefile (100%) rename {cpu => arch/sparc/cpu}/leon3/ambapp.c (100%) rename {cpu => arch/sparc/cpu}/leon3/config.mk (100%) rename {cpu => arch/sparc/cpu}/leon3/cpu.c (100%) rename {cpu => arch/sparc/cpu}/leon3/cpu_init.c (100%) rename {cpu => arch/sparc/cpu}/leon3/interrupts.c (100%) rename {cpu => arch/sparc/cpu}/leon3/prom.c (100%) rename {cpu => arch/sparc/cpu}/leon3/serial.c (100%) rename {cpu => arch/sparc/cpu}/leon3/start.S (100%) rename {cpu => arch/sparc/cpu}/leon3/usb_uhci.c (100%) rename {cpu => arch/sparc/cpu}/leon3/usb_uhci.h (100%) diff --git a/cpu/leon2/Makefile b/arch/sparc/cpu/leon2/Makefile similarity index 100% rename from cpu/leon2/Makefile rename to arch/sparc/cpu/leon2/Makefile diff --git a/cpu/leon2/config.mk b/arch/sparc/cpu/leon2/config.mk similarity index 100% rename from cpu/leon2/config.mk rename to arch/sparc/cpu/leon2/config.mk diff --git a/cpu/leon2/cpu.c b/arch/sparc/cpu/leon2/cpu.c similarity index 100% rename from cpu/leon2/cpu.c rename to arch/sparc/cpu/leon2/cpu.c diff --git a/cpu/leon2/cpu_init.c b/arch/sparc/cpu/leon2/cpu_init.c similarity index 100% rename from cpu/leon2/cpu_init.c rename to arch/sparc/cpu/leon2/cpu_init.c diff --git a/cpu/leon2/interrupts.c b/arch/sparc/cpu/leon2/interrupts.c similarity index 100% rename from cpu/leon2/interrupts.c rename to arch/sparc/cpu/leon2/interrupts.c diff --git a/cpu/leon2/prom.c b/arch/sparc/cpu/leon2/prom.c similarity index 100% rename from cpu/leon2/prom.c rename to arch/sparc/cpu/leon2/prom.c diff --git a/cpu/leon2/serial.c b/arch/sparc/cpu/leon2/serial.c similarity index 100% rename from cpu/leon2/serial.c rename to arch/sparc/cpu/leon2/serial.c diff --git a/cpu/leon2/start.S b/arch/sparc/cpu/leon2/start.S similarity index 100% rename from cpu/leon2/start.S rename to arch/sparc/cpu/leon2/start.S diff --git a/cpu/leon3/Makefile b/arch/sparc/cpu/leon3/Makefile similarity index 100% rename from cpu/leon3/Makefile rename to arch/sparc/cpu/leon3/Makefile diff --git a/cpu/leon3/ambapp.c b/arch/sparc/cpu/leon3/ambapp.c similarity index 100% rename from cpu/leon3/ambapp.c rename to arch/sparc/cpu/leon3/ambapp.c diff --git a/cpu/leon3/config.mk b/arch/sparc/cpu/leon3/config.mk similarity index 100% rename from cpu/leon3/config.mk rename to arch/sparc/cpu/leon3/config.mk diff --git a/cpu/leon3/cpu.c b/arch/sparc/cpu/leon3/cpu.c similarity index 100% rename from cpu/leon3/cpu.c rename to arch/sparc/cpu/leon3/cpu.c diff --git a/cpu/leon3/cpu_init.c b/arch/sparc/cpu/leon3/cpu_init.c similarity index 100% rename from cpu/leon3/cpu_init.c rename to arch/sparc/cpu/leon3/cpu_init.c diff --git a/cpu/leon3/interrupts.c b/arch/sparc/cpu/leon3/interrupts.c similarity index 100% rename from cpu/leon3/interrupts.c rename to arch/sparc/cpu/leon3/interrupts.c diff --git a/cpu/leon3/prom.c b/arch/sparc/cpu/leon3/prom.c similarity index 100% rename from cpu/leon3/prom.c rename to arch/sparc/cpu/leon3/prom.c diff --git a/cpu/leon3/serial.c b/arch/sparc/cpu/leon3/serial.c similarity index 100% rename from cpu/leon3/serial.c rename to arch/sparc/cpu/leon3/serial.c diff --git a/cpu/leon3/start.S b/arch/sparc/cpu/leon3/start.S similarity index 100% rename from cpu/leon3/start.S rename to arch/sparc/cpu/leon3/start.S diff --git a/cpu/leon3/usb_uhci.c b/arch/sparc/cpu/leon3/usb_uhci.c similarity index 100% rename from cpu/leon3/usb_uhci.c rename to arch/sparc/cpu/leon3/usb_uhci.c diff --git a/cpu/leon3/usb_uhci.h b/arch/sparc/cpu/leon3/usb_uhci.h similarity index 100% rename from cpu/leon3/usb_uhci.h rename to arch/sparc/cpu/leon3/usb_uhci.h diff --git a/board/gaisler/gr_cpci_ax2000/u-boot.lds b/board/gaisler/gr_cpci_ax2000/u-boot.lds index d5d784215..22826823c 100644 --- a/board/gaisler/gr_cpci_ax2000/u-boot.lds +++ b/board/gaisler/gr_cpci_ax2000/u-boot.lds @@ -60,7 +60,7 @@ SECTIONS _text = .; *(.start) - cpu/leon3/start.o (.text) + arch/sparc/cpu/leon3/start.o (.text) /* 8k is the same as the PROM offset from end of main memory, (CONFIG_SYS_PROM_SIZE) */ . = ALIGN(8192); /* PROM CODE, Will be relocated to the end of memory, diff --git a/board/gaisler/gr_ep2s60/u-boot.lds b/board/gaisler/gr_ep2s60/u-boot.lds index 99aa0adda..0ca265170 100644 --- a/board/gaisler/gr_ep2s60/u-boot.lds +++ b/board/gaisler/gr_ep2s60/u-boot.lds @@ -60,7 +60,7 @@ SECTIONS _text = .; *(.start) - cpu/leon3/start.o (.text) + arch/sparc/cpu/leon3/start.o (.text) /* 8k is the same as the PROM offset from end of main memory, (CONFIG_SYS_PROM_SIZE) */ . = ALIGN(8192); /* PROM CODE, Will be relocated to the end of memory, diff --git a/board/gaisler/gr_xc3s_1500/u-boot.lds b/board/gaisler/gr_xc3s_1500/u-boot.lds index 3b13190cb..67222ac8e 100644 --- a/board/gaisler/gr_xc3s_1500/u-boot.lds +++ b/board/gaisler/gr_xc3s_1500/u-boot.lds @@ -60,7 +60,7 @@ SECTIONS _text = .; *(.start) - cpu/leon3/start.o (.text) + arch/sparc/cpu/leon3/start.o (.text) /* 8k is the same as the PROM offset from end of main memory, (CONFIG_SYS_PROM_SIZE) */ . = ALIGN(8192); /* PROM CODE, Will be relocated to the end of memory, diff --git a/board/gaisler/grsim/u-boot.lds b/board/gaisler/grsim/u-boot.lds index 0fa6627df..681fd8d01 100644 --- a/board/gaisler/grsim/u-boot.lds +++ b/board/gaisler/grsim/u-boot.lds @@ -59,7 +59,7 @@ SECTIONS _text = .; *(.start) - cpu/leon3/start.o (.text) + arch/sparc/cpu/leon3/start.o (.text) /* 8k is the same as the PROM offset from end of main memory, (CONFIG_SYS_PROM_SIZE) */ . = ALIGN(8192); /* PROM CODE, Will be relocated to the end of memory, diff --git a/board/gaisler/grsim_leon2/u-boot.lds b/board/gaisler/grsim_leon2/u-boot.lds index c5311a6c1..a12e7fb9c 100644 --- a/board/gaisler/grsim_leon2/u-boot.lds +++ b/board/gaisler/grsim_leon2/u-boot.lds @@ -59,7 +59,7 @@ SECTIONS _text = .; *(.start) - cpu/leon2/start.o (.text) + arch/sparc/cpu/leon2/start.o (.text) /* 8k is the same as the PROM offset from end of main memory, (CONFIG_SYS_PROM_SIZE) */ . = ALIGN(8192); /* PROM CODE, Will be relocated to the end of memory, From 6a8a2b7058a398fe207021259cb2c529fb225eff Mon Sep 17 00:00:00 2001 From: Peter Tyser Date: Mon, 12 Apr 2010 22:28:19 -0500 Subject: [PATCH 149/164] nios: Move cpu/nios/* to arch/nios/cpu/* Signed-off-by: Peter Tyser --- {cpu/nios => arch/nios/cpu}/Makefile | 0 {cpu/nios => arch/nios/cpu}/asmi.c | 0 {cpu/nios => arch/nios/cpu}/config.mk | 0 {cpu/nios => arch/nios/cpu}/cpu.c | 0 {cpu/nios => arch/nios/cpu}/interrupts.c | 0 {cpu/nios => arch/nios/cpu}/serial.c | 0 {cpu/nios => arch/nios/cpu}/spi.c | 0 {cpu/nios => arch/nios/cpu}/start.S | 0 {cpu/nios => arch/nios/cpu}/traps.S | 0 board/altera/dk1c20/u-boot.lds | 2 +- board/altera/dk1s10/u-boot.lds | 2 +- board/altera/ep1c20/u-boot.lds | 2 +- board/altera/ep1s10/u-boot.lds | 2 +- board/altera/ep1s40/u-boot.lds | 2 +- board/psyent/pci5441/u-boot.lds | 2 +- board/psyent/pk1c20/u-boot.lds | 2 +- board/ssv/adnpesc1/u-boot.lds | 2 +- doc/README.nios | 2 +- 18 files changed, 9 insertions(+), 9 deletions(-) rename {cpu/nios => arch/nios/cpu}/Makefile (100%) rename {cpu/nios => arch/nios/cpu}/asmi.c (100%) rename {cpu/nios => arch/nios/cpu}/config.mk (100%) rename {cpu/nios => arch/nios/cpu}/cpu.c (100%) rename {cpu/nios => arch/nios/cpu}/interrupts.c (100%) rename {cpu/nios => arch/nios/cpu}/serial.c (100%) rename {cpu/nios => arch/nios/cpu}/spi.c (100%) rename {cpu/nios => arch/nios/cpu}/start.S (100%) rename {cpu/nios => arch/nios/cpu}/traps.S (100%) diff --git a/cpu/nios/Makefile b/arch/nios/cpu/Makefile similarity index 100% rename from cpu/nios/Makefile rename to arch/nios/cpu/Makefile diff --git a/cpu/nios/asmi.c b/arch/nios/cpu/asmi.c similarity index 100% rename from cpu/nios/asmi.c rename to arch/nios/cpu/asmi.c diff --git a/cpu/nios/config.mk b/arch/nios/cpu/config.mk similarity index 100% rename from cpu/nios/config.mk rename to arch/nios/cpu/config.mk diff --git a/cpu/nios/cpu.c b/arch/nios/cpu/cpu.c similarity index 100% rename from cpu/nios/cpu.c rename to arch/nios/cpu/cpu.c diff --git a/cpu/nios/interrupts.c b/arch/nios/cpu/interrupts.c similarity index 100% rename from cpu/nios/interrupts.c rename to arch/nios/cpu/interrupts.c diff --git a/cpu/nios/serial.c b/arch/nios/cpu/serial.c similarity index 100% rename from cpu/nios/serial.c rename to arch/nios/cpu/serial.c diff --git a/cpu/nios/spi.c b/arch/nios/cpu/spi.c similarity index 100% rename from cpu/nios/spi.c rename to arch/nios/cpu/spi.c diff --git a/cpu/nios/start.S b/arch/nios/cpu/start.S similarity index 100% rename from cpu/nios/start.S rename to arch/nios/cpu/start.S diff --git a/cpu/nios/traps.S b/arch/nios/cpu/traps.S similarity index 100% rename from cpu/nios/traps.S rename to arch/nios/cpu/traps.S diff --git a/board/altera/dk1c20/u-boot.lds b/board/altera/dk1c20/u-boot.lds index 98ee8f832..50c3fe75a 100644 --- a/board/altera/dk1c20/u-boot.lds +++ b/board/altera/dk1c20/u-boot.lds @@ -30,7 +30,7 @@ SECTIONS { .text : { - cpu/nios/start.o (.text) + arch/nios/cpu/start.o (.text) *(.text) } __text_end = .; diff --git a/board/altera/dk1s10/u-boot.lds b/board/altera/dk1s10/u-boot.lds index 98ee8f832..50c3fe75a 100644 --- a/board/altera/dk1s10/u-boot.lds +++ b/board/altera/dk1s10/u-boot.lds @@ -30,7 +30,7 @@ SECTIONS { .text : { - cpu/nios/start.o (.text) + arch/nios/cpu/start.o (.text) *(.text) } __text_end = .; diff --git a/board/altera/ep1c20/u-boot.lds b/board/altera/ep1c20/u-boot.lds index e2eb3aa43..b909e94f8 100644 --- a/board/altera/ep1c20/u-boot.lds +++ b/board/altera/ep1c20/u-boot.lds @@ -30,7 +30,7 @@ SECTIONS { .text : { - cpu/nios2/start.o (.text) + arch/nios/cpu2/start.o (.text) *(.text) *(.text.*) *(.gnu.linkonce.t*) diff --git a/board/altera/ep1s10/u-boot.lds b/board/altera/ep1s10/u-boot.lds index e2eb3aa43..b909e94f8 100644 --- a/board/altera/ep1s10/u-boot.lds +++ b/board/altera/ep1s10/u-boot.lds @@ -30,7 +30,7 @@ SECTIONS { .text : { - cpu/nios2/start.o (.text) + arch/nios/cpu2/start.o (.text) *(.text) *(.text.*) *(.gnu.linkonce.t*) diff --git a/board/altera/ep1s40/u-boot.lds b/board/altera/ep1s40/u-boot.lds index e2eb3aa43..b909e94f8 100644 --- a/board/altera/ep1s40/u-boot.lds +++ b/board/altera/ep1s40/u-boot.lds @@ -30,7 +30,7 @@ SECTIONS { .text : { - cpu/nios2/start.o (.text) + arch/nios/cpu2/start.o (.text) *(.text) *(.text.*) *(.gnu.linkonce.t*) diff --git a/board/psyent/pci5441/u-boot.lds b/board/psyent/pci5441/u-boot.lds index b2d88a558..f155800a6 100644 --- a/board/psyent/pci5441/u-boot.lds +++ b/board/psyent/pci5441/u-boot.lds @@ -30,7 +30,7 @@ SECTIONS { .text : { - cpu/nios2/start.o (.text) + arch/nios/cpu2/start.o (.text) *(.text) *(.text.*) *(.gnu.linkonce.t*) diff --git a/board/psyent/pk1c20/u-boot.lds b/board/psyent/pk1c20/u-boot.lds index b2d88a558..f155800a6 100644 --- a/board/psyent/pk1c20/u-boot.lds +++ b/board/psyent/pk1c20/u-boot.lds @@ -30,7 +30,7 @@ SECTIONS { .text : { - cpu/nios2/start.o (.text) + arch/nios/cpu2/start.o (.text) *(.text) *(.text.*) *(.gnu.linkonce.t*) diff --git a/board/ssv/adnpesc1/u-boot.lds b/board/ssv/adnpesc1/u-boot.lds index 98ee8f832..50c3fe75a 100644 --- a/board/ssv/adnpesc1/u-boot.lds +++ b/board/ssv/adnpesc1/u-boot.lds @@ -30,7 +30,7 @@ SECTIONS { .text : { - cpu/nios/start.o (.text) + arch/nios/cpu/start.o (.text) *(.text) } __text_end = .; diff --git a/doc/README.nios b/doc/README.nios index da30ff5ae..562814460 100644 --- a/doc/README.nios +++ b/doc/README.nios @@ -243,7 +243,7 @@ cover most of the individual functions to get you started. following commands, then close the console window: (gdb) directory common - (gdb) directory cpu/nios + (gdb) directory arch/nios/cpu (gdb) directory arch/nios/lib (gdb) directory board/altera/dk1c20 From 37e4dafaae96ccc970a896f90186fadcf858aad0 Mon Sep 17 00:00:00 2001 From: Peter Tyser Date: Mon, 12 Apr 2010 22:28:20 -0500 Subject: [PATCH 150/164] nios2: Move cpu/nios2/* to arch/nios2/cpu/* Signed-off-by: Peter Tyser --- {cpu/nios2 => arch/nios2/cpu}/Makefile | 0 {cpu/nios2 => arch/nios2/cpu}/config.mk | 0 {cpu/nios2 => arch/nios2/cpu}/cpu.c | 0 {cpu/nios2 => arch/nios2/cpu}/epcs.c | 0 {cpu/nios2 => arch/nios2/cpu}/exceptions.S | 0 {cpu/nios2 => arch/nios2/cpu}/interrupts.c | 0 {cpu/nios2 => arch/nios2/cpu}/start.S | 0 {cpu/nios2 => arch/nios2/cpu}/sysid.c | 0 {cpu/nios2 => arch/nios2/cpu}/traps.c | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename {cpu/nios2 => arch/nios2/cpu}/Makefile (100%) rename {cpu/nios2 => arch/nios2/cpu}/config.mk (100%) rename {cpu/nios2 => arch/nios2/cpu}/cpu.c (100%) rename {cpu/nios2 => arch/nios2/cpu}/epcs.c (100%) rename {cpu/nios2 => arch/nios2/cpu}/exceptions.S (100%) rename {cpu/nios2 => arch/nios2/cpu}/interrupts.c (100%) rename {cpu/nios2 => arch/nios2/cpu}/start.S (100%) rename {cpu/nios2 => arch/nios2/cpu}/sysid.c (100%) rename {cpu/nios2 => arch/nios2/cpu}/traps.c (100%) diff --git a/cpu/nios2/Makefile b/arch/nios2/cpu/Makefile similarity index 100% rename from cpu/nios2/Makefile rename to arch/nios2/cpu/Makefile diff --git a/cpu/nios2/config.mk b/arch/nios2/cpu/config.mk similarity index 100% rename from cpu/nios2/config.mk rename to arch/nios2/cpu/config.mk diff --git a/cpu/nios2/cpu.c b/arch/nios2/cpu/cpu.c similarity index 100% rename from cpu/nios2/cpu.c rename to arch/nios2/cpu/cpu.c diff --git a/cpu/nios2/epcs.c b/arch/nios2/cpu/epcs.c similarity index 100% rename from cpu/nios2/epcs.c rename to arch/nios2/cpu/epcs.c diff --git a/cpu/nios2/exceptions.S b/arch/nios2/cpu/exceptions.S similarity index 100% rename from cpu/nios2/exceptions.S rename to arch/nios2/cpu/exceptions.S diff --git a/cpu/nios2/interrupts.c b/arch/nios2/cpu/interrupts.c similarity index 100% rename from cpu/nios2/interrupts.c rename to arch/nios2/cpu/interrupts.c diff --git a/cpu/nios2/start.S b/arch/nios2/cpu/start.S similarity index 100% rename from cpu/nios2/start.S rename to arch/nios2/cpu/start.S diff --git a/cpu/nios2/sysid.c b/arch/nios2/cpu/sysid.c similarity index 100% rename from cpu/nios2/sysid.c rename to arch/nios2/cpu/sysid.c diff --git a/cpu/nios2/traps.c b/arch/nios2/cpu/traps.c similarity index 100% rename from cpu/nios2/traps.c rename to arch/nios2/cpu/traps.c From 8d321b81c5441db93425ee37cb79cc51d9ce2fb0 Mon Sep 17 00:00:00 2001 From: Peter Tyser Date: Mon, 12 Apr 2010 22:28:21 -0500 Subject: [PATCH 151/164] Update README to reflect new directory structure Also fix up some whitespace issues that were introduced when moving directory locations. Signed-off-by: Peter Tyser --- README | 158 +++++++++++++++++++++++++++++++++------------------------ 1 file changed, 91 insertions(+), 67 deletions(-) diff --git a/README b/README index d5ccdc552..99320abad 100644 --- a/README +++ b/README @@ -138,68 +138,91 @@ U-Boot will always have a patchlevel of "0". Directory Hierarchy: ==================== -- api Machine/arch independent API for external apps -- board Board dependent files -- common Misc architecture independent functions -- cpu CPU specific files - - 74xx_7xx Files specific to Freescale MPC74xx and 7xx CPUs - - arm720t Files specific to ARM 720 CPUs - - arm920t Files specific to ARM 920 CPUs - - at91rm9200 Files specific to Atmel AT91RM9200 CPU - - imx Files specific to Freescale MC9328 i.MX CPUs - - s3c24x0 Files specific to Samsung S3C24X0 CPUs - - arm925t Files specific to ARM 925 CPUs - - arm926ejs Files specific to ARM 926 CPUs - - arm1136 Files specific to ARM 1136 CPUs - - at32ap Files specific to Atmel AVR32 AP CPUs - - blackfin Files specific to Analog Devices Blackfin CPUs - - i386 Files specific to i386 CPUs - - ixp Files specific to Intel XScale IXP CPUs - - leon2 Files specific to Gaisler LEON2 SPARC CPU - - leon3 Files specific to Gaisler LEON3 SPARC CPU - - mcf52x2 Files specific to Freescale ColdFire MCF52x2 CPUs - - mcf5227x Files specific to Freescale ColdFire MCF5227x CPUs - - mcf532x Files specific to Freescale ColdFire MCF5329 CPUs - - mcf5445x Files specific to Freescale ColdFire MCF5445x CPUs - - mcf547x_8x Files specific to Freescale ColdFire MCF547x_8x CPUs - - mips Files specific to MIPS CPUs - - mpc5xx Files specific to Freescale MPC5xx CPUs - - mpc5xxx Files specific to Freescale MPC5xxx CPUs - - mpc8xx Files specific to Freescale MPC8xx CPUs - - mpc8220 Files specific to Freescale MPC8220 CPUs - - mpc824x Files specific to Freescale MPC824x CPUs - - mpc8260 Files specific to Freescale MPC8260 CPUs - - mpc85xx Files specific to Freescale MPC85xx CPUs - - nios Files specific to Altera NIOS CPUs - - nios2 Files specific to Altera Nios-II CPUs - - ppc4xx Files specific to AMCC PowerPC 4xx CPUs - - pxa Files specific to Intel XScale PXA CPUs - - s3c44b0 Files specific to Samsung S3C44B0 CPUs - - sa1100 Files specific to Intel StrongARM SA1100 CPUs -- disk Code for disk drive partition handling -- doc Documentation (don't expect too much) -- drivers Commonly used device drivers -- examples Example code for standalone applications, etc. -- fs Filesystem code (cramfs, ext2, jffs2, etc.) -- include Header Files -- arch/arm/lib Files generic to ARM architecture -- arch/avr32/lib Files generic to AVR32 architecture -- arch/blackfin/lib Files generic to Blackfin architecture -- lib Files generic to all architectures -- arch/i386/lib Files generic to i386 architecture -- arch/m68k/lib Files generic to m68k architecture -- arch/microblaze/lib Files generic to microblaze architecture -- arch/mips/lib Files generic to MIPS architecture -- arch/nios/lib Files generic to NIOS architecture -- arch/nios/lib2 Files generic to NIOS2 architecture -- arch/ppc/lib Files generic to PowerPC architecture -- arch/sh/lib Files generic to SH architecture -- arch/sparc/lib Files generic to SPARC architecture -- libfdt Library files to support flattened device trees -- net Networking code -- post Power On Self Test -- rtc Real Time Clock drivers -- tools Tools to build S-Record or U-Boot images, etc. +/arch Architecture specific files + /arm Files generic to ARM architecture + /cpu CPU specific files + /arm720t Files specific to ARM 720 CPUs + /arm920t Files specific to ARM 920 CPUs + /at91rm9200 Files specific to Atmel AT91RM9200 CPU + /imx Files specific to Freescale MC9328 i.MX CPUs + /s3c24x0 Files specific to Samsung S3C24X0 CPUs + /arm925t Files specific to ARM 925 CPUs + /arm926ejs Files specific to ARM 926 CPUs + /arm1136 Files specific to ARM 1136 CPUs + /ixp Files specific to Intel XScale IXP CPUs + /pxa Files specific to Intel XScale PXA CPUs + /s3c44b0 Files specific to Samsung S3C44B0 CPUs + /sa1100 Files specific to Intel StrongARM SA1100 CPUs + /lib Architecture specific library files + /avr32 Files generic to AVR32 architecture + /cpu CPU specific files + /lib Architecture specific library files + /blackfin Files generic to Analog Devices Blackfin architecture + /cpu CPU specific files + /lib Architecture specific library files + /i386 Files generic to i386 architecture + /cpu CPU specific files + /lib Architecture specific library files + /m68k Files generic to m68k architecture + /cpu CPU specific files + /mcf52x2 Files specific to Freescale ColdFire MCF52x2 CPUs + /mcf5227x Files specific to Freescale ColdFire MCF5227x CPUs + /mcf532x Files specific to Freescale ColdFire MCF5329 CPUs + /mcf5445x Files specific to Freescale ColdFire MCF5445x CPUs + /mcf547x_8x Files specific to Freescale ColdFire MCF547x_8x CPUs + /lib Architecture specific library files + /microblaze Files generic to microblaze architecture + /cpu CPU specific files + /lib Architecture specific library files + /mips Files generic to MIPS architecture + /cpu CPU specific files + /lib Architecture specific library files + /nios Files generic to Altera NIOS architecture + /cpu CPU specific files + /lib Architecture specific library files + /nios2 Files generic to Altera NIOS2 architecture + /cpu CPU specific files + /lib Architecture specific library files + /ppc Files generic to PowerPC architecture + /cpu CPU specific files + /74xx_7xx Files specific to Freescale MPC74xx and 7xx CPUs + /mpc5xx Files specific to Freescale MPC5xx CPUs + /mpc5xxx Files specific to Freescale MPC5xxx CPUs + /mpc8xx Files specific to Freescale MPC8xx CPUs + /mpc8220 Files specific to Freescale MPC8220 CPUs + /mpc824x Files specific to Freescale MPC824x CPUs + /mpc8260 Files specific to Freescale MPC8260 CPUs + /mpc85xx Files specific to Freescale MPC85xx CPUs + /ppc4xx Files specific to AMCC PowerPC 4xx CPUs + /lib Architecture specific library files + /sh Files generic to SH architecture + /cpu CPU specific files + /sh2 Files specific to sh2 CPUs + /sh3 Files specific to sh3 CPUs + /sh4 Files specific to sh4 CPUs + /lib Architecture specific library files + /sparc Files generic to SPARC architecture + /cpu CPU specific files + /leon2 Files specific to Gaisler LEON2 SPARC CPU + /leon3 Files specific to Gaisler LEON3 SPARC CPU + /lib Architecture specific library files +/api Machine/arch independent API for external apps +/board Board dependent files +/common Misc architecture independent functions +/disk Code for disk drive partition handling +/doc Documentation (don't expect too much) +/drivers Commonly used device drivers +/examples Example code for standalone applications, etc. +/fs Filesystem code (cramfs, ext2, jffs2, etc.) +/include Header Files +/lib Files generic to all architectures + /libfdt Library files to support flattened device trees + /lzma Library files to support LZMA decompression + /lzo Library files to support LZO decompression +/net Networking code +/post Power On Self Test +/rtc Real Time Clock drivers +/tools Tools to build S-Record or U-Boot images, etc. Software Configuration: ======================= @@ -1393,10 +1416,11 @@ The following options need to be configured: to run and CONFIG_SYS_I2C_SLAVE to be the address of this node (ie the CPU's i2c node address). - Now, the u-boot i2c code for the mpc8xx (arch/ppc/cpu/mpc8xx/i2c.c) - sets the CPU up as a master node and so its address should - therefore be cleared to 0 (See, eg, MPC823e User's Manual - p.16-473). So, set CONFIG_SYS_I2C_SLAVE to 0. + Now, the u-boot i2c code for the mpc8xx + (arch/ppc/cpu/mpc8xx/i2c.c) sets the CPU up as a master node + and so its address should therefore be cleared to 0 (See, + eg, MPC823e User's Manual p.16-473). So, set + CONFIG_SYS_I2C_SLAVE to 0. CONFIG_SYS_I2C_INIT_MPC5XXX @@ -1942,7 +1966,7 @@ Legacy uImage format: 15 arch//lib/bootm.c All preparation done, transferring control to OS - -30 arch/ppc/lib/board.c Fatal error, hang the system + -30 arch/ppc/lib/board.c Fatal error, hang the system -31 post/post.c POST test failed, detected by post_output_backlog() -32 post/post.c POST test failed, detected by post_run_single() From 288991c93fdd150ef3817e676c657cb487468d38 Mon Sep 17 00:00:00 2001 From: Stefan Roese Date: Thu, 8 Apr 2010 09:33:13 +0200 Subject: [PATCH 152/164] ppc4xx: alpr: Remove some not needed commands to make image fit again The latest changes increased the size of the alpr image a bit more. Now it doesn't fit into the 256k reserved for it. This patch now removes the commands "loads" and "loadb" which are not needed in the production systems. Signed-off-by: Stefan Roese Cc: Pieter Voorthuijsen --- include/configs/alpr.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/configs/alpr.h b/include/configs/alpr.h index f2392f648..ee0c14d96 100644 --- a/include/configs/alpr.h +++ b/include/configs/alpr.h @@ -236,11 +236,13 @@ #define CONFIG_CMD_EEPROM #define CONFIG_CMD_FPGA #define CONFIG_CMD_I2C +#undef CONFIG_CMD_LOADB +#undef CONFIG_CMD_LOADS #define CONFIG_CMD_MII #define CONFIG_CMD_NAND #define CONFIG_CMD_NET -#define CONFIG_CMD_PCI #undef CONFIG_CMD_NFS +#define CONFIG_CMD_PCI #undef CONFIG_WATCHDOG /* watchdog disabled */ From 2a72e9ed18d2164eb7fe569119342eb631b568da Mon Sep 17 00:00:00 2001 From: Stefan Roese Date: Fri, 9 Apr 2010 14:03:59 +0200 Subject: [PATCH 153/164] ppc4xx: Add option for PPC440SPe ports without old Rev. A support The 440SPe Rev. A is quite old and newer 440SPe boards don't need support for this CPU revision. Since removing support for this older version simplifies the creation for newer U-Boot ports, this patch now enables 440SPe > Rev. A support by creating the CONFIG_440SPE_REVA define. By defining this in the board config header, Rev. A will still be supported. Otherwise (default for newer board ports), Rev. A will not be supported. Signed-off-by: Stefan Roese --- arch/ppc/cpu/ppc4xx/start.S | 2 +- include/configs/katmai.h | 1 + include/configs/yucca.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/ppc/cpu/ppc4xx/start.S b/arch/ppc/cpu/ppc4xx/start.S index 927c88c78..c739deb9b 100644 --- a/arch/ppc/cpu/ppc4xx/start.S +++ b/arch/ppc/cpu/ppc4xx/start.S @@ -475,7 +475,7 @@ tlbnxt: addi r4,r4,1 /* Next TLB */ /*----------------------------------------------------------------*/ /* TLB entry setup -- step thru tlbtab */ /*----------------------------------------------------------------*/ -#if defined(CONFIG_440SPE) +#if defined(CONFIG_440SPE_REVA) /*----------------------------------------------------------------*/ /* We have different TLB tables for revA and rev B of 440SPe */ /*----------------------------------------------------------------*/ diff --git a/include/configs/katmai.h b/include/configs/katmai.h index c013ac4b3..fb8ccae71 100644 --- a/include/configs/katmai.h +++ b/include/configs/katmai.h @@ -37,6 +37,7 @@ #define CONFIG_4xx 1 /* ... PPC4xx family */ #define CONFIG_440 1 /* ... PPC440 family */ #define CONFIG_440SPE 1 /* Specifc SPe support */ +#define CONFIG_440SPE_REVA 1 /* Support old Rev A. */ #define CONFIG_SYS_CLK_FREQ 33333333 /* external freq to pll */ #define CONFIG_SYS_4xx_RESET_TYPE 0x2 /* use chip reset on this board */ diff --git a/include/configs/yucca.h b/include/configs/yucca.h index 42f880785..0b4dfb8e7 100644 --- a/include/configs/yucca.h +++ b/include/configs/yucca.h @@ -37,6 +37,7 @@ #define CONFIG_4xx 1 /* ... PPC4xx family */ #define CONFIG_440 1 /* ... PPC440 family */ #define CONFIG_440SPE 1 /* Specifc SPe support */ +#define CONFIG_440SPE_REVA 1 /* Support old Rev A. */ #define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_pre_init */ #define CONFIG_SYS_CLK_FREQ 33333333 /* external freq to pll */ #define EXTCLK_33_33 33333333 From 534864eff695e72cef1bd9a304f448491037f201 Mon Sep 17 00:00:00 2001 From: trix Date: Sat, 10 Apr 2010 12:46:49 -0500 Subject: [PATCH 154/164] ARM Update mach-types Fetched from http://www.arm.linux.org.uk/developer/machines/download.php And built with repo http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm commit 85b3cce880a19e78286570d5fd004cc3cac06f57 Signed-off-by: Tom Rix --- arch/arm/include/asm/mach-types.h | 986 +++++++++++++++++++++++++++++- 1 file changed, 974 insertions(+), 12 deletions(-) diff --git a/arch/arm/include/asm/mach-types.h b/arch/arm/include/asm/mach-types.h index 4622557b5..b33e97b5f 100644 --- a/arch/arm/include/asm/mach-types.h +++ b/arch/arm/include/asm/mach-types.h @@ -2659,7 +2659,7 @@ extern unsigned int __machine_arch_type; #define MACH_TYPE_AQUILA 2676 #define MACH_TYPE_SPARK_SLS_HW2 2677 #define MACH_TYPE_ESATA_SHEEVAPLUG 2678 -#define MACH_TYPE_SURF7X30 2679 +#define MACH_TYPE_MSM7X30_SURF 2679 #define MACH_TYPE_MICRO2440 2680 #define MACH_TYPE_AM2440 2681 #define MACH_TYPE_TQ2440 2682 @@ -2693,12 +2693,86 @@ extern unsigned int __machine_arch_type; #define MACH_TYPE_QSD8X50_FFA 2710 #define MACH_TYPE_QSD8X50A_SURF 2711 #define MACH_TYPE_QSD8X50A_FFA 2712 -#define MACH_TYPE_XGCP10 2713 +#define MACH_TYPE_ADX_XGCP10 2713 #define MACH_TYPE_MCGWUMTS2A 2714 #define MACH_TYPE_MOBIKT 2715 #define MACH_TYPE_MX53_EVK 2716 #define MACH_TYPE_IGEP0030 2717 #define MACH_TYPE_AXELL_H40_H50_CTRL 2718 +#define MACH_TYPE_DTCOMMOD 2719 +#define MACH_TYPE_GOULD 2720 +#define MACH_TYPE_SIBERIA 2721 +#define MACH_TYPE_SBC3530 2722 +#define MACH_TYPE_QARM 2723 +#define MACH_TYPE_MIPS 2724 +#define MACH_TYPE_MX27GRB 2725 +#define MACH_TYPE_SBC8100 2726 +#define MACH_TYPE_SAARB 2727 +#define MACH_TYPE_OMAP3MINI 2728 +#define MACH_TYPE_CNMBOOK7SE 2729 +#define MACH_TYPE_CATAN 2730 +#define MACH_TYPE_HARMONY 2731 +#define MACH_TYPE_TONGA 2732 +#define MACH_TYPE_CYBOOK_ORIZON 2733 +#define MACH_TYPE_HTCRHODIUMCDMA 2734 +#define MACH_TYPE_EPC_G45 2735 +#define MACH_TYPE_EPC_LPC3250 2736 +#define MACH_TYPE_MXC91341EVB 2737 +#define MACH_TYPE_RTW1000 2738 +#define MACH_TYPE_BOBCAT 2739 +#define MACH_TYPE_TRIZEPS6 2740 +#define MACH_TYPE_MSM7X30_FLUID 2741 +#define MACH_TYPE_NEDAP9263 2742 +#define MACH_TYPE_NETGEAR_MS2110 2743 +#define MACH_TYPE_BMX 2744 +#define MACH_TYPE_NETSTREAM 2745 +#define MACH_TYPE_VPNEXT_RCU 2746 +#define MACH_TYPE_VPNEXT_MPU 2747 +#define MACH_TYPE_BCMRING_TABLET_V1 2748 +#define MACH_TYPE_SGARM10 2749 +#define MACH_TYPE_CM_T3517 2750 +#define MACH_TYPE_OMAP3_CPS 2751 +#define MACH_TYPE_AXAR1500_RECEIVER 2752 +#define MACH_TYPE_WBD222 2753 +#define MACH_TYPE_MT65XX 2754 +#define MACH_TYPE_MSM8X60_SURF 2755 +#define MACH_TYPE_MSM8X60_SIM 2756 +#define MACH_TYPE_VMC300 2757 +#define MACH_TYPE_TCC8000_SDK 2758 +#define MACH_TYPE_NANOS 2759 +#define MACH_TYPE_STAMP9G10 2760 +#define MACH_TYPE_STAMP9G45 2761 +#define MACH_TYPE_H6053 2762 +#define MACH_TYPE_SMINT01 2763 +#define MACH_TYPE_PRTLVT2 2764 +#define MACH_TYPE_AP420 2765 +#define MACH_TYPE_HTCSHIFT 2766 +#define MACH_TYPE_DAVINCI_DM365_FC 2767 +#define MACH_TYPE_MSM8X55_SURF 2768 +#define MACH_TYPE_MSM8X55_FFA 2769 +#define MACH_TYPE_ESL_VAMANA 2770 +#define MACH_TYPE_SBC35 2771 +#define MACH_TYPE_MPX6446 2772 +#define MACH_TYPE_OREO_CONTROLLER 2773 +#define MACH_TYPE_KOPIN_MODELS 2774 +#define MACH_TYPE_TTC_VISION2 2775 +#define MACH_TYPE_CNS3420VB 2776 +#define MACH_TYPE_LPC2 2777 +#define MACH_TYPE_OLYMPUS 2778 +#define MACH_TYPE_VORTEX 2779 +#define MACH_TYPE_S5PC200 2780 +#define MACH_TYPE_ECUCORE_9263 2781 +#define MACH_TYPE_SMDKC200 2782 +#define MACH_TYPE_EMSISO_SX27 2783 +#define MACH_TYPE_APX_SOM9G45_EK 2784 +#define MACH_TYPE_SONGSHAN 2785 +#define MACH_TYPE_TIANSHAN 2786 +#define MACH_TYPE_VPX500 2787 +#define MACH_TYPE_AM3517SAM 2788 +#define MACH_TYPE_SKAT91_SIM508 2789 +#define MACH_TYPE_SKAT91_S3E 2790 +#define MACH_TYPE_OMAP4_PANDA 2791 +#define MACH_TYPE_DF7220 2792 #ifdef CONFIG_ARCH_EBSA110 # ifdef machine_arch_type @@ -18343,9 +18417,9 @@ extern unsigned int __machine_arch_type; # else # define machine_arch_type MACH_TYPE_HYNET_INE # endif -# define machine_is_hynet_ine() (machine_arch_type == MACH_TYPE_HYNET_INE) +# define machine_is_argonst_foundation() (machine_arch_type == MACH_TYPE_HYNET_INE) #else -# define machine_is_hynet_ine() (0) +# define machine_is_argonst_foundation() (0) #endif #ifdef CONFIG_MACH_HYNET_APP @@ -30211,9 +30285,9 @@ extern unsigned int __machine_arch_type; # else # define machine_arch_type MACH_TYPE_OREO # endif -# define machine_is_oreo() (machine_arch_type == MACH_TYPE_OREO) +# define machine_is_oreo_camera() (machine_arch_type == MACH_TYPE_OREO) #else -# define machine_is_oreo() (0) +# define machine_is_oreo_camera() (0) #endif #ifdef CONFIG_MACH_SMDK6442 @@ -34464,14 +34538,14 @@ extern unsigned int __machine_arch_type; # define machine_is_sheeva_esata() (0) #endif -#ifdef CONFIG_MACH_SURF7X30 +#ifdef CONFIG_MACH_MSM7X30_SURF # ifdef machine_arch_type # undef machine_arch_type # define machine_arch_type __machine_arch_type # else -# define machine_arch_type MACH_TYPE_SURF7X30 +# define machine_arch_type MACH_TYPE_MSM7X30_SURF # endif -# define machine_is_msm7x30_surf() (machine_arch_type == MACH_TYPE_SURF7X30) +# define machine_is_msm7x30_surf() (machine_arch_type == MACH_TYPE_MSM7X30_SURF) #else # define machine_is_msm7x30_surf() (0) #endif @@ -34872,14 +34946,14 @@ extern unsigned int __machine_arch_type; # define machine_is_qsd8x50a_ffa() (0) #endif -#ifdef CONFIG_MACH_XGCP10 +#ifdef CONFIG_MACH_ADX_XGCP10 # ifdef machine_arch_type # undef machine_arch_type # define machine_arch_type __machine_arch_type # else -# define machine_arch_type MACH_TYPE_XGCP10 +# define machine_arch_type MACH_TYPE_ADX_XGCP10 # endif -# define machine_is_adx_xgcp10() (machine_arch_type == MACH_TYPE_XGCP10) +# define machine_is_adx_xgcp10() (machine_arch_type == MACH_TYPE_ADX_XGCP10) #else # define machine_is_adx_xgcp10() (0) #endif @@ -34944,6 +35018,894 @@ extern unsigned int __machine_arch_type; # define machine_is_axell_h40_h50_ctrl() (0) #endif +#ifdef CONFIG_MACH_DTCOMMOD +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_DTCOMMOD +# endif +# define machine_is_dtcommod() (machine_arch_type == MACH_TYPE_DTCOMMOD) +#else +# define machine_is_dtcommod() (0) +#endif + +#ifdef CONFIG_MACH_GOULD +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_GOULD +# endif +# define machine_is_gould() (machine_arch_type == MACH_TYPE_GOULD) +#else +# define machine_is_gould() (0) +#endif + +#ifdef CONFIG_MACH_SIBERIA +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_SIBERIA +# endif +# define machine_is_siberia() (machine_arch_type == MACH_TYPE_SIBERIA) +#else +# define machine_is_siberia() (0) +#endif + +#ifdef CONFIG_MACH_SBC3530 +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_SBC3530 +# endif +# define machine_is_sbc3530() (machine_arch_type == MACH_TYPE_SBC3530) +#else +# define machine_is_sbc3530() (0) +#endif + +#ifdef CONFIG_MACH_QARM +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_QARM +# endif +# define machine_is_qarm() (machine_arch_type == MACH_TYPE_QARM) +#else +# define machine_is_qarm() (0) +#endif + +#ifdef CONFIG_MACH_MIPS +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_MIPS +# endif +# define machine_is_mips() (machine_arch_type == MACH_TYPE_MIPS) +#else +# define machine_is_mips() (0) +#endif + +#ifdef CONFIG_MACH_MX27GRB +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_MX27GRB +# endif +# define machine_is_mx27grb() (machine_arch_type == MACH_TYPE_MX27GRB) +#else +# define machine_is_mx27grb() (0) +#endif + +#ifdef CONFIG_MACH_SBC8100 +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_SBC8100 +# endif +# define machine_is_sbc8100() (machine_arch_type == MACH_TYPE_SBC8100) +#else +# define machine_is_sbc8100() (0) +#endif + +#ifdef CONFIG_MACH_SAARB +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_SAARB +# endif +# define machine_is_saarb() (machine_arch_type == MACH_TYPE_SAARB) +#else +# define machine_is_saarb() (0) +#endif + +#ifdef CONFIG_MACH_OMAP3MINI +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_OMAP3MINI +# endif +# define machine_is_omap3mini() (machine_arch_type == MACH_TYPE_OMAP3MINI) +#else +# define machine_is_omap3mini() (0) +#endif + +#ifdef CONFIG_MACH_CNMBOOK7SE +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_CNMBOOK7SE +# endif +# define machine_is_cnmbook7se() (machine_arch_type == MACH_TYPE_CNMBOOK7SE) +#else +# define machine_is_cnmbook7se() (0) +#endif + +#ifdef CONFIG_MACH_CATAN +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_CATAN +# endif +# define machine_is_catan() (machine_arch_type == MACH_TYPE_CATAN) +#else +# define machine_is_catan() (0) +#endif + +#ifdef CONFIG_MACH_HARMONY +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_HARMONY +# endif +# define machine_is_harmony() (machine_arch_type == MACH_TYPE_HARMONY) +#else +# define machine_is_harmony() (0) +#endif + +#ifdef CONFIG_MACH_TONGA +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_TONGA +# endif +# define machine_is_tonga() (machine_arch_type == MACH_TYPE_TONGA) +#else +# define machine_is_tonga() (0) +#endif + +#ifdef CONFIG_MACH_CYBOOK_ORIZON +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_CYBOOK_ORIZON +# endif +# define machine_is_cybook_orizon() (machine_arch_type == MACH_TYPE_CYBOOK_ORIZON) +#else +# define machine_is_cybook_orizon() (0) +#endif + +#ifdef CONFIG_MACH_HTCRHODIUMCDMA +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_HTCRHODIUMCDMA +# endif +# define machine_is_htcrhodiumcdma() (machine_arch_type == MACH_TYPE_HTCRHODIUMCDMA) +#else +# define machine_is_htcrhodiumcdma() (0) +#endif + +#ifdef CONFIG_MACH_EPC_G45 +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_EPC_G45 +# endif +# define machine_is_epc_g45() (machine_arch_type == MACH_TYPE_EPC_G45) +#else +# define machine_is_epc_g45() (0) +#endif + +#ifdef CONFIG_MACH_EPC_LPC3250 +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_EPC_LPC3250 +# endif +# define machine_is_epc_lpc3250() (machine_arch_type == MACH_TYPE_EPC_LPC3250) +#else +# define machine_is_epc_lpc3250() (0) +#endif + +#ifdef CONFIG_MACH_MXC91341EVB +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_MXC91341EVB +# endif +# define machine_is_mxc91341evb() (machine_arch_type == MACH_TYPE_MXC91341EVB) +#else +# define machine_is_mxc91341evb() (0) +#endif + +#ifdef CONFIG_MACH_RTW1000 +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_RTW1000 +# endif +# define machine_is_rtw1000() (machine_arch_type == MACH_TYPE_RTW1000) +#else +# define machine_is_rtw1000() (0) +#endif + +#ifdef CONFIG_MACH_BOBCAT +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_BOBCAT +# endif +# define machine_is_bobcat() (machine_arch_type == MACH_TYPE_BOBCAT) +#else +# define machine_is_bobcat() (0) +#endif + +#ifdef CONFIG_MACH_TRIZEPS6 +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_TRIZEPS6 +# endif +# define machine_is_trizeps6() (machine_arch_type == MACH_TYPE_TRIZEPS6) +#else +# define machine_is_trizeps6() (0) +#endif + +#ifdef CONFIG_MACH_MSM7X30_FLUID +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_MSM7X30_FLUID +# endif +# define machine_is_msm7x30_fluid() (machine_arch_type == MACH_TYPE_MSM7X30_FLUID) +#else +# define machine_is_msm7x30_fluid() (0) +#endif + +#ifdef CONFIG_MACH_NEDAP9263 +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_NEDAP9263 +# endif +# define machine_is_nedap9263() (machine_arch_type == MACH_TYPE_NEDAP9263) +#else +# define machine_is_nedap9263() (0) +#endif + +#ifdef CONFIG_MACH_NETGEAR_MS2110 +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_NETGEAR_MS2110 +# endif +# define machine_is_netgear_ms2110() (machine_arch_type == MACH_TYPE_NETGEAR_MS2110) +#else +# define machine_is_netgear_ms2110() (0) +#endif + +#ifdef CONFIG_MACH_BMX +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_BMX +# endif +# define machine_is_bmx() (machine_arch_type == MACH_TYPE_BMX) +#else +# define machine_is_bmx() (0) +#endif + +#ifdef CONFIG_MACH_NETSTREAM +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_NETSTREAM +# endif +# define machine_is_netstream() (machine_arch_type == MACH_TYPE_NETSTREAM) +#else +# define machine_is_netstream() (0) +#endif + +#ifdef CONFIG_MACH_VPNEXT_RCU +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_VPNEXT_RCU +# endif +# define machine_is_vpnext_rcu() (machine_arch_type == MACH_TYPE_VPNEXT_RCU) +#else +# define machine_is_vpnext_rcu() (0) +#endif + +#ifdef CONFIG_MACH_VPNEXT_MPU +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_VPNEXT_MPU +# endif +# define machine_is_vpnext_mpu() (machine_arch_type == MACH_TYPE_VPNEXT_MPU) +#else +# define machine_is_vpnext_mpu() (0) +#endif + +#ifdef CONFIG_MACH_BCMRING_TABLET_V1 +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_BCMRING_TABLET_V1 +# endif +# define machine_is_bcmring_tablet_v1() (machine_arch_type == MACH_TYPE_BCMRING_TABLET_V1) +#else +# define machine_is_bcmring_tablet_v1() (0) +#endif + +#ifdef CONFIG_MACH_SGARM10 +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_SGARM10 +# endif +# define machine_is_sgarm10() (machine_arch_type == MACH_TYPE_SGARM10) +#else +# define machine_is_sgarm10() (0) +#endif + +#ifdef CONFIG_MACH_CM_T3517 +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_CM_T3517 +# endif +# define machine_is_cm_t3517() (machine_arch_type == MACH_TYPE_CM_T3517) +#else +# define machine_is_cm_t3517() (0) +#endif + +#ifdef CONFIG_MACH_OMAP3_CPS +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_OMAP3_CPS +# endif +# define machine_is_omap3_cps() (machine_arch_type == MACH_TYPE_OMAP3_CPS) +#else +# define machine_is_omap3_cps() (0) +#endif + +#ifdef CONFIG_MACH_AXAR1500_RECEIVER +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_AXAR1500_RECEIVER +# endif +# define machine_is_axar1500_receiver() (machine_arch_type == MACH_TYPE_AXAR1500_RECEIVER) +#else +# define machine_is_axar1500_receiver() (0) +#endif + +#ifdef CONFIG_MACH_WBD222 +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_WBD222 +# endif +# define machine_is_wbd222() (machine_arch_type == MACH_TYPE_WBD222) +#else +# define machine_is_wbd222() (0) +#endif + +#ifdef CONFIG_MACH_MT65XX +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_MT65XX +# endif +# define machine_is_mt65xx() (machine_arch_type == MACH_TYPE_MT65XX) +#else +# define machine_is_mt65xx() (0) +#endif + +#ifdef CONFIG_MACH_MSM8X60_SURF +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_MSM8X60_SURF +# endif +# define machine_is_msm8x60_surf() (machine_arch_type == MACH_TYPE_MSM8X60_SURF) +#else +# define machine_is_msm8x60_surf() (0) +#endif + +#ifdef CONFIG_MACH_MSM8X60_SIM +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_MSM8X60_SIM +# endif +# define machine_is_msm8x60_sim() (machine_arch_type == MACH_TYPE_MSM8X60_SIM) +#else +# define machine_is_msm8x60_sim() (0) +#endif + +#ifdef CONFIG_MACH_VMC300 +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_VMC300 +# endif +# define machine_is_vmc300() (machine_arch_type == MACH_TYPE_VMC300) +#else +# define machine_is_vmc300() (0) +#endif + +#ifdef CONFIG_MACH_TCC8000_SDK +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_TCC8000_SDK +# endif +# define machine_is_tcc8000_sdk() (machine_arch_type == MACH_TYPE_TCC8000_SDK) +#else +# define machine_is_tcc8000_sdk() (0) +#endif + +#ifdef CONFIG_MACH_NANOS +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_NANOS +# endif +# define machine_is_nanos() (machine_arch_type == MACH_TYPE_NANOS) +#else +# define machine_is_nanos() (0) +#endif + +#ifdef CONFIG_MACH_STAMP9G10 +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_STAMP9G10 +# endif +# define machine_is_stamp9g10() (machine_arch_type == MACH_TYPE_STAMP9G10) +#else +# define machine_is_stamp9g10() (0) +#endif + +#ifdef CONFIG_MACH_STAMP9G45 +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_STAMP9G45 +# endif +# define machine_is_stamp9g45() (machine_arch_type == MACH_TYPE_STAMP9G45) +#else +# define machine_is_stamp9g45() (0) +#endif + +#ifdef CONFIG_MACH_H6053 +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_H6053 +# endif +# define machine_is_h6053() (machine_arch_type == MACH_TYPE_H6053) +#else +# define machine_is_h6053() (0) +#endif + +#ifdef CONFIG_MACH_SMINT01 +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_SMINT01 +# endif +# define machine_is_smint01() (machine_arch_type == MACH_TYPE_SMINT01) +#else +# define machine_is_smint01() (0) +#endif + +#ifdef CONFIG_MACH_PRTLVT2 +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_PRTLVT2 +# endif +# define machine_is_prtlvt2() (machine_arch_type == MACH_TYPE_PRTLVT2) +#else +# define machine_is_prtlvt2() (0) +#endif + +#ifdef CONFIG_MACH_AP420 +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_AP420 +# endif +# define machine_is_ap420() (machine_arch_type == MACH_TYPE_AP420) +#else +# define machine_is_ap420() (0) +#endif + +#ifdef CONFIG_MACH_HTCSHIFT +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_HTCSHIFT +# endif +# define machine_is_htcclio() (machine_arch_type == MACH_TYPE_HTCSHIFT) +#else +# define machine_is_htcclio() (0) +#endif + +#ifdef CONFIG_MACH_DAVINCI_DM365_FC +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_DAVINCI_DM365_FC +# endif +# define machine_is_davinci_dm365_fc() (machine_arch_type == MACH_TYPE_DAVINCI_DM365_FC) +#else +# define machine_is_davinci_dm365_fc() (0) +#endif + +#ifdef CONFIG_MACH_MSM8X55_SURF +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_MSM8X55_SURF +# endif +# define machine_is_msm8x55_surf() (machine_arch_type == MACH_TYPE_MSM8X55_SURF) +#else +# define machine_is_msm8x55_surf() (0) +#endif + +#ifdef CONFIG_MACH_MSM8X55_FFA +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_MSM8X55_FFA +# endif +# define machine_is_msm8x55_ffa() (machine_arch_type == MACH_TYPE_MSM8X55_FFA) +#else +# define machine_is_msm8x55_ffa() (0) +#endif + +#ifdef CONFIG_MACH_ESL_VAMANA +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_ESL_VAMANA +# endif +# define machine_is_esl_vamana() (machine_arch_type == MACH_TYPE_ESL_VAMANA) +#else +# define machine_is_esl_vamana() (0) +#endif + +#ifdef CONFIG_MACH_SBC35 +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_SBC35 +# endif +# define machine_is_sbc35() (machine_arch_type == MACH_TYPE_SBC35) +#else +# define machine_is_sbc35() (0) +#endif + +#ifdef CONFIG_MACH_MPX6446 +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_MPX6446 +# endif +# define machine_is_mpx6446() (machine_arch_type == MACH_TYPE_MPX6446) +#else +# define machine_is_mpx6446() (0) +#endif + +#ifdef CONFIG_MACH_OREO_CONTROLLER +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_OREO_CONTROLLER +# endif +# define machine_is_oreo_controller() (machine_arch_type == MACH_TYPE_OREO_CONTROLLER) +#else +# define machine_is_oreo_controller() (0) +#endif + +#ifdef CONFIG_MACH_KOPIN_MODELS +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_KOPIN_MODELS +# endif +# define machine_is_kopin_models() (machine_arch_type == MACH_TYPE_KOPIN_MODELS) +#else +# define machine_is_kopin_models() (0) +#endif + +#ifdef CONFIG_MACH_TTC_VISION2 +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_TTC_VISION2 +# endif +# define machine_is_ttc_vision2() (machine_arch_type == MACH_TYPE_TTC_VISION2) +#else +# define machine_is_ttc_vision2() (0) +#endif + +#ifdef CONFIG_MACH_CNS3420VB +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_CNS3420VB +# endif +# define machine_is_cns3420vb() (machine_arch_type == MACH_TYPE_CNS3420VB) +#else +# define machine_is_cns3420vb() (0) +#endif + +#ifdef CONFIG_MACH_LPC2 +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_LPC2 +# endif +# define machine_is_lpc2() (machine_arch_type == MACH_TYPE_LPC2) +#else +# define machine_is_lpc2() (0) +#endif + +#ifdef CONFIG_MACH_OLYMPUS +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_OLYMPUS +# endif +# define machine_is_olympus() (machine_arch_type == MACH_TYPE_OLYMPUS) +#else +# define machine_is_olympus() (0) +#endif + +#ifdef CONFIG_MACH_VORTEX +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_VORTEX +# endif +# define machine_is_vortex() (machine_arch_type == MACH_TYPE_VORTEX) +#else +# define machine_is_vortex() (0) +#endif + +#ifdef CONFIG_MACH_S5PC200 +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_S5PC200 +# endif +# define machine_is_s5pc200() (machine_arch_type == MACH_TYPE_S5PC200) +#else +# define machine_is_s5pc200() (0) +#endif + +#ifdef CONFIG_MACH_ECUCORE_9263 +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_ECUCORE_9263 +# endif +# define machine_is_ecucore_9263() (machine_arch_type == MACH_TYPE_ECUCORE_9263) +#else +# define machine_is_ecucore_9263() (0) +#endif + +#ifdef CONFIG_MACH_SMDKC200 +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_SMDKC200 +# endif +# define machine_is_smdkc200() (machine_arch_type == MACH_TYPE_SMDKC200) +#else +# define machine_is_smdkc200() (0) +#endif + +#ifdef CONFIG_MACH_EMSISO_SX27 +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_EMSISO_SX27 +# endif +# define machine_is_emsiso_sx27() (machine_arch_type == MACH_TYPE_EMSISO_SX27) +#else +# define machine_is_emsiso_sx27() (0) +#endif + +#ifdef CONFIG_MACH_APX_SOM9G45_EK +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_APX_SOM9G45_EK +# endif +# define machine_is_apx_som9g45_ek() (machine_arch_type == MACH_TYPE_APX_SOM9G45_EK) +#else +# define machine_is_apx_som9g45_ek() (0) +#endif + +#ifdef CONFIG_MACH_SONGSHAN +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_SONGSHAN +# endif +# define machine_is_songshan() (machine_arch_type == MACH_TYPE_SONGSHAN) +#else +# define machine_is_songshan() (0) +#endif + +#ifdef CONFIG_MACH_TIANSHAN +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_TIANSHAN +# endif +# define machine_is_tianshan() (machine_arch_type == MACH_TYPE_TIANSHAN) +#else +# define machine_is_tianshan() (0) +#endif + +#ifdef CONFIG_MACH_VPX500 +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_VPX500 +# endif +# define machine_is_vpx500() (machine_arch_type == MACH_TYPE_VPX500) +#else +# define machine_is_vpx500() (0) +#endif + +#ifdef CONFIG_MACH_AM3517SAM +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_AM3517SAM +# endif +# define machine_is_am3517sam() (machine_arch_type == MACH_TYPE_AM3517SAM) +#else +# define machine_is_am3517sam() (0) +#endif + +#ifdef CONFIG_MACH_SKAT91_SIM508 +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_SKAT91_SIM508 +# endif +# define machine_is_skat91_sim508() (machine_arch_type == MACH_TYPE_SKAT91_SIM508) +#else +# define machine_is_skat91_sim508() (0) +#endif + +#ifdef CONFIG_MACH_SKAT91_S3E +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_SKAT91_S3E +# endif +# define machine_is_skat91_s3e() (machine_arch_type == MACH_TYPE_SKAT91_S3E) +#else +# define machine_is_skat91_s3e() (0) +#endif + +#ifdef CONFIG_MACH_OMAP4_PANDA +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_OMAP4_PANDA +# endif +# define machine_is_omap4_panda() (machine_arch_type == MACH_TYPE_OMAP4_PANDA) +#else +# define machine_is_omap4_panda() (0) +#endif + +#ifdef CONFIG_MACH_DF7220 +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_DF7220 +# endif +# define machine_is_df7220() (machine_arch_type == MACH_TYPE_DF7220) +#else +# define machine_is_df7220() (0) +#endif + /* * These have not yet been registered */ From 9428d2f83ce93e41fb24dbe01f46e8e6540cae3d Mon Sep 17 00:00:00 2001 From: Asen Dimov Date: Tue, 6 Apr 2010 16:18:04 +0300 Subject: [PATCH 155/164] pm9261 converted to at91 soc access Signed-off-by: Asen Dimov --- board/ronetix/pm9261/led.c | 18 ++-- board/ronetix/pm9261/pm9261.c | 150 +++++++++++++++++++--------------- include/configs/pm9261.h | 68 ++++++++------- 3 files changed, 129 insertions(+), 107 deletions(-) diff --git a/board/ronetix/pm9261/led.c b/board/ronetix/pm9261/led.c index 396c3e734..ff21ce667 100644 --- a/board/ronetix/pm9261/led.c +++ b/board/ronetix/pm9261/led.c @@ -26,19 +26,21 @@ #include #include #include -#include +#include #include void coloured_LED_init(void) { + at91_pmc_t *pmc = (at91_pmc_t *) AT91_PMC_BASE; + /* Enable clock */ - at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9261_ID_PIOC); + writel(1 << AT91SAM9261_ID_PIOC, &pmc->pcer); - at91_set_gpio_output(CONFIG_RED_LED, 1); - at91_set_gpio_output(CONFIG_GREEN_LED, 1); - at91_set_gpio_output(CONFIG_YELLOW_LED, 1); + at91_set_pio_output(CONFIG_RED_LED, 1); + at91_set_pio_output(CONFIG_GREEN_LED, 1); + at91_set_pio_output(CONFIG_YELLOW_LED, 1); - at91_set_gpio_value(CONFIG_RED_LED, 0); - at91_set_gpio_value(CONFIG_GREEN_LED, 1); - at91_set_gpio_value(CONFIG_YELLOW_LED, 1); + at91_set_pio_value(CONFIG_RED_LED, 0); + at91_set_pio_value(CONFIG_GREEN_LED, 1); + at91_set_pio_value(CONFIG_YELLOW_LED, 1); } diff --git a/board/ronetix/pm9261/pm9261.c b/board/ronetix/pm9261/pm9261.c index 866233958..53d8c4828 100644 --- a/board/ronetix/pm9261/pm9261.c +++ b/board/ronetix/pm9261/pm9261.c @@ -27,13 +27,14 @@ #include #include #include -#include #include #include #include #include +#include +#include #include -#include +#include #include #include #include @@ -55,39 +56,48 @@ DECLARE_GLOBAL_DATA_PTR; static void pm9261_nand_hw_init(void) { unsigned long csa; + at91_smc_t *smc = (at91_smc_t *) AT91_SMC_BASE; + at91_matrix_t *matrix = (at91_matrix_t *) AT91_MATRIX_BASE; + at91_pmc_t *pmc = (at91_pmc_t *) AT91_PMC_BASE; /* Enable CS3 */ - csa = at91_sys_read(AT91_MATRIX_EBICSA); - at91_sys_write(AT91_MATRIX_EBICSA, - csa | AT91_MATRIX_CS3A_SMC_SMARTMEDIA); + csa = readl(&matrix->csa) | AT91_MATRIX_CSA_EBI_CS3A; + writel(csa, &matrix->csa); /* Configure SMC CS3 for NAND/SmartMedia */ - at91_sys_write(AT91_SMC_SETUP(3), - AT91_SMC_NWESETUP_(1) | AT91_SMC_NCS_WRSETUP_(0) | - AT91_SMC_NRDSETUP_(1) | AT91_SMC_NCS_RDSETUP_(0)); - at91_sys_write(AT91_SMC_PULSE(3), - AT91_SMC_NWEPULSE_(3) | AT91_SMC_NCS_WRPULSE_(3) | - AT91_SMC_NRDPULSE_(3) | AT91_SMC_NCS_RDPULSE_(3)); - at91_sys_write(AT91_SMC_CYCLE(3), - AT91_SMC_NWECYCLE_(5) | AT91_SMC_NRDCYCLE_(5)); - at91_sys_write(AT91_SMC_MODE(3), - AT91_SMC_READMODE | AT91_SMC_WRITEMODE | - AT91_SMC_EXNWMODE_DISABLE | + writel(AT91_SMC_SETUP_NWE(1) | AT91_SMC_SETUP_NCS_WR(0) | + AT91_SMC_SETUP_NRD(1) | AT91_SMC_SETUP_NCS_RD(0), + &smc->cs[3].setup); + + writel(AT91_SMC_PULSE_NWE(3) | AT91_SMC_PULSE_NCS_WR(3) | + AT91_SMC_PULSE_NRD(3) | AT91_SMC_PULSE_NCS_RD(3), + &smc->cs[3].pulse); + + writel(AT91_SMC_CYCLE_NWE(5) | AT91_SMC_CYCLE_NRD(5), + &smc->cs[3].cycle); + + writel(AT91_SMC_MODE_RM_NRD | AT91_SMC_MODE_WM_NWE | + AT91_SMC_MODE_EXNW_DISABLE | #ifdef CONFIG_SYS_NAND_DBW_16 - AT91_SMC_DBW_16 | + AT91_SMC_MODE_DBW_16 | #else /* CONFIG_SYS_NAND_DBW_8 */ - AT91_SMC_DBW_8 | + AT91_SMC_MODE_DBW_8 | #endif - AT91_SMC_TDF_(2)); + AT91_SMC_MODE_TDF_CYCLE(2), + &smc->cs[3].mode); + + writel(1 << AT91SAM9261_ID_PIOA | + 1 << AT91SAM9261_ID_PIOC, + &pmc->pcer); /* Configure RDY/BSY */ - at91_set_gpio_input(AT91_PIN_PA16, 1); + at91_set_pio_input(CONFIG_SYS_NAND_READY_PIN, 1); /* Enable NandFlash */ - at91_set_gpio_output(AT91_PIN_PC14, 1); + at91_set_pio_output(CONFIG_SYS_NAND_ENABLE_PIN, 1); - at91_set_A_periph(AT91_PIN_PC0, 0); /* NANDOE */ - at91_set_A_periph(AT91_PIN_PC1, 0); /* NANDWE */ + at91_set_a_periph(AT91_PIO_PORTC, 0, 0); /* NANDOE */ + at91_set_a_periph(AT91_PIO_PORTC, 1, 0); /* NANDWE */ } #endif @@ -95,23 +105,30 @@ static void pm9261_nand_hw_init(void) #ifdef CONFIG_DRIVER_DM9000 static void pm9261_dm9000_hw_init(void) { + at91_smc_t *smc = (at91_smc_t *) AT91_SMC_BASE; + at91_pmc_t *pmc = (at91_pmc_t *) AT91_PMC_BASE; + /* Configure SMC CS2 for DM9000 */ - at91_sys_write(AT91_SMC_SETUP(2), - AT91_SMC_NWESETUP_(2) | AT91_SMC_NCS_WRSETUP_(0) | - AT91_SMC_NRDSETUP_(2) | AT91_SMC_NCS_RDSETUP_(0)); - at91_sys_write(AT91_SMC_PULSE(2), - AT91_SMC_NWEPULSE_(4) | AT91_SMC_NCS_WRPULSE_(8) | - AT91_SMC_NRDPULSE_(4) | AT91_SMC_NCS_RDPULSE_(8)); - at91_sys_write(AT91_SMC_CYCLE(2), - AT91_SMC_NWECYCLE_(16) | AT91_SMC_NRDCYCLE_(16)); - at91_sys_write(AT91_SMC_MODE(2), - AT91_SMC_READMODE | AT91_SMC_WRITEMODE | - AT91_SMC_EXNWMODE_DISABLE | - AT91_SMC_BAT_WRITE | AT91_SMC_DBW_16 | - AT91_SMC_TDF_(1)); + writel(AT91_SMC_SETUP_NWE(2) | AT91_SMC_SETUP_NCS_WR(0) | + AT91_SMC_SETUP_NRD(2) | AT91_SMC_SETUP_NCS_RD(0), + &smc->cs[2].setup); + + writel(AT91_SMC_PULSE_NWE(4) | AT91_SMC_PULSE_NCS_WR(8) | + AT91_SMC_PULSE_NRD(4) | AT91_SMC_PULSE_NCS_RD(8), + &smc->cs[2].pulse); + + writel(AT91_SMC_CYCLE_NWE(16) | AT91_SMC_CYCLE_NRD(16), + &smc->cs[2].cycle); + + writel(AT91_SMC_MODE_RM_NRD | AT91_SMC_MODE_WM_NWE | + AT91_SMC_MODE_EXNW_DISABLE | + AT91_SMC_MODE_BAT | AT91_SMC_MODE_DBW_16 | + AT91_SMC_MODE_TDF_CYCLE(1), + &smc->cs[2].mode); /* Configure Interrupt pin as input, no pull-up */ - at91_set_gpio_input(AT91_PIN_PA24, 0); + writel(1 << AT91SAM9261_ID_PIOA, &pmc->pcer); + at91_set_pio_input(AT91_PIO_PORTA, 24, 0); } #endif @@ -135,40 +152,42 @@ vidinfo_t panel_info = { void lcd_enable(void) { - at91_set_gpio_value(AT91_PIN_PA22, 0); /* power up */ + at91_set_pio_value(AT91_PIO_PORTA, 22, 0); /* power up */ } void lcd_disable(void) { - at91_set_gpio_value(AT91_PIN_PA22, 1); /* power down */ + at91_set_pio_value(AT91_PIO_PORTA, 22, 1); /* power down */ } static void pm9261_lcd_hw_init(void) { - at91_set_A_periph(AT91_PIN_PB1, 0); /* LCDHSYNC */ - at91_set_A_periph(AT91_PIN_PB2, 0); /* LCDDOTCK */ - at91_set_A_periph(AT91_PIN_PB3, 0); /* LCDDEN */ - at91_set_A_periph(AT91_PIN_PB4, 0); /* LCDCC */ - at91_set_A_periph(AT91_PIN_PB7, 0); /* LCDD2 */ - at91_set_A_periph(AT91_PIN_PB8, 0); /* LCDD3 */ - at91_set_A_periph(AT91_PIN_PB9, 0); /* LCDD4 */ - at91_set_A_periph(AT91_PIN_PB10, 0); /* LCDD5 */ - at91_set_A_periph(AT91_PIN_PB11, 0); /* LCDD6 */ - at91_set_A_periph(AT91_PIN_PB12, 0); /* LCDD7 */ - at91_set_A_periph(AT91_PIN_PB15, 0); /* LCDD10 */ - at91_set_A_periph(AT91_PIN_PB16, 0); /* LCDD11 */ - at91_set_A_periph(AT91_PIN_PB17, 0); /* LCDD12 */ - at91_set_A_periph(AT91_PIN_PB18, 0); /* LCDD13 */ - at91_set_A_periph(AT91_PIN_PB19, 0); /* LCDD14 */ - at91_set_A_periph(AT91_PIN_PB20, 0); /* LCDD15 */ - at91_set_B_periph(AT91_PIN_PB23, 0); /* LCDD18 */ - at91_set_B_periph(AT91_PIN_PB24, 0); /* LCDD19 */ - at91_set_B_periph(AT91_PIN_PB25, 0); /* LCDD20 */ - at91_set_B_periph(AT91_PIN_PB26, 0); /* LCDD21 */ - at91_set_B_periph(AT91_PIN_PB27, 0); /* LCDD22 */ - at91_set_B_periph(AT91_PIN_PB28, 0); /* LCDD23 */ + at91_pmc_t *pmc = (at91_pmc_t *) AT91_PMC_BASE; - at91_sys_write(AT91_PMC_SCER, AT91_PMC_HCK1); + at91_set_a_periph(AT91_PIO_PORTB, 1, 0); /* LCDHSYNC */ + at91_set_a_periph(AT91_PIO_PORTB, 2, 0); /* LCDDOTCK */ + at91_set_a_periph(AT91_PIO_PORTB, 3, 0); /* LCDDEN */ + at91_set_a_periph(AT91_PIO_PORTB, 4, 0); /* LCDCC */ + at91_set_a_periph(AT91_PIO_PORTB, 7, 0); /* LCDD2 */ + at91_set_a_periph(AT91_PIO_PORTB, 8, 0); /* LCDD3 */ + at91_set_a_periph(AT91_PIO_PORTB, 9, 0); /* LCDD4 */ + at91_set_a_periph(AT91_PIO_PORTB, 10, 0); /* LCDD5 */ + at91_set_a_periph(AT91_PIO_PORTB, 11, 0); /* LCDD6 */ + at91_set_a_periph(AT91_PIO_PORTB, 12, 0); /* LCDD7 */ + at91_set_a_periph(AT91_PIO_PORTB, 15, 0); /* LCDD10 */ + at91_set_a_periph(AT91_PIO_PORTB, 16, 0); /* LCDD11 */ + at91_set_a_periph(AT91_PIO_PORTB, 17, 0); /* LCDD12 */ + at91_set_a_periph(AT91_PIO_PORTB, 18, 0); /* LCDD13 */ + at91_set_a_periph(AT91_PIO_PORTB, 19, 0); /* LCDD14 */ + at91_set_a_periph(AT91_PIO_PORTB, 20, 0); /* LCDD15 */ + at91_set_b_periph(AT91_PIO_PORTB, 23, 0); /* LCDD18 */ + at91_set_b_periph(AT91_PIO_PORTB, 24, 0); /* LCDD19 */ + at91_set_b_periph(AT91_PIO_PORTB, 25, 0); /* LCDD20 */ + at91_set_b_periph(AT91_PIO_PORTB, 26, 0); /* LCDD21 */ + at91_set_b_periph(AT91_PIO_PORTB, 27, 0); /* LCDD22 */ + at91_set_b_periph(AT91_PIO_PORTB, 28, 0); /* LCDD23 */ + + writel(1 << 17, &pmc->scer); /* LCD controller Clock, AT91SAM9261 only */ gd->fb_base = AT91SAM9261_SRAM_BASE; } @@ -222,11 +241,14 @@ void lcd_show_board_info(void) int board_init(void) { + at91_pmc_t *pmc = (at91_pmc_t *) AT91_PMC_BASE; + /* Enable Ctrlc */ console_init_f(); - at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9261_ID_PIOA); - at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9261_ID_PIOC); + writel(1 << AT91SAM9261_ID_PIOA | + 1 << AT91SAM9261_ID_PIOC, + &pmc->pcer); /* arch number of PM9261-Board */ gd->bd->bi_arch_number = MACH_TYPE_PM9261; diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h index 47bb8c09a..b245761b3 100644 --- a/include/configs/pm9261.h +++ b/include/configs/pm9261.h @@ -28,8 +28,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_AT91_LEGACY - /* ARM asynchronous clock */ #define CONFIG_SYS_AT91_CPU_NAME "AT91SAM9261" @@ -51,26 +49,26 @@ /* clocks */ /* CKGR_MOR - enable main osc. */ #define CONFIG_SYS_MOR_VAL \ - (AT91_PMC_MOSCEN | \ + (AT91_PMC_MOR_MOSCEN | \ (255 << 8)) /* Main Oscillator Start-up Time */ #define CONFIG_SYS_PLLAR_VAL \ - (AT91_PMC_PLLA_WR_ERRATA | /* Bit 29 must be 1 when prog */ \ - AT91_PMC_OUT | \ + (AT91_PMC_PLLAR_29 | /* Bit 29 must be 1 when prog */ \ + AT91_PMC_PLLXR_OUT(3) | \ ((MASTER_PLL_MUL - 1) << 16) | (MASTER_PLL_DIV)) /* PCK/2 = MCK Master Clock from PLLA */ #define CONFIG_SYS_MCKR1_VAL \ - (AT91_PMC_CSS_SLOW | \ - AT91_PMC_PRES_1 | \ - AT91SAM9_PMC_MDIV_2 | \ - AT91_PMC_PDIV_1) + (AT91_PMC_MCKR_CSS_SLOW | \ + AT91_PMC_MCKR_PRES_1 | \ + AT91_PMC_MCKR_MDIV_2 | \ + AT91_PMC_MCKR_PLLADIV_1) /* PCK/2 = MCK Master Clock from PLLA */ #define CONFIG_SYS_MCKR2_VAL \ - (AT91_PMC_CSS_PLLA | \ - AT91_PMC_PRES_1 | \ - AT91SAM9_PMC_MDIV_2 | \ - AT91_PMC_PDIV_1) + (AT91_PMC_MCKR_CSS_PLLA | \ + AT91_PMC_MCKR_PRES_1 | \ + AT91_PMC_MCKR_MDIV_2 | \ + AT91_PMC_MCKR_PLLADIV_1) /* define PDC[31:16] as DATA[31:16] */ #define CONFIG_SYS_PIOC_PDR_VAL1 0xFFFF0000 @@ -79,7 +77,7 @@ /* EBI_CSA, no pull-ups for D[15:0], CS1 SDRAM, CS3 NAND Flash */ #define CONFIG_SYS_MATRIX_EBICSA_VAL \ - (AT91_MATRIX_DBPUC | AT91_MATRIX_CS1A_SDRAMC) + (AT91_MATRIX_CSA_DBPUC | AT91_MATRIX_CSA_EBI_CS1A) /* SDRAM */ /* SDRAMC_MR Mode register */ @@ -122,32 +120,32 @@ /* setup SMC0, CS0 (NOR Flash) - 16-bit, 15 WS */ #define CONFIG_SYS_SMC0_SETUP0_VAL \ - (AT91_SMC_NWESETUP_(10) | AT91_SMC_NCS_WRSETUP_(10) | \ - AT91_SMC_NRDSETUP_(10) | AT91_SMC_NCS_RDSETUP_(10)) + (AT91_SMC_SETUP_NWE(10) | AT91_SMC_SETUP_NCS_WR(10) | \ + AT91_SMC_SETUP_NRD(10) | AT91_SMC_SETUP_NCS_RD(10)) #define CONFIG_SYS_SMC0_PULSE0_VAL \ - (AT91_SMC_NWEPULSE_(11) | AT91_SMC_NCS_WRPULSE_(11) | \ - AT91_SMC_NRDPULSE_(11) | AT91_SMC_NCS_RDPULSE_(11)) + (AT91_SMC_PULSE_NWE(11) | AT91_SMC_PULSE_NCS_WR(11) | \ + AT91_SMC_PULSE_NRD(11) | AT91_SMC_PULSE_NCS_RD(11)) #define CONFIG_SYS_SMC0_CYCLE0_VAL \ - (AT91_SMC_NWECYCLE_(22) | AT91_SMC_NRDCYCLE_(22)) + (AT91_SMC_CYCLE_NWE(22) | AT91_SMC_CYCLE_NRD(22)) #define CONFIG_SYS_SMC0_MODE0_VAL \ - (AT91_SMC_READMODE | AT91_SMC_WRITEMODE | \ - AT91_SMC_DBW_16 | \ - AT91_SMC_TDFMODE | \ - AT91_SMC_TDF_(6)) + (AT91_SMC_MODE_RM_NRD | AT91_SMC_MODE_WM_NWE | \ + AT91_SMC_MODE_DBW_16 | \ + AT91_SMC_MODE_TDF | \ + AT91_SMC_MODE_TDF_CYCLE(6)) /* user reset enable */ #define CONFIG_SYS_RSTC_RMR_VAL \ (AT91_RSTC_KEY | \ - AT91_RSTC_PROCRST | \ - AT91_RSTC_RSTTYP_WAKEUP | \ - AT91_RSTC_RSTTYP_WATCHDOG) + AT91_RSTC_CR_PROCRST | \ + AT91_RSTC_MR_ERSTL(1) | \ + AT91_RSTC_MR_ERSTL(2)) /* Disable Watchdog */ #define CONFIG_SYS_WDTC_WDMR_VAL \ - (AT91_WDT_WDIDLEHLT | AT91_WDT_WDDBGHLT | \ - AT91_WDT_WDV | \ - AT91_WDT_WDDIS | \ - AT91_WDT_WDD) + (AT91_WDT_MR_WDIDLEHLT | AT91_WDT_MR_WDDBGHLT | \ + AT91_WDT_MR_WDV(0xfff) | \ + AT91_WDT_MR_WDDIS | \ + AT91_WDT_MR_WDD(0xfff)) #define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS 1 @@ -180,9 +178,9 @@ /* LED */ #define CONFIG_AT91_LED -#define CONFIG_RED_LED AT91_PIN_PC12 -#define CONFIG_GREEN_LED AT91_PIN_PC13 -#define CONFIG_YELLOW_LED AT91_PIN_PC15 +#define CONFIG_RED_LED AT91_PIO_PORTC, 12 +#define CONFIG_GREEN_LED AT91_PIO_PORTC, 13 +#define CONFIG_YELLOW_LED AT91_PIO_PORTC, 15 #define CONFIG_BOOTDELAY 3 @@ -236,8 +234,8 @@ #define CONFIG_SYS_NAND_MASK_ALE (1 << 22) /* our CLE is AD21 */ #define CONFIG_SYS_NAND_MASK_CLE (1 << 21) -#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PC14 -#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PA16 +#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIO_PORTC, 14 +#define CONFIG_SYS_NAND_READY_PIN AT91_PIO_PORTA, 16 /* NOR flash */ #define CONFIG_SYS_FLASH_CFI 1 From 14f7f8be6b259eb8c2d875708a03df3b3a15ea09 Mon Sep 17 00:00:00 2001 From: Asen Dimov Date: Tue, 6 Apr 2010 16:17:34 +0300 Subject: [PATCH 156/164] pm9261: remove CONFIG_CMD_AUTOSCRIPT Signed-off-by: Asen Dimov --- include/configs/pm9261.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h index b245761b3..a0b00e970 100644 --- a/include/configs/pm9261.h +++ b/include/configs/pm9261.h @@ -198,7 +198,6 @@ #include #undef CONFIG_CMD_BDI #undef CONFIG_CMD_IMI -#undef CONFIG_CMD_AUTOSCRIPT #undef CONFIG_CMD_FPGA #undef CONFIG_CMD_LOADS #undef CONFIG_CMD_IMLS From 364a1a57e2e34bab81acd138f1aaf2356104b3b1 Mon Sep 17 00:00:00 2001 From: Alexander Holler Date: Mon, 29 Mar 2010 21:39:43 +0200 Subject: [PATCH 157/164] at91: add defines for RTT and GPBR Signed-off-by: Alexander Holler --- arch/arm/include/asm/arch-at91/at91sam9260.h | 2 ++ arch/arm/include/asm/arch-at91/at91sam9261.h | 2 ++ arch/arm/include/asm/arch-at91/at91sam9263.h | 3 +++ 3 files changed, 7 insertions(+) diff --git a/arch/arm/include/asm/arch-at91/at91sam9260.h b/arch/arm/include/asm/arch-at91/at91sam9260.h index a60a0811c..ec0431803 100644 --- a/arch/arm/include/asm/arch-at91/at91sam9260.h +++ b/arch/arm/include/asm/arch-at91/at91sam9260.h @@ -56,8 +56,10 @@ #define AT91_PIO_BASE 0xfffff400 #define AT91_PMC_BASE 0xfffffc00 #define AT91_RSTC_BASE 0xfffffd00 +#define AT91_RTT_BASE 0xfffffd20 #define AT91_PIT_BASE 0xfffffd30 #define AT91_WDT_BASE 0xfffffd40 +#define AT91_GPR_BASE 0xfffffd50 #ifdef CONFIG_AT91_LEGACY diff --git a/arch/arm/include/asm/arch-at91/at91sam9261.h b/arch/arm/include/asm/arch-at91/at91sam9261.h index 2952292c5..7ca028313 100644 --- a/arch/arm/include/asm/arch-at91/at91sam9261.h +++ b/arch/arm/include/asm/arch-at91/at91sam9261.h @@ -49,8 +49,10 @@ #define AT91_PIO_BASE 0xfffff400 #define AT91_PMC_BASE 0xfffffc00 #define AT91_RSTC_BASE 0xfffffd00 +#define AT91_RTT_BASE 0xfffffd20 #define AT91_PIT_BASE 0xfffffd30 #define AT91_WDT_BASE 0xfffffd40 +#define AT91_GPBR_BASE 0xfffffd50 #ifdef CONFIG_AT91_LEGACY diff --git a/arch/arm/include/asm/arch-at91/at91sam9263.h b/arch/arm/include/asm/arch-at91/at91sam9263.h index c177bd059..4ada1ceaf 100644 --- a/arch/arm/include/asm/arch-at91/at91sam9263.h +++ b/arch/arm/include/asm/arch-at91/at91sam9263.h @@ -61,8 +61,11 @@ #define AT91_PIO_BASE 0xfffff200 #define AT91_PMC_BASE 0xfffffc00 #define AT91_RSTC_BASE 0xfffffd00 +#define AT91_RTT0_BASE 0xfffffd20 #define AT91_PIT_BASE 0xfffffd30 #define AT91_WDT_BASE 0xfffffd40 +#define AT91_RTT1_BASE 0xfffffd50 +#define AT91_GPBR_BASE 0xfffffd60 #ifdef CONFIG_AT91_LEGACY From ed1a529ab55593260c4c19000724777cf8dd7102 Mon Sep 17 00:00:00 2001 From: Asen Dimov Date: Wed, 7 Apr 2010 12:33:11 +0300 Subject: [PATCH 158/164] pm9263: remove CONFIG_CMD_AUTOSCRIPT Signed-off-by: Asen Dimov --- include/configs/pm9263.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h index 807dba8f4..f854f3874 100644 --- a/include/configs/pm9263.h +++ b/include/configs/pm9263.h @@ -215,7 +215,6 @@ #include #undef CONFIG_CMD_BDI #undef CONFIG_CMD_IMI -#undef CONFIG_CMD_AUTOSCRIPT #undef CONFIG_CMD_FPGA #undef CONFIG_CMD_LOADS #undef CONFIG_CMD_IMLS From 5aa02e4d6a0ef5995ded70dc37b7f06e35fa6e21 Mon Sep 17 00:00:00 2001 From: Minkyu Kang Date: Wed, 24 Mar 2010 16:59:30 +0900 Subject: [PATCH 159/164] SAMSUNG: serial: modify name from s5pc1xx to s5p Because of other s5p series SoC will use these serial functions, modify function's name and structure's name. Signed-off-by: Minkyu Kang --- arch/arm/include/asm/arch-s5pc1xx/uart.h | 2 +- common/serial.c | 16 +++++----- drivers/serial/Makefile | 2 +- .../serial/{serial_s5pc1xx.c => serial_s5p.c} | 30 +++++++++---------- include/serial.h | 8 ++--- 5 files changed, 29 insertions(+), 29 deletions(-) rename drivers/serial/{serial_s5pc1xx.c => serial_s5p.c} (83%) diff --git a/arch/arm/include/asm/arch-s5pc1xx/uart.h b/arch/arm/include/asm/arch-s5pc1xx/uart.h index 140dbdc45..2d7ad7ec9 100644 --- a/arch/arm/include/asm/arch-s5pc1xx/uart.h +++ b/arch/arm/include/asm/arch-s5pc1xx/uart.h @@ -24,7 +24,7 @@ #define __ASM_ARCH_UART_H_ #ifndef __ASSEMBLY__ -struct s5pc1xx_uart { +struct s5p_uart { unsigned int ulcon; unsigned int ucon; unsigned int ufcon; diff --git a/common/serial.c b/common/serial.c index 5f9ffd7e4..94e192121 100644 --- a/common/serial.c +++ b/common/serial.c @@ -71,13 +71,13 @@ struct serial_device *__default_serial_console (void) #endif #elif defined(CONFIG_S5PC1XX) #if defined(CONFIG_SERIAL0) - return &s5pc1xx_serial0_device; + return &s5p_serial0_device; #elif defined(CONFIG_SERIAL1) - return &s5pc1xx_serial1_device; + return &s5p_serial1_device; #elif defined(CONFIG_SERIAL2) - return &s5pc1xx_serial2_device; + return &s5p_serial2_device; #elif defined(CONFIG_SERIAL3) - return &s5pc1xx_serial3_device; + return &s5p_serial3_device; #else #error "CONFIG_SERIAL? missing." #endif @@ -154,10 +154,10 @@ void serial_initialize (void) serial_register(&s3c24xx_serial2_device); #endif #if defined(CONFIG_S5PC1XX) - serial_register(&s5pc1xx_serial0_device); - serial_register(&s5pc1xx_serial1_device); - serial_register(&s5pc1xx_serial2_device); - serial_register(&s5pc1xx_serial3_device); + serial_register(&s5p_serial0_device); + serial_register(&s5p_serial1_device); + serial_register(&s5p_serial2_device); + serial_register(&s5p_serial3_device); #endif serial_assign (default_serial_console ()->name); } diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile index d2b4820b6..c731bfb59 100644 --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile @@ -36,7 +36,7 @@ COBJS-$(CONFIG_OPENCORES_YANU) += opencores_yanu.o COBJS-$(CONFIG_SYS_NS16550) += ns16550.o COBJS-$(CONFIG_DRIVER_S3C4510_UART) += s3c4510b_uart.o COBJS-$(CONFIG_S3C64XX) += s3c64xx.o -COBJS-$(CONFIG_S5PC1XX) += serial_s5pc1xx.o +COBJS-$(CONFIG_S5PC1XX) += serial_s5p.o COBJS-$(CONFIG_SYS_NS16550_SERIAL) += serial.o COBJS-$(CONFIG_CLPS7111_SERIAL) += serial_clps7111.o COBJS-$(CONFIG_IMX_SERIAL) += serial_imx.o diff --git a/drivers/serial/serial_s5pc1xx.c b/drivers/serial/serial_s5p.c similarity index 83% rename from drivers/serial/serial_s5pc1xx.c rename to drivers/serial/serial_s5p.c index 73669a9f1..68b8d0101 100644 --- a/drivers/serial/serial_s5pc1xx.c +++ b/drivers/serial/serial_s5p.c @@ -27,18 +27,18 @@ #include #include -static inline struct s5pc1xx_uart *s5pc1xx_get_base_uart(int dev_index) +static inline struct s5p_uart *s5p_get_base_uart(int dev_index) { - u32 offset = dev_index * sizeof(struct s5pc1xx_uart); + u32 offset = dev_index * sizeof(struct s5p_uart); if (cpu_is_s5pc100()) - return (struct s5pc1xx_uart *)(S5PC100_UART_BASE + offset); + return (struct s5p_uart *)(S5PC100_UART_BASE + offset); else - return (struct s5pc1xx_uart *)(S5PC110_UART_BASE + offset); + return (struct s5p_uart *)(S5PC110_UART_BASE + offset); } /* - * The coefficient, used to calculate the baudrate on S5PC1XX UARTs is + * The coefficient, used to calculate the baudrate on S5P UARTs is * calculated as * C = UBRDIV * 16 + number_of_set_bits_in_UDIVSLOT * however, section 31.6.11 of the datasheet doesn't recomment using 1 for 1, @@ -66,7 +66,7 @@ static const int udivslot[] = { void serial_setbrg_dev(const int dev_index) { DECLARE_GLOBAL_DATA_PTR; - struct s5pc1xx_uart *const uart = s5pc1xx_get_base_uart(dev_index); + struct s5p_uart *const uart = s5p_get_base_uart(dev_index); u32 pclk = get_pclk(); u32 baudrate = gd->baudrate; u32 val; @@ -83,7 +83,7 @@ void serial_setbrg_dev(const int dev_index) */ int serial_init_dev(const int dev_index) { - struct s5pc1xx_uart *const uart = s5pc1xx_get_base_uart(dev_index); + struct s5p_uart *const uart = s5p_get_base_uart(dev_index); /* reset and enable FIFOs, set triggers to the maximum */ writel(0, &uart->ufcon); @@ -100,7 +100,7 @@ int serial_init_dev(const int dev_index) static int serial_err_check(const int dev_index, int op) { - struct s5pc1xx_uart *const uart = s5pc1xx_get_base_uart(dev_index); + struct s5p_uart *const uart = s5p_get_base_uart(dev_index); unsigned int mask; /* @@ -125,7 +125,7 @@ static int serial_err_check(const int dev_index, int op) */ int serial_getc_dev(const int dev_index) { - struct s5pc1xx_uart *const uart = s5pc1xx_get_base_uart(dev_index); + struct s5p_uart *const uart = s5p_get_base_uart(dev_index); /* wait for character to arrive */ while (!(readl(&uart->utrstat) & 0x1)) { @@ -141,7 +141,7 @@ int serial_getc_dev(const int dev_index) */ void serial_putc_dev(const char c, const int dev_index) { - struct s5pc1xx_uart *const uart = s5pc1xx_get_base_uart(dev_index); + struct s5p_uart *const uart = s5p_get_base_uart(dev_index); /* wait for room in the tx FIFO */ while (!(readl(&uart->utrstat) & 0x2)) { @@ -161,7 +161,7 @@ void serial_putc_dev(const char c, const int dev_index) */ int serial_tstc_dev(const int dev_index) { - struct s5pc1xx_uart *const uart = s5pc1xx_get_base_uart(dev_index); + struct s5p_uart *const uart = s5p_get_base_uart(dev_index); return (int)(readl(&uart->utrstat) & 0x1); } @@ -192,14 +192,14 @@ void s5p_serial##port##_puts(const char *s) { serial_puts_dev(s, port); } s5p_serial##port##_puts, } DECLARE_S5P_SERIAL_FUNCTIONS(0); -struct serial_device s5pc1xx_serial0_device = +struct serial_device s5p_serial0_device = INIT_S5P_SERIAL_STRUCTURE(0, "s5pser0", "S5PUART0"); DECLARE_S5P_SERIAL_FUNCTIONS(1); -struct serial_device s5pc1xx_serial1_device = +struct serial_device s5p_serial1_device = INIT_S5P_SERIAL_STRUCTURE(1, "s5pser1", "S5PUART1"); DECLARE_S5P_SERIAL_FUNCTIONS(2); -struct serial_device s5pc1xx_serial2_device = +struct serial_device s5p_serial2_device = INIT_S5P_SERIAL_STRUCTURE(2, "s5pser2", "S5PUART2"); DECLARE_S5P_SERIAL_FUNCTIONS(3); -struct serial_device s5pc1xx_serial3_device = +struct serial_device s5p_serial3_device = INIT_S5P_SERIAL_STRUCTURE(3, "s5pser3", "S5PUART3"); diff --git a/include/serial.h b/include/serial.h index f2638ec56..4caf79072 100644 --- a/include/serial.h +++ b/include/serial.h @@ -44,10 +44,10 @@ extern struct serial_device s3c24xx_serial2_device; #endif #if defined(CONFIG_S5PC1XX) -extern struct serial_device s5pc1xx_serial0_device; -extern struct serial_device s5pc1xx_serial1_device; -extern struct serial_device s5pc1xx_serial2_device; -extern struct serial_device s5pc1xx_serial3_device; +extern struct serial_device s5p_serial0_device; +extern struct serial_device s5p_serial1_device; +extern struct serial_device s5p_serial2_device; +extern struct serial_device s5p_serial3_device; #endif #if defined(CONFIG_OMAP3_ZOOM2) From eff3b9a742b2f43f177bd23dc1d1d453d2316c4b Mon Sep 17 00:00:00 2001 From: Minkyu Kang Date: Wed, 24 Mar 2010 15:31:06 +0900 Subject: [PATCH 160/164] SAMSUNG: make s5p common gpio functions Because of s5pc1xx gpio is same as s5p seires SoC, move gpio functions to drvier/gpio/ and modify structure's name from s5pc1xx_ to s5p_. Signed-off-by: Minkyu Kang --- arch/arm/cpu/arm_cortexa8/s5pc1xx/Makefile | 1 - arch/arm/include/asm/arch-s5pc1xx/gpio.h | 192 +++++++++--------- drivers/gpio/Makefile | 1 + .../s5pc1xx/gpio.c => drivers/gpio/s5p_gpio.c | 16 +- 4 files changed, 105 insertions(+), 105 deletions(-) rename arch/arm/cpu/arm_cortexa8/s5pc1xx/gpio.c => drivers/gpio/s5p_gpio.c (82%) diff --git a/arch/arm/cpu/arm_cortexa8/s5pc1xx/Makefile b/arch/arm/cpu/arm_cortexa8/s5pc1xx/Makefile index 01c93feda..3785593d2 100644 --- a/arch/arm/cpu/arm_cortexa8/s5pc1xx/Makefile +++ b/arch/arm/cpu/arm_cortexa8/s5pc1xx/Makefile @@ -33,7 +33,6 @@ SOBJS += reset.o COBJS += clock.o COBJS += cpu_info.o -COBJS += gpio.o COBJS += sromc.o COBJS += timer.o diff --git a/arch/arm/include/asm/arch-s5pc1xx/gpio.h b/arch/arm/include/asm/arch-s5pc1xx/gpio.h index 8e4bb863f..9a7faed31 100644 --- a/arch/arm/include/asm/arch-s5pc1xx/gpio.h +++ b/arch/arm/include/asm/arch-s5pc1xx/gpio.h @@ -22,7 +22,7 @@ #define __ASM_ARCH_GPIO_H #ifndef __ASSEMBLY__ -struct s5pc1xx_gpio_bank { +struct s5p_gpio_bank { unsigned int con; unsigned int dat; unsigned int pull; @@ -33,107 +33,107 @@ struct s5pc1xx_gpio_bank { }; struct s5pc100_gpio { - struct s5pc1xx_gpio_bank gpio_a0; - struct s5pc1xx_gpio_bank gpio_a1; - struct s5pc1xx_gpio_bank gpio_b; - struct s5pc1xx_gpio_bank gpio_c; - struct s5pc1xx_gpio_bank gpio_d; - struct s5pc1xx_gpio_bank gpio_e0; - struct s5pc1xx_gpio_bank gpio_e1; - struct s5pc1xx_gpio_bank gpio_f0; - struct s5pc1xx_gpio_bank gpio_f1; - struct s5pc1xx_gpio_bank gpio_f2; - struct s5pc1xx_gpio_bank gpio_f3; - struct s5pc1xx_gpio_bank gpio_g0; - struct s5pc1xx_gpio_bank gpio_g1; - struct s5pc1xx_gpio_bank gpio_g2; - struct s5pc1xx_gpio_bank gpio_g3; - struct s5pc1xx_gpio_bank gpio_i; - struct s5pc1xx_gpio_bank gpio_j0; - struct s5pc1xx_gpio_bank gpio_j1; - struct s5pc1xx_gpio_bank gpio_j2; - struct s5pc1xx_gpio_bank gpio_j3; - struct s5pc1xx_gpio_bank gpio_j4; - struct s5pc1xx_gpio_bank gpio_k0; - struct s5pc1xx_gpio_bank gpio_k1; - struct s5pc1xx_gpio_bank gpio_k2; - struct s5pc1xx_gpio_bank gpio_k3; - struct s5pc1xx_gpio_bank gpio_l0; - struct s5pc1xx_gpio_bank gpio_l1; - struct s5pc1xx_gpio_bank gpio_l2; - struct s5pc1xx_gpio_bank gpio_l3; - struct s5pc1xx_gpio_bank gpio_l4; - struct s5pc1xx_gpio_bank gpio_h0; - struct s5pc1xx_gpio_bank gpio_h1; - struct s5pc1xx_gpio_bank gpio_h2; - struct s5pc1xx_gpio_bank gpio_h3; + struct s5p_gpio_bank gpio_a0; + struct s5p_gpio_bank gpio_a1; + struct s5p_gpio_bank gpio_b; + struct s5p_gpio_bank gpio_c; + struct s5p_gpio_bank gpio_d; + struct s5p_gpio_bank gpio_e0; + struct s5p_gpio_bank gpio_e1; + struct s5p_gpio_bank gpio_f0; + struct s5p_gpio_bank gpio_f1; + struct s5p_gpio_bank gpio_f2; + struct s5p_gpio_bank gpio_f3; + struct s5p_gpio_bank gpio_g0; + struct s5p_gpio_bank gpio_g1; + struct s5p_gpio_bank gpio_g2; + struct s5p_gpio_bank gpio_g3; + struct s5p_gpio_bank gpio_i; + struct s5p_gpio_bank gpio_j0; + struct s5p_gpio_bank gpio_j1; + struct s5p_gpio_bank gpio_j2; + struct s5p_gpio_bank gpio_j3; + struct s5p_gpio_bank gpio_j4; + struct s5p_gpio_bank gpio_k0; + struct s5p_gpio_bank gpio_k1; + struct s5p_gpio_bank gpio_k2; + struct s5p_gpio_bank gpio_k3; + struct s5p_gpio_bank gpio_l0; + struct s5p_gpio_bank gpio_l1; + struct s5p_gpio_bank gpio_l2; + struct s5p_gpio_bank gpio_l3; + struct s5p_gpio_bank gpio_l4; + struct s5p_gpio_bank gpio_h0; + struct s5p_gpio_bank gpio_h1; + struct s5p_gpio_bank gpio_h2; + struct s5p_gpio_bank gpio_h3; }; struct s5pc110_gpio { - struct s5pc1xx_gpio_bank gpio_a0; - struct s5pc1xx_gpio_bank gpio_a1; - struct s5pc1xx_gpio_bank gpio_b; - struct s5pc1xx_gpio_bank gpio_c0; - struct s5pc1xx_gpio_bank gpio_c1; - struct s5pc1xx_gpio_bank gpio_d0; - struct s5pc1xx_gpio_bank gpio_d1; - struct s5pc1xx_gpio_bank gpio_e0; - struct s5pc1xx_gpio_bank gpio_e1; - struct s5pc1xx_gpio_bank gpio_f0; - struct s5pc1xx_gpio_bank gpio_f1; - struct s5pc1xx_gpio_bank gpio_f2; - struct s5pc1xx_gpio_bank gpio_f3; - struct s5pc1xx_gpio_bank gpio_g0; - struct s5pc1xx_gpio_bank gpio_g1; - struct s5pc1xx_gpio_bank gpio_g2; - struct s5pc1xx_gpio_bank gpio_g3; - struct s5pc1xx_gpio_bank gpio_i; - struct s5pc1xx_gpio_bank gpio_j0; - struct s5pc1xx_gpio_bank gpio_j1; - struct s5pc1xx_gpio_bank gpio_j2; - struct s5pc1xx_gpio_bank gpio_j3; - struct s5pc1xx_gpio_bank gpio_j4; - struct s5pc1xx_gpio_bank gpio_mp0_1; - struct s5pc1xx_gpio_bank gpio_mp0_2; - struct s5pc1xx_gpio_bank gpio_mp0_3; - struct s5pc1xx_gpio_bank gpio_mp0_4; - struct s5pc1xx_gpio_bank gpio_mp0_5; - struct s5pc1xx_gpio_bank gpio_mp0_6; - struct s5pc1xx_gpio_bank gpio_mp0_7; - struct s5pc1xx_gpio_bank gpio_mp1_0; - struct s5pc1xx_gpio_bank gpio_mp1_1; - struct s5pc1xx_gpio_bank gpio_mp1_2; - struct s5pc1xx_gpio_bank gpio_mp1_3; - struct s5pc1xx_gpio_bank gpio_mp1_4; - struct s5pc1xx_gpio_bank gpio_mp1_5; - struct s5pc1xx_gpio_bank gpio_mp1_6; - struct s5pc1xx_gpio_bank gpio_mp1_7; - struct s5pc1xx_gpio_bank gpio_mp1_8; - struct s5pc1xx_gpio_bank gpio_mp2_0; - struct s5pc1xx_gpio_bank gpio_mp2_1; - struct s5pc1xx_gpio_bank gpio_mp2_2; - struct s5pc1xx_gpio_bank gpio_mp2_3; - struct s5pc1xx_gpio_bank gpio_mp2_4; - struct s5pc1xx_gpio_bank gpio_mp2_5; - struct s5pc1xx_gpio_bank gpio_mp2_6; - struct s5pc1xx_gpio_bank gpio_mp2_7; - struct s5pc1xx_gpio_bank gpio_mp2_8; - struct s5pc1xx_gpio_bank res1[48]; - struct s5pc1xx_gpio_bank gpio_h0; - struct s5pc1xx_gpio_bank gpio_h1; - struct s5pc1xx_gpio_bank gpio_h2; - struct s5pc1xx_gpio_bank gpio_h3; + struct s5p_gpio_bank gpio_a0; + struct s5p_gpio_bank gpio_a1; + struct s5p_gpio_bank gpio_b; + struct s5p_gpio_bank gpio_c0; + struct s5p_gpio_bank gpio_c1; + struct s5p_gpio_bank gpio_d0; + struct s5p_gpio_bank gpio_d1; + struct s5p_gpio_bank gpio_e0; + struct s5p_gpio_bank gpio_e1; + struct s5p_gpio_bank gpio_f0; + struct s5p_gpio_bank gpio_f1; + struct s5p_gpio_bank gpio_f2; + struct s5p_gpio_bank gpio_f3; + struct s5p_gpio_bank gpio_g0; + struct s5p_gpio_bank gpio_g1; + struct s5p_gpio_bank gpio_g2; + struct s5p_gpio_bank gpio_g3; + struct s5p_gpio_bank gpio_i; + struct s5p_gpio_bank gpio_j0; + struct s5p_gpio_bank gpio_j1; + struct s5p_gpio_bank gpio_j2; + struct s5p_gpio_bank gpio_j3; + struct s5p_gpio_bank gpio_j4; + struct s5p_gpio_bank gpio_mp0_1; + struct s5p_gpio_bank gpio_mp0_2; + struct s5p_gpio_bank gpio_mp0_3; + struct s5p_gpio_bank gpio_mp0_4; + struct s5p_gpio_bank gpio_mp0_5; + struct s5p_gpio_bank gpio_mp0_6; + struct s5p_gpio_bank gpio_mp0_7; + struct s5p_gpio_bank gpio_mp1_0; + struct s5p_gpio_bank gpio_mp1_1; + struct s5p_gpio_bank gpio_mp1_2; + struct s5p_gpio_bank gpio_mp1_3; + struct s5p_gpio_bank gpio_mp1_4; + struct s5p_gpio_bank gpio_mp1_5; + struct s5p_gpio_bank gpio_mp1_6; + struct s5p_gpio_bank gpio_mp1_7; + struct s5p_gpio_bank gpio_mp1_8; + struct s5p_gpio_bank gpio_mp2_0; + struct s5p_gpio_bank gpio_mp2_1; + struct s5p_gpio_bank gpio_mp2_2; + struct s5p_gpio_bank gpio_mp2_3; + struct s5p_gpio_bank gpio_mp2_4; + struct s5p_gpio_bank gpio_mp2_5; + struct s5p_gpio_bank gpio_mp2_6; + struct s5p_gpio_bank gpio_mp2_7; + struct s5p_gpio_bank gpio_mp2_8; + struct s5p_gpio_bank res1[48]; + struct s5p_gpio_bank gpio_h0; + struct s5p_gpio_bank gpio_h1; + struct s5p_gpio_bank gpio_h2; + struct s5p_gpio_bank gpio_h3; }; /* functions */ -void gpio_cfg_pin(struct s5pc1xx_gpio_bank *bank, int gpio, int cfg); -void gpio_direction_output(struct s5pc1xx_gpio_bank *bank, int gpio, int en); -void gpio_direction_input(struct s5pc1xx_gpio_bank *bank, int gpio); -void gpio_set_value(struct s5pc1xx_gpio_bank *bank, int gpio, int en); -unsigned int gpio_get_value(struct s5pc1xx_gpio_bank *bank, int gpio); -void gpio_set_pull(struct s5pc1xx_gpio_bank *bank, int gpio, int mode); -void gpio_set_drv(struct s5pc1xx_gpio_bank *bank, int gpio, int mode); -void gpio_set_rate(struct s5pc1xx_gpio_bank *bank, int gpio, int mode); +void gpio_cfg_pin(struct s5p_gpio_bank *bank, int gpio, int cfg); +void gpio_direction_output(struct s5p_gpio_bank *bank, int gpio, int en); +void gpio_direction_input(struct s5p_gpio_bank *bank, int gpio); +void gpio_set_value(struct s5p_gpio_bank *bank, int gpio, int en); +unsigned int gpio_get_value(struct s5p_gpio_bank *bank, int gpio); +void gpio_set_pull(struct s5p_gpio_bank *bank, int gpio, int mode); +void gpio_set_drv(struct s5p_gpio_bank *bank, int gpio, int mode); +void gpio_set_rate(struct s5p_gpio_bank *bank, int gpio, int mode); #endif /* Pin configurations */ diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index d9660820b..528ca2e99 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -29,6 +29,7 @@ COBJS-$(CONFIG_AT91_GPIO) += at91_gpio.o COBJS-$(CONFIG_KIRKWOOD_GPIO) += kw_gpio.o COBJS-$(CONFIG_MX31_GPIO) += mx31_gpio.o COBJS-$(CONFIG_PCA953X) += pca953x.o +COBJS-$(CONFIG_S5PC1XX) += s5p_gpio.o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c) diff --git a/arch/arm/cpu/arm_cortexa8/s5pc1xx/gpio.c b/drivers/gpio/s5p_gpio.c similarity index 82% rename from arch/arm/cpu/arm_cortexa8/s5pc1xx/gpio.c rename to drivers/gpio/s5p_gpio.c index a97244bf3..0439477e4 100644 --- a/arch/arm/cpu/arm_cortexa8/s5pc1xx/gpio.c +++ b/drivers/gpio/s5p_gpio.c @@ -36,7 +36,7 @@ #define RATE_MASK(x) (0x1 << (x + 16)) #define RATE_SET(x) (0x1 << (x + 16)) -void gpio_cfg_pin(struct s5pc1xx_gpio_bank *bank, int gpio, int cfg) +void gpio_cfg_pin(struct s5p_gpio_bank *bank, int gpio, int cfg) { unsigned int value; @@ -46,7 +46,7 @@ void gpio_cfg_pin(struct s5pc1xx_gpio_bank *bank, int gpio, int cfg) writel(value, &bank->con); } -void gpio_direction_output(struct s5pc1xx_gpio_bank *bank, int gpio, int en) +void gpio_direction_output(struct s5p_gpio_bank *bank, int gpio, int en) { unsigned int value; @@ -59,12 +59,12 @@ void gpio_direction_output(struct s5pc1xx_gpio_bank *bank, int gpio, int en) writel(value, &bank->dat); } -void gpio_direction_input(struct s5pc1xx_gpio_bank *bank, int gpio) +void gpio_direction_input(struct s5p_gpio_bank *bank, int gpio) { gpio_cfg_pin(bank, gpio, GPIO_INPUT); } -void gpio_set_value(struct s5pc1xx_gpio_bank *bank, int gpio, int en) +void gpio_set_value(struct s5p_gpio_bank *bank, int gpio, int en) { unsigned int value; @@ -75,7 +75,7 @@ void gpio_set_value(struct s5pc1xx_gpio_bank *bank, int gpio, int en) writel(value, &bank->dat); } -unsigned int gpio_get_value(struct s5pc1xx_gpio_bank *bank, int gpio) +unsigned int gpio_get_value(struct s5p_gpio_bank *bank, int gpio) { unsigned int value; @@ -83,7 +83,7 @@ unsigned int gpio_get_value(struct s5pc1xx_gpio_bank *bank, int gpio) return !!(value & DAT_MASK(gpio)); } -void gpio_set_pull(struct s5pc1xx_gpio_bank *bank, int gpio, int mode) +void gpio_set_pull(struct s5p_gpio_bank *bank, int gpio, int mode) { unsigned int value; @@ -102,7 +102,7 @@ void gpio_set_pull(struct s5pc1xx_gpio_bank *bank, int gpio, int mode) writel(value, &bank->pull); } -void gpio_set_drv(struct s5pc1xx_gpio_bank *bank, int gpio, int mode) +void gpio_set_drv(struct s5p_gpio_bank *bank, int gpio, int mode) { unsigned int value; @@ -123,7 +123,7 @@ void gpio_set_drv(struct s5pc1xx_gpio_bank *bank, int gpio, int mode) writel(value, &bank->drv); } -void gpio_set_rate(struct s5pc1xx_gpio_bank *bank, int gpio, int mode) +void gpio_set_rate(struct s5p_gpio_bank *bank, int gpio, int mode) { unsigned int value; From 9f6f58209e0a66b2f1a28c8655c38d8a55842a10 Mon Sep 17 00:00:00 2001 From: Heiko Schocher Date: Thu, 4 Mar 2010 08:12:05 +0100 Subject: [PATCH 161/164] arm, mx27: add support for SDHC1 pin init Signed-off-by: Heiko Schocher --- arch/arm/cpu/arm926ejs/mx27/generic.c | 17 +++++++++++++++++ arch/arm/include/asm/arch-mx27/imx-regs.h | 1 + 2 files changed, 18 insertions(+) diff --git a/arch/arm/cpu/arm926ejs/mx27/generic.c b/arch/arm/cpu/arm926ejs/mx27/generic.c index 30cf54471..ae2ce5841 100644 --- a/arch/arm/cpu/arm926ejs/mx27/generic.c +++ b/arch/arm/cpu/arm926ejs/mx27/generic.c @@ -316,6 +316,23 @@ void mx27_fec_init_pins(void) #endif /* CONFIG_FEC_MXC */ #ifdef CONFIG_MXC_MMC +void mx27_sd1_init_pins(void) +{ + int i; + unsigned int mode[] = { + PE18_PF_SD1_D0, + PE19_PF_SD1_D1, + PE20_PF_SD1_D2, + PE21_PF_SD1_D3, + PE22_PF_SD1_CMD, + PE23_PF_SD1_CLK, + }; + + for (i = 0; i < ARRAY_SIZE(mode); i++) + imx_gpio_mode(mode[i]); + +} + void mx27_sd2_init_pins(void) { int i; diff --git a/arch/arm/include/asm/arch-mx27/imx-regs.h b/arch/arm/include/asm/arch-mx27/imx-regs.h index d36a6da96..6ecddaae8 100644 --- a/arch/arm/include/asm/arch-mx27/imx-regs.h +++ b/arch/arm/include/asm/arch-mx27/imx-regs.h @@ -37,6 +37,7 @@ extern void mx27_fec_init_pins(void); #endif /* CONFIG_FEC_MXC */ #ifdef CONFIG_MXC_MMC +extern void mx27_sd1_init_pins(void); extern void mx27_sd2_init_pins(void); #endif /* CONFIG_MXC_MMC */ From e470955b64116c30dd0fe9893d6d813b929618d7 Mon Sep 17 00:00:00 2001 From: Heiko Schocher Date: Fri, 5 Mar 2010 07:36:33 +0100 Subject: [PATCH 162/164] arm, i.mx27: add support for magnesium board from projectiondesign This patch adds support for the magnesium board from projectiondesign. This board uses i.MX27 SoC and has 8MB NOR flash, 128MB NAND flash, FEC ethernet controller integrated into i.MX27. As this port is based on the imx27lite port, common config options are collected in include/configs/imx27lite-common.h Signed-off-by: Heiko Schocher --- MAINTAINERS | 4 + MAKEALL | 1 + Makefile | 1 + board/logicpd/imx27lite/imx27lite.c | 18 ++- include/configs/imx27lite-common.h | 237 ++++++++++++++++++++++++++++ include/configs/imx27lite.h | 200 +---------------------- include/configs/magnesium.h | 71 +++++++++ 7 files changed, 335 insertions(+), 197 deletions(-) create mode 100644 include/configs/imx27lite-common.h create mode 100644 include/configs/magnesium.h diff --git a/MAINTAINERS b/MAINTAINERS index 04c87309d..0e759c95d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -734,6 +734,10 @@ Jens Scharsig eb_cpux9k2 ARM920T (AT91RM9200 SoC) +Heiko Schocher + + magnesium i.MX27 + Robert Schwebel csb226 xscale diff --git a/MAKEALL b/MAKEALL index fb1f7a3ce..b15d407fa 100755 --- a/MAKEALL +++ b/MAKEALL @@ -562,6 +562,7 @@ LIST_ARM9=" \ edb9315a \ imx27lite \ lpd7a400 \ + magnesium \ mv88f6281gtw_ge \ mx1ads \ mx1fs2 \ diff --git a/Makefile b/Makefile index 0381c8110..8b4e0b938 100644 --- a/Makefile +++ b/Makefile @@ -2941,6 +2941,7 @@ davinci_dm365evm_config : unconfig davinci_dm6467evm_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm926ejs dm6467evm davinci davinci +magnesium_config \ imx27lite_config: unconfig @$(MKCONFIG) $(@:_config=) arm arm926ejs imx27lite logicpd mx27 diff --git a/board/logicpd/imx27lite/imx27lite.c b/board/logicpd/imx27lite/imx27lite.c index 63375d5da..442741547 100644 --- a/board/logicpd/imx27lite/imx27lite.c +++ b/board/logicpd/imx27lite/imx27lite.c @@ -29,6 +29,10 @@ DECLARE_GLOBAL_DATA_PTR; int board_init (void) { struct gpio_regs *regs = (struct gpio_regs *)IMX_GPIO_BASE; +#if defined(CONFIG_SYS_NAND_LARGEPAGE) + struct system_control_regs *sc_regs = + (struct system_control_regs *)IMX_SYSTEM_CTL_BASE; +#endif gd->bd->bi_arch_number = MACH_TYPE_IMX27LITE; gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100; @@ -43,9 +47,20 @@ int board_init (void) ®s->port[PORTC].dr); #endif #ifdef CONFIG_MXC_MMC +#if defined(CONFIG_MAGNESIUM) + mx27_sd1_init_pins(); +#else mx27_sd2_init_pins(); #endif +#endif +#if defined(CONFIG_SYS_NAND_LARGEPAGE) + /* + * set in FMCR NF_FMS Bit(5) to 1 + * (NAND Flash with 2 Kbyte page size) + */ + writel(readl(&sc_regs->fmcr) | (1 << 5), &sc_regs->fmcr); +#endif return 0; } @@ -68,6 +83,7 @@ int dram_init (void) int checkboard(void) { - printf("LogicPD imx27lite\n"); + puts ("Board: "); + puts(CONFIG_BOARDNAME); return 0; } diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h new file mode 100644 index 000000000..1da860261 --- /dev/null +++ b/include/configs/imx27lite-common.h @@ -0,0 +1,237 @@ +/* + * Copyright (C) 2010 Heiko Schocher + * + * based on: + * Copyright (C) 2009 Ilya Yanok + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#ifndef __IMX27LITE_COMMON_CONFIG_H +#define __IMX27LITE_COMMON_CONFIG_H + +/* + * SoC Configuration + */ +#define CONFIG_ARM926EJS /* arm926ejs CPU core */ +#define CONFIG_MX27 +#define CONFIG_MX27_CLK32 32768 /* OSC32K frequency */ +#define CONFIG_SYS_HZ 1000 + +#define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_DISPLAY_CPUINFO + +#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ +#define CONFIG_SETUP_MEMORY_TAGS 1 +#define CONFIG_INITRD_TAG 1 + +/* + * Lowlevel configuration + */ +#define SDRAM_ESDCFG_REGISTER_VAL(cas) \ + (ESDCFG_TRC(10) | \ + ESDCFG_TRCD(3) | \ + ESDCFG_TCAS(cas) | \ + ESDCFG_TRRD(1) | \ + ESDCFG_TRAS(5) | \ + ESDCFG_TWR | \ + ESDCFG_TMRD(2) | \ + ESDCFG_TRP(2) | \ + ESDCFG_TXP(3)) + +#define SDRAM_ESDCTL_REGISTER_VAL \ + (ESDCTL_PRCT(0) | \ + ESDCTL_BL | \ + ESDCTL_PWDT(0) | \ + ESDCTL_SREFR(3) | \ + ESDCTL_DSIZ_32 | \ + ESDCTL_COL10 | \ + ESDCTL_ROW13 | \ + ESDCTL_SDE) + +#define SDRAM_ALL_VAL 0xf00 + +#define SDRAM_MODE_REGISTER_VAL 0x33 /* BL: 8, CAS: 3 */ +#define SDRAM_EXT_MODE_REGISTER_VAL 0x1000000 + +#define MPCTL0_VAL 0x1ef15d5 + +#define SPCTL0_VAL 0x043a1c09 + +#define CSCR_VAL 0x33f08107 + +#define PCDR0_VAL 0x120470c3 +#define PCDR1_VAL 0x03030303 +#define PCCR0_VAL 0xffffffff +#define PCCR1_VAL 0xfffffffc + +#define AIPI1_PSR0_VAL 0x20040304 +#define AIPI1_PSR1_VAL 0xdffbfcfb +#define AIPI2_PSR0_VAL 0x07ffc200 +#define AIPI2_PSR1_VAL 0xffffffff + +/* + * Memory Info + */ +/* malloc() len */ +#define CONFIG_SYS_MALLOC_LEN (0x10000 + 512 * 1024) +/* reserved for initial data */ +#define CONFIG_SYS_GBL_DATA_SIZE 128 +/* memtest start address */ +#define CONFIG_SYS_MEMTEST_START 0xA0000000 +#define CONFIG_SYS_MEMTEST_END 0xA1000000 /* 16MB RAM test */ +#define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */ +#define CONFIG_STACKSIZE (256 * 1024) /* regular stack */ +#define PHYS_SDRAM_1 0xA0000000 /* DDR Start */ +#define PHYS_SDRAM_1_SIZE 0x08000000 /* DDR size 128MB */ + +/* + * Serial Driver info + */ +#define CONFIG_MXC_UART +#define CONFIG_SYS_MX27_UART1 +#define CONFIG_CONS_INDEX 1 /* use UART0 for console */ +#define CONFIG_BAUDRATE 115200 /* Default baud rate */ +#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } + +/* + * Flash & Environment + */ +#define CONFIG_ENV_IS_IN_FLASH +#define CONFIG_FLASH_CFI_DRIVER +#define CONFIG_SYS_FLASH_CFI +/* Use buffered writes (~10x faster) */ +#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE 1 +/* Use hardware sector protection */ +#define CONFIG_SYS_FLASH_PROTECTION 1 +#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of flash banks */ +/* CS2 Base address */ +#define PHYS_FLASH_1 0xc0000000 +/* Flash Base for U-Boot */ +#define CONFIG_SYS_FLASH_BASE PHYS_FLASH_1 +#define CONFIG_SYS_MAX_FLASH_SECT (PHYS_FLASH_SIZE / \ + CONFIG_SYS_FLASH_SECT_SZ) +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE +#define CONFIG_SYS_MONITOR_LEN 0x40000 /* Reserve 256KiB */ +#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE +/* Address and size of Redundant Environment Sector */ +#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) +#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE + +/* + * Ethernet + */ +#define CONFIG_FEC_MXC +#define CONFIG_FEC_MXC_PHYADDR 0x1f +#define CONFIG_MII +#define CONFIG_NET_MULTI + +/* + * MTD + */ +#define CONFIG_FLASH_CFI_MTD +#define CONFIG_MTD_DEVICE + +/* + * NAND + */ +#define CONFIG_NAND_MXC +#define CONFIG_MXC_NAND_REGS_BASE 0xd8000000 +#define CONFIG_SYS_MAX_NAND_DEVICE 1 +#define CONFIG_SYS_NAND_BASE 0xd8000000 +#define CONFIG_JFFS2_NAND +#define CONFIG_MXC_NAND_HWECC +#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */ + +/* + * SD/MMC + */ +#define CONFIG_MMC +#define CONFIG_GENERIC_MMC +#define CONFIG_MXC_MMC +#define CONFIG_DOS_PARTITION + +/* + * MTD partitions + */ +#define CONFIG_CMD_MTDPARTS + +/* + * U-Boot general configuration + */ +#define CONFIG_SYS_PROMPT "=> " /* Monitor Command Prompt */ +#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ +/* Print buffer sz */ +#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ + sizeof(CONFIG_SYS_PROMPT) + 16) +#define CONFIG_SYS_MAXARGS 16 /* max number of command args */ +/* Boot Argument Buffer Size */ +#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE +#define CONFIG_CMDLINE_EDITING +#define CONFIG_SYS_LONGHELP + +/* + * U-Boot commands + */ +#include +#define CONFIG_CMD_ASKENV +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_DIAG +#define CONFIG_CMD_FAT +#define CONFIG_CMD_JFFS2 +#define CONFIG_CMD_MII +#define CONFIG_CMD_MMC +#define CONFIG_CMD_NAND +#define CONFIG_CMD_PING + +#define CONFIG_BOOTDELAY 5 + +#define CONFIG_LOADADDR 0xa0800000 /* loadaddr env var */ +#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR + +#define xstr(s) str(s) +#define str(s) #s + +#define CONFIG_EXTRA_ENV_SETTINGS \ + "netdev=eth0\0" \ + "nfsargs=setenv bootargs root=/dev/nfs rw " \ + "nfsroot=${serverip}:${rootpath}\0" \ + "ramargs=setenv bootargs root=/dev/ram rw\0" \ + "addip=setenv bootargs ${bootargs} " \ + "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}" \ + ":${hostname}:${netdev}:off panic=1\0" \ + "addtty=setenv bootargs ${bootargs}" \ + " console=ttymxc0,${baudrate}\0" \ + "addmtd=setenv bootargs ${bootargs} ${mtdparts}\0" \ + "addmisc=setenv bootargs ${bootargs}\0" \ + "u-boot=" xstr(CONFIG_HOSTNAME) "/u-boot.bin\0" \ + "kernel_addr_r=a0800000\0" \ + "bootfile=" xstr(CONFIG_HOSTNAME) "/uImage\0" \ + "rootpath=/opt/eldk-4.2-arm/arm\0" \ + "net_nfs=tftp ${kernel_addr_r} ${bootfile};" \ + "run nfsargs addip addtty addmtd addmisc;" \ + "bootm\0" \ + "bootcmd=run net_nfs\0" \ + "load=tftp ${loadaddr} ${u-boot}\0" \ + "update=protect off " xstr(CONFIG_SYS_MONITOR_BASE) \ + " +${filesize};era " xstr(CONFIG_SYS_MONITOR_BASE) \ + " +${filesize};cp.b ${fileaddr} " \ + xstr(CONFIG_SYS_MONITOR_BASE) " ${filesize}\0" \ + "upd=run load update\0" \ + "mtdids=" MTDIDS_DEFAULT "\0" \ + "mtdparts=" MTDPARTS_DEFAULT "\0" \ + +#endif /* __IMX27LITE_COMMON_CONFIG_H */ diff --git a/include/configs/imx27lite.h b/include/configs/imx27lite.h index ee749ecd2..72f6e80ed 100644 --- a/include/configs/imx27lite.h +++ b/include/configs/imx27lite.h @@ -20,158 +20,31 @@ #ifndef __CONFIG_H #define __CONFIG_H +/* include common defines/options for all imx27lite related boards */ +#include "imx27lite-common.h" /* * SoC Configuration */ -#define CONFIG_ARM926EJS /* arm926ejs CPU core */ -#define CONFIG_MX27 #define CONFIG_IMX27LITE -#define CONFIG_MX27_CLK32 32768 /* OSC32K frequency */ -#define CONFIG_SYS_HZ 1000 - -#define CONFIG_DISPLAY_CPUINFO - -#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 - -/* - * Lowlevel configuration - */ -#define SDRAM_ESDCFG_REGISTER_VAL(cas) \ - (ESDCFG_TRC(10) | \ - ESDCFG_TRCD(3) | \ - ESDCFG_TCAS(cas) | \ - ESDCFG_TRRD(1) | \ - ESDCFG_TRAS(5) | \ - ESDCFG_TWR | \ - ESDCFG_TMRD(2) | \ - ESDCFG_TRP(2) | \ - ESDCFG_TXP(3)) - -#define SDRAM_ESDCTL_REGISTER_VAL \ - (ESDCTL_PRCT(0) | \ - ESDCTL_BL | \ - ESDCTL_PWDT(0) | \ - ESDCTL_SREFR(3) | \ - ESDCTL_DSIZ_32 | \ - ESDCTL_COL10 | \ - ESDCTL_ROW13 | \ - ESDCTL_SDE) - -#define SDRAM_ALL_VAL 0xf00 - -#define SDRAM_MODE_REGISTER_VAL 0x33 /* BL: 8, CAS: 3 */ -#define SDRAM_EXT_MODE_REGISTER_VAL 0x1000000 - -#define MPCTL0_VAL 0x1ef15d5 - -#define SPCTL0_VAL 0x043a1c09 - -#define CSCR_VAL 0x33f08107 - -#define PCDR0_VAL 0x120470c3 -#define PCDR1_VAL 0x03030303 -#define PCCR0_VAL 0xffffffff -#define PCCR1_VAL 0xfffffffc - -#define AIPI1_PSR0_VAL 0x20040304 -#define AIPI1_PSR1_VAL 0xdffbfcfb -#define AIPI2_PSR0_VAL 0x07ffc200 -#define AIPI2_PSR1_VAL 0xffffffff - -/* - * Memory Info - */ -/* malloc() len */ -#define CONFIG_SYS_MALLOC_LEN (0x10000 + 512 * 1024) -/* reserved for initial data */ -#define CONFIG_SYS_GBL_DATA_SIZE 128 -/* memtest start address */ -#define CONFIG_SYS_MEMTEST_START 0xA0000000 -#define CONFIG_SYS_MEMTEST_END 0xA1000000 /* 16MB RAM test */ -#define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */ -#define CONFIG_STACKSIZE (256 * 1024) /* regular stack */ -#define PHYS_SDRAM_1 0xA0000000 /* DDR Start */ -#define PHYS_SDRAM_1_SIZE 0x08000000 /* DDR size 128MB */ - -/* - * Serial Driver info - */ -#define CONFIG_MXC_UART -#define CONFIG_SYS_MX27_UART1 -#define CONFIG_CONS_INDEX 1 /* use UART0 for console */ -#define CONFIG_BAUDRATE 115200 /* Default baud rate */ -#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } +#define CONFIG_HOSTNAME imx27 +#define CONFIG_BOARDNAME "LogicPD imx27lite\n" /* * Flash & Environment */ -#define CONFIG_ENV_IS_IN_FLASH -#define CONFIG_FLASH_CFI_DRIVER -#define CONFIG_SYS_FLASH_CFI -/* Use buffered writes (~10x faster) */ -#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE 1 -/* Use hardware sector protection */ -#define CONFIG_SYS_FLASH_PROTECTION 1 -#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of flash banks */ #define CONFIG_SYS_FLASH_SECT_SZ 0x2000 /* 8KB sect size Intel Flash */ -/* end of flash */ #define CONFIG_ENV_OFFSET (PHYS_FLASH_SIZE - 0x20000) -/* CS2 Base address */ -#define PHYS_FLASH_1 0xc0000000 -/* Flash Base for U-Boot */ -#define CONFIG_SYS_FLASH_BASE PHYS_FLASH_1 -/* Flash size 2MB */ #define PHYS_FLASH_SIZE 0x200000 -#define CONFIG_SYS_MAX_FLASH_SECT (PHYS_FLASH_SIZE / \ - CONFIG_SYS_FLASH_SECT_SZ) -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE -#define CONFIG_SYS_MONITOR_LEN 0x40000 /* Reserve 256KiB */ #define CONFIG_ENV_SECT_SIZE 0x10000 /* Env sector Size */ -#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE -/* Address and size of Redundant Environment Sector */ -#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) -#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE - -/* - * Ethernet - */ -#define CONFIG_FEC_MXC -#define CONFIG_FEC_MXC_PHYADDR 0x1f -#define CONFIG_MII -#define CONFIG_NET_MULTI - -/* - * MTD - */ -#define CONFIG_FLASH_CFI_MTD -#define CONFIG_MTD_DEVICE - -/* - * NAND - */ -#define CONFIG_NAND_MXC -#define CONFIG_MXC_NAND_REGS_BASE 0xd8000000 -#define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_SYS_NAND_BASE 0xd8000000 -#define CONFIG_JFFS2_NAND -#define CONFIG_MXC_NAND_HWECC -#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */ /* * SD/MMC */ -#define CONFIG_MMC -#define CONFIG_GENERIC_MMC -#define CONFIG_MXC_MMC #define CONFIG_MXC_MCI_REGS_BASE 0x10014000 -#define CONFIG_DOS_PARTITION /* * MTD partitions */ -#define CONFIG_CMD_MTDPARTS #define MTDIDS_DEFAULT "nor0=physmap-flash.0,nand0=mxc_nand.0" #define MTDPARTS_DEFAULT \ "mtdparts=" \ @@ -186,69 +59,4 @@ "22m(rootfs)," \ "-(userfs)" -/* - * U-Boot general configuration - */ -#define CONFIG_BOOTFILE "uImage" /* Boot file name */ -#define CONFIG_SYS_PROMPT "=> " /* Monitor Command Prompt */ -#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ -/* Print buffer sz */ -#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ - sizeof(CONFIG_SYS_PROMPT) + 16) -#define CONFIG_SYS_MAXARGS 16 /* max number of command args */ -/* Boot Argument Buffer Size */ -#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE -#define CONFIG_CMDLINE_EDITING -#define CONFIG_SYS_LONGHELP - -/* - * U-Boot commands - */ -#include -#define CONFIG_CMD_ASKENV -#define CONFIG_CMD_DHCP -#define CONFIG_CMD_DIAG -#define CONFIG_CMD_FAT -#define CONFIG_CMD_JFFS2 -#define CONFIG_CMD_MII -#define CONFIG_CMD_MMC -#define CONFIG_CMD_NAND -#define CONFIG_CMD_PING - -#define CONFIG_BOOTDELAY 5 - -#define CONFIG_LOADADDR 0xa0800000 /* loadaddr env var */ -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR - -#define xstr(s) str(s) -#define str(s) #s - -#define CONFIG_EXTRA_ENV_SETTINGS \ - "netdev=eth0\0" \ - "nfsargs=setenv bootargs root=/dev/nfs rw " \ - "nfsroot=${serverip}:${rootpath}\0" \ - "ramargs=setenv bootargs root=/dev/ram rw\0" \ - "addip=setenv bootargs ${bootargs} " \ - "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}" \ - ":${hostname}:${netdev}:off panic=1\0" \ - "addtty=setenv bootargs ${bootargs}" \ - " console=ttymxc0,${baudrate}\0" \ - "addmtd=setenv bootargs ${bootargs} ${mtdparts}\0" \ - "addmisc=setenv bootargs ${bootargs}\0" \ - "u-boot=imx27/u-boot.bin\0" \ - "kernel_addr_r=a0800000\0" \ - "hostname=imx27\0" \ - "bootfile=imx27/uImage\0" \ - "rootpath=/opt/eldk-4.2-arm/arm\0" \ - "net_nfs=tftp ${kernel_addr_r} ${bootfile};" \ - "run nfsargs addip addtty addmtd addmisc;" \ - "bootm\0" \ - "bootcmd=run net_nfs\0" \ - "load=tftp ${loadaddr} ${u-boot}\0" \ - "update=protect off " xstr(CONFIG_SYS_MONITOR_BASE) \ - " +${filesize};era " xstr(CONFIG_SYS_MONITOR_BASE) \ - " +${filesize};cp.b ${fileaddr} " \ - xstr(CONFIG_SYS_MONITOR_BASE) " ${filesize}\0" \ - "upd=run load update\0" \ - #endif /* __CONFIG_H */ diff --git a/include/configs/magnesium.h b/include/configs/magnesium.h new file mode 100644 index 000000000..4fb7744ba --- /dev/null +++ b/include/configs/magnesium.h @@ -0,0 +1,71 @@ +/* + * Copyright (C) 2010 Heiko Schocher + * + * based on: + * Copyright (C) 2009 Ilya Yanok + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#ifndef __CONFIG_H +#define __CONFIG_H + +/* include common defines/options for all imx27lite related boards */ +#include "imx27lite-common.h" + +/* + * SoC Configuration + */ +#define CONFIG_MAGNESIUM +#define CONFIG_HOSTNAME magnesium +#define CONFIG_BOARDNAME "Projectiondesign magnesium\n" + +/* + * Flash & Environment + */ +#define CONFIG_SYS_FLASH_SECT_SZ 0x8000 /* 64KB sect size */ +#define CONFIG_ENV_OFFSET (PHYS_FLASH_SIZE - 0x40000) +#define PHYS_FLASH_SIZE 0x800000 +#define CONFIG_ENV_SECT_SIZE 0x20000 /* Env sector Size */ + +/* + * NAND + */ +#define CONFIG_SYS_NAND_LARGEPAGE + +/* + * SD/MMC + */ +#define CONFIG_MXC_MCI_REGS_BASE 0x10013000 + +/* + * MTD partitions + */ +#define MTDIDS_DEFAULT "nor0=physmap-flash.0,nand0=mxc_nand.0" +#define MTDPARTS_DEFAULT \ + "mtdparts=" \ + "physmap-flash.0:" \ + "256k(U-Boot)," \ + "7680k(user)," \ + "128k(env1)," \ + "128k(env2);" \ + "mxc_nand.0:" \ + "128k(IPL-SPL)," \ + "4m(kernel)," \ + "22m(rootfs)," \ + "-(userfs)" + +#endif /* __CONFIG_H */ From 84a6e0d0f8465627f24c5baefa1f425c89b848cd Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 31 Mar 2010 06:32:56 -0700 Subject: [PATCH 163/164] MX51EVK: Remove CPLD related code There is no CPLD on MX51EVK board, so remove CPLD related function. Signed-off-by: Fabio Estevam --- board/freescale/mx51evk/mx51evk.c | 67 ------------------------------- board/freescale/mx51evk/mx51evk.h | 1 - 2 files changed, 68 deletions(-) diff --git a/board/freescale/mx51evk/mx51evk.c b/board/freescale/mx51evk/mx51evk.c index 875456380..f0b7abcf5 100644 --- a/board/freescale/mx51evk/mx51evk.c +++ b/board/freescale/mx51evk/mx51evk.c @@ -72,72 +72,6 @@ static void setup_iomux_uart(void) mxc_iomux_set_pad(MX51_PIN_UART1_CTS, pad); } -static void setup_expio(void) -{ - u32 reg; - struct weim *pweim = (struct weim *)WEIM_BASE_ADDR; - struct clkctl *pclkctl = (struct clkctl *)CCM_BASE_ADDR; - - /* CS5 setup */ - mxc_request_iomux(MX51_PIN_EIM_CS5, IOMUX_CONFIG_ALT0); - writel(0x00410089, &pweim[5].csgcr1); - writel(0x00000002, &pweim[5].csgcr2); - - /* RWSC=50, RADVA=2, RADVN=6, OEA=0, OEN=0, RCSA=0, RCSN=0 */ - writel(0x32260000, &pweim[5].csrcr1); - - /* APR = 0 */ - writel(0x00000000, &pweim[5].csrcr2); - - /* - * WAL=0, WBED=1, WWSC=50, WADVA=2, WADVN=6, WEA=0, WEN=0, - * WCSA=0, WCSN=0 - */ - writel(0x72080F00, &pweim[5].cswcr1); - - mx51_io_board = (struct io_board_ctrl *)(CS5_BASE_ADDR + - IO_BOARD_OFFSET); - if ((readw(&mx51_io_board->id1) == 0xAAAA) && - (readw(&mx51_io_board->id2) == 0x5555)) { - if (is_soc_rev(CHIP_REV_2_0) < 0) { - reg = readl(&pclkctl->cbcdr); - reg = (reg & (~0x70000)) | 0x30000; - writel(reg, &pclkctl->cbcdr); - /* make sure divider effective */ - while (readl(&pclkctl->cdhipr) != 0) - ; - writel(0x0, &pclkctl->ccdr); - } - } else { - /* CS1 */ - writel(0x00410089, &pweim[1].csgcr1); - writel(0x00000002, &pweim[1].csgcr2); - /* RWSC=50, RADVA=2, RADVN=6, OEA=0, OEN=0, RCSA=0, RCSN=0 */ - writel(0x32260000, &pweim[1].csrcr1); - /* APR=0 */ - writel(0x00000000, &pweim[1].csrcr2); - /* - * WAL=0, WBED=1, WWSC=50, WADVA=2, WADVN=6, WEA=0, - * WEN=0, WCSA=0, WCSN=0 - */ - writel(0x72080F00, &pweim[1].cswcr1); - mx51_io_board = (struct io_board_ctrl *)(CS1_BASE_ADDR + - IO_BOARD_OFFSET); - } - - /* Reset interrupt status reg */ - writew(0x1F, &(mx51_io_board->int_rest)); - writew(0x00, &(mx51_io_board->int_rest)); - writew(0xFFFF, &(mx51_io_board->int_mask)); - - /* Reset the XUART and Ethernet controllers */ - reg = readw(&(mx51_io_board->sw_reset)); - reg |= 0x9; - writew(reg, &(mx51_io_board->sw_reset)); - reg &= ~0x9; - writew(reg, &(mx51_io_board->sw_reset)); -} - static void setup_iomux_fec(void) { /*FEC_MDIO*/ @@ -349,7 +283,6 @@ int board_init(void) gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100; setup_iomux_uart(); - setup_expio(); setup_iomux_fec(); return 0; } diff --git a/board/freescale/mx51evk/mx51evk.h b/board/freescale/mx51evk/mx51evk.h index 524cdcced..2854e71e8 100644 --- a/board/freescale/mx51evk/mx51evk.h +++ b/board/freescale/mx51evk/mx51evk.h @@ -47,5 +47,4 @@ struct io_board_ctrl { }; #endif -#define IO_BOARD_OFFSET (0x20000) #endif From 07739bcef5da07cc4a4edef8b91014ccc332eda3 Mon Sep 17 00:00:00 2001 From: Stefano Babic Date: Sun, 28 Mar 2010 13:43:26 +0200 Subject: [PATCH 164/164] Moved board specific values in config file The lowlevel_init file contained some hard-coded values to setup the RAM. These board related values are moved into the board configuration file. Signed-off-by: Stefano Babic --- arch/arm/cpu/arm_cortexa8/mx51/lowlevel_init.S | 5 ++++- include/configs/mx51evk.h | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/arm/cpu/arm_cortexa8/mx51/lowlevel_init.S b/arch/arm/cpu/arm_cortexa8/mx51/lowlevel_init.S index 31af9e2b5..783c81f72 100644 --- a/arch/arm/cpu/arm_cortexa8/mx51/lowlevel_init.S +++ b/arch/arm/cpu/arm_cortexa8/mx51/lowlevel_init.S @@ -158,6 +158,7 @@ /* Switch peripheral to PLL 3 */ ldr r0, =CCM_BASE_ADDR ldr r1, =0x000010C0 + orr r1,r1,#CONFIG_SYS_DDR_CLKSEL str r1, [r0, #CLKCTL_CBCMR] ldr r1, =0x13239145 str r1, [r0, #CLKCTL_CBCDR] @@ -171,6 +172,7 @@ ldr r1, =0x19239145 str r1, [r0, #CLKCTL_CBCDR] ldr r1, =0x000020C0 + orr r1,r1,#CONFIG_SYS_DDR_CLKSEL str r1, [r0, #CLKCTL_CBCMR] mov r3, #DP_OP_216 @@ -201,9 +203,10 @@ /* setup the rest */ /* Use lp_apm (24MHz) source for perclk */ ldr r1, =0x000020C2 + orr r1,r1,#CONFIG_SYS_DDR_CLKSEL str r1, [r0, #CLKCTL_CBCMR] /* ddr clock from PLL 1, all perclk dividers are 1 since using 24MHz */ - ldr r1, =0x59E35100 + ldr r1, =CONFIG_SYS_CLKTL_CBCDR str r1, [r0, #CLKCTL_CBCDR] /* Restore the default values in the Gate registers */ diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index 903fe6da7..3626df73d 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -160,6 +160,9 @@ #define PHYS_SDRAM_1 CSD0_BASE_ADDR #define PHYS_SDRAM_1_SIZE (512 * 1024 * 1024) +#define CONFIG_SYS_DDR_CLKSEL 0 +#define CONFIG_SYS_CLKTL_CBCDR 0x59E35100 + /*----------------------------------------------------------------------- * FLASH and environment organization */