Re: [U-Boot] Patch submission process
Vipin KUMAR wrote: > On 4/1/2010 2:45 PM, Wolfgang Denk wrote: >> Dear Vipin KUMAR, >> >> In message <4bb45f3d.8040...@st.com> you wrote: >>> After reading about the patch submission process, I felt that patches >>> can only be sent when the merging window is open but patches are being >>> continuously sent and reviewed. >>> >>> Is it correct to assume that a patch can be sent at any time and will >>> only be applied to the mainline code during the merging window >> First, please keep in mind that there are different types of patches. >> >> - There are bug fixes that correct problems in the existing code. >> These can go in moe or less any time. In reality, it depends on how >> urgent the problem is and how intrusive the bug fix is. Urgent >> fixes and low-intrusive patches go in more easily - for example, if >> a bug breaks support for a number of boards it makes no sense to >> continue with the release process without adding this patch - it is >> the urgency here that counts. On the other hand, if a patch fixes a >> spelling error in one of the README files, it is NOT urgent, but >> may go in quickly anyway, because it is obvious that applying this >> change has no impact on other parts of the code. Compare a patch >> that fixxes a bug that gets triggered under certain conditions >> only, but that requiires heavy vchanges to a lot of files - such a >> patch will go in early in the release process, but not if we are >> approaching the scheduled release date. If the patch is a bug fix that should go in a release, please let me know. >> >> - There are patches that add new features and/or support for new >> boards and processors. Such patches get accepted for mainline only >> when the merge window is open. It makes sense to post such patches >> before that, to get initial review comments and to have the patches >> clean and ready for posting when the merge window opens. >> >> Some custodians even accept patches before that, and add these for >> example to their respective "next" branches. This is mostly a matter >> of the personal style of working of the respective custodian. I will take patches or pull requests at any time. Usually they go to arm/master. Outside of the merge window they go arm/next. Tom >> >> - Then there are patches that are intended as RFC, i. e. that are >> mainly intended to illustrate an idea and ask for discussion of a >> specific implementation. Such patches are not intended for inclusion >> into mainline and thus it makes not much sense to synchronize these >> with the release schedule. >> >> > > Yes, I understand it well now. > Thanks for a elaborate reply > >> Hope this helps. >> >> Best regards, >> >> Wolfgang Denk >> > ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 2/2] Fix compile errors for atmel_nand with hw-ecc and new SoC access
Alexander Holler wrote:
> atmel_nand.c with HW-ECC doesn't compile with the new SoC access.
> Using CONFIG_AT91_LEGACY to circumvent the compile errors only leaves
> the driver in a state where it doesn't find the NAND.
>
> To use HW-ECC with atmel_nand one has to use
> CONFIG_SYS_NAND_ECC_BASE AT91_ECC0_BASE (instead of AT91_ECC0)
> for an AT91SAM9263 or AT91_ECC_BASE for an AT91SAM9260.
>
Nak
The new Soc access is the preferred method.
The fix should use the Soc access, not the legacy method.
Tom
> I've removed three unused variables too.
> ---
> drivers/mtd/nand/atmel_nand.c |7 +++
> 1 files changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c
> index d5eb54a..5f10a02 100644
> --- a/drivers/mtd/nand/atmel_nand.c
> +++ b/drivers/mtd/nand/atmel_nand.c
> @@ -35,9 +35,9 @@
>
> /* Register access macros */
> #define ecc_readl(add, reg) \
> - readl(AT91_BASE_SYS + add + ATMEL_ECC_##reg)
> + readl(add + ATMEL_ECC_##reg)
> #define ecc_writel(add, reg, value) \
> - writel((value), AT91_BASE_SYS + add + ATMEL_ECC_##reg)
> + writel((value), add + ATMEL_ECC_##reg)
>
> #include "atmel_nand_ecc.h" /* Hardware ECC registers */
>
> @@ -79,7 +79,6 @@ static struct nand_ecclayout atmel_oobinfo_small = {
> 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 */
> @@ -167,7 +166,7 @@ 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_status;
> unsigned int ecc_word, ecc_bit;
>
> /* get the status from the Status Register */
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Contact My Lawyer
I am Mrs Claire page.i am very sick in the hospital Please contact my lawyer for an urgent message Email peterfoxchamb...@gala.net ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] 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 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index 058fdf1..1cb7067 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 */ -- 1.6.4.2 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] configs/openrd_base.h: reordered macros
moved CONFIG_CMD_FAT to filesystem section swappeda CONFIG_CMD_NAND and CONFIG_CMD_MII so they are alpha correct Signed-off-by: Frans Meulenbroeks --- include/configs/openrd_base.h |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/openrd_base.h b/include/configs/openrd_base.h index 88f27ba..d2f4502 100644 --- a/include/configs/openrd_base.h +++ b/include/configs/openrd_base.h @@ -99,9 +99,8 @@ #define CONFIG_CMD_AUTOSCRIPT #define CONFIG_CMD_DHCP #define CONFIG_CMD_ENV -#define CONFIG_CMD_FAT -#define CONFIG_CMD_NAND #define CONFIG_CMD_MII +#define CONFIG_CMD_NAND #define CONFIG_CMD_PING #define CONFIG_CMD_USB @@ -208,6 +207,7 @@ /* * File system */ +#define CONFIG_CMD_FAT #define CONFIG_CMD_UBI #define CONFIG_CMD_UBIFS #define CONFIG_RBTREE -- 1.6.4.2 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 2/2] Fix compile errors for atmel_nand with hw-ecc and new SoC access
Hi, please just forget my patches. I don't feel the need to waste your and my time in posting examples of my obivous incompetence and I'm long out of school and don't want to take lessons about exploring how other people want their names of variables. Happy easter, Alexander ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] configs/sheevaplug: added a few additional commands
This patch includes a few additional commands in the sheevaplug version of u-boot: - support for LONGHELP so you can get help messages - auto completion and command editing - ubi and mii support - ext2 filesystem (convenient if you have an ext2 from which you want to boot) - jffs2 and ubifs filesystems (if you want to use these in NAND) This also makes it more similar to openrd client. Side effect of this patch is that the code now needs 3 sectors i.s.o. 2 so an existing env is overwritten Signed-off-by: Frans Meulenbroeks --- Have fun! Frans. --- include/configs/sheevaplug.h | 27 ++- 1 files changed, 22 insertions(+), 5 deletions(-) diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index fc401a8..e9edc44 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -85,6 +85,7 @@ #defineCONFIG_SYS_CBSIZE 1024/* Console I/O Buff Size */ #defineCONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE \ +sizeof(CONFIG_SYS_PROMPT) + 16)/* Print Buff */ + /* * Commands configuration */ @@ -93,7 +94,7 @@ #define CONFIG_CMD_AUTOSCRIPT #define CONFIG_CMD_DHCP #define CONFIG_CMD_ENV -#define CONFIG_CMD_FAT +#define CONFIG_CMD_MII #define CONFIG_CMD_NAND #define CONFIG_CMD_PING #define CONFIG_CMD_USB @@ -123,8 +124,8 @@ * it has to be rounded to sector size */ #define CONFIG_ENV_SIZE0x2 /* 128k */ -#define CONFIG_ENV_ADDR0x4 -#define CONFIG_ENV_OFFSET 0x4 /* env starts here */ +#define CONFIG_ENV_ADDR0x6 +#define CONFIG_ENV_OFFSET 0x6 /* env starts here */ /* * Default environment variables @@ -145,14 +146,16 @@ /* * Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (1024 * 128) /* 128kB for malloc() */ +#define CONFIG_SYS_MALLOC_LEN (1024 * 1024) /* 1 MiB for malloc() */ /* size in bytes reserved for initial data */ #define CONFIG_SYS_GBL_DATA_SIZE 128 /* * Other required minimal configurations */ -#define CONFIG_CONSOLE_INFO_QUIET /* some code reduction */ +#define CONFIG_SYS_LONGHELP +#define CONFIG_AUTO_COMPLETE +#define CONFIG_CMDLINE_EDITING #define CONFIG_ARCH_CPU_INIT /* call arch_cpu_init() */ #define CONFIG_ARCH_MISC_INIT /* call arch_misc_init() */ #define CONFIG_DISPLAY_CPUINFO /* Display cpu info */ @@ -192,4 +195,18 @@ #define CONFIG_SUPPORT_VFAT #endif /* CONFIG_CMD_USB */ +/* + * File system + */ +#define CONFIG_CMD_EXT2 +#define CONFIG_CMD_FAT +#define CONFIG_CMD_JFFS2 +#define CONFIG_CMD_UBI +#define CONFIG_CMD_UBIFS +#define CONFIG_RBTREE +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ +#define CONFIG_MTD_PARTITIONS +#define CONFIG_CMD_MTDPARTS +#define CONFIG_LZO + #endif /* _CONFIG_SHEEVAPLUG_H */ -- 1.6.4.2 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] cmd_nand.c: converted to new style subcmd handling
converted to new style subcmd handling.
partly tested on sheevaplug
read and information commands tested on sheevaplug
(sorry did not want to nuke my device so I did not want to
test things like nand scrub)
Signed-off-by: Frans Meulenbroeks
---
note that nand biterr has no implementation
---
common/cmd_nand.c | 595 ++---
1 files changed, 386 insertions(+), 209 deletions(-)
diff --git a/common/cmd_nand.c b/common/cmd_nand.c
index 9b0c930..d537b4b 100644
--- a/common/cmd_nand.c
+++ b/common/cmd_nand.c
@@ -204,281 +204,458 @@ static void nand_print_info(int idx)
nand->name, nand->erasesize >> 10);
}
-int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+static int nand_quiet(void)
{
- int i, dev, ret = 0;
- ulong addr, off;
- size_t size;
- char *cmd, *s;
- nand_info_t *nand;
+ const char *quiet_str = getenv("quiet");
#ifdef CONFIG_SYS_NAND_QUIET
int quiet = CONFIG_SYS_NAND_QUIET;
#else
int quiet = 0;
#endif
- const char *quiet_str = getenv("quiet");
-
- /* at least two arguments please */
- if (argc < 2)
- goto usage;
-
if (quiet_str)
quiet = simple_strtoul(quiet_str, NULL, 0) != 0;
+ return quiet;
+}
- cmd = argv[1];
+static nand_info_t *get_nand(void)
+{
+ /* the following commands operate on the current device */
+ if (nand_curr_device < 0 || nand_curr_device >=
CONFIG_SYS_MAX_NAND_DEVICE ||
+ !nand_info[nand_curr_device].name) {
+ puts("\nno devices available\n");
+ return NULL;
+ }
+ return &nand_info[nand_curr_device];
+}
- if (strcmp(cmd, "info") == 0) {
+static int do_nand_info(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+{
+ int i;
- putc('\n');
- for (i = 0; i < CONFIG_SYS_MAX_NAND_DEVICE; i++) {
- if (nand_info[i].name)
- nand_print_info(i);
- }
- return 0;
+ putc('\n');
+ for (i = 0; i < CONFIG_SYS_MAX_NAND_DEVICE; i++) {
+ if (nand_info[i].name)
+ nand_print_info(i);
}
+ return 0;
+}
- if (strcmp(cmd, "device") == 0) {
+static int do_nand_device(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+{
+ int dev;
- if (argc < 3) {
- putc('\n');
- if ((nand_curr_device < 0) ||
- (nand_curr_device >= CONFIG_SYS_MAX_NAND_DEVICE))
- puts("no devices available\n");
- else
- nand_print_info(nand_curr_device);
- return 0;
- }
- dev = (int)simple_strtoul(argv[2], NULL, 10);
- if (dev < 0 || dev >= CONFIG_SYS_MAX_NAND_DEVICE ||
!nand_info[dev].name) {
- puts("No such device\n");
- return 1;
- }
- printf("Device %d: %s", dev, nand_info[dev].name);
- puts("... is now current device\n");
- nand_curr_device = dev;
+ if (argc < 2) {
+ putc('\n');
+ if ((nand_curr_device < 0) ||
+ (nand_curr_device >= CONFIG_SYS_MAX_NAND_DEVICE))
+ puts("no devices available\n");
+ else
+ nand_print_info(nand_curr_device);
+ return 0;
+ }
+ dev = (int)simple_strtoul(argv[1], NULL, 10);
+ if (dev < 0 || dev >= CONFIG_SYS_MAX_NAND_DEVICE ||
!nand_info[dev].name) {
+ puts("No such device\n");
+ return 1;
+ }
+ printf("Device %d: %s", dev, nand_info[dev].name);
+ puts("... is now current device\n");
+ nand_curr_device = dev;
#ifdef CONFIG_SYS_NAND_SELECT_DEVICE
- /*
-* Select the chip in the board/cpu specific driver
-*/
- board_nand_select_device(nand_info[dev].priv, dev);
+ /*
+* Select the chip in the board/cpu specific driver
+*/
+ board_nand_select_device(nand_info[dev].priv, dev);
#endif
- return 0;
+ return 0;
+}
+
+static int do_nand_read(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+{
+ int ret = 0;
+ size_t size;
+ ulong off;
+ ulong addr;
+ char *s;
+ nand_info_t *nand;
+
+ nand = get_nand();
+ if (!nand)
+ return 1;
+
+ if (argc < 4)
+ {
+ cmd_usage(cmdtp);
+ return 1;
}
- if (strcmp(cmd, "bad") != 0 && strcmp(cmd, "erase") != 0 &&
- strncmp(cmd, "dump", 4) != 0 &&
- strncmp(cmd, "read", 4) != 0 && strncmp(cmd, "write", 5) != 0 &&
- strcmp(cmd, "scrub") != 0 && st
[U-Boot] [PATCH] PXAMMC: Drop different delays for PXA27X
In case the delays were set to 1, the MMC card on PXA27X boards (and PXA3xx
boards) didn't initialize on first try. Increasing the delays and leaving just
those for PXA25x and 26x (that is 20) fixes this problem.
Signed-off-by: Marek Vasut
---
drivers/mmc/pxa_mmc.c |8
1 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/drivers/mmc/pxa_mmc.c b/drivers/mmc/pxa_mmc.c
index 8225235..b155541 100644
--- a/drivers/mmc/pxa_mmc.c
+++ b/drivers/mmc/pxa_mmc.c
@@ -584,11 +584,7 @@ mmc_legacy_init(int verbose)
debug("Detected SD card\n");
break;
}
-#ifdef CONFIG_PXA27X
- udelay(1);
-#else
udelay(20);
-#endif
}
if (retries <= 0 || !(IF_TYPE_SD == mmc_dev.if_type)) {
@@ -598,11 +594,7 @@ mmc_legacy_init(int verbose)
retries = 10;
while (retries-- && resp && !(resp[0] & 0x8000)) {
-#ifdef CONFIG_PXA27X
- udelay(1);
-#else
udelay(20);
-#endif
resp =
mmc_cmd(MMC_CMD_SEND_OP_COND, 0x00ff, 0x8000,
MMC_CMDAT_R3);
--
1.7.0
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 02/20] 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 f85bef5..fb93531 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 f85bef5..fb93531 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 f85bef5..fb93531 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 3c0b46f..b50e1f2 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 3c0b46f..b50e1f2 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 bc14257..95d0fcc 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 3c0b46f..b50e1f2 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 42ff946..aff12e9 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 cfad21a..b517025 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 mo
[U-Boot] [PATCH v2 00/20] Reorganize directory structure
This series reorganizes U-Boot's directory structure so that it looks like: /arch/$ARCH/ /lib/ /include/asm/ /cpu/ /config.mk (old lib_$ARCH/config.mk) /lib/ / /libfdt/ /lzma/ /lzo/ Patches 8 through 19 can be squashed if desired, I split them up to keep the series somewhat manageable. Some of the patches still exceed the mailinglist's arbitrary size limit. I can post the series on a website if needed. I compile tested on PPC, mips, and blackfin and no new errors were introduced. The previous discussion about this series can be seen at http://lists.denx.de/pipermail/u-boot/2009-December/065391.html Changes since v1: - Convert to using directory-specific CFLAGS - No cpu subdirectories for 1-CPU architectures (eg blackfin, mips, etc) as mentioned by Mike Frysinger - Fix libfdt path typo pointed out by Luigi Mantellini - Added final README fixup patch Peter Tyser (20): Create CPUDIR variable Change directory-specific CFLAGS to use full path Move lib_$ARCH directories to arch/$ARCH/lib Rename lib_generic/ to lib/ Move libfdt/ into lib/ Replace "#include " with "#include " Move architecture-specific includes to arch/$ARCH/include/asm ppc: Move cpu/$CPU to arch/ppc/cpu/$CPU sh: Move cpu/$CPU to arch/sh/cpu/$CPU arm: Move cpu/$CPU to arch/arm/cpu/$CPU m68k: Move cpu/$CPU to arch/m68k/cpu/$CPU blackfin: Move cpu/blackfin/* to arch/blackfin/cpu/* mips: Move cpu/mips/* to arch/mips/cpu/* avr32: Move cpu/at32ap/* to arch/avr32/cpu/* microblaze: Move cpu/microblaze/* to arch/microblaze/cpu/* i386: Move cpu/i386/* to arch/i386/cpu/* sparc: Move cpu/leon[23] to arch/sparc/cpu/leon[23] nios: Move cpu/nios/* to arch/nios/cpu/* nios2: Move cpu/nios2/* to arch/nios2/cpu/* Update README to reflect new directory structure ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 01/20] 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|5 +++-- 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, 29 insertions(+), 28 deletions(-) diff --git a/Makefile b/Makefile index 4532550..a8e3f0d 100644 --- a/Makefile +++ b/Makefile @@ -169,16 +169,16 @@ include $(TOPDIR)/config.mk # # U-Boot objectsorder 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 e38af73..3f5447a 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 7de0f7c..86f138c 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 c8279ec..af70ec2 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 = 0x9780 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 0f7a048..1f9f7b6 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 cb1c4af..ee9ca28 100644 --- a/config.mk +++ b/config.mk @@ -114,10 +1
[U-Boot] [PATCH v2 05/20] 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 6b0d0ab..7c96282 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 a6f11c9..749d994 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 82c2728..8407277 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)/to
[U-Boot] [PATCH v2 06/20] 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 +- cpu/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 a5c9d6d..7439c80 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 0b66796..993bec3 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 811a96a..153fa81 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 1c74a82..90598f6 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 fb54dea..513b0fc 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 8bcfbb1..e7c75df 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 363d793..4da5869 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 bc8cb0c..32fb8c5 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 3c0e400..f090070 100644 --- a/board/amcc/sequoia/init.S +++ b/board/amcc/sequoia/init.S @@ -22
[U-Boot] [PATCH v2 09/20] 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 6db5a00..e4e8b60 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 1e55b83..8afe160 100644
--- a/cp
[U-Boot] [PATCH v2 12/20] 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
.../blackfin/cpu}/bootrom-asm-offsets.awk |0
.../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 80138f7..2235c64 100644
--- a/Makefile
+++ b/Makefile
@@ -3740,7 +3740,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 arc
[U-Boot] [PATCH v2 13/20] 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 42756f5..b3c6d51 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 59873d5..8c3b55a 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 773e446..2510ddf 1006
[U-Boot] [PATCH v2 14/20] 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
.../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 insertions(+), 1 deletions(-)
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 0dcacb9..cc0f137 100644
--- a/board/mimc/mimc200/mimc200.c
+++ b/board/mimc/
[U-Boot] [PATCH v2 11/20] 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/
[U-Boot] [PATCH v2 16/20] 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 8d324d9..07426fe 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 a08632d..521fd35 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/TO
[U-Boot] [PATCH v2 15/20] 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
.../microblaze => arch/microblaze/cpu}/exception.c |0
.../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 insertions(+), 1 deletions(-)
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 c20c6dd..ee41145 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 = .;
}
--
1.6.2.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 18/20] 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 98ee8f8..50c3fe7 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 98ee8f8..50c3fe7 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 e2eb3aa..b909e94 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 e2eb3aa..b909e94 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 e2eb3aa..b909e94 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 b2d88a5..f155800 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/psyen
[U-Boot] [PATCH v2 19/20] 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}/serial.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
10 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}/serial.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/serial.c b/arch/nios2/cpu/serial.c
similarity index 100%
rename from cpu/nios2/serial.c
rename to arch/nios2/cpu/serial.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
--
1.6.2.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 17/20] 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
[U-Boot] [PATCH v2 20/20] 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 files changed, 91 insertions(+), 67 deletions(-) diff --git a/README b/README index 2162617..e63eb69 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 -- boardBoard dependent files -- common Misc architecture independent functions -- cpu CPU specific files - - 74xx_7xx Files specific to Freescale MPC74xx and 7xx CPUs - - arm720tFiles specific to ARM 720 CPUs - - arm920tFiles 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 - - arm925tFiles specific to ARM 925 CPUs - - arm926ejs Files specific to ARM 926 CPUs - - arm1136Files 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 - - ixpFiles specific to Intel XScale IXP CPUs - - leon2 Files specific to Gaisler LEON2 SPARC CPU - - leon3 Files specific to Gaisler LEON3 SPARC CPU - - mcf52x2Files specific to Freescale ColdFire MCF52x2 CPUs - - mcf5227x Files specific to Freescale ColdFire MCF5227x CPUs - - mcf532xFiles 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 - - mpc5xxxFiles specific to Freescale MPC5xxx CPUs - - mpc8xx Files specific to Freescale MPC8xx CPUs - - mpc8220Files specific to Freescale MPC8220 CPUs - - mpc824xFiles specific to Freescale MPC824x CPUs - - mpc8260Files specific to Freescale MPC8260 CPUs - - mpc85xxFiles 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 - - pxaFiles specific to Intel XScale PXA CPUs - - s3c44b0Files 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/libFiles generic to Blackfin architecture -- lib Files generic to all architectures -- arch/i386/libFiles generic to i386architecture -- arch/m68k/libFiles generic to m68karchitecture -- arch/microblaze/lib Files generic to microblaze architecture -- arch/mips/libFiles generic to MIPSarchitecture -- arch/nios/libFiles generic to NIOSarchitecture -- 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 -- toolsTools 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 +/at91rm9200Files 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
[U-Boot] [PATCH] mkimage: Fix strict-aliasing compiler warning
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 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/tools/mkimage.c b/tools/mkimage.c
index 5c3e872..f5859d7 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",
--
1.6.2.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] 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
---
common/cmd_ubi.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/common/cmd_ubi.c b/common/cmd_ubi.c
index 54faac1..2484b40 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];
--
1.6.2.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Patch submission process
Hello Tom, >>> In message <4bb45f3d.8040...@st.com> you wrote: After reading about the patch submission process, I felt that patches can only be sent when the merging window is open but patches are being continuously sent and reviewed. Is it correct to assume that a patch can be sent at any time and will only be applied to the mainline code during the merging window >>> First, please keep in mind that there are different types of patches. >>> >>> - There are bug fixes that correct problems in the existing code. >>> These can go in moe or less any time. In reality, it depends on how >>> urgent the problem is and how intrusive the bug fix is. Urgent >>> fixes and low-intrusive patches go in more easily - for example, if >>> a bug breaks support for a number of boards it makes no sense to >>> continue with the release process without adding this patch - it is >>> the urgency here that counts. On the other hand, if a patch fixes a >>> spelling error in one of the README files, it is NOT urgent, but >>> may go in quickly anyway, because it is obvious that applying this >>> change has no impact on other parts of the code. Compare a patch >>> that fixxes a bug that gets triggered under certain conditions >>> only, but that requiires heavy vchanges to a lot of files - such a >>> patch will go in early in the release process, but not if we are >>> approaching the scheduled release date. > > If the patch is a bug fix that should go in a release, > please let me know. > No, it was just for clarification mainly. Thanks for your inputs >>> >>> - There are patches that add new features and/or support for new >>> boards and processors. Such patches get accepted for mainline only >>> when the merge window is open. It makes sense to post such patches >>> before that, to get initial review comments and to have the patches >>> clean and ready for posting when the merge window opens. >>> >>> Some custodians even accept patches before that, and add these for >>> example to their respective "next" branches. This is mostly a matter >>> of the personal style of working of the respective custodian. > > I will take patches or pull requests at any time. > Usually they go to arm/master. > Outside of the merge window they go arm/next. > OK > Tom > > Regards Vipin ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] net: Kirkwood_egiga.c: fixed build warnings
Hi Prafulla, On 3/3/2010 1:57 AM, Prafulla Wadaskar wrote: > This patch fixes following build warnings for kirkwood_egiga.c > > kirkwood_egiga.c: In function ‘kwgbe_init’: > kirkwood_egiga.c:448: warning: dereferencing type-punned pointer will break > strict-aliasing rules > kirkwood_egiga.c: In function ‘kwgbe_recv’: > kirkwood_egiga.c:609: warning: dereferencing type-punned pointer will break > strict-aliasing rules > > Signed-off-by: Prafulla Wadaskar > --- > Applied to net repo. thanks, Ben ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] DM9000: fix build when debugging is enabled
Hi Mike,
On 3/24/2010 3:21 PM, Mike Frysinger wrote:
From: Brent Kandetzki
The debug code uses the gcc __func__ define, but tries to use it as a
static const string which no longer works. So treat it like a normal
printf string argument.
Signed-off-by: Brent Kandetzki
Signed-off-by: Mike Frysinger
---
drivers/net/dm9000x.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/dm9000x.c b/drivers/net/dm9000x.c
index 73dd335..a7fef56 100644
--- a/drivers/net/dm9000x.c
+++ b/drivers/net/dm9000x.c
@@ -75,7 +75,7 @@ TODO: external MII is not functional, only internal at the
moment.
#define DM9000_DMP_PACKET(func,packet,length) \
do { \
int i; \
- printf(func ": length: %d\n", length);\
+ printf("%s: length: %d\n", func, length); \
for (i = 0; i< length; i++) { \
if (i % 8 == 0) \
printf("\n%s: %02x: ", func, i); \
An identical patch was applied in December (commit
076cd24cb4278c125c8f36df386852dc0fcfefae). Am I missing something?
regards,
Ben
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [RFC][PATCH 19/21] [eNET] Add support for onboard RTL8100B (RTL8139) chips
HI Graeme,
On 3/25/2010 4:23 AM, Graeme Russ wrote:
> ---
> I simply do not know why PCI_BASE_ADDRESS_1 has to be changed to
> PCI_BASE_ADDRESS_0 - Please comment
>
> board/eNET/eNET.c | 12
> drivers/net/rtl8139.c |2 +-
> include/asm-i386/ic/sc520.h |6 +++---
> include/configs/eNET.h |9 -
> 4 files changed, 24 insertions(+), 5 deletions(-)
>
> diff --git a/board/eNET/eNET.c b/board/eNET/eNET.c
> index 52ea140..9d782f3 100644
> --- a/board/eNET/eNET.c
> +++ b/board/eNET/eNET.c
> @@ -24,6 +24,8 @@
> #include
> #include
> #include
> +#include
> +#include
>
> #ifdef CONFIG_HW_WATCHDOG
> #include
> @@ -173,3 +175,13 @@ ulong board_flash_get_legacy (ulong base, int banknum,
> flash_info_t * info)
> } else
> return 0;
> }
> +
> +int board_eth_init(bd_t *bis)
> +{
> + int adapters;
> + adapters = pci_eth_init(bis);
> +
> + if (adapters> 0)
> + eth_init(bis);
>
I'm not sure why you're calling eth_init() here. Are you sure that's
what you want to do? Keep in mind that board_eth_init() gets called by
eth_initialize() in the common net code.
> +
> + return adapters;
> diff --git a/drivers/net/rtl8139.c b/drivers/net/rtl8139.c
> index db8a727..a3df564 100644
> --- a/drivers/net/rtl8139.c
> +++ b/drivers/net/rtl8139.c
> @@ -214,7 +214,7 @@ int rtl8139_initialize(bd_t *bis)
> if ((devno = pci_find_devices(supported, idx++))< 0)
> break;
>
> - pci_read_config_dword(devno, PCI_BASE_ADDRESS_1,&iobase);
> + pci_read_config_dword(devno, PCI_BASE_ADDRESS_0,&iobase);
>
Are you fixing a bug here? This seems like a change that would have
fairly wide-ranging implications beyond your board.
regards,
Ben
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 01/28] nios2: add nios2-generic board
Hi Thomas,
On 3/19/2010 12:43 AM, Thomas Chou wrote:
> This is a generic approach to port u-boot for nios2 boards.
> It uses a new set of device drivers, such as the cfi flash, spi
> lash, nand flash and new ethernet drivers.
>
>
> +#ifdef CONFIG_CMD_NET
> +int board_eth_init(bd_t *bis)
> +{
> + int rc = 0;
> +#ifdef CONFIG_SMC9
> + rc = smc9_initialize(bis, CONFIG_SMC9_BASE);
> +#endif
> +
> +#ifdef CONFIG_DRIVER_DM9000
> + rc = dm9000_initialize(bis);
> +#endif
> +
> +#ifdef CONFIG_ALTERA_TSE
> + altera_tse_init(bis, CONFIG_SYS_NUM_TSE_MACS);
> +#endif
> +
> +#ifdef CONFIG_ETHOC
> + rc = ethoc_initialize(bis, CONFIG_SYS_ETHOC_BASE);
> +#endif
> + return rc;
> +}
>
Please clean up the return code handling. The drivers are not mutually
exclusive.
> +
> +#define CONFIG_ETHADDR 08:00:3e:26:0a:5b
> +#define CONFIG_NETMASK 255.255.255.0
> +#define CONFIG_IPADDR192.168.2.21
> +#define CONFIG_SERVERIP 192.168.2.16
> +
>
Please remove these definitions
regards,
Ben
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] fix lockup in mcfmii/mii_discover_phy() in case communication fails
Hi Wolfgang,
On 3/30/2010 10:19 AM, Wolfgang Wegner wrote:
> Signed-off-by: Wolfgang Wegner
> ---
> drivers/net/mcfmii.c |6 +-
> 1 files changed, 5 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/net/mcfmii.c b/drivers/net/mcfmii.c
> index 4acc29e..83c0873 100644
> --- a/drivers/net/mcfmii.c
> +++ b/drivers/net/mcfmii.c
> @@ -185,7 +185,11 @@ int mii_discover_phy(struct eth_device *dev)
> printf("PHY @ 0x%x pass %d\n", phyno, pass);
> #endif
>
> - for (i = 0; i< (sizeof(phyinfo) /
> sizeof(phy_info_t)); i++) {
> + for (i = 0;
> + (i< (sizeof(phyinfo)
> + / sizeof(phy_info_t)))
> + && (phyinfo[i].phyid != 0);
> + i++) {
> if (phyinfo[i].phyid == phytype) {
> #ifdef ET_DEBUG
> printf("phyid %x - %s\n",
>
This is brutal. Using 8-space tabs really does a good job of
highlighting deep nesting of conditionals. If you're unable to make the
driver easier to read (and I understand if that's the case), my
preference would be to keep the sizeof()s on one line and combine the
second && term and the i++ on another. This makes lines > 80 chars, but
it was already that way.
regards,
Ben
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 2/5 v2] nios2: add Altera EP2C35 board
Hi Thomas, On 3/30/2010 9:03 PM, Thomas Chou wrote: > This patch supports the Altera CycloneII Nios dev board using > the example FPGA design at http://nioswiki.com/Linux. > > Signed-off-by: Thomas Chou > --- > +/* #define CONFIG_ETHOC */ > +#define CONFIG_SYS_ETHOC_BASE(IGOR_MAC_BASE | IO_REGION_BASE) > + > +#define CONFIG_ETHADDR 08:00:3e:26:0a:5b > +#define CONFIG_NETMASK 255.255.255.0 > +#define CONFIG_IPADDR192.168.1.10 > +#define CONFIG_SERVERIP 192.168.1.254 > + > Please remove these definitions. regards, Ben ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 4/5 v2] nios2: add Altera NEEK board
Hi Thomas, On 3/30/2010 9:03 PM, Thomas Chou wrote: > This patch supports the Altera Nios2 Embedded Evaluation Kit using > the example FPGA design at http://nioswiki.com/Linux. > > Signed-off-by: Thomas Chou > --- > +#define CONFIG_ETHOC > +#define CONFIG_SYS_ETHOC_BASE(IGOR_MAC_BASE | IO_REGION_BASE) > + > +#define CONFIG_ETHADDR 08:00:3e:26:0a:5b > +#define CONFIG_NETMASK 255.255.255.0 > +#define CONFIG_IPADDR192.168.1.10 > +#define CONFIG_SERVERIP 192.168.1.254 > + > Please remove these definitions regards, Ben ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v4 tabify] net: add altera triple speeds ethernet mac driver
Hi Thomas,
On 3/28/2010 1:32 AM, Thomas Chou wrote:
> This driver supports the Altera triple speeds 10/100/1000 ethernet
> mac.
>
> Signed-off-by: Thomas Chou
> ---
> drivers/net/Makefile |1 +
> drivers/net/altera_tse.c | 978
> ++
> drivers/net/altera_tse.h | 512
> include/netdev.h |1 +
> 4 files changed, 1492 insertions(+), 0 deletions(-)
> create mode 100644 drivers/net/altera_tse.c
> create mode 100644 drivers/net/altera_tse.h
>
> diff --git a/drivers/net/Makefile b/drivers/net/Makefile
> index 0e68e52..b75c02f 100644
> --- a/drivers/net/Makefile
> +++ b/drivers/net/Makefile
> @@ -27,6 +27,7 @@ LIB := $(obj)libnet.a
>
> COBJS-$(CONFIG_DRIVER_3C589) += 3c589.o
> COBJS-$(CONFIG_PPC4xx_EMAC) += 4xx_enet.o
> +COBJS-$(CONFIG_ALTERA_TSE) += altera_tse.o
> COBJS-$(CONFIG_DRIVER_AT91EMAC) += at91_emac.o
> COBJS-$(CONFIG_DRIVER_AX88180) += ax88180.o
> COBJS-$(CONFIG_BCM570x) += bcm570x.o bcm570x_autoneg.o 5701rls.o
> diff --git a/drivers/net/altera_tse.c b/drivers/net/altera_tse.c
> new file mode 100644
> index 000..7a2cb66
> --- /dev/null
> +++ b/drivers/net/altera_tse.c
> @@ -0,0 +1,978 @@
> +/*
> + * Altera 10/100/1000 triple speed ethernet mac driver
> + *
> + * Copyright (C) 2008 Altera Corporation.
> + * Copyright (C) 2010 Thomas Chou
> + *
> + * 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.
> + */
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include "altera_tse.h"
> +
> +static int tse_eth_send(struct eth_device *dev, volatile void *packet,
> + int length);
> +static int tse_eth_rx(struct eth_device *dev);
> +static void tse_eth_halt(struct eth_device *dev);
> +static void tse_eth_reset(struct eth_device *dev);
> +static int tse_eth_init(struct eth_device *dev, bd_t *bd);
> +
> +static int tse_mdio_read(struct altera_tse_priv *priv, unsigned int regnum);
> +static int tse_mdio_write(struct altera_tse_priv *priv, unsigned int regnum,
> +unsigned int value);
>
Are these prototypes really needed? If so, please re-order the code so
they're not.
> +#define read_phy_reg(priv, regnum) tse_mdio_read(priv, regnum)
> +#define write_phy_reg(priv, regnum, value) tse_mdio_write(priv, regnum,
> value)
> +#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)&& !defined(BITBANGMII)
> +static int altera_tse_miiphy_write(char *devname, unsigned char addr,
> +unsigned char reg, unsigned short value);
> +static int altera_tse_miiphy_read(char *devname, unsigned char addr,
> + unsigned char reg, unsigned short *value);
> +#endif
> +
> +static int tse_adjust_link(struct altera_tse_priv *priv);
> +
> +static uint mii_parse_88E1011_psr(uint mii_reg, struct altera_tse_priv
> *priv);
> +static uint mii_parse_sr(uint mii_reg, struct altera_tse_priv *priv);
> +static uint mii_m88es_setmode_sr(uint mii_reg,
> + struct altera_tse_priv *priv);
> +static uint mii_m88es_setmode_cr(uint mii_reg,
> + struct altera_tse_priv *priv);
> +static uint mii_cr_init(uint mii_reg, struct altera_tse_priv *priv);
> +
> +static struct phy_info *get_phy_info(struct eth_device *dev);
> +static void phy_run_commands(struct altera_tse_priv *priv, struct phy_cmd
> *cmd);
> +static int init_phy(struct eth_device *dev);
> +
> +/* sgdma debug - print descriptor */
> +static void alt_sgdma_print_desc(volatile struct alt_sgdma_descriptor *desc)
> +{
> + debug("SGDMA DEBUG :\n");
> + debug("desc->source : 0x%x \n", (unsigned int)desc->source);
> + debug("desc->destination : 0x%x \n", (unsigned int)desc->destination);
> + debug("desc->next : 0x%x \n", (unsigned int)desc->next);
> + debug("desc->source_pad : 0x%x \n", (unsigned int)desc->source_pad);
> + debug("desc->destination_pad : 0x%x \n",
> + (unsigned int)desc->destination_pad);
> + debug("desc->next_pad : 0x%x \n", (unsigned int)desc->next_pad);
> + debug("desc->bytes_to_transfer : 0x%x \n",
> + (unsigned int)desc->bytes_to_transfer);
> + debug("desc->actual_bytes_transferred : 0x%x \n",
> + (unsigned int)desc->actual_bytes_transferred);
> + debug("desc->descriptor_status : 0x%x \n",
> + (unsigned int)desc->descriptor_status);
> + debug("desc->descriptor_control : 0x%x \n",
> + (unsigned int)desc->descriptor_control);
> +}
> +
> +/* This is a generic routine that the SGDMA mode-specific routines
> + * call to populate a descriptor.
> + * arg1 :pointer to first SGDMA descriptor.
> + * arg2 :pointer to next SGDMA descriptor.
> + * arg3 :Address to where data to be written.
> + * arg4 :Addres
Re: [U-Boot] [PATCH v2] net: add opencore 10/100 ethernet mac driver
Hi Thomas, On 3/24/2010 6:34 AM, Thomas Chou wrote: > This patch ports the opencore 10/100 ethernet mac driver ethoc.c > from linux kernel to u-boot. > > Signed-off-by: Thomas Chou > --- > drivers/net/Makefile |1 + > drivers/net/ethoc.c | 533 > ++ > include/netdev.h |1 + > 3 files changed, 535 insertions(+), 0 deletions(-) > create mode 100644 drivers/net/ethoc.c > > diff --git a/drivers/net/Makefile b/drivers/net/Makefile > index 1ec0ba1..0e68e52 100644 > --- a/drivers/net/Makefile > +++ b/drivers/net/Makefile > @@ -39,6 +39,7 @@ COBJS-$(CONFIG_E1000) += e1000.o > COBJS-$(CONFIG_EEPRO100) += eepro100.o > COBJS-$(CONFIG_ENC28J60) += enc28j60.o > COBJS-$(CONFIG_EP93XX) += ep93xx_eth.o > +COBJS-$(CONFIG_ETHOC) += ethoc.o > COBJS-$(CONFIG_FEC_MXC) += fec_mxc.o > COBJS-$(CONFIG_FSLDMAFEC) += fsl_mcdmafec.o mcfmii.o > COBJS-$(CONFIG_FTMAC100) += ftmac100.o > diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c > new file mode 100644 > index 000..c1eb239 > --- /dev/null > +++ b/drivers/net/ethoc.c > @@ -0,0 +1,533 @@ > +/* > + * Opencore 10/100 ethernet mac driver > + * > + * Copyright (C) 2007-2008 Avionic Design Development GmbH > + * Copyright (C) 2008-2009 Avionic Design GmbH > + * Thierry Reding > + * Copyright (C) 2010 Thomas Chou > + * > + * 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. > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +/* register offsets */ > +#define MODER 0x00 > +#define INT_SOURCE 0x04 > +#define INT_MASK0x08 > +#define IPGT0x0c > +#define IPGR1 0x10 > +#define IPGR2 0x14 > +#define PACKETLEN 0x18 > +#define COLLCONF0x1c > +#define TX_BD_NUM 0x20 > +#define CTRLMODER 0x24 > +#define MIIMODER0x28 > +#define MIICOMMAND 0x2c > +#define MIIADDRESS 0x30 > +#define MIITX_DATA 0x34 > +#define MIIRX_DATA 0x38 > +#define MIISTATUS 0x3c > +#define MAC_ADDR0 0x40 > +#define MAC_ADDR1 0x44 > +#define ETH_HASH0 0x48 > +#define ETH_HASH1 0x4c > +#define ETH_TXCTRL 0x50 > + > +/* mode register */ > +#define MODER_RXEN (1<< 0) /* receive enable */ > +#define MODER_TXEN (1<< 1) /* transmit enable */ > +#define MODER_NOPRE (1<< 2) /* no preamble */ > +#define MODER_BRO (1<< 3) /* broadcast address */ > +#define MODER_IAM (1<< 4) /* individual address mode */ > +#define MODER_PRO (1<< 5) /* promiscuous mode */ > +#define MODER_IFG (1<< 6) /* interframe gap for incoming > frames */ > +#define MODER_LOOP (1<< 7) /* loopback */ > +#define MODER_NBO (1<< 8) /* no back-off */ > +#define MODER_EDE (1<< 9) /* excess defer enable */ > +#define MODER_FULLD (1<< 10) /* full duplex */ > +#define MODER_RESET (1<< 11) /* FIXME: reset (undocumented) > */ > +#define MODER_DCRC (1<< 12) /* delayed CRC enable */ > +#define MODER_CRC (1<< 13) /* CRC enable */ > +#define MODER_HUGE (1<< 14) /* huge packets enable */ > +#define MODER_PAD (1<< 15) /* padding enabled */ > +#define MODER_RSM (1<< 16) /* receive small packets */ > + > +/* interrupt source and mask registers */ > +#define INT_MASK_TXF(1<< 0)/* transmit frame */ > +#define INT_MASK_TXE(1<< 1)/* transmit error */ > +#define INT_MASK_RXF(1<< 2)/* receive frame */ > +#define INT_MASK_RXE(1<< 3)/* receive error */ > +#define INT_MASK_BUSY (1<< 4) > +#define INT_MASK_TXC(1<< 5)/* transmit control frame */ > +#define INT_MASK_RXC(1<< 6)/* receive control frame */ > + > +#define INT_MASK_TX (INT_MASK_TXF | INT_MASK_TXE) > +#define INT_MASK_RX (INT_MASK_RXF | INT_MASK_RXE) > + > +#define INT_MASK_ALL ( \ > + INT_MASK_TXF | INT_MASK_TXE | \ > + INT_MASK_RXF | INT_MASK_RXE | \ > + INT_MASK_TXC | INT_MASK_RXC | \ > + INT_MASK_BUSY \ > + ) > + > +/* packet length register */ > +#define PACKETLEN_MIN(min) (((min)& 0x)<< 16) > +#define PACKETLEN_MAX(max) (((max)& 0x)<< 0) > +#define PACKETLEN_MIN_MAX(min, max) (PACKETLEN_MIN(min) | \ > + PACKETLEN_MAX(max)) > + > +/* transmit buffer number register */ > +#define TX_BD_NUM_VAL(x)(((x)<= 0x80) ? (x) : 0x80
