[U-Boot] [PATCH] mailmap: Update mail address
Update my email address from gmail to my domain. Signed-off-by: Ricardo Ribalda Delgado --- .mailmap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.mailmap b/.mailmap index dc72f24688..63afce3774 100644 --- a/.mailmap +++ b/.mailmap @@ -31,8 +31,8 @@ Markus Klotzbuecher Paul Burton Prabhakar Kushwaha Rajeshwari Shinde -Ricardo Ribalda -Ricardo Ribalda +Ricardo Ribalda +Ricardo Ribalda Sandeep Paulraj Shaohui Xie Stefan Roese -- 2.23.0.rc1 ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 0/2] powerpc: remove 4xx support
Hi all On Fri, Jun 30, 2017 at 3:54 PM, Tom Rini <tr...@konsulko.com> wrote: > On Fri, Jun 30, 2017 at 03:50:28PM +0200, Ricardo Ribalda Delgado wrote: >> Hi >> >> On Thu, Jun 29, 2017 at 7:26 PM, Tom Rini <tr...@konsulko.com> wrote: >> >> >> > I also recall this. Ricardo? Do you still have interest here? >> > Otherwise I'm going to remove these soon, thanks! >> >> This also makes me quite sad. It has been my first big contribution to OS. >> >> I personally do not have the time to maintain it on my free time (I >> have an 8 month fork :) ) >> >> But I would like to ask my employer if we can afford to maintain it. >> We still have some hundreds of cameras running u-boot on ppc440. >> >> Can I give you a final answer in a week before this is merged? > > Yes, I can wait about that long for an answer, thanks! With a lot of sadness, I must give up on ppc440. As I previously said, I have currently 0 personal time, and my company has confirmed that we cannot afford the test/development time. Thank you all for your mentorship, patience and help during this time. See you on the ELCE. Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com> > > -- > Tom -- Ricardo Ribalda ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 0/2] powerpc: remove 4xx support
Hi On Thu, Jun 29, 2017 at 7:26 PM, Tom Riniwrote: > I also recall this. Ricardo? Do you still have interest here? > Otherwise I'm going to remove these soon, thanks! This also makes me quite sad. It has been my first big contribution to OS. I personally do not have the time to maintain it on my free time (I have an 8 month fork :) ) But I would like to ask my employer if we can afford to maintain it. We still have some hundreds of cameras running u-boot on ppc440. Can I give you a final answer in a week before this is merged? Best regards! > > -- > Tom -- Ricardo Ribalda ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v2 1/2] kconfig: Move CONFIG_OF_LIBFDT to Kconfig
For xilinx-ppc405-generic and xilinx-ppc440-generic: Reviewed-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com> I have access to my hardware again from the 20th of April. I can give you a tested-by by them if you want ;) regards! On Thu, Apr 7, 2016 at 2:39 PM, Michal Simek <michal.si...@xilinx.com> wrote: > On 7.4.2016 14:37, Ricardo Ribalda Delgado wrote: >> Hi Michal >> >> You are right, >> >> OF_CONTROL (on arch/powerpc/cpu/ppc4xx/Kconfig ) selects OF_LIBFDT by >> default (on lib/Kconfig) >> >> So no need for my changes > > ok. Your Tested-by or Reviewed-by flag would help. > > Thanks, > Michal > -- Ricardo Ribalda ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2 1/2] kconfig: Move CONFIG_OF_LIBFDT to Kconfig
Hi Michal You are right, OF_CONTROL (on arch/powerpc/cpu/ppc4xx/Kconfig ) selects OF_LIBFDT by default (on lib/Kconfig) So no need for my changes Thanks! On Thu, Apr 7, 2016 at 8:06 AM, Michal Simek <michal.si...@xilinx.com> wrote: > Hi, > > On 6.4.2016 22:34, Ricardo Ribalda Delgado wrote: >> Hi Michal >> >> xilinx-ppc405-generic and xilinx-ppc440-generic also depend on >> xilinx-ppc.h So I think this is missing. >> >> Shall I send this as a separated patch? or you want to include it in yours? > > I was checking that and LIBFDT is enabled by default that's why there > was not defconfig update. Definitely feel free to check it and test if > this patch breaks something. > > Thanks, > Michal -- Ricardo Ribalda ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2 1/2] kconfig: Move CONFIG_OF_LIBFDT to Kconfig
Hi Michal xilinx-ppc405-generic and xilinx-ppc440-generic also depend on xilinx-ppc.h So I think this is missing. Shall I send this as a separated patch? or you want to include it in yours? Regards ricardo@pilix:~/curro/u-boot$ git diff diff --git a/configs/xilinx-ppc405-generic_defconfig b/configs/xilinx-ppc405-generic_defconfig index 2008a8d79394..381b668bb9e4 100644 --- a/configs/xilinx-ppc405-generic_defconfig +++ b/configs/xilinx-ppc405-generic_defconfig @@ -13,3 +13,5 @@ CONFIG_SYS_PROMPT="xlx-ppc405:/# " CONFIG_OF_EMBED=y CONFIG_SYS_NS16550=y CONFIG_XILINX_UARTLITE=y +CONFIG_OF_LIBFDT=y +# CONFIG_EFI_LOADER is not set diff --git a/configs/xilinx-ppc440-generic_defconfig b/configs/xilinx-ppc440-generic_defconfig index 8df33d3270d1..9fe518a83dc3 100644 --- a/configs/xilinx-ppc440-generic_defconfig +++ b/configs/xilinx-ppc440-generic_defconfig @@ -13,3 +13,5 @@ CONFIG_OF_EMBED=y CONFIG_NETCONSOLE=y CONFIG_SYS_NS16550=y CONFIG_XILINX_UARTLITE=y +CONFIG_OF_LIBFDT=y +# CONFIG_EFI_LOADER is not set On Wed, Apr 6, 2016 at 8:28 PM, Michal Simekwrote: > This patch follows work done by: > "Move CONFIG_OF_LIBFDT to Kconfig" > (sha1: 69e173eb57d1f4848f070c83456096ba5d2ba1b4) > > Signed-off-by: Michal Simek > --- > > Changes in v2: > - new patch in series. Masahiro asked for it. > > configs/legoev3_defconfig | 2 ++ > configs/ma5d4evk_defconfig| 2 ++ > configs/stm32f746-disco_defconfig | 2 ++ > configs/zipitz2_defconfig | 4 +++- > include/configs/legoev3.h | 1 - > include/configs/ma5d4evk.h| 1 - > include/configs/pic32mzdask.h | 5 - > include/configs/stm32f746-disco.h | 1 - > include/configs/xilinx-ppc.h | 1 - > include/configs/zipitz2.h | 1 - > 10 files changed, 9 insertions(+), 11 deletions(-) > > diff --git a/configs/legoev3_defconfig b/configs/legoev3_defconfig > index d838baa32cbb..22fd0578ef72 100644 > --- a/configs/legoev3_defconfig > +++ b/configs/legoev3_defconfig > @@ -10,3 +10,5 @@ CONFIG_AUTOBOOT_STOP_STR="l" > CONFIG_SPI_FLASH=y > CONFIG_SPI_FLASH_STMICRO=y > CONFIG_SYS_NS16550=y > +CONFIG_OF_LIBFDT=y > +# CONFIG_EFI_LOADER is not set > diff --git a/configs/ma5d4evk_defconfig b/configs/ma5d4evk_defconfig > index 39ce550ff44f..144851426937 100644 > --- a/configs/ma5d4evk_defconfig > +++ b/configs/ma5d4evk_defconfig > @@ -12,3 +12,5 @@ CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4" > CONFIG_SPI_FLASH=y > CONFIG_USB=y > CONFIG_USB_GADGET=y > +CONFIG_OF_LIBFDT=y > +# CONFIG_EFI_LOADER is not set > diff --git a/configs/stm32f746-disco_defconfig > b/configs/stm32f746-disco_defconfig > index 7cfed4a514bf..07aa874760c2 100644 > --- a/configs/stm32f746-disco_defconfig > +++ b/configs/stm32f746-disco_defconfig > @@ -7,3 +7,5 @@ CONFIG_AUTOBOOT_KEYED=y > CONFIG_AUTOBOOT_PROMPT="Hit SPACE in %d seconds to stop autoboot.\n" > CONFIG_AUTOBOOT_STOP_STR=" " > # CONFIG_CMD_SETEXPR is not set > +CONFIG_OF_LIBFDT=y > +# CONFIG_EFI_LOADER is not set > diff --git a/configs/zipitz2_defconfig b/configs/zipitz2_defconfig > index 2977ccc8ddee..d2fa63d15f08 100644 > --- a/configs/zipitz2_defconfig > +++ b/configs/zipitz2_defconfig > @@ -1,7 +1,9 @@ > CONFIG_ARM=y > CONFIG_TARGET_ZIPITZ2=y > +CONFIG_SYS_PROMPT="$ " > # CONFIG_CMD_IMLS is not set > # CONFIG_CMD_SETEXPR is not set > # CONFIG_CMD_NET is not set > # CONFIG_CMD_NFS is not set > -CONFIG_SYS_PROMPT="$ " > +CONFIG_OF_LIBFDT=y > +# CONFIG_EFI_LOADER is not set > diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h > index 79fa3c476ad1..0bc9d2dc18b4 100644 > --- a/include/configs/legoev3.h > +++ b/include/configs/legoev3.h > @@ -160,7 +160,6 @@ > #define CONFIG_SYS_LONGHELP > #define CONFIG_CRC32_VERIFY > #define CONFIG_MX_CYCLIC > -#define CONFIG_OF_LIBFDT > > /* > * Linux Information > diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h > index e061a101aee6..8a80b954a68d 100644 > --- a/include/configs/ma5d4evk.h > +++ b/include/configs/ma5d4evk.h > @@ -150,7 +150,6 @@ > #define CONFIG_LOADADDR0x2080 > #define CONFIG_BOOTCOMMAND "run mmc_mmc" > #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR > -#define CONFIG_OF_LIBFDT > > /* > * Extra Environments > diff --git a/include/configs/pic32mzdask.h b/include/configs/pic32mzdask.h > index 3ea11946b8ab..fd874c42a2bc 100644 > --- a/include/configs/pic32mzdask.h > +++ b/include/configs/pic32mzdask.h > @@ -92,11 +92,6 @@ > #define CONFIG_BOOTP_GATEWAY > #define CONFIG_BOOTP_HOSTNAME > > -/* > - * Handover flattened device tree (dtb file) to Linux kernel > - */ > -#define CONFIG_OF_LIBFDT 1 > - > /*--- > * SDHC Configuration > */ > diff --git a/include/configs/stm32f746-disco.h > b/include/configs/stm32f746-disco.h > index 807ab6574eb5..e94812bf5a78 100644 > --- a/include/configs/stm32f746-disco.h > +++ b/include/configs/stm32f746-disco.h > @@
Re: [U-Boot] [GIT PULL] Xilinx changes
Hi I have just sent a patch for this. Sorry about that! On Fri, Jan 29, 2016 at 12:18 AM, Tom Riniwrote: > On Wed, Jan 27, 2016 at 04:42:09PM +0100, Michal Simek wrote: > >> Hi Tom, >> >> here is the branch with xilinx changes which are flying around. >> It is targeting PowerPC, Microblaze, ARM and ARM64. >> I can't see any build problem via buildman. >> >> Thanks, >> Michal >> >> >> The following changes since commit 9e4de7fd4acc8f99b6d383c711d21c0159849629: >> >> Merge branch 'master' of http://git.denx.de/u-boot-sunxi (2016-01-26 >> 17:45:37 -0500) >> >> are available in the git repository at: >> >> >> git://www.denx.de/git/u-boot-microblaze.git master >> >> for you to fetch changes up to f36919a8138ed7ecd3dbce4630e02936b13907da: >> >> ppc: xilinx-ppc440-generic: Wire LL_TEMAC driver (2016-01-27 15:57:20 >> +0100) >> > > Applied to u-boot/master, thanks! > > But note: > +(xilinx-ppc405-generic) Device Tree Source is not correctly specified. > +(xilinx-ppc405-generic) Please define 'CONFIG_DEFAULT_DEVICE_TREE' > +(xilinx-ppc405-generic) or build with 'DEVICE_TREE=' argument > +(xilinx-ppc405-generic) make[2]: *** > [arch/powerpc/dts/xilinx-ppc440-generic.dtb] Error 1 > +(xilinx-ppc405-generic) make[1]: *** [dts] Error 2 > > -- > Tom > > ___ > U-Boot mailing list > U-Boot@lists.denx.de > http://lists.denx.de/mailman/listinfo/u-boot > -- Ricardo Ribalda ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] ppc: xilinx-ppc405-generic
Fix device tree name: +(xilinx-ppc405-generic) Device Tree Source is not correctly specified. +(xilinx-ppc405-generic) Please define 'CONFIG_DEFAULT_DEVICE_TREE' +(xilinx-ppc405-generic) or build with 'DEVICE_TREE=' argument +(xilinx-ppc405-generic) make[2]: *** [arch/powerpc/dts/xilinx-ppc440-generic.dtb] Error 1 +(xilinx-ppc405-generic) make[1]: *** [dts] Error 2 Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com> --- configs/xilinx-ppc405-generic_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/xilinx-ppc405-generic_defconfig b/configs/xilinx-ppc405-generic_defconfig index e7132cd61152..85bc3b97ff38 100644 --- a/configs/xilinx-ppc405-generic_defconfig +++ b/configs/xilinx-ppc405-generic_defconfig @@ -14,4 +14,4 @@ CONFIG_OF_EMBED=y CONFIG_OF_CONTROL=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y -CONFIG_DEFAULT_DEVICE_TREE="xilinx-ppc440-generic" +CONFIG_DEFAULT_DEVICE_TREE="xilinx-ppc405-generic" -- 2.7.0 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 00/22] xilinx-ppc4xx: Cleanout and port to DM serial
Hello Michal Thanks for your fast review :). Usually my patches were through Stefan Roese (sorry, I forgot to add you as cc in the patchset :( ) In this case, as it depends on yuour patches I do not know what should be the right path. Tom, Stefan what do you propose? Regards! On Tue, Jan 26, 2016 at 12:55 PM, Michal Simek <mon...@monstr.eu> wrote: > On 26.1.2016 11:24, Ricardo Ribalda Delgado wrote: >> xilinx-ppc4xx made us of serial uartlite, which was ported to DM. >> This patch moves port these boards to DM. >> >> Now that Kconfig works really well, there is no need to maintain >> the specific boards (fx12mm, ml507 and v5fx30teval) or their flash >> version. >> >> The ppc440 boards have been wired to the ll_temac driver. >> >> A series of cleanouts have been done. >> >> This patchset sits on top of: >> http://git.denx.de/?p=u-boot/u-boot-microblaze.git;a=shortlog;h=refs/heads/mb >> >> It has been tested on a ppc440 bard. >> >> Hopefully Georg Schardt can test the changes on his fx12mm. >> >> These changes can also be browset at >> https://github.com/ribalda/u-boot/tree/xilinx-ppc4xx-generic-dm >> >> >> Regards (and thanks for your patience)! >> >> >> >> Ricardo Ribalda (22): >> ppc: xilinx-ppc440: Remove support for ml507 >> ppc: xilinx-ppc405: Remove support for fx12mm >> xilinx-ppc440: Remove support for v5fx30teval >> .mailmap: Add all the mail alias for Ricardo Ribalda >> mailaddr: Update mail address >> ppc: pp405-generic: Simplify Makefile >> ppc: pp440-generic: Simplify Makefile >> ppc: ppc440: ppc440-generic_flash_defconfig >> ppc: ppc405: ppc405-generic_flash_defconfig >> ppc: xilinx-ppc440-generic: Cleanout header files >> ppc: xilinx-ppc405-generic: Cleanout header files >> ppc: xilinx-ppc4xx-generic: Update xparameters.h >> ppc: dts: Add device tree for xilix-ppc4xx-generic >> configs/xilinx-ppc405-generic: Typos and size >> configs/xilinx-ppc440-generic: Typos and size >> ppc: xilinx-ppc4xx: Port to DM serial >> ppc: xilinx_ppc405_generic: Remove weak attributes >> ppc: xilinx_ppc440_generic: Remove weak attributes >> ppc: xilinx_ppc405_generic: Remove uncalled functions >> ppc: xilinx_ppc440_generic: Remove uncalled functions >> net: xilinx_ll_temac: Fix string overflow >> ppc: xilinx-ppc440-generic: Wire LL_TEMAC driver >> >> .mailmap | 3 ++ >> arch/powerpc/cpu/ppc4xx/Kconfig| 20 - >> arch/powerpc/cpu/ppc4xx/interrupts.c | 2 +- >> arch/powerpc/cpu/ppc4xx/uic.c | 2 +- >> arch/powerpc/cpu/ppc4xx/xilinx_irq.c | 2 +- >> arch/powerpc/dts/Makefile | 2 + >> arch/powerpc/dts/xilinx-ppc405-generic.dts | 13 ++ >> arch/powerpc/dts/xilinx-ppc440-generic.dts | 13 ++ >> arch/powerpc/include/asm/interrupt.h | 2 +- >> arch/powerpc/include/asm/xilinx_irq.h | 2 +- >> board/avnet/fx12mm/Kconfig | 12 -- >> board/avnet/fx12mm/MAINTAINERS | 7 --- >> board/avnet/fx12mm/Makefile| 11 - >> board/avnet/fx12mm/fx12mm.c| 34 --- >> board/avnet/fx12mm/xparameters.h | 35 --- >> board/avnet/v5fx30teval/Kconfig| 12 -- >> board/avnet/v5fx30teval/MAINTAINERS| 7 --- >> board/avnet/v5fx30teval/Makefile | 11 - >> board/avnet/v5fx30teval/v5fx30teval.c | 17 >> board/avnet/v5fx30teval/xparameters.h | 22 -- >> board/xilinx/ml507/Kconfig | 12 -- >> board/xilinx/ml507/MAINTAINERS | 7 --- >> board/xilinx/ml507/Makefile| 11 - >> board/xilinx/ml507/ml507.c | 17 >> board/xilinx/ml507/xparameters.h | 23 -- >> board/xilinx/ppc405-generic/MAINTAINERS| 2 +- >> board/xilinx/ppc405-generic/Makefile | 4 +- >> .../xilinx/ppc405-generic/xilinx_ppc405_generic.c | 31 ++ >> board/xilinx/ppc405-generic/xparameters.h | 7 ++- >> board/xilinx/ppc440-generic/MAINTAINERS| 2 +- >> board/xilinx/ppc440-generic/Makefile | 6 +-- >> board/xilinx/ppc440-generic/init.S | 2 +- >> .../xilinx/ppc440-generic/xi
[U-Boot] [PATCH 22/22] ppc: xilinx-ppc440-generic: Wire LL_TEMAC driver
If the xparameters file contains a LL_TEMAC definition compile its driver and the net commands. Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com> --- .../xilinx/ppc440-generic/xilinx_ppc440_generic.c | 22 ++ board/xilinx/ppc440-generic/xparameters.h | 4 configs/xilinx-ppc440-generic_defconfig| 5 + include/configs/xilinx-ppc440-generic.h| 10 ++ 4 files changed, 41 insertions(+) diff --git a/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c b/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c index 0e3ab94e31ef..d8233529304d 100644 --- a/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c +++ b/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c @@ -8,6 +8,7 @@ #include #include +#include #include int checkboard(void) @@ -34,3 +35,24 @@ void get_sys_info(sys_info_t *sys_info) int get_serial_clock(void){ return XPAR_UARTNS550_0_CLOCK_FREQ_HZ; } + +int board_eth_init(bd_t *bis) +{ + int ret = 0; + + puts("Init xilinx temac\n"); +#ifdef XPAR_LLTEMAC_0_BASEADDR + ret |= xilinx_ll_temac_eth_init(bis, XPAR_LLTEMAC_0_BASEADDR, + XILINX_LL_TEMAC_M_SDMA_DCR | XILINX_LL_TEMAC_M_SDMA_PLB, + XPAR_LLTEMAC_0_LLINK_CONNECTED_BASEADDR); + +#endif + +#ifdef XPAR_LLTEMAC_1_BASEADDR + ret |= xilinx_ll_temac_eth_init(bis, XPAR_LLTEMAC_1_BASEADDR, + XILINX_LL_TEMAC_M_SDMA_DCR | XILINX_LL_TEMAC_M_SDMA_PLB, + XPAR_LLTEMAC_1_LLINK_CONNECTED_BASEADDR); +#endif + + return ret; +} diff --git a/board/xilinx/ppc440-generic/xparameters.h b/board/xilinx/ppc440-generic/xparameters.h index 9685560673ab..b45a6a1d7668 100644 --- a/board/xilinx/ppc440-generic/xparameters.h +++ b/board/xilinx/ppc440-generic/xparameters.h @@ -18,5 +18,9 @@ #define XPAR_CORE_CLOCK_FREQ_HZ4 #define XPAR_INTC_MAX_NUM_INTR_INPUTS 32 #define XPAR_UARTNS550_0_CLOCK_FREQ_HZ 1 +#define XPAR_LLTEMAC_0_LLINK_CONNECTED_BASEADDR 0x80 +#define XPAR_LLTEMAC_1_LLINK_CONNECTED_BASEADDR 0x98 +#define XPAR_LLTEMAC_0_BASEADDR0x8300 +#define XPAR_LLTEMAC_1_BASEADDR0x8340 #endif diff --git a/configs/xilinx-ppc440-generic_defconfig b/configs/xilinx-ppc440-generic_defconfig index c66357e08724..64b55ee1359e 100644 --- a/configs/xilinx-ppc440-generic_defconfig +++ b/configs/xilinx-ppc440-generic_defconfig @@ -11,3 +11,8 @@ CONFIG_OF_CONTROL=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_DEFAULT_DEVICE_TREE="xilinx-ppc440-generic" +CONFIG_CMD_TFTPPUT=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y +CONFIG_NETCONSOLE=y + diff --git a/include/configs/xilinx-ppc440-generic.h b/include/configs/xilinx-ppc440-generic.h index 2af5f7fc1de5..8b9d37f42e03 100644 --- a/include/configs/xilinx-ppc440-generic.h +++ b/include/configs/xilinx-ppc440-generic.h @@ -33,6 +33,16 @@ #define MTDIDS_DEFAULT "nor0=flash" #define MTDPARTS_DEFAULT "mtdparts=flash:-(user)" +/*Net*/ +#ifdef XPAR_LLTEMAC_0_BASEADDR +#define CONFIG_XILINX_LL_TEMAC +#define CONFIG_MII +#define CONFIG_PHYLIB +#define CONFIG_PHY_MARVELL +#define CONFIG_NET_RANDOM_ETHADDR +#define CONFIG_LIB_RAND +#endif + /*Generic Configs*/ #include -- 2.7.0.rc3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 18/22] ppc: xilinx_ppc440_generic: Remove weak attributes
Now that the specific boards have been removed there is no need to maintain the weak functions. Fix also CamelCase to make checkpatch happy Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com> --- board/xilinx/ppc440-generic/xilinx_ppc440_generic.c | 18 +++--- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c b/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c index f92a3033e14d..52c63f20583e 100644 --- a/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c +++ b/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c @@ -10,35 +10,31 @@ #include #include -int __board_pre_init(void) +int board_pre_init(void) { return 0; } -int board_pre_init(void) __attribute__((weak, alias("__board_pre_init"))); -int __checkboard(void) +int checkboard(void) { puts("Xilinx PPC440 Generic Board\n"); return 0; } -int checkboard(void) __attribute__((weak, alias("__checkboard"))); -phys_size_t __initdram(int board_type) +phys_size_t initdram(int board_type) { return get_ram_size(XPAR_DDR2_SDRAM_MEM_BASEADDR, CONFIG_SYS_SDRAM_SIZE_MB * 1024 * 1024); } -phys_size_t initdram(int) __attribute__((weak, alias("__initdram"))); -void __get_sys_info(sys_info_t *sysInfo) +void get_sys_info(sys_info_t *sys_info) { - sysInfo->freqProcessor = XPAR_CORE_CLOCK_FREQ_HZ; - sysInfo->freqPLB = XPAR_PLB_CLOCK_FREQ_HZ; - sysInfo->freqPCI = 0; + sys_info->freqProcessor = XPAR_CORE_CLOCK_FREQ_HZ; + sys_info->freqPLB = XPAR_PLB_CLOCK_FREQ_HZ; + sys_info->freqPCI = 0; return; } -void get_sys_info(sys_info_t *) __attribute__((weak, alias("__get_sys_info"))); int get_serial_clock(void){ return XPAR_UARTNS550_0_CLOCK_FREQ_HZ; -- 2.7.0.rc3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 21/22] net: xilinx_ll_temac: Fix string overflow
Size of this snprintf "lltemac.%lx" is bigger than 16 characters. Replacing it with "ll_tem.%lx" Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com> --- drivers/net/xilinx_ll_temac.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/xilinx_ll_temac.c b/drivers/net/xilinx_ll_temac.c index 7cc86571e495..ca09546ab59f 100644 --- a/drivers/net/xilinx_ll_temac.c +++ b/drivers/net/xilinx_ll_temac.c @@ -303,7 +303,8 @@ int xilinx_ll_temac_initialize(bd_t *bis, struct ll_temac_info *devinf) if (devinf->devname) { strncpy(dev->name, devinf->devname, sizeof(dev->name)); } else { - snprintf(dev->name, sizeof(dev->name), "lltemac.%lx", devinf->base_addr); + snprintf(dev->name, sizeof(dev->name), "ll_tem.%lx", +devinf->base_addr); devinf->devname = dev->name; } -- 2.7.0.rc3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 17/22] ppc: xilinx_ppc405_generic: Remove weak attributes
Now that the specific boards have been removed there is no need to maintain the weak functions. Fix also CamelCase to make checkpatch happy Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com> --- .../xilinx/ppc405-generic/xilinx_ppc405_generic.c | 22 -- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/board/xilinx/ppc405-generic/xilinx_ppc405_generic.c b/board/xilinx/ppc405-generic/xilinx_ppc405_generic.c index 32105a823b0b..5c19ac0e6a34 100644 --- a/board/xilinx/ppc405-generic/xilinx_ppc405_generic.c +++ b/board/xilinx/ppc405-generic/xilinx_ppc405_generic.c @@ -10,42 +10,36 @@ #include #include -ulong __get_PCI_freq(void) +ulong get_PCI_freq(void) { return 0; } -ulong get_PCI_freq(void) __attribute__((weak, alias("__get_PCI_freq"))); - -int __board_pre_init(void) +int board_pre_init(void) { return 0; } -int board_pre_init(void) __attribute__((weak, alias("__board_pre_init"))); -int __checkboard(void) +int checkboard(void) { puts("Xilinx PPC405 Generic Board\n"); return 0; } -int checkboard(void) __attribute__((weak, alias("__checkboard"))); -phys_size_t __initdram(int board_type) +phys_size_t initdram(int board_type) { return get_ram_size(XPAR_DDR2_SDRAM_MEM_BASEADDR, CONFIG_SYS_SDRAM_SIZE_MB * 1024 * 1024); } -phys_size_t initdram(int) __attribute__((weak, alias("__initdram"))); -void __get_sys_info(sys_info_t *sysInfo) +void get_sys_info(sys_info_t *sys_info) { - sysInfo->freqProcessor = XPAR_CORE_CLOCK_FREQ_HZ; - sysInfo->freqPLB = XPAR_PLB_CLOCK_FREQ_HZ; - sysInfo->freqPCI = 0; + sys_info->freqProcessor = XPAR_CORE_CLOCK_FREQ_HZ; + sys_info->freqPLB = XPAR_PLB_CLOCK_FREQ_HZ; + sys_info->freqPCI = 0; return; } -void get_sys_info(sys_info_t *) __attribute__((weak, alias("__get_sys_info"))); int get_serial_clock(void){ return XPAR_UARTNS550_0_CLOCK_FREQ_HZ; -- 2.7.0.rc3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 20/22] ppc: xilinx_ppc440_generic: Remove uncalled functions
board_pre_init was not called because CONFIG_BOARD_EARLY_INIT_F was not set. Remove unused function. Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com> --- board/xilinx/ppc440-generic/xilinx_ppc440_generic.c | 5 - 1 file changed, 5 deletions(-) diff --git a/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c b/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c index 52c63f20583e..0e3ab94e31ef 100644 --- a/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c +++ b/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c @@ -10,11 +10,6 @@ #include #include -int board_pre_init(void) -{ - return 0; -} - int checkboard(void) { puts("Xilinx PPC440 Generic Board\n"); -- 2.7.0.rc3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 11/22] ppc: xilinx-ppc405-generic: Cleanout header files
Now that there is only one header file for all ppc405 files, merge header files. Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com> --- include/configs/xilinx-ppc405-generic.h | 5 - include/configs/xilinx-ppc405.h | 22 -- 2 files changed, 4 insertions(+), 23 deletions(-) delete mode 100644 include/configs/xilinx-ppc405.h diff --git a/include/configs/xilinx-ppc405-generic.h b/include/configs/xilinx-ppc405-generic.h index bdb9372abc45..e2d189d0ac60 100644 --- a/include/configs/xilinx-ppc405-generic.h +++ b/include/configs/xilinx-ppc405-generic.h @@ -14,6 +14,9 @@ #include "../board/xilinx/ppc405-generic/xparameters.h" +#define CONFIG_405 1 +#define CONFIG_XILINX_405 1 + /* sdram */ #define CONFIG_SYS_SDRAM_SIZE_MB 256 @@ -37,5 +40,5 @@ #define MTDIDS_DEFAULT "nor0=ppc405-flash" #define MTDPARTS_DEFAULT "mtdpartsa=ppc405-flash:-(user)" -#include +#include #endif /* __CONFIG_H */ diff --git a/include/configs/xilinx-ppc405.h b/include/configs/xilinx-ppc405.h deleted file mode 100644 index dcfe56e0483b.. --- a/include/configs/xilinx-ppc405.h +++ /dev/null @@ -1,22 +0,0 @@ -/* - * - * (C) Copyright 2008 - * Ricado Ribalda-Universidad Autonoma de madrid-ricardo.riba...@gmail.com - * This work has been supported by: QTechnology http://qtec.com/ - * - * (C) Copyright 2008 - * Georg Schardt <scha...@team-ctech.de> - * - * SPDX-License-Identifier:GPL-2.0+ - */ - -#ifndef __CONFIG_H -#define __CONFIG_H - -/* cpu parameter */ -#define CONFIG_405 1 -#define CONFIG_XILINX_405 1 - -#include - -#endif -- 2.7.0.rc3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 01/22] ppc: xilinx-ppc440: Remove support for ml507
ml507 is just a specialized version of the xilinx-ppc440-generic Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com> --- arch/powerpc/cpu/ppc4xx/Kconfig | 4 board/xilinx/ml507/Kconfig | 12 board/xilinx/ml507/MAINTAINERS | 7 --- board/xilinx/ml507/Makefile | 11 --- board/xilinx/ml507/ml507.c | 17 - board/xilinx/ml507/xparameters.h | 23 --- configs/ml507_defconfig | 9 - configs/ml507_flash_defconfig| 8 include/configs/ml507.h | 38 -- 9 files changed, 129 deletions(-) delete mode 100644 board/xilinx/ml507/Kconfig delete mode 100644 board/xilinx/ml507/MAINTAINERS delete mode 100644 board/xilinx/ml507/Makefile delete mode 100644 board/xilinx/ml507/ml507.c delete mode 100644 board/xilinx/ml507/xparameters.h delete mode 100644 configs/ml507_defconfig delete mode 100644 configs/ml507_flash_defconfig delete mode 100644 include/configs/ml507.h diff --git a/arch/powerpc/cpu/ppc4xx/Kconfig b/arch/powerpc/cpu/ppc4xx/Kconfig index efd316573ce6..ba09b57fca50 100644 --- a/arch/powerpc/cpu/ppc4xx/Kconfig +++ b/arch/powerpc/cpu/ppc4xx/Kconfig @@ -115,9 +115,6 @@ config TARGET_PIP405 config TARGET_XPEDITE1000 bool "Support xpedite1000" -config TARGET_ML507 - bool "Support ml507" - config TARGET_XILINX_PPC405_GENERIC bool "Support xilinx-ppc405-generic" @@ -158,7 +155,6 @@ source "board/mpl/mip405/Kconfig" source "board/mpl/pip405/Kconfig" source "board/t3corp/Kconfig" source "board/xes/xpedite1000/Kconfig" -source "board/xilinx/ml507/Kconfig" source "board/xilinx/ppc405-generic/Kconfig" source "board/xilinx/ppc440-generic/Kconfig" diff --git a/board/xilinx/ml507/Kconfig b/board/xilinx/ml507/Kconfig deleted file mode 100644 index d580a7beafef.. --- a/board/xilinx/ml507/Kconfig +++ /dev/null @@ -1,12 +0,0 @@ -if TARGET_ML507 - -config SYS_BOARD - default "ml507" - -config SYS_VENDOR - default "xilinx" - -config SYS_CONFIG_NAME - default "ml507" - -endif diff --git a/board/xilinx/ml507/MAINTAINERS b/board/xilinx/ml507/MAINTAINERS deleted file mode 100644 index 8b40f4450085.. --- a/board/xilinx/ml507/MAINTAINERS +++ /dev/null @@ -1,7 +0,0 @@ -ML507 BOARD -M: Ricardo Ribalda <ricardo.riba...@uam.es> -S: Maintained -F: board/xilinx/ml507/ -F: include/configs/ml507.h -F: configs/ml507_defconfig -F: configs/ml507_flash_defconfig diff --git a/board/xilinx/ml507/Makefile b/board/xilinx/ml507/Makefile deleted file mode 100644 index 9a3809f3c065.. --- a/board/xilinx/ml507/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# -# (C) Copyright 2008 -# Ricardo Ribalda,Universidad Autonoma de Madrid, ricardo.riba...@uam.es -# This work has been supported by: Qtechnology http://qtec.com/ -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y += ml507.o - -include $(srctree)/board/xilinx/ppc440-generic/Makefile diff --git a/board/xilinx/ml507/ml507.c b/board/xilinx/ml507/ml507.c deleted file mode 100644 index 83b764b7337b.. --- a/board/xilinx/ml507/ml507.c +++ /dev/null @@ -1,17 +0,0 @@ -/* - * (C) Copyright 2008 - * Ricado Ribalda-Universidad Autonoma de madrid-ricardo.riba...@uam.es - * This work has been supported by: QTechnology http://qtec.com/ - * SPDX-License-Identifier:GPL-2.0+ -*/ - -#include -#include -#include - - -int checkboard(void) -{ - puts("Xilinx ML507 Board\n"); - return 0; -} diff --git a/board/xilinx/ml507/xparameters.h b/board/xilinx/ml507/xparameters.h deleted file mode 100644 index e30e592bbe12.. --- a/board/xilinx/ml507/xparameters.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * (C) Copyright 2008 - * Ricado Ribalda-Universidad Autonoma de madrid-ricardo.riba...@uam.es - * This work has been supported by: QTechnology http://qtec.com/ - * based on xparameters-ml507.h by Xilinx - * - * SPDX-License-Identifier:GPL-2.0+ -*/ - -#ifndef XPARAMETER_H -#define XPARAMETER_H - -#define XPAR_DDR2_SDRAM_MEM_BASEADDR 0x -#define XPAR_IIC_EEPROM_BASEADDR 0x8160 -#define XPAR_INTC_0_BASEADDR 0x8180 -#define XPAR_UARTLITE_0_BASEADDR 0x8400 -#define XPAR_FLASH_MEM0_BASEADDR 0xFE00 -#define XPAR_PLB_CLOCK_FREQ_HZ 1 -#define XPAR_CORE_CLOCK_FREQ_HZ4 -#define XPAR_INTC_MAX_NUM_INTR_INPUTS 13 -#define XPAR_UARTLITE_0_BAUDRATE 9600 - -#endif diff --git a/configs/ml507_defconfig b/configs/ml507_defconfig deleted file mode 100644 index d1e4e30371bf.. --- a/configs/ml507_defconfig +++ /dev/null @@ -1,9 +0,0 @@ -CONFIG_PPC=y -CONFIG_4xx=y -CONFIG_TARGET_ML507=y -CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x0400,RESET_VECTOR_ADDRE
[U-Boot] [PATCH 04/22] .mailmap: Add all the mail alias for Ricardo Ribalda
Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com> --- .mailmap | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.mailmap b/.mailmap index 02dccfc1aee7..f72fef174825 100644 --- a/.mailmap +++ b/.mailmap @@ -21,6 +21,9 @@ Jagan Teki <jagannadha.sutradharudu-t...@xilinx.com> Markus Klotzbuecher <m...@denx.de> Prabhakar Kushwaha <prabha...@freescale.com> Rajeshwari Shinde <rajeshwar...@samsung.com> +Ricardo Ribalda Delgado <ricardo.riba...@uam.es> +Ricardo Ribalda <ricardo.riba...@uam.es> +Ricardo Ribalda <ricardo.riba...@gmail.com> Sandeep Paulraj <s-paul...@ti.com> Shaohui Xie <shaohui@freescale.com> Stefan Roese -- 2.7.0.rc3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 00/22] xilinx-ppc4xx: Cleanout and port to DM serial
xilinx-ppc4xx made us of serial uartlite, which was ported to DM. This patch moves port these boards to DM. Now that Kconfig works really well, there is no need to maintain the specific boards (fx12mm, ml507 and v5fx30teval) or their flash version. The ppc440 boards have been wired to the ll_temac driver. A series of cleanouts have been done. This patchset sits on top of: http://git.denx.de/?p=u-boot/u-boot-microblaze.git;a=shortlog;h=refs/heads/mb It has been tested on a ppc440 bard. Hopefully Georg Schardt can test the changes on his fx12mm. These changes can also be browset at https://github.com/ribalda/u-boot/tree/xilinx-ppc4xx-generic-dm Regards (and thanks for your patience)! Ricardo Ribalda (22): ppc: xilinx-ppc440: Remove support for ml507 ppc: xilinx-ppc405: Remove support for fx12mm xilinx-ppc440: Remove support for v5fx30teval .mailmap: Add all the mail alias for Ricardo Ribalda mailaddr: Update mail address ppc: pp405-generic: Simplify Makefile ppc: pp440-generic: Simplify Makefile ppc: ppc440: ppc440-generic_flash_defconfig ppc: ppc405: ppc405-generic_flash_defconfig ppc: xilinx-ppc440-generic: Cleanout header files ppc: xilinx-ppc405-generic: Cleanout header files ppc: xilinx-ppc4xx-generic: Update xparameters.h ppc: dts: Add device tree for xilix-ppc4xx-generic configs/xilinx-ppc405-generic: Typos and size configs/xilinx-ppc440-generic: Typos and size ppc: xilinx-ppc4xx: Port to DM serial ppc: xilinx_ppc405_generic: Remove weak attributes ppc: xilinx_ppc440_generic: Remove weak attributes ppc: xilinx_ppc405_generic: Remove uncalled functions ppc: xilinx_ppc440_generic: Remove uncalled functions net: xilinx_ll_temac: Fix string overflow ppc: xilinx-ppc440-generic: Wire LL_TEMAC driver .mailmap | 3 ++ arch/powerpc/cpu/ppc4xx/Kconfig| 20 - arch/powerpc/cpu/ppc4xx/interrupts.c | 2 +- arch/powerpc/cpu/ppc4xx/uic.c | 2 +- arch/powerpc/cpu/ppc4xx/xilinx_irq.c | 2 +- arch/powerpc/dts/Makefile | 2 + arch/powerpc/dts/xilinx-ppc405-generic.dts | 13 ++ arch/powerpc/dts/xilinx-ppc440-generic.dts | 13 ++ arch/powerpc/include/asm/interrupt.h | 2 +- arch/powerpc/include/asm/xilinx_irq.h | 2 +- board/avnet/fx12mm/Kconfig | 12 -- board/avnet/fx12mm/MAINTAINERS | 7 --- board/avnet/fx12mm/Makefile| 11 - board/avnet/fx12mm/fx12mm.c| 34 --- board/avnet/fx12mm/xparameters.h | 35 --- board/avnet/v5fx30teval/Kconfig| 12 -- board/avnet/v5fx30teval/MAINTAINERS| 7 --- board/avnet/v5fx30teval/Makefile | 11 - board/avnet/v5fx30teval/v5fx30teval.c | 17 board/avnet/v5fx30teval/xparameters.h | 22 -- board/xilinx/ml507/Kconfig | 12 -- board/xilinx/ml507/MAINTAINERS | 7 --- board/xilinx/ml507/Makefile| 11 - board/xilinx/ml507/ml507.c | 17 board/xilinx/ml507/xparameters.h | 23 -- board/xilinx/ppc405-generic/MAINTAINERS| 2 +- board/xilinx/ppc405-generic/Makefile | 4 +- .../xilinx/ppc405-generic/xilinx_ppc405_generic.c | 31 ++ board/xilinx/ppc405-generic/xparameters.h | 7 ++- board/xilinx/ppc440-generic/MAINTAINERS| 2 +- board/xilinx/ppc440-generic/Makefile | 6 +-- board/xilinx/ppc440-generic/init.S | 2 +- .../xilinx/ppc440-generic/xilinx_ppc440_generic.c | 49 ++--- board/xilinx/ppc440-generic/xparameters.h | 15 --- configs/fx12mm_defconfig | 10 - configs/fx12mm_flash_defconfig | 9 configs/ml507_defconfig| 9 configs/ml507_flash_defconfig | 8 configs/v5fx30teval_defconfig | 9 configs/v5fx30teval_flash_defconfig| 8 configs/xilinx-ppc405-generic_defconfig| 8 configs/xilinx-ppc405-generic_flash_defconfig | 8 configs/xilinx-ppc440-generic_defconfig| 17 ++-- configs/xilinx-ppc440-generic_flash_defconfig | 8 drivers/hwmon/adt7460.c| 2 +- drivers/net/xilinx_ll_temac.c | 3 +- drivers/serial/Kconfig | 2 +- include/configs/fx12mm.h | 50 -- include/configs/ml507.h| 38 include/configs/v5fx30teval.h | 38
[U-Boot] [PATCH 02/22] ppc: xilinx-ppc405: Remove support for fx12mm
It is just a specialized version of the xilinx-ppc405 Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com> --- arch/powerpc/cpu/ppc4xx/Kconfig | 4 board/avnet/fx12mm/Kconfig | 12 -- board/avnet/fx12mm/MAINTAINERS | 7 -- board/avnet/fx12mm/Makefile | 11 - board/avnet/fx12mm/fx12mm.c | 34 --- board/avnet/fx12mm/xparameters.h | 35 configs/fx12mm_defconfig | 10 configs/fx12mm_flash_defconfig | 9 include/configs/fx12mm.h | 50 9 files changed, 172 deletions(-) delete mode 100644 board/avnet/fx12mm/Kconfig delete mode 100644 board/avnet/fx12mm/MAINTAINERS delete mode 100644 board/avnet/fx12mm/Makefile delete mode 100644 board/avnet/fx12mm/fx12mm.c delete mode 100644 board/avnet/fx12mm/xparameters.h delete mode 100644 configs/fx12mm_defconfig delete mode 100644 configs/fx12mm_flash_defconfig delete mode 100644 include/configs/fx12mm.h diff --git a/arch/powerpc/cpu/ppc4xx/Kconfig b/arch/powerpc/cpu/ppc4xx/Kconfig index ba09b57fca50..120d5cfb3f39 100644 --- a/arch/powerpc/cpu/ppc4xx/Kconfig +++ b/arch/powerpc/cpu/ppc4xx/Kconfig @@ -55,9 +55,6 @@ config TARGET_YOSEMITE config TARGET_YUCCA bool "Support yucca" -config TARGET_FX12MM - bool "Support fx12mm" - config TARGET_V5FX30TEVAL bool "Support v5fx30teval" @@ -136,7 +133,6 @@ source "board/amcc/sequoia/Kconfig" source "board/amcc/walnut/Kconfig" source "board/amcc/yosemite/Kconfig" source "board/amcc/yucca/Kconfig" -source "board/avnet/fx12mm/Kconfig" source "board/avnet/v5fx30teval/Kconfig" source "board/esd/cpci2dp/Kconfig" source "board/esd/cpci405/Kconfig" diff --git a/board/avnet/fx12mm/Kconfig b/board/avnet/fx12mm/Kconfig deleted file mode 100644 index 0b67ebde93b8.. --- a/board/avnet/fx12mm/Kconfig +++ /dev/null @@ -1,12 +0,0 @@ -if TARGET_FX12MM - -config SYS_BOARD - default "fx12mm" - -config SYS_VENDOR - default "avnet" - -config SYS_CONFIG_NAME - default "fx12mm" - -endif diff --git a/board/avnet/fx12mm/MAINTAINERS b/board/avnet/fx12mm/MAINTAINERS deleted file mode 100644 index c92e258df95c.. --- a/board/avnet/fx12mm/MAINTAINERS +++ /dev/null @@ -1,7 +0,0 @@ -FX12MM BOARD -M: Georg Schardt <scha...@team-ctech.de> -S: Maintained -F: board/avnet/fx12mm/ -F: include/configs/fx12mm.h -F: configs/fx12mm_defconfig -F: configs/fx12mm_flash_defconfig diff --git a/board/avnet/fx12mm/Makefile b/board/avnet/fx12mm/Makefile deleted file mode 100644 index 618b42f8917c.. --- a/board/avnet/fx12mm/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# -# (C) Copyright 2008 -# Ricardo Ribalda,Universidad Autonoma de Madrid, ricardo.riba...@uam.es -# This work has been supported by: Qtechnology http://qtec.com/ -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y += fx12mm.o - -include $(srctree)/board/xilinx/ppc405-generic/Makefile diff --git a/board/avnet/fx12mm/fx12mm.c b/board/avnet/fx12mm/fx12mm.c deleted file mode 100644 index 92e1cfb75f3c.. --- a/board/avnet/fx12mm/fx12mm.c +++ /dev/null @@ -1,34 +0,0 @@ -/* - * (C) Copyright 2008 - * - * Author: Xilinx Inc. - * - * Modified by: - * Georg Schardt <scha...@team-ctech.de> - * - * SPDX-License-Identifier:GPL-2.0+ - */ - -#include -#include -#include - -int checkboard(void) -{ - char buf[64]; - int i; - int l = getenv_f("serial#", buf, sizeof(buf)); - - if (l < 0) { - printf("Avnet Virtex4 FX12 with no serial #"); - } else { - printf("Avnet Virtex4 FX12 Minimodul # "); - for (i = 0; i < l; ++i) { - if (buf[i] == ' ') - break; - putc(buf[i]); - } - } - putc('\n'); - return 0; -} diff --git a/board/avnet/fx12mm/xparameters.h b/board/avnet/fx12mm/xparameters.h deleted file mode 100644 index 94f682f8ecce.. --- a/board/avnet/fx12mm/xparameters.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * (C) Copyright 2008 - * - * Georg Schardt <scha...@team-ctech.de> - * - * SPDX-License-Identifier:GPL-2.0+ - * - * CAUTION: This file is based on the xparameters.h automatically - * generated by libgen. Version: Xilinx EDK 10.1.02 Build EDK_K_SP2.5 - */ - -#ifndef __XPARAMETER_H__ -#define __XPARAMETER_H__ - -/* RS232 */ -#define XPAR_UARTNS550_0_CLOCK_FREQ_HZ 1 -#define XPAR_UARTNS550_0_BASEADDR 0x83E0 - - -/* INT_C */ -#define XPAR_XPS_INTC_0_DEVICE_ID 0 -#define XPAR_XPS_INTC_0_BASEADDR 0x8180 -#define XPAR_INTC_MAX_NUM_INTR_INPUTS 2 - -/* CPU core clock */ -#define XPAR_CORE_CLOCK_FREQ_HZ 3
[U-Boot] [PATCH 03/22] xilinx-ppc440: Remove support for v5fx30teval
It is just a specialized version of xilinx-ppc440 Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com> --- arch/powerpc/cpu/ppc4xx/Kconfig | 4 board/avnet/v5fx30teval/Kconfig | 12 --- board/avnet/v5fx30teval/MAINTAINERS | 7 --- board/avnet/v5fx30teval/Makefile | 11 -- board/avnet/v5fx30teval/v5fx30teval.c | 17 board/avnet/v5fx30teval/xparameters.h | 22 configs/v5fx30teval_defconfig | 9 - configs/v5fx30teval_flash_defconfig | 8 include/configs/v5fx30teval.h | 38 --- 9 files changed, 128 deletions(-) delete mode 100644 board/avnet/v5fx30teval/Kconfig delete mode 100644 board/avnet/v5fx30teval/MAINTAINERS delete mode 100644 board/avnet/v5fx30teval/Makefile delete mode 100644 board/avnet/v5fx30teval/v5fx30teval.c delete mode 100644 board/avnet/v5fx30teval/xparameters.h delete mode 100644 configs/v5fx30teval_defconfig delete mode 100644 configs/v5fx30teval_flash_defconfig delete mode 100644 include/configs/v5fx30teval.h diff --git a/arch/powerpc/cpu/ppc4xx/Kconfig b/arch/powerpc/cpu/ppc4xx/Kconfig index 120d5cfb3f39..3959585d44c3 100644 --- a/arch/powerpc/cpu/ppc4xx/Kconfig +++ b/arch/powerpc/cpu/ppc4xx/Kconfig @@ -55,9 +55,6 @@ config TARGET_YOSEMITE config TARGET_YUCCA bool "Support yucca" -config TARGET_V5FX30TEVAL - bool "Support v5fx30teval" - config TARGET_CPCI2DP bool "Support CPCI2DP" @@ -133,7 +130,6 @@ source "board/amcc/sequoia/Kconfig" source "board/amcc/walnut/Kconfig" source "board/amcc/yosemite/Kconfig" source "board/amcc/yucca/Kconfig" -source "board/avnet/v5fx30teval/Kconfig" source "board/esd/cpci2dp/Kconfig" source "board/esd/cpci405/Kconfig" source "board/esd/plu405/Kconfig" diff --git a/board/avnet/v5fx30teval/Kconfig b/board/avnet/v5fx30teval/Kconfig deleted file mode 100644 index 079387b707a7.. --- a/board/avnet/v5fx30teval/Kconfig +++ /dev/null @@ -1,12 +0,0 @@ -if TARGET_V5FX30TEVAL - -config SYS_BOARD - default "v5fx30teval" - -config SYS_VENDOR - default "avnet" - -config SYS_CONFIG_NAME - default "v5fx30teval" - -endif diff --git a/board/avnet/v5fx30teval/MAINTAINERS b/board/avnet/v5fx30teval/MAINTAINERS deleted file mode 100644 index 91dde7a5c8f9.. --- a/board/avnet/v5fx30teval/MAINTAINERS +++ /dev/null @@ -1,7 +0,0 @@ -V5FX30TEVAL BOARD -M: Ricardo Ribalda <ricardo.riba...@uam.es> -S: Maintained -F: board/avnet/v5fx30teval/ -F: include/configs/v5fx30teval.h -F: configs/v5fx30teval_defconfig -F: configs/v5fx30teval_flash_defconfig diff --git a/board/avnet/v5fx30teval/Makefile b/board/avnet/v5fx30teval/Makefile deleted file mode 100644 index 8c41af02d4f2.. --- a/board/avnet/v5fx30teval/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# -# (C) Copyright 2008 -# Ricardo Ribalda,Universidad Autonoma de Madrid, ricardo.riba...@uam.es -# This work has been supported by: Qtechnology http://qtec.com/ -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y += v5fx30teval.o - -include $(srctree)/board/xilinx/ppc440-generic/Makefile diff --git a/board/avnet/v5fx30teval/v5fx30teval.c b/board/avnet/v5fx30teval/v5fx30teval.c deleted file mode 100644 index 68b0eb959dea.. --- a/board/avnet/v5fx30teval/v5fx30teval.c +++ /dev/null @@ -1,17 +0,0 @@ -/* - * (C) Copyright 2008 - * Ricado Ribalda-Universidad Autonoma de madrid-ricardo.riba...@uam.es - * This work has been supported by: QTechnology http://qtec.com/ - * SPDX-License-Identifier:GPL-2.0+ -*/ - -#include -#include -#include - - -int checkboard(void) -{ - puts("Avnet Virtex 5 FX30 Evaluation Board\n"); - return 0; -} diff --git a/board/avnet/v5fx30teval/xparameters.h b/board/avnet/v5fx30teval/xparameters.h deleted file mode 100644 index 95b8c285ad1a.. --- a/board/avnet/v5fx30teval/xparameters.h +++ /dev/null @@ -1,22 +0,0 @@ -/* - * (C) Copyright 2008 - * Ricado Ribalda-Universidad Autonoma de madrid-ricardo.riba...@uam.es - * This work has been supported by: QTechnology http://qtec.com/ - * based on xparameters.h by Xilinx - * - * SPDX-License-Identifier:GPL-2.0+ -*/ - -#ifndef XPARAMETER_H -#define XPARAMETER_H - -#define XPAR_DDR2_SDRAM_MEM_BASEADDR 0x -#define XPAR_INTC_0_BASEADDR 0x8180 -#define XPAR_UARTLITE_0_BASEADDR 0x8400 -#define XPAR_FLASH_MEM0_BASEADDR 0xFF00 -#define XPAR_PLB_CLOCK_FREQ_HZ 1 -#define XPAR_CORE_CLOCK_FREQ_HZ4 -#define XPAR_INTC_MAX_NUM_INTR_INPUTS 13 -#define XPAR_UARTLITE_0_BAUDRATE 9600 - -#endif diff --git a/configs/v5fx30teval_defconfig b/configs/v5fx30teval_defconfig deleted file mode 100644 index 3e2ce7d2fe76.
[U-Boot] [PATCH 05/22] mailaddr: Update mail address
The old mail address will stop working soon. Update it all the files Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com> --- arch/powerpc/cpu/ppc4xx/interrupts.c| 2 +- arch/powerpc/cpu/ppc4xx/uic.c | 2 +- arch/powerpc/cpu/ppc4xx/xilinx_irq.c| 2 +- arch/powerpc/include/asm/interrupt.h| 2 +- arch/powerpc/include/asm/xilinx_irq.h | 2 +- board/xilinx/ppc405-generic/MAINTAINERS | 2 +- board/xilinx/ppc405-generic/Makefile| 2 +- board/xilinx/ppc405-generic/xilinx_ppc405_generic.c | 2 +- board/xilinx/ppc405-generic/xparameters.h | 2 +- board/xilinx/ppc440-generic/MAINTAINERS | 2 +- board/xilinx/ppc440-generic/Makefile| 2 +- board/xilinx/ppc440-generic/init.S | 2 +- board/xilinx/ppc440-generic/xilinx_ppc440_generic.c | 2 +- board/xilinx/ppc440-generic/xparameters.h | 2 +- drivers/hwmon/adt7460.c | 2 +- include/configs/xilinx-ppc.h| 2 +- include/configs/xilinx-ppc405-generic.h | 2 +- include/configs/xilinx-ppc405.h | 2 +- include/configs/xilinx-ppc440-generic.h | 2 +- include/configs/xilinx-ppc440.h | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/arch/powerpc/cpu/ppc4xx/interrupts.c b/arch/powerpc/cpu/ppc4xx/interrupts.c index d9b565468b60..45997d6eae06 100644 --- a/arch/powerpc/cpu/ppc4xx/interrupts.c +++ b/arch/powerpc/cpu/ppc4xx/interrupts.c @@ -9,7 +9,7 @@ * Travis B. Sawyer, Sandburst Corporation, tsaw...@sandburst.com * * (C) Copyright 2008 (PPC440X05 port for Virtex 5 FX) - * Ricardo Ribalda-Universidad Autonoma de madrid-ricardo.riba...@uam.es + * Ricardo Ribalda-Universidad Autonoma de madrid-ricardo.riba...@gmail.com * Work supported by Qtechnology (htpp://qtec.com) * * SPDX-License-Identifier:GPL-2.0+ diff --git a/arch/powerpc/cpu/ppc4xx/uic.c b/arch/powerpc/cpu/ppc4xx/uic.c index bd955ed83ff0..fb453b1adfb5 100644 --- a/arch/powerpc/cpu/ppc4xx/uic.c +++ b/arch/powerpc/cpu/ppc4xx/uic.c @@ -9,7 +9,7 @@ * Travis B. Sawyer, Sandburst Corporation, tsaw...@sandburst.com * * (C) Copyright 2008 (PPC440X05 port for Virtex 5 FX) - * Ricardo Ribalda-Universidad Autonoma de madrid-ricardo.riba...@uam.es + * Ricardo Ribalda-Universidad Autonoma de madrid-ricardo.riba...@gmail.com * Work supported by Qtechnology (htpp://qtec.com) * * SPDX-License-Identifier:GPL-2.0+ diff --git a/arch/powerpc/cpu/ppc4xx/xilinx_irq.c b/arch/powerpc/cpu/ppc4xx/xilinx_irq.c index 71e1be02a678..1a2e917eb23b 100644 --- a/arch/powerpc/cpu/ppc4xx/xilinx_irq.c +++ b/arch/powerpc/cpu/ppc4xx/xilinx_irq.c @@ -1,6 +1,6 @@ /* * (C) Copyright 2008 - * Ricado Ribalda-Universidad Autonoma de madrid-ricardo.riba...@uam.es + * Ricado Ribalda-Universidad Autonoma de madrid-ricardo.riba...@gmail.com * This work has been supported by: QTechnology http://qtec.com/ * Based on interrupts.c Wolfgang Denk-DENX Software engineering...@denx.de * SPDX-License-Identifier:GPL-2.0+ diff --git a/arch/powerpc/include/asm/interrupt.h b/arch/powerpc/include/asm/interrupt.h index 1a6a93384e76..9f370dd83c9d 100644 --- a/arch/powerpc/include/asm/interrupt.h +++ b/arch/powerpc/include/asm/interrupt.h @@ -1,6 +1,6 @@ /* * (C) Copyright 2008 - * Ricado Ribalda-Universidad Autonoma de madrid-ricardo.riba...@uam.es + * Ricado Ribalda-Universidad Autonoma de madrid-ricardo.riba...@gmail.com * This work has been supported by: QTechnology http://qtec.com/ * Based on interrupts.c Wolfgang Denk-DENX Software engineering...@denx.de * diff --git a/arch/powerpc/include/asm/xilinx_irq.h b/arch/powerpc/include/asm/xilinx_irq.h index 333a0372b788..5766bde366ce 100644 --- a/arch/powerpc/include/asm/xilinx_irq.h +++ b/arch/powerpc/include/asm/xilinx_irq.h @@ -1,6 +1,6 @@ /* * (C) Copyright 2008 - * Ricado Ribalda-Universidad Autonoma de madrid-ricardo.riba...@uam.es + * Ricado Ribalda-Universidad Autonoma de madrid-ricardo.riba...@gmail.com * This work has been supported by: QTechnology http://qtec.com/ * Based on interrupts.c Wolfgang Denk-DENX Software engineering...@denx.de * SPDX-License-Identifier:GPL-2.0+ diff --git a/board/xilinx/ppc405-generic/MAINTAINERS b/board/xilinx/ppc405-generic/MAINTAINERS index 2b0c98dc8b73..ba48f50c29bf 100644 --- a/board/xilinx/ppc405-generic/MAINTAINERS +++ b/board/xilinx/ppc405-generic/MAINTAINERS @@ -1,5 +1,5 @@ PPC405-GENERIC BOARD -M: Ricardo Ribalda <ricardo.riba...@uam.es> +M: Ricardo Ribalda <ricardo.riba...@gmail.com> S: Maintained F: board/xilinx/ppc405-generic/ F: include/configs/xilinx-ppc405-generic.h diff --git a/board/xilinx/ppc405-generic/Makefile b/board/xilinx/ppc405-generic/Makefile index c9da87065747..922946d72341 100644 --- a/board/xilinx/ppc405-generic/Makefile +++ b/b
[U-Boot] [PATCH 09/22] ppc: ppc405: ppc405-generic_flash_defconfig
Remove redundant defconfig file. Boot via flash can be configured via Kconfig. Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com> --- configs/xilinx-ppc405-generic_flash_defconfig | 8 1 file changed, 8 deletions(-) delete mode 100644 configs/xilinx-ppc405-generic_flash_defconfig diff --git a/configs/xilinx-ppc405-generic_flash_defconfig b/configs/xilinx-ppc405-generic_flash_defconfig deleted file mode 100644 index 37084fb0a82d.. --- a/configs/xilinx-ppc405-generic_flash_defconfig +++ /dev/null @@ -1,8 +0,0 @@ -CONFIG_PPC=y -CONFIG_4xx=y -CONFIG_TARGET_XILINX_PPC405_GENERIC=y -CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xF7F6,RESET_VECTOR_ADDRESS=0xF7FC" -# CONFIG_CMD_IMLS is not set -# CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set -- 2.7.0.rc3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 07/22] ppc: pp440-generic: Simplify Makefile
As a result of the specific board removal, the Makefiles can be simplified. Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com> --- board/xilinx/ppc440-generic/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/xilinx/ppc440-generic/Makefile b/board/xilinx/ppc440-generic/Makefile index 5ca57a9b0d54..4d5f41029ac6 100644 --- a/board/xilinx/ppc440-generic/Makefile +++ b/board/xilinx/ppc440-generic/Makefile @@ -9,5 +9,5 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-y += ../../xilinx/ppc440-generic/xilinx_ppc440_generic.o -extra-y+= ../../xilinx/ppc440-generic/init.o +obj-y += xilinx_ppc440_generic.o +extra-y += init.o -- 2.7.0.rc3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 16/22] ppc: xilinx-ppc4xx: Port to DM serial
xilinx_uartlite has been ported to DM, this patch makes the xilinx-ppc405-generic and the xilinx-ppc440-generic boards use the new DM driver. Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com> --- arch/powerpc/cpu/ppc4xx/Kconfig | 8 board/xilinx/ppc405-generic/xilinx_ppc405_generic.c | 4 board/xilinx/ppc440-generic/xilinx_ppc440_generic.c | 4 configs/xilinx-ppc405-generic_defconfig | 8 configs/xilinx-ppc440-generic_defconfig | 12 drivers/serial/Kconfig | 2 +- include/configs/xilinx-ppc.h| 20 7 files changed, 37 insertions(+), 21 deletions(-) diff --git a/arch/powerpc/cpu/ppc4xx/Kconfig b/arch/powerpc/cpu/ppc4xx/Kconfig index 3959585d44c3..36af1b9419b0 100644 --- a/arch/powerpc/cpu/ppc4xx/Kconfig +++ b/arch/powerpc/cpu/ppc4xx/Kconfig @@ -111,9 +111,17 @@ config TARGET_XPEDITE1000 config TARGET_XILINX_PPC405_GENERIC bool "Support xilinx-ppc405-generic" + select SUPPORT_SPL + select OF_CONTROL + select DM + select DM_SERIAL config TARGET_XILINX_PPC440_GENERIC bool "Support xilinx-ppc440-generic" + select SUPPORT_SPL + select OF_CONTROL + select DM + select DM_SERIAL endchoice diff --git a/board/xilinx/ppc405-generic/xilinx_ppc405_generic.c b/board/xilinx/ppc405-generic/xilinx_ppc405_generic.c index 8b10dbaed149..32105a823b0b 100644 --- a/board/xilinx/ppc405-generic/xilinx_ppc405_generic.c +++ b/board/xilinx/ppc405-generic/xilinx_ppc405_generic.c @@ -46,3 +46,7 @@ void __get_sys_info(sys_info_t *sysInfo) return; } void get_sys_info(sys_info_t *) __attribute__((weak, alias("__get_sys_info"))); + +int get_serial_clock(void){ + return XPAR_UARTNS550_0_CLOCK_FREQ_HZ; +} diff --git a/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c b/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c index 3718a76f8022..f92a3033e14d 100644 --- a/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c +++ b/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c @@ -39,3 +39,7 @@ void __get_sys_info(sys_info_t *sysInfo) return; } void get_sys_info(sys_info_t *) __attribute__((weak, alias("__get_sys_info"))); + +int get_serial_clock(void){ + return XPAR_UARTNS550_0_CLOCK_FREQ_HZ; +} diff --git a/configs/xilinx-ppc405-generic_defconfig b/configs/xilinx-ppc405-generic_defconfig index 53fafc324e68..e7132cd61152 100644 --- a/configs/xilinx-ppc405-generic_defconfig +++ b/configs/xilinx-ppc405-generic_defconfig @@ -7,3 +7,11 @@ CONFIG_SYS_PROMPT="xlx-ppc405:/# " # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NET is not set # CONFIG_CMD_NFS is not set +CONFIG_SYS_MALLOC_SIMPLE=y +CONFIG_XILINX_UARTLITE=y +CONFIG_SYS_NS16550=y +CONFIG_OF_EMBED=y +CONFIG_OF_CONTROL=y +CONFIG_FIT=y +CONFIG_FIT_VERBOSE=y +CONFIG_DEFAULT_DEVICE_TREE="xilinx-ppc440-generic" diff --git a/configs/xilinx-ppc440-generic_defconfig b/configs/xilinx-ppc440-generic_defconfig index 79be48a9955e..c66357e08724 100644 --- a/configs/xilinx-ppc440-generic_defconfig +++ b/configs/xilinx-ppc440-generic_defconfig @@ -3,7 +3,11 @@ CONFIG_4xx=y CONFIG_TARGET_XILINX_PPC440_GENERIC=y CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x0400,RESET_VECTOR_ADDRESS=0x0410,BOOT_FROM_XMD=1" CONFIG_SYS_PROMPT="board:/# " -# CONFIG_CMD_IMLS is not set -# CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set +CONFIG_SYS_MALLOC_SIMPLE=y +CONFIG_XILINX_UARTLITE=y +CONFIG_SYS_NS16550=y +CONFIG_OF_EMBED=y +CONFIG_OF_CONTROL=y +CONFIG_FIT=y +CONFIG_FIT_VERBOSE=y +CONFIG_DEFAULT_DEVICE_TREE="xilinx-ppc440-generic" diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 82f52dd12330..197686483cc7 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig @@ -252,7 +252,7 @@ config UNIPHIER_SERIAL config XILINX_UARTLITE bool "Xilinx Uarlite support" - depends on DM_SERIAL && (MICROBLAZE || ARCH_ZYNQ || ARCH_ZYNQMP) + depends on DM_SERIAL && (MICROBLAZE || ARCH_ZYNQ || ARCH_ZYNQMP || 4xx) help If you have a Xilinx based board and want to use the uartlite serial ports, say Y to this option. If unsure, say N. diff --git a/include/configs/xilinx-ppc.h b/include/configs/xilinx-ppc.h index 876750b13820..d01d88b33f4d 100644 --- a/include/configs/xilinx-ppc.h +++ b/include/configs/xilinx-ppc.h @@ -101,22 +101,10 @@ #define CONFIG_SYS_NO_FLASH #endif -/* serial communication */ -#ifdef XPAR_UARTLITE_0_BASEADDR -#define CONFIG_XILINX_UARTLITE -#define XILINX_UARTLITE_BASEADDR XPAR_UARTLITE_0_BASEADDR -#define CONFIG_BAUDRATEXPAR_UARTLITE_0_BAUDRATE -#define CONFIG_SYS_BAUDRATE_TABLE { CONFIG_BAUDRATE } -#else -#ifdef XPAR_UARTNS550_0_BASEADDR -#def
[U-Boot] [PATCH 19/22] ppc: xilinx_ppc405_generic: Remove uncalled functions
board_pre_init was not called because CONFIG_BOARD_EARLY_INIT_F was not set. Remove unused function. Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com> --- board/xilinx/ppc405-generic/xilinx_ppc405_generic.c | 5 - 1 file changed, 5 deletions(-) diff --git a/board/xilinx/ppc405-generic/xilinx_ppc405_generic.c b/board/xilinx/ppc405-generic/xilinx_ppc405_generic.c index 5c19ac0e6a34..3729f07624a3 100644 --- a/board/xilinx/ppc405-generic/xilinx_ppc405_generic.c +++ b/board/xilinx/ppc405-generic/xilinx_ppc405_generic.c @@ -15,11 +15,6 @@ ulong get_PCI_freq(void) return 0; } -int board_pre_init(void) -{ - return 0; -} - int checkboard(void) { puts("Xilinx PPC405 Generic Board\n"); -- 2.7.0.rc3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 15/22] configs/xilinx-ppc440-generic: Typos and size
-Fix typos (runnining -> running) -Increase default size Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com> --- include/configs/xilinx-ppc440-generic.h | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/configs/xilinx-ppc440-generic.h b/include/configs/xilinx-ppc440-generic.h index 47bc4aec148e..2af5f7fc1de5 100644 --- a/include/configs/xilinx-ppc440-generic.h +++ b/include/configs/xilinx-ppc440-generic.h @@ -21,17 +21,17 @@ #defineCONFIG_ENV_IS_IN_FLASH 1 #defineCONFIG_ENV_SIZE 0x2 #defineCONFIG_ENV_SECT_SIZE0x2 -#define CONFIG_ENV_OFFSET 0x34 +#define CONFIG_ENV_OFFSET 0x34 #define CONFIG_ENV_ADDR (XPAR_FLASH_MEM0_BASEADDR+CONFIG_ENV_OFFSET) /*Misc*/ -#define CONFIG_PREBOOT "echo U-Boot is up and runnining;" +#define CONFIG_PREBOOT "echo U-Boot is up and running;" /*Flash*/ -#defineCONFIG_SYS_FLASH_SIZE (32*1024*1024) -#defineCONFIG_SYS_MAX_FLASH_SECT 259 -#define MTDIDS_DEFAULT "nor0=ml507-flash" -#define MTDPARTS_DEFAULT "mtdparts=ml507-flash:-(user)" +#defineCONFIG_SYS_FLASH_SIZE (128*1024*1024) +#defineCONFIG_SYS_MAX_FLASH_SECT 1024 +#define MTDIDS_DEFAULT "nor0=flash" +#define MTDPARTS_DEFAULT "mtdparts=flash:-(user)" /*Generic Configs*/ #include -- 2.7.0.rc3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 10/22] ppc: xilinx-ppc440-generic: Cleanout header files
Now that there is only one header file for all ppc440 files, merge header files. Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com> --- include/configs/xilinx-ppc440-generic.h | 3 ++- include/configs/xilinx-ppc440.h | 17 - 2 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 include/configs/xilinx-ppc440.h diff --git a/include/configs/xilinx-ppc440-generic.h b/include/configs/xilinx-ppc440-generic.h index 769a1deb8a6f..47bc4aec148e 100644 --- a/include/configs/xilinx-ppc440-generic.h +++ b/include/configs/xilinx-ppc440-generic.h @@ -10,6 +10,7 @@ /*CPU*/ #define CONFIG_440 1 +#define CONFIG_XILINX_440 1 #define CONFIG_XILINX_PPC440_GENERIC 1 #include "../board/xilinx/ppc440-generic/xparameters.h" @@ -33,6 +34,6 @@ #define MTDPARTS_DEFAULT "mtdparts=ml507-flash:-(user)" /*Generic Configs*/ -#include +#include #endif /* __CONFIG_H */ diff --git a/include/configs/xilinx-ppc440.h b/include/configs/xilinx-ppc440.h deleted file mode 100644 index f521387d2289.. --- a/include/configs/xilinx-ppc440.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * (C) Copyright 2008 - * Ricado Ribalda-Universidad Autonoma de madrid-ricardo.riba...@gmail.com - * This work has been supported by: QTechnology http://qtec.com/ - * SPDX-License-Identifier:GPL-2.0+ -*/ - -#ifndef __CONFIG_GEN_H -#define __CONFIG_GEN_H - -/*CPU*/ -#define CONFIG_440 1 -#define CONFIG_XILINX_440 1 - -#include - -#endif /* __CONFIG_H */ -- 2.7.0.rc3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 22/22] ppc: xilinx-ppc440-generic: Wire LL_TEMAC driver
hello We are using the driver and can take a look if we can port it to DM. But it wont be in this or next week sorry. Regards! On Tue, Jan 26, 2016 at 3:20 PM, Michal Simek <mon...@monstr.eu> wrote: > On 26.1.2016 13:43, Ricardo Ribalda Delgado wrote: >> Hello Bin >> >> On Tue, Jan 26, 2016 at 1:21 PM, Bin Meng <bmeng...@gmail.com> wrote: >>> Hi Ricardo, >>> >>> On Tue, Jan 26, 2016 at 6:24 PM, Ricardo Ribalda Delgado >>> <ricardo.riba...@gmail.com> wrote: >>>> If the xparameters file contains a LL_TEMAC definition compile its >>>> driver and the net commands. >>>> >>>> Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com> >>>> --- >>>> .../xilinx/ppc440-generic/xilinx_ppc440_generic.c | 22 >>>> ++ >>>> board/xilinx/ppc440-generic/xparameters.h | 4 >>>> configs/xilinx-ppc440-generic_defconfig| 5 + >>>> include/configs/xilinx-ppc440-generic.h| 10 ++ >>>> 4 files changed, 41 insertions(+) >>>> >>>> diff --git a/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c >>>> b/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c >>>> index 0e3ab94e31ef..d8233529304d 100644 >>>> --- a/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c >>>> +++ b/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c >>>> @@ -8,6 +8,7 @@ >>>> >>>> #include >>>> #include >>>> +#include >>>> #include >>>> >>>> int checkboard(void) >>>> @@ -34,3 +35,24 @@ void get_sys_info(sys_info_t *sys_info) >>>> int get_serial_clock(void){ >>>> return XPAR_UARTNS550_0_CLOCK_FREQ_HZ; >>>> } >>>> + >>>> +int board_eth_init(bd_t *bis) >>>> +{ >>>> + int ret = 0; >>>> + >>>> + puts("Init xilinx temac\n"); >>>> +#ifdef XPAR_LLTEMAC_0_BASEADDR >>>> + ret |= xilinx_ll_temac_eth_init(bis, XPAR_LLTEMAC_0_BASEADDR, >>>> + XILINX_LL_TEMAC_M_SDMA_DCR | >>>> XILINX_LL_TEMAC_M_SDMA_PLB, >>>> + XPAR_LLTEMAC_0_LLINK_CONNECTED_BASEADDR); >>>> + >>>> +#endif >>>> + >>>> +#ifdef XPAR_LLTEMAC_1_BASEADDR >>>> + ret |= xilinx_ll_temac_eth_init(bis, XPAR_LLTEMAC_1_BASEADDR, >>>> + XILINX_LL_TEMAC_M_SDMA_DCR | >>>> XILINX_LL_TEMAC_M_SDMA_PLB, >>>> + XPAR_LLTEMAC_1_LLINK_CONNECTED_BASEADDR); >>>> +#endif >>> >>> No DM ethernet driver for LLTEMAC? >> >> >> Not as far as I know > > I have removed ll_temac support from Microblaze and as we discussed > before we are not going to support ppc platforms. That's why if someone > wants to use this driver it has to invest time to move it to DM or will > be removed at some point in future. > > Thanks, > Michal > > -- > Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 > w: www.monstr.eu p: +42-0-721842854 > Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/ > Maintainer of Linux kernel - Xilinx Zynq ARM architecture > Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform > > -- Ricardo Ribalda ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 14/22] configs/xilinx-ppc405-generic: Typos and size
-Fix typos (runnining -> running) -Increase default size Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com> --- include/configs/xilinx-ppc405-generic.h | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/configs/xilinx-ppc405-generic.h b/include/configs/xilinx-ppc405-generic.h index e2d189d0ac60..6182b0e7cf05 100644 --- a/include/configs/xilinx-ppc405-generic.h +++ b/include/configs/xilinx-ppc405-generic.h @@ -29,16 +29,16 @@ #define CONFIG_ENV_OVERWRITE 1 /*Misc*/ -#define CONFIG_PREBOOT "echo U-Boot is up and runnining;" +#define CONFIG_PREBOOT "echo U-Boot is up and running;" /*Flash*/ -#define CONFIG_SYS_FLASH_BASE XPAR_FLASH_MEM0_BASEADDR -#define CONFIG_SYS_FLASH_SIZE (32*1024*1024) -#define CONFIG_SYS_MAX_FLASH_SECT 71 +#define CONFIG_SYS_FLASH_BASE XPAR_FLASH_MEM0_BASEADDR +#define CONFIG_SYS_FLASH_SIZE (128*1024*1024) +#define CONFIG_SYS_MAX_FLASH_SECT 1024 #define CONFIG_SYS_FLASH_CFI 1 #define CONFIG_FLASH_CFI_DRIVER1 -#define MTDIDS_DEFAULT "nor0=ppc405-flash" -#define MTDPARTS_DEFAULT "mtdpartsa=ppc405-flash:-(user)" +#define MTDIDS_DEFAULT "nor0=flash" +#define MTDPARTS_DEFAULT "mtdparts=flash:-(user)" #include #endif /* __CONFIG_H */ -- 2.7.0.rc3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 13/22] ppc: dts: Add device tree for xilix-ppc4xx-generic
Add device tree example file for xilinx-ppc440-generic and xilinx-ppc405-generic Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com> --- arch/powerpc/dts/Makefile | 2 ++ arch/powerpc/dts/xilinx-ppc405-generic.dts | 13 + arch/powerpc/dts/xilinx-ppc440-generic.dts | 13 + 3 files changed, 28 insertions(+) create mode 100644 arch/powerpc/dts/xilinx-ppc405-generic.dts create mode 100644 arch/powerpc/dts/xilinx-ppc440-generic.dts diff --git a/arch/powerpc/dts/Makefile b/arch/powerpc/dts/Makefile index 5d9f5c2822b2..80b4c0c4e374 100644 --- a/arch/powerpc/dts/Makefile +++ b/arch/powerpc/dts/Makefile @@ -3,6 +3,8 @@ # dtb-$(CONFIG_TARGET_CANYONLANDS) += arches.dtb canyonlands.dtb glacier.dtb +dtb-$(CONFIG_TARGET_XILINX_PPC440_GENERIC) += xilinx-ppc440-generic.dtb +dtb-$(CONFIG_TARGET_XILINX_PPC405_GENERIC) += xilinx-ppc405-generic.dtb targets += $(dtb-y) diff --git a/arch/powerpc/dts/xilinx-ppc405-generic.dts b/arch/powerpc/dts/xilinx-ppc405-generic.dts new file mode 100644 index ..23c89335831e --- /dev/null +++ b/arch/powerpc/dts/xilinx-ppc405-generic.dts @@ -0,0 +1,13 @@ +/dts-v1/; +/ { + #address-cells = <1>; + #size-cells = <1>; + aliases { + console = + } ; + uart0: serial@8400 { + compatible = "xlnx,xps-uartlite-1.00.a"; + interrupts = <0 0>; + reg = <0x8400 0x1>; + }; +} ; diff --git a/arch/powerpc/dts/xilinx-ppc440-generic.dts b/arch/powerpc/dts/xilinx-ppc440-generic.dts new file mode 100644 index ..faae9fffcd0e --- /dev/null +++ b/arch/powerpc/dts/xilinx-ppc440-generic.dts @@ -0,0 +1,13 @@ +/dts-v1/; +/ { + #address-cells = <1>; + #size-cells = <1>; + aliases { + console = + } ; + uart0: serial@8b00 { + compatible = "xlnx,xps-uartlite-1.00.a"; + interrupts = <0 0>; + reg = <0x8b00 0x1>; + }; +} ; -- 2.7.0.rc3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 12/22] ppc: xilinx-ppc4xx-generic: Update xparameters.h
-Remove UART address (It is now part of the dts). -Include dummy ns16550 clock -Fix address to last test Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com> --- board/xilinx/ppc405-generic/xparameters.h | 5 ++--- board/xilinx/ppc440-generic/xparameters.h | 9 - 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/board/xilinx/ppc405-generic/xparameters.h b/board/xilinx/ppc405-generic/xparameters.h index e61040785937..c3df9e51091f 100644 --- a/board/xilinx/ppc405-generic/xparameters.h +++ b/board/xilinx/ppc405-generic/xparameters.h @@ -14,12 +14,11 @@ #define XPAR_IIC_EEPROM_BASEADDR 0x8160 #define XPAR_INTC_0_BASEADDR 0x8180 #define XPAR_SPI_0_BASEADDR 0x8340 -#define XPAR_UARTLITE_0_BASEADDR 0x8400 #define XPAR_FLASH_MEM0_BASEADDR 0xFE00 #define XPAR_PLB_CLOCK_FREQ_HZ 1 #define XPAR_CORE_CLOCK_FREQ_HZ4 -#define XPAR_INTC_MAX_NUM_INTR_INPUTS 13 -#define XPAR_UARTLITE_0_BAUDRATE 9600 +#define XPAR_INTC_MAX_NUM_INTR_INPUTS 32 #define XPAR_SPI_0_NUM_TRANSFER_BITS 8 +#define XPAR_UARTNS550_0_CLOCK_FREQ_HZ 1 #endif diff --git a/board/xilinx/ppc440-generic/xparameters.h b/board/xilinx/ppc440-generic/xparameters.h index 3c135ec42b37..9685560673ab 100644 --- a/board/xilinx/ppc440-generic/xparameters.h +++ b/board/xilinx/ppc440-generic/xparameters.h @@ -12,12 +12,11 @@ #define XPAR_DDR2_SDRAM_MEM_BASEADDR 0x #define XPAR_IIC_EEPROM_BASEADDR 0x8160 -#define XPAR_INTC_0_BASEADDR 0x8180 -#define XPAR_UARTLITE_0_BASEADDR 0x8400 -#define XPAR_FLASH_MEM0_BASEADDR 0xFE00 +#define XPAR_INTC_0_BASEADDR 0x8700 +#define XPAR_FLASH_MEM0_BASEADDR 0xF000 #define XPAR_PLB_CLOCK_FREQ_HZ 1 #define XPAR_CORE_CLOCK_FREQ_HZ4 -#define XPAR_INTC_MAX_NUM_INTR_INPUTS 13 -#define XPAR_UARTLITE_0_BAUDRATE 9600 +#define XPAR_INTC_MAX_NUM_INTR_INPUTS 32 +#define XPAR_UARTNS550_0_CLOCK_FREQ_HZ 1 #endif -- 2.7.0.rc3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 08/22] ppc: ppc440: ppc440-generic_flash_defconfig
Remove redundant defconfig file. Boot via flash can be configured via Kconfig. Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com> --- configs/xilinx-ppc440-generic_flash_defconfig | 8 1 file changed, 8 deletions(-) delete mode 100644 configs/xilinx-ppc440-generic_flash_defconfig diff --git a/configs/xilinx-ppc440-generic_flash_defconfig b/configs/xilinx-ppc440-generic_flash_defconfig deleted file mode 100644 index 629903344b77.. --- a/configs/xilinx-ppc440-generic_flash_defconfig +++ /dev/null @@ -1,8 +0,0 @@ -CONFIG_PPC=y -CONFIG_4xx=y -CONFIG_TARGET_XILINX_PPC440_GENERIC=y -CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xF7F6,RESET_VECTOR_ADDRESS=0xF7FC" -# CONFIG_CMD_IMLS is not set -# CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set -- 2.7.0.rc3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 06/22] ppc: pp405-generic: Simplify Makefile
As a result of the specific board removal, the Makefiles can be simplified. Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com> --- board/xilinx/ppc405-generic/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/xilinx/ppc405-generic/Makefile b/board/xilinx/ppc405-generic/Makefile index 922946d72341..2800f6862640 100644 --- a/board/xilinx/ppc405-generic/Makefile +++ b/board/xilinx/ppc405-generic/Makefile @@ -9,4 +9,4 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-y += ../../xilinx/ppc405-generic/xilinx_ppc405_generic.o +obj-y += xilinx_ppc405_generic.o -- 2.7.0.rc3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 22/22] ppc: xilinx-ppc440-generic: Wire LL_TEMAC driver
If the xparameters file contains a LL_TEMAC definition compile its driver and the net commands. Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com> --- v2: Add whitespaces after /* and before*/ Credit-to: Bin Meng <bmeng...@gmail.com> .../xilinx/ppc440-generic/xilinx_ppc440_generic.c | 22 ++ board/xilinx/ppc440-generic/xparameters.h | 4 configs/xilinx-ppc440-generic_defconfig| 5 + include/configs/xilinx-ppc440-generic.h| 22 -- 4 files changed, 47 insertions(+), 6 deletions(-) diff --git a/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c b/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c index 0e3ab94e31ef..d8233529304d 100644 --- a/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c +++ b/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c @@ -8,6 +8,7 @@ #include #include +#include #include int checkboard(void) @@ -34,3 +35,24 @@ void get_sys_info(sys_info_t *sys_info) int get_serial_clock(void){ return XPAR_UARTNS550_0_CLOCK_FREQ_HZ; } + +int board_eth_init(bd_t *bis) +{ + int ret = 0; + + puts("Init xilinx temac\n"); +#ifdef XPAR_LLTEMAC_0_BASEADDR + ret |= xilinx_ll_temac_eth_init(bis, XPAR_LLTEMAC_0_BASEADDR, + XILINX_LL_TEMAC_M_SDMA_DCR | XILINX_LL_TEMAC_M_SDMA_PLB, + XPAR_LLTEMAC_0_LLINK_CONNECTED_BASEADDR); + +#endif + +#ifdef XPAR_LLTEMAC_1_BASEADDR + ret |= xilinx_ll_temac_eth_init(bis, XPAR_LLTEMAC_1_BASEADDR, + XILINX_LL_TEMAC_M_SDMA_DCR | XILINX_LL_TEMAC_M_SDMA_PLB, + XPAR_LLTEMAC_1_LLINK_CONNECTED_BASEADDR); +#endif + + return ret; +} diff --git a/board/xilinx/ppc440-generic/xparameters.h b/board/xilinx/ppc440-generic/xparameters.h index 9685560673ab..b45a6a1d7668 100644 --- a/board/xilinx/ppc440-generic/xparameters.h +++ b/board/xilinx/ppc440-generic/xparameters.h @@ -18,5 +18,9 @@ #define XPAR_CORE_CLOCK_FREQ_HZ4 #define XPAR_INTC_MAX_NUM_INTR_INPUTS 32 #define XPAR_UARTNS550_0_CLOCK_FREQ_HZ 1 +#define XPAR_LLTEMAC_0_LLINK_CONNECTED_BASEADDR 0x80 +#define XPAR_LLTEMAC_1_LLINK_CONNECTED_BASEADDR 0x98 +#define XPAR_LLTEMAC_0_BASEADDR0x8300 +#define XPAR_LLTEMAC_1_BASEADDR0x8340 #endif diff --git a/configs/xilinx-ppc440-generic_defconfig b/configs/xilinx-ppc440-generic_defconfig index c66357e08724..64b55ee1359e 100644 --- a/configs/xilinx-ppc440-generic_defconfig +++ b/configs/xilinx-ppc440-generic_defconfig @@ -11,3 +11,8 @@ CONFIG_OF_CONTROL=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_DEFAULT_DEVICE_TREE="xilinx-ppc440-generic" +CONFIG_CMD_TFTPPUT=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y +CONFIG_NETCONSOLE=y + diff --git a/include/configs/xilinx-ppc440-generic.h b/include/configs/xilinx-ppc440-generic.h index 2af5f7fc1de5..f2505a6cd2b2 100644 --- a/include/configs/xilinx-ppc440-generic.h +++ b/include/configs/xilinx-ppc440-generic.h @@ -8,32 +8,42 @@ #ifndef __CONFIG_H #define __CONFIG_H -/*CPU*/ +/* CPU */ #define CONFIG_440 1 #define CONFIG_XILINX_440 1 #define CONFIG_XILINX_PPC440_GENERIC 1 #include "../board/xilinx/ppc440-generic/xparameters.h" -/*Mem Map*/ +/* Mem Map */ #define CONFIG_SYS_SDRAM_SIZE_MB 256 -/*Env*/ +/* Env */ #defineCONFIG_ENV_IS_IN_FLASH 1 #defineCONFIG_ENV_SIZE 0x2 #defineCONFIG_ENV_SECT_SIZE0x2 #define CONFIG_ENV_OFFSET 0x34 #define CONFIG_ENV_ADDR (XPAR_FLASH_MEM0_BASEADDR+CONFIG_ENV_OFFSET) -/*Misc*/ +/* Misc */ #define CONFIG_PREBOOT "echo U-Boot is up and running;" -/*Flash*/ +/* Flash */ #defineCONFIG_SYS_FLASH_SIZE (128*1024*1024) #defineCONFIG_SYS_MAX_FLASH_SECT 1024 #define MTDIDS_DEFAULT "nor0=flash" #define MTDPARTS_DEFAULT "mtdparts=flash:-(user)" -/*Generic Configs*/ +/* Net */ +#ifdef XPAR_LLTEMAC_0_BASEADDR +#define CONFIG_XILINX_LL_TEMAC +#define CONFIG_MII +#define CONFIG_PHYLIB +#define CONFIG_PHY_MARVELL +#define CONFIG_NET_RANDOM_ETHADDR +#define CONFIG_LIB_RAND +#endif + +/* Generic Configs */ #include #endif /* __CONFIG_H */ -- 2.7.0.rc3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 13/22] ppc: dts: Add device tree for xilix-ppc4xx-generic
On Tue, Jan 26, 2016 at 1:21 PM, Bin Meng <bmeng...@gmail.com> wrote: > Hi Ricardo, > > On Tue, Jan 26, 2016 at 6:24 PM, Ricardo Ribalda Delgado > <ricardo.riba...@gmail.com> wrote: >> Add device tree example file for xilinx-ppc440-generic and >> xilinx-ppc405-generic >> >> Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com> >> --- >> arch/powerpc/dts/Makefile | 2 ++ >> arch/powerpc/dts/xilinx-ppc405-generic.dts | 13 + >> arch/powerpc/dts/xilinx-ppc440-generic.dts | 13 + >> 3 files changed, 28 insertions(+) >> create mode 100644 arch/powerpc/dts/xilinx-ppc405-generic.dts >> create mode 100644 arch/powerpc/dts/xilinx-ppc440-generic.dts >> >> diff --git a/arch/powerpc/dts/Makefile b/arch/powerpc/dts/Makefile >> index 5d9f5c2822b2..80b4c0c4e374 100644 >> --- a/arch/powerpc/dts/Makefile >> +++ b/arch/powerpc/dts/Makefile >> @@ -3,6 +3,8 @@ >> # >> >> dtb-$(CONFIG_TARGET_CANYONLANDS) += arches.dtb canyonlands.dtb glacier.dtb >> +dtb-$(CONFIG_TARGET_XILINX_PPC440_GENERIC) += xilinx-ppc440-generic.dtb >> +dtb-$(CONFIG_TARGET_XILINX_PPC405_GENERIC) += xilinx-ppc405-generic.dtb >> >> targets += $(dtb-y) >> >> diff --git a/arch/powerpc/dts/xilinx-ppc405-generic.dts >> b/arch/powerpc/dts/xilinx-ppc405-generic.dts >> new file mode 100644 >> index ..23c89335831e >> --- /dev/null >> +++ b/arch/powerpc/dts/xilinx-ppc405-generic.dts >> @@ -0,0 +1,13 @@ >> +/dts-v1/; > > nits: should have a blank line here > >> +/ { >> + #address-cells = <1>; >> + #size-cells = <1>; > > nits: ditto > >> + aliases { >> + console = >> + } ; > > nits: ditto > >> + uart0: serial@8400 { >> + compatible = "xlnx,xps-uartlite-1.00.a"; >> + interrupts = <0 0>; >> + reg = <0x8400 0x1>; >> + }; >> +} ; >> diff --git a/arch/powerpc/dts/xilinx-ppc440-generic.dts >> b/arch/powerpc/dts/xilinx-ppc440-generic.dts >> new file mode 100644 >> index ..faae9fffcd0e >> --- /dev/null >> +++ b/arch/powerpc/dts/xilinx-ppc440-generic.dts >> @@ -0,0 +1,13 @@ >> +/dts-v1/; >> +/ { >> + #address-cells = <1>; >> + #size-cells = <1>; >> + aliases { >> + console = >> + } ; >> + uart0: serial@8b00 { >> + compatible = "xlnx,xps-uartlite-1.00.a"; >> + interrupts = <0 0>; >> + reg = <0x8b00 0x1>; >> + }; >> +} ; >> -- > > BTW no /chosen node? Apparently it is not needed > > Regards, > Bin -- Ricardo Ribalda ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 22/22] ppc: xilinx-ppc440-generic: Wire LL_TEMAC driver
Hello Bin On Tue, Jan 26, 2016 at 1:21 PM, Bin Meng <bmeng...@gmail.com> wrote: > Hi Ricardo, > > On Tue, Jan 26, 2016 at 6:24 PM, Ricardo Ribalda Delgado > <ricardo.riba...@gmail.com> wrote: >> If the xparameters file contains a LL_TEMAC definition compile its >> driver and the net commands. >> >> Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com> >> --- >> .../xilinx/ppc440-generic/xilinx_ppc440_generic.c | 22 >> ++ >> board/xilinx/ppc440-generic/xparameters.h | 4 >> configs/xilinx-ppc440-generic_defconfig| 5 + >> include/configs/xilinx-ppc440-generic.h| 10 ++ >> 4 files changed, 41 insertions(+) >> >> diff --git a/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c >> b/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c >> index 0e3ab94e31ef..d8233529304d 100644 >> --- a/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c >> +++ b/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c >> @@ -8,6 +8,7 @@ >> >> #include >> #include >> +#include >> #include >> >> int checkboard(void) >> @@ -34,3 +35,24 @@ void get_sys_info(sys_info_t *sys_info) >> int get_serial_clock(void){ >> return XPAR_UARTNS550_0_CLOCK_FREQ_HZ; >> } >> + >> +int board_eth_init(bd_t *bis) >> +{ >> + int ret = 0; >> + >> + puts("Init xilinx temac\n"); >> +#ifdef XPAR_LLTEMAC_0_BASEADDR >> + ret |= xilinx_ll_temac_eth_init(bis, XPAR_LLTEMAC_0_BASEADDR, >> + XILINX_LL_TEMAC_M_SDMA_DCR | >> XILINX_LL_TEMAC_M_SDMA_PLB, >> + XPAR_LLTEMAC_0_LLINK_CONNECTED_BASEADDR); >> + >> +#endif >> + >> +#ifdef XPAR_LLTEMAC_1_BASEADDR >> + ret |= xilinx_ll_temac_eth_init(bis, XPAR_LLTEMAC_1_BASEADDR, >> + XILINX_LL_TEMAC_M_SDMA_DCR | >> XILINX_LL_TEMAC_M_SDMA_PLB, >> + XPAR_LLTEMAC_1_LLINK_CONNECTED_BASEADDR); >> +#endif > > No DM ethernet driver for LLTEMAC? Not as far as I know > >> + >> + return ret; >> +} >> diff --git a/board/xilinx/ppc440-generic/xparameters.h >> b/board/xilinx/ppc440-generic/xparameters.h >> index 9685560673ab..b45a6a1d7668 100644 >> --- a/board/xilinx/ppc440-generic/xparameters.h >> +++ b/board/xilinx/ppc440-generic/xparameters.h >> @@ -18,5 +18,9 @@ >> #define XPAR_CORE_CLOCK_FREQ_HZ4 >> #define XPAR_INTC_MAX_NUM_INTR_INPUTS 32 >> #define XPAR_UARTNS550_0_CLOCK_FREQ_HZ 1 >> +#define XPAR_LLTEMAC_0_LLINK_CONNECTED_BASEADDR 0x80 >> +#define XPAR_LLTEMAC_1_LLINK_CONNECTED_BASEADDR 0x98 >> +#define XPAR_LLTEMAC_0_BASEADDR0x8300 >> +#define XPAR_LLTEMAC_1_BASEADDR0x8340 >> >> #endif >> diff --git a/configs/xilinx-ppc440-generic_defconfig >> b/configs/xilinx-ppc440-generic_defconfig >> index c66357e08724..64b55ee1359e 100644 >> --- a/configs/xilinx-ppc440-generic_defconfig >> +++ b/configs/xilinx-ppc440-generic_defconfig >> @@ -11,3 +11,8 @@ CONFIG_OF_CONTROL=y >> CONFIG_FIT=y >> CONFIG_FIT_VERBOSE=y >> CONFIG_DEFAULT_DEVICE_TREE="xilinx-ppc440-generic" >> +CONFIG_CMD_TFTPPUT=y >> +CONFIG_CMD_DHCP=y >> +CONFIG_CMD_PING=y >> +CONFIG_NETCONSOLE=y >> + >> diff --git a/include/configs/xilinx-ppc440-generic.h >> b/include/configs/xilinx-ppc440-generic.h >> index 2af5f7fc1de5..8b9d37f42e03 100644 >> --- a/include/configs/xilinx-ppc440-generic.h >> +++ b/include/configs/xilinx-ppc440-generic.h >> @@ -33,6 +33,16 @@ >> #define MTDIDS_DEFAULT "nor0=flash" >> #define MTDPARTS_DEFAULT "mtdparts=flash:-(user)" >> >> +/*Net*/ > > nits: /* Net */ > >> +#ifdef XPAR_LLTEMAC_0_BASEADDR >> +#define CONFIG_XILINX_LL_TEMAC >> +#define CONFIG_MII >> +#define CONFIG_PHYLIB >> +#define CONFIG_PHY_MARVELL >> +#define CONFIG_NET_RANDOM_ETHADDR >> +#define CONFIG_LIB_RAND > > I believe we can move part of these into boards' defconfig files, and > if with DM ethernet plus OF control we can always enable the driver. > I want to build it only when the core is present. This is checked with the definitions from the xparameters.h file, obtained by the fpga syntesis tool. >> +#endif >> + >> /*Generic Configs*/ >> #include >> >> -- > > Regards, > Bin Thanks! -- Ricardo Ribalda ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 13/22] ppc: dts: Add device tree for xilix-ppc4xx-generic
Add device tree example file for xilinx-ppc440-generic and xilinx-ppc405-generic Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com> --- arch/powerpc/dts/Makefile | 2 ++ arch/powerpc/dts/xilinx-ppc405-generic.dts | 15 +++ arch/powerpc/dts/xilinx-ppc440-generic.dts | 15 +++ 3 files changed, 32 insertions(+) create mode 100644 arch/powerpc/dts/xilinx-ppc405-generic.dts create mode 100644 arch/powerpc/dts/xilinx-ppc440-generic.dts v2: Add newlines after size-cells and aliases block Credit-to: Bin Meng <bmeng...@gmail.com> diff --git a/arch/powerpc/dts/Makefile b/arch/powerpc/dts/Makefile index 5d9f5c2822b2..80b4c0c4e374 100644 --- a/arch/powerpc/dts/Makefile +++ b/arch/powerpc/dts/Makefile @@ -3,6 +3,8 @@ # dtb-$(CONFIG_TARGET_CANYONLANDS) += arches.dtb canyonlands.dtb glacier.dtb +dtb-$(CONFIG_TARGET_XILINX_PPC440_GENERIC) += xilinx-ppc440-generic.dtb +dtb-$(CONFIG_TARGET_XILINX_PPC405_GENERIC) += xilinx-ppc405-generic.dtb targets += $(dtb-y) diff --git a/arch/powerpc/dts/xilinx-ppc405-generic.dts b/arch/powerpc/dts/xilinx-ppc405-generic.dts new file mode 100644 index ..64983216b57f --- /dev/null +++ b/arch/powerpc/dts/xilinx-ppc405-generic.dts @@ -0,0 +1,15 @@ +/dts-v1/; +/ { + #address-cells = <1>; + #size-cells = <1>; + + aliases { + console = + }; + + uart0: serial@8400 { + compatible = "xlnx,xps-uartlite-1.00.a"; + interrupts = <0 0>; + reg = <0x8400 0x1>; + }; +} ; diff --git a/arch/powerpc/dts/xilinx-ppc440-generic.dts b/arch/powerpc/dts/xilinx-ppc440-generic.dts new file mode 100644 index ..c83523a5a481 --- /dev/null +++ b/arch/powerpc/dts/xilinx-ppc440-generic.dts @@ -0,0 +1,15 @@ +/dts-v1/; +/ { + #address-cells = <1>; + #size-cells = <1>; + + aliases { + console = + }; + + uart0: serial@8b00 { + compatible = "xlnx,xps-uartlite-1.00.a"; + interrupts = <0 0>; + reg = <0x8b00 0x1>; + }; +} ; -- 2.7.0.rc3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [GIT PULL] Microblaze changes
Hi My main concern is that the support for the board is not removed. I have one active product based on virtex5 ppc440. Today I had to do some last minute support and now I am on a plane... Otherwise the patchset would be on your inbox. I have taken a fast look over the required changes, and it is not that bad. Most of the hard work has already been done by you for mblaze. Thanks for your understanding ;). On 22 Jan 2016 19:23, "Michal Simek" <mon...@monstr.eu> wrote: > Hi, > > On 22.1.2016 15:53, Ricardo Ribalda Delgado wrote: > > Hello > > > > I will probably have something by next week. Is it ok? > > do you want to me to wait? I have another sort of 50 patches which I > would like to merge in this merge window to have enough time for testing. > > Thanks, > Michal > > -- > Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 > w: www.monstr.eu p: +42-0-721842854 > Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/ > Maintainer of Linux kernel - Xilinx Zynq ARM architecture > Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform > > > ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [GIT PULL] Microblaze changes
Hello I will probably have something by next week. Is it ok? On Wed, Jan 20, 2016 at 2:35 PM, Ricardo Ribalda Delgado <ricardo.riba...@uam.es> wrote: > I have allocated the whole Friday for this > > On Wed, Jan 20, 2016 at 2:23 PM, Michal Simek <mon...@monstr.eu> wrote: >> Hi Ricardo, >> >> are you on track on this? >> >> Thanks, >> Michal >> >> On 15.1.2016 08:08, Michal Simek wrote: >>> Hi, >>> >>> On 14.1.2016 21:24, Ricardo Ribalda Delgado wrote: >>>> Hello Michal >>>> >>>> I will give a look to it during the next week. Hopefuly by the end of >>>> it I can give you the patch or an educated estimated. Is this a good >>>> timeline for you? >>> >>> ok. Let's wait one more week and I hope you will have SPL up and running. >>> >>> Thanks, >>> Michal >>> >> >> >> -- >> Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 >> w: www.monstr.eu p: +42-0-721842854 >> Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/ >> Maintainer of Linux kernel - Xilinx Zynq ARM architecture >> Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform >> >> > > > > -- > Ricardo Ribalda -- Ricardo Ribalda ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [GIT PULL] Microblaze changes
I have allocated the whole Friday for this On Wed, Jan 20, 2016 at 2:23 PM, Michal Simek <mon...@monstr.eu> wrote: > Hi Ricardo, > > are you on track on this? > > Thanks, > Michal > > On 15.1.2016 08:08, Michal Simek wrote: >> Hi, >> >> On 14.1.2016 21:24, Ricardo Ribalda Delgado wrote: >>> Hello Michal >>> >>> I will give a look to it during the next week. Hopefuly by the end of >>> it I can give you the patch or an educated estimated. Is this a good >>> timeline for you? >> >> ok. Let's wait one more week and I hope you will have SPL up and running. >> >> Thanks, >> Michal >> > > > -- > Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 > w: www.monstr.eu p: +42-0-721842854 > Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/ > Maintainer of Linux kernel - Xilinx Zynq ARM architecture > Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform > > -- Ricardo Ribalda ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [GIT PULL] Microblaze changes
Hello Michal I will give a look to it during the next week. Hopefuly by the end of it I can give you the patch or an educated estimated. Is this a good timeline for you? Thanks! On Thu, Jan 14, 2016 at 2:50 PM, Michal Simekwrote: > Hi Ricardo, > > On 14.1.2016 14:17, Tom Rini wrote: >> On Thu, Jan 14, 2016 at 09:51:32AM +0100, Michal Simek wrote: >> >>> Hi Tom, >>> >>> here are microblaze patches for moving stuff to DM. This is the patch >>> series which we postpone to next release. Buildman doesn't show any >>> problems for mb, zynq_zc702 and zynqmp. >> >> It breaks xilinx-ppc440-generic at least 'tho, please fix, thanks! > > The reason for this break is moving serial driver to DM. > Can you please tell us when you move platform to DM? > > Thanks, > Michal > > -- > Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 > w: www.monstr.eu p: +42-0-721842854 > Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/ > Maintainer of Linux kernel - Xilinx Zynq ARM architecture > Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform > > > > ___ > U-Boot mailing list > U-Boot@lists.denx.de > http://lists.denx.de/mailman/listinfo/u-boot > -- Ricardo Ribalda ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 2/2] ppc: xilinx-ppc: Move to generic board support
On behalf of Georg Tested-by: Georg Schardt scha...@team-ctech.de On Tue, May 12, 2015 at 4:20 PM, Ricardo Ribalda Delgado ricardo.riba...@gmail.com wrote: Generic board support seems to work just fine. Tested on ml507 with bitstream generated on the latest ISE software. Signed-off-by: Ricardo Ribalda Delgado ricardo.riba...@gmail.com --- include/configs/xilinx-ppc.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/configs/xilinx-ppc.h b/include/configs/xilinx-ppc.h index 0ccd73a8681e..ccae703cbce2 100644 --- a/include/configs/xilinx-ppc.h +++ b/include/configs/xilinx-ppc.h @@ -11,6 +11,9 @@ #ifndef __CONFIG_XLX_H #define __CONFIG_XLX_H + +#define CONFIG_SYS_GENERIC_BOARD + /* #define DEBUG #define ET_DEBUG -- 2.1.4 -- Ricardo Ribalda ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 2/2] ppc: xilinx-ppc: Move to generic board support
Generic board support seems to work just fine. Tested on ml507 with bitstream generated on the latest ISE software. Signed-off-by: Ricardo Ribalda Delgado ricardo.riba...@gmail.com --- include/configs/xilinx-ppc.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/configs/xilinx-ppc.h b/include/configs/xilinx-ppc.h index 0ccd73a8681e..ccae703cbce2 100644 --- a/include/configs/xilinx-ppc.h +++ b/include/configs/xilinx-ppc.h @@ -11,6 +11,9 @@ #ifndef __CONFIG_XLX_H #define __CONFIG_XLX_H + +#define CONFIG_SYS_GENERIC_BOARD + /* #define DEBUG #define ET_DEBUG -- 2.1.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] ppc: xilinx: Remove ancient ppc405 and ppc440 platform
Hello I have followed doc/README.generic-board and simply adding CONFIG_SYS_GENERIC_BOARD does the trick. So far it has build with no warnings for: ml507 ml507_flash xilinx-ppc440-generic v5fx30teval and I have run it on the ml507 with no issues (is the only hw I have with me this week, but it is VERY similar to the others): Simply adding CONFIG_SYS_GENERIC_BOARD to the .h file works perfectly As you can see from here: U-Boot 2015.07-rc1-00091-g698a12bef9e7-dirty (May 12 2015 - 10:14:15) CPU: IBM PowerPC 440x5 VIRTEX5 at 400 MHz (PLB=100 OPB=8 EBC=67) 32 KiB I-Cache 32 KiB D-Cache DRAM: 256 MiB Flash: 32 MiB *** Warning - bad CRC, using default environment U-Boot is up and runnining ml507:/# Regarding xilinx-ppc404 and fx12mm It also builds ok, but I have no access to an fx12mm. Perhaps Georg can give it a try to confirm that this still works. Is there any other test that needs to be done after porting them to generic board? Thanks On Mon, May 11, 2015 at 3:45 PM, Michal Simek michal.si...@xilinx.com wrote: Hi, On 05/11/2015 09:34 AM, Ricardo Ribalda Delgado wrote: Hello Michal Thanks for your reply On Mon, May 11, 2015 at 9:11 AM, Michal Simek michal.si...@xilinx.com wrote: Hi, On 05/09/2015 06:24 PM, Ricardo Ribalda Delgado wrote: Hello Michal and Stefan Could you provide some context about why are we removing this? Virtex 5 (and V4) are not yet in their end of life. I was checking this internally and ppc is not supported by tools for several releases (roughly ~2 years). All support from tools was already removed. Virtex5 is only supported by ise/edk, not vivado. This is why the tools from the last two years does not support ppc. It is also about SDK where that support was removed. I think that the position from xilinx was to support ise for as long as v5, s6... was on sale. http://forums.xilinx.com/t5/Implementation/VIrtex-5-and-Vivado-HSL/td-p/250930 One thing was support design tools and the next was to support the latest SW. Anyway this is Virtex5 - ppc440. Any intention to keep ppc405 alive? There is no testing on it done for a long time that's why this platform is obsolete from my point of view. We still use it actively on the fpga family of our productsm and cisco uses quite a lot of virtex5 :) Also avnet virtex5 boards are still available http://avnetexpress.avnet.com/store/em/EMController?action=productscatalogId=500201storeId=500201N=0langId=-1slnk=bterm=AES-XLX-V5LX-EVL110-Ghrf=http%3A%2F%2Fwww.em.avnet.com%2Fen-us%2Fdesign%2Fdrc%2FPages%2FXilinx-Virtex-5-LX-Evaluation-Kit.aspxintcmp=EMA-BUY-AES-XLX-V5LX-EVL110-G ok. I really have no problem to let you support these boards. :-) The plan is to re-factor the code for this platform or just drop all the support? Platform needs to be moved to generic board support and none from xilinx will do it. If you want to invest your time and support these boards feel free to do it but from my perspective we should just remove it because it is just old and make no sense to waste our time on it. Give me a couple of days and I will be able to answer to that question. If the patch can wait a bit before it is merged it will be great. Definitely it can wait but it has to be moved and test for generic board support. There are also yocto layers that support ml507 and ml405 http://git.yoctoproject.org/cgit/cgit.cgi/meta-xilinx-community/tree/conf/machine I am not yocto guy but from cgit it looks like that it is pretty old too. ppc support 4 years ago, ml507 2 years ago. Last change for virtex5 is from 2014. :-) really just make no sense for me to keep these things alive because we are not testing it at all. Thanks, Michal -- Ricardo Ribalda ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/2] doc/README.generic-board: Trivial spell check
Signed-off-by: Ricardo Ribalda Delgado ricardo.riba...@gmail.com --- doc/README.generic-board | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/README.generic-board b/doc/README.generic-board index bd8eae1992c7..734f1aa9249a 100644 --- a/doc/README.generic-board +++ b/doc/README.generic-board @@ -36,7 +36,7 @@ fields which are common to all architectures. Architecture-specific fields have been moved to separate structures. -Supported Arcthitectures +Supported Architectures If you are unlucky then your architecture may not support generic board. @@ -105,12 +105,12 @@ places. initialisation is painful since it must be independently added in 10 places. -3. As time goes by the architectures naturely diverge since there is limited -pressure to compare features or even CONFIG options against simiilar things +3. As time goes by the architectures naturally diverge since there is limited +pressure to compare features or even CONFIG options against similar things in other board.c files. 4. New architectures must implement all the features all over again, and -sometimes in subtley different ways. This places an unfair burden on getting +sometimes in subtle different ways. This places an unfair burden on getting a new architecture fully functional and running with U-Boot. 5. While it is a bit of a tricky change, I believe it is worthwhile and -- 2.1.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] ppc: xilinx: Remove ancient ppc405 and ppc440 platform
Hello Georg Please make sure this patch is applied: http://lists.denx.de/pipermail/u-boot/2015-May/214017.html when you test it. Thanks! On Tue, May 12, 2015 at 4:27 PM, Georg Schardt scha...@team-ctech.de wrote: Hello, yes, we have still some fx12mm in use and i can try to compile and run the newest u-boot in the next few days. regards Georg Am 12.05.2015 um 16:19 schrieb Ricardo Ribalda Delgado: Hello I have followed doc/README.generic-board and simply adding CONFIG_SYS_GENERIC_BOARD does the trick. So far it has build with no warnings for: ml507 ml507_flash xilinx-ppc440-generic v5fx30teval and I have run it on the ml507 with no issues (is the only hw I have with me this week, but it is VERY similar to the others): Simply adding CONFIG_SYS_GENERIC_BOARD to the .h file works perfectly As you can see from here: U-Boot 2015.07-rc1-00091-g698a12bef9e7-dirty (May 12 2015 - 10:14:15) CPU: IBM PowerPC 440x5 VIRTEX5 at 400 MHz (PLB=100 OPB=8 EBC=67) 32 KiB I-Cache 32 KiB D-Cache DRAM: 256 MiB Flash: 32 MiB *** Warning - bad CRC, using default environment U-Boot is up and runnining ml507:/# Regarding xilinx-ppc404 and fx12mm It also builds ok, but I have no access to an fx12mm. Perhaps Georg can give it a try to confirm that this still works. Is there any other test that needs to be done after porting them to generic board? Thanks On Mon, May 11, 2015 at 3:45 PM, Michal Simek michal.si...@xilinx.com wrote: Hi, On 05/11/2015 09:34 AM, Ricardo Ribalda Delgado wrote: Hello Michal Thanks for your reply On Mon, May 11, 2015 at 9:11 AM, Michal Simek michal.si...@xilinx.com wrote: Hi, On 05/09/2015 06:24 PM, Ricardo Ribalda Delgado wrote: Hello Michal and Stefan Could you provide some context about why are we removing this? Virtex 5 (and V4) are not yet in their end of life. I was checking this internally and ppc is not supported by tools for several releases (roughly ~2 years). All support from tools was already removed. Virtex5 is only supported by ise/edk, not vivado. This is why the tools from the last two years does not support ppc. It is also about SDK where that support was removed. I think that the position from xilinx was to support ise for as long as v5, s6... was on sale. http://forums.xilinx.com/t5/Implementation/VIrtex-5-and-Vivado-HSL/td-p/250930 One thing was support design tools and the next was to support the latest SW. Anyway this is Virtex5 - ppc440. Any intention to keep ppc405 alive? There is no testing on it done for a long time that's why this platform is obsolete from my point of view. We still use it actively on the fpga family of our productsm and cisco uses quite a lot of virtex5 :) Also avnet virtex5 boards are still available http://avnetexpress.avnet.com/store/em/EMController?action=productscatalogId=500201storeId=500201N=0langId=-1slnk=bterm=AES-XLX-V5LX-EVL110-Ghrf=http%3A%2F%2Fwww.em.avnet.com%2Fen-us%2Fdesign%2Fdrc%2FPages%2FXilinx-Virtex-5-LX-Evaluation-Kit.aspxintcmp=EMA-BUY-AES-XLX-V5LX-EVL110-G ok. I really have no problem to let you support these boards. :-) The plan is to re-factor the code for this platform or just drop all the support? Platform needs to be moved to generic board support and none from xilinx will do it. If you want to invest your time and support these boards feel free to do it but from my perspective we should just remove it because it is just old and make no sense to waste our time on it. Give me a couple of days and I will be able to answer to that question. If the patch can wait a bit before it is merged it will be great. Definitely it can wait but it has to be moved and test for generic board support. There are also yocto layers that support ml507 and ml405 http://git.yoctoproject.org/cgit/cgit.cgi/meta-xilinx-community/tree/conf/machine I am not yocto guy but from cgit it looks like that it is pretty old too. ppc support 4 years ago, ml507 2 years ago. Last change for virtex5 is from 2014. :-) really just make no sense for me to keep these things alive because we are not testing it at all. Thanks, Michal -- Ricardo Ribalda ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] ppc: xilinx: Remove ancient ppc405 and ppc440 platform
Hello Michal Thanks for your reply On Mon, May 11, 2015 at 9:11 AM, Michal Simek michal.si...@xilinx.com wrote: Hi, On 05/09/2015 06:24 PM, Ricardo Ribalda Delgado wrote: Hello Michal and Stefan Could you provide some context about why are we removing this? Virtex 5 (and V4) are not yet in their end of life. I was checking this internally and ppc is not supported by tools for several releases (roughly ~2 years). All support from tools was already removed. Virtex5 is only supported by ise/edk, not vivado. This is why the tools from the last two years does not support ppc. I think that the position from xilinx was to support ise for as long as v5, s6... was on sale. http://forums.xilinx.com/t5/Implementation/VIrtex-5-and-Vivado-HSL/td-p/250930 There is no testing on it done for a long time that's why this platform is obsolete from my point of view. We still use it actively on the fpga family of our productsm and cisco uses quite a lot of virtex5 :) Also avnet virtex5 boards are still available http://avnetexpress.avnet.com/store/em/EMController?action=productscatalogId=500201storeId=500201N=0langId=-1slnk=bterm=AES-XLX-V5LX-EVL110-Ghrf=http%3A%2F%2Fwww.em.avnet.com%2Fen-us%2Fdesign%2Fdrc%2FPages%2FXilinx-Virtex-5-LX-Evaluation-Kit.aspxintcmp=EMA-BUY-AES-XLX-V5LX-EVL110-G The plan is to re-factor the code for this platform or just drop all the support? Platform needs to be moved to generic board support and none from xilinx will do it. If you want to invest your time and support these boards feel free to do it but from my perspective we should just remove it because it is just old and make no sense to waste our time on it. Give me a couple of days and I will be able to answer to that question. If the patch can wait a bit before it is merged it will be great. There are also yocto layers that support ml507 and ml405 http://git.yoctoproject.org/cgit/cgit.cgi/meta-xilinx-community/tree/conf/machine I am not yocto guy but from cgit it looks like that it is pretty old too. ppc support 4 years ago, ml507 2 years ago. Last change for virtex5 is from 2014. Regards! -- Ricardo Ribalda ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] ppc: xilinx: Remove ancient ppc405 and ppc440 platform
Hello Michal and Stefan Could you provide some context about why are we removing this? Virtex 5 (and V4) are not yet in their end of life. The plan is to re-factor the code for this platform or just drop all the support? There are also yocto layers that support ml507 and ml405 http://git.yoctoproject.org/cgit/cgit.cgi/meta-xilinx-community/tree/conf/machine The xilinx git tree still supports this boards, will you also remove support there? Regards! -- Ricardo Ribalda ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v6] net: ll_temac: Add LL TEMAC driver to u-boot
Hello Stefan, Hello Wolfgang, Hello Michal, I have tried the code on a Propietary Virtex5 fx board (ppc440) and it works Thanks for your work. Regards! -- Ricardo Ribalda ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v6] net: ll_temac: Add LL TEMAC driver to u-boot
Hello Stephan I just checked it, and I am using v7 :) from: http://patchwork.ozlabs.org/bundle/rexut/net-ll_temac/ Once it is applied I will post the patches for xilinx-ppc440-generic (mainly instantiate it in the config...) I have tried to download an image with the dhcp command over 100 and 1000M... I have to work more on it, but it looks promising. If you need an specific test, just say it, tomorrow I will be working with the board. Thanks again for the patch, it was very needed for u-boot. Regards On Thu, Dec 22, 2011 at 19:52, Stephan Linz l...@li-pro.net wrote: Hello Recardo, Am Donnerstag, den 22.12.2011, 17:06 +0100 schrieb Ricardo Ribalda Delgado: Hello Stefan, Hello Wolfgang, Hello Michal, I have tried the code on a Propietary Virtex5 fx board (ppc440) and it works Thanks for your work. OK, thanks for your efforts. Would it be possible for you to test even the latest v7 patch? There were some critical changes between v6 and v7, especially timeout regime, function pointers for plattform specific in/out accessors, and MDIO clock calculation. -- Best regards, Stephan Linz __ MB-Ref: http://www.li-pro.de/xilinx_mb:mbref:start OpenDCC: http://www.li-pro.net/opendcc.phtml PC/M: http://www.li-pro.net/pcm.phtml Sourceforge: http://sourceforge.net/users/slz Gitorious: https://gitorious.org/~slz -- Ricardo Ribalda ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] xilinx_ppc_boards: Change address of RESET_VECTOR
Old address of RESET_VECTOR were overwritten by the bss sector, making impossible its run from xmd. Signed-off-by: Ricardo Ribalda Delgado ricardo.riba...@gmail.com --- boards.cfg | 10 +- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/boards.cfg b/boards.cfg index 94b8745..2ba603d 100644 --- a/boards.cfg +++ b/boards.cfg @@ -675,9 +675,9 @@ yellowstone powerpc ppc4xx yosemiteamcc yosemite powerpc ppc4xx yosemiteamcc - yosemite:YOSEMITE yuccapowerpc ppc4xx - amcc AP1000 powerpc ppc4xx ap1000 amirix -fx12mm powerpc ppc4xx fx12mm avnet - fx12mm:SYS_TEXT_BASE=0x0400,RESET_VECTOR_ADDRESS=0x03FC,INIT_TLB=board/xilinx/ppc405-generic/init.o +fx12mm powerpc ppc4xx fx12mm avnet - fx12mm:SYS_TEXT_BASE=0x0400,RESET_VECTOR_ADDRESS=0x0410,INIT_TLB=board/xilinx/ppc405-generic/init.o fx12mm_flash powerpc ppc4xx fx12mm avnet - fx12mm:SYS_TEXT_BASE=0xF7F6,RESET_VECTOR_ADDRESS=0xF7FC,INIT_TLB=board/xilinx/ppc405-generic/init.o -v5fx30teval powerpc ppc4xx v5fx30teval avnet - v5fx30teval:SYS_TEXT_BASE=0x0400,RESET_VECTOR_ADDRESS=0x03FC,BOOT_FROM_XMD=1,INIT_TLB=board/xilinx/ppc440-generic/init.o +v5fx30teval powerpc ppc4xx v5fx30teval avnet - v5fx30teval:SYS_TEXT_BASE=0x0400,RESET_VECTOR_ADDRESS=0x0410,BOOT_FROM_XMD=1,INIT_TLB=board/xilinx/ppc440-generic/init.o v5fx30teval_flashpowerpc ppc4xx v5fx30teval avnet - v5fx30teval:SYS_TEXT_BASE=0xF7F6,RESET_VECTOR_ADDRESS=0xF7FC,INIT_TLB=board/xilinx/ppc440-generic/init.o CRAYL1 powerpc ppc4xx L1 cray CATcenterpowerpc ppc4xx PPChameleonEVB dave - CATcenter:PPCHAMELEON_MODULE_MODEL=1 @@ -736,11 +736,11 @@ p3p440 powerpc ppc4xx - prodriv KAREFpowerpc ppc4xx karef sandburst METROBOX powerpc ppc4xx metrobox sandburst xpedite1000 powerpc ppc4xx - xes -ml507powerpc ppc4xx ml507 xilinx - ml507:SYS_TEXT_BASE=0x0400,RESET_VECTOR_ADDRESS=0x03FC,BOOT_FROM_XMD=1,INIT_TLB=board/xilinx/ppc440-generic/init.o +ml507powerpc ppc4xx ml507 xilinx - ml507:SYS_TEXT_BASE=0x0400,RESET_VECTOR_ADDRESS=0x0410,BOOT_FROM_XMD=1,INIT_TLB=board/xilinx/ppc440-generic/init.o ml507_flash powerpc ppc4xx ml507 xilinx - ml507:SYS_TEXT_BASE=0xF7F6,RESET_VECTOR_ADDRESS=0xF7FC,INIT_TLB=board/xilinx/ppc440-generic/init.o -xilinx-ppc405-genericpowerpc ppc4xx ppc405-generic xilinx - xilinx-ppc405-generic:SYS_TEXT_BASE=0x0400,RESET_VECTOR_ADDRESS=0x03FC +xilinx-ppc405-genericpowerpc ppc4xx ppc405-generic xilinx - xilinx-ppc405-generic:SYS_TEXT_BASE=0x0400,RESET_VECTOR_ADDRESS=0x0410 xilinx-ppc405-generic_flash powerpc ppc4xx ppc405-generic xilinx - xilinx-ppc405-generic:SYS_TEXT_BASE=0xF7F6,RESET_VECTOR_ADDRESS=0xF7FC -xilinx-ppc440-genericpowerpc ppc4xx ppc440-generic xilinx - xilinx-ppc440-generic:SYS_TEXT_BASE=0x0400,RESET_VECTOR_ADDRESS=0x03FC,BOOT_FROM_XMD=1 +xilinx-ppc440-genericpowerpc ppc4xx ppc440-generic xilinx - xilinx-ppc440-generic:SYS_TEXT_BASE=0x0400,RESET_VECTOR_ADDRESS=0x0410,BOOT_FROM_XMD=1 xilinx-ppc440-generic_flash powerpc ppc4xx ppc440-generic xilinx - xilinx-ppc440-generic:SYS_TEXT_BASE=0xF7F6,RESET_VECTOR_ADDRESS=0xF7FC rsk7203 sh sh2 rsk7203 renesas- mpr2 sh sh3 mpr2- - -- 1.7.2.3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] ppc4xx: Generic architecture for xilinx ppc405(v3)
Hello It is weird. just fetch stefan/next from the repository and make fx12mm works with no problem (what is mainly what I use for tests). It is the MAKEALL script that fails. It is quite late now, but I will try to find out the differences tomorrow. Best regards. On Thu, Dec 23, 2010 at 23:22, Wolfgang Denk w...@denx.de wrote: Dear Ricardo Ribalda Delgado, In message 1224606586-7538-1-git-send-email-ricardo.riba...@uam.es you wrote: As ppc44x: Unification of virtex5 pp440 boards did for the xilinx ppc440 boards, this patch presents a common architecture for all the xilinx ppc405 boards. Any custom xilinx ppc405 board can be added very easily with no code duplicity. This patch also adds a simple generic board, that can be used on almost any design with xilinx ppc405 replacing the file ppc405-generic/xparameters.h This patch is prepared to work with the latest version of EDK (10.1) Signed-off-by: Ricardo Ribalda Delgado ricardo.riba...@uam.es As it turns out this patch has obviously never been tested with an out-of-tree build. I get for example: MAKEALL_LOGDIR=/work/wd/tmp-ppc-LOG \ BUILD_DIR=/work/wd/tmp-ppc \ ./MAKEALL fx12mm Configuring for fx12mm - Board: fx12mm, Options: SYS_TEXT_BASE=0x0400,RESET_VECTOR_ADDRESS=0x03FC,INIT_TLB=board/xilinx/ppc405-generic/init.o Assembler messages: Fatal error: can't create /work/wd/tmp-ppc/board/avnet/fx12mm/../../xilinx/ppc405-generic/xilinx_ppc405_generic.o: No such file or directory make[1]: *** [/work/wd/tmp-ppc/board/avnet/fx12mm/../../xilinx/ppc405-generic/xilinx_ppc405_generic.o] Error 2 make[1]: *** Waiting for unfinished jobs make: *** [/work/wd/tmp-ppc/board/avnet/fx12mm/libfx12mm.o] Error 2 ppc_6xx-size: '/work/wd/tmp-ppc/u-boot': No such file This happens for all affected boards. Please provide a fix; alternatively, we can revert that commit. Thanks. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH,   MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de The game of life is a game of boomerangs.  Our  thoughts,  deeds  and words return to us sooner or later with astounding accuracy. -- Ricardo Ribalda http://www.eps.uam.es/~rribalda/ ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] xilinx-ppc4xx-generic: Fix Makefile to work with MAKEALL
config.mk only mkdirs $(obj), but we have objects shared with other boards located on other dirs. This patch mkdirs the needed dirs for the xlnx-generic boards. --- board/xilinx/ppc405-generic/Makefile | 11 +++ board/xilinx/ppc440-generic/Makefile | 14 -- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/board/xilinx/ppc405-generic/Makefile b/board/xilinx/ppc405-generic/Makefile index 717ffc9..501fd46 100644 --- a/board/xilinx/ppc405-generic/Makefile +++ b/board/xilinx/ppc405-generic/Makefile @@ -27,12 +27,9 @@ include $(TOPDIR)/config.mk ifneq ($(OBJTREE),$(SRCTREE)) +$(shell mkdir -p $(obj)../../xilinx/ppc405-generic) endif -INCS := -CFLAGS += $(INCS) -HOSTCFLAGS += $(INCS) - LIB= $(obj)lib$(BOARD).o COBJS += ../../xilinx/ppc405-generic/xilinx_ppc405_generic.o @@ -41,10 +38,8 @@ SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) SOBJS := $(addprefix $(obj),$(SOBJS)) -all: $(LIB) $(SOBJS) - -$(LIB):$(OBJS) - $(call cmd_link_o_target, $^) +$(LIB):$(obj).depend $(OBJS) $(SOBJS) + $(call cmd_link_o_target, $(OBJS)) clean: rm -f $(SOBJS) $(OBJS) diff --git a/board/xilinx/ppc440-generic/Makefile b/board/xilinx/ppc440-generic/Makefile index 1760e4e..ed2cf9f 100644 --- a/board/xilinx/ppc440-generic/Makefile +++ b/board/xilinx/ppc440-generic/Makefile @@ -27,26 +27,20 @@ include $(TOPDIR)/config.mk ifneq ($(OBJTREE),$(SRCTREE)) +$(shell mkdir -p $(obj)../../xilinx/ppc440-generic) endif -INCS := -CFLAGS += $(INCS) -HOSTCFLAGS += $(INCS) - LIB= $(obj)lib$(BOARD).o COBJS += ../../xilinx/ppc440-generic/xilinx_ppc440_generic.o - -SOBJS += ../../xilinx/ppc440-generic/init.o +SOBJS += ../../xilinx/ppc440-generic/init.o SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) SOBJS := $(addprefix $(obj),$(SOBJS)) -all: $(LIB) $(SOBJS) - -$(LIB):$(OBJS) - $(call cmd_link_o_target, $^) +$(LIB):$(obj).depend $(OBJS) $(SOBJS) + $(call cmd_link_o_target, $(OBJS)) clean: rm -f $(SOBJS) $(OBJS) -- 1.7.2.3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] ppc4xx: Generic architecture for xilinx ppc405(v3)
Patch is on the mail Best regards and Merry Christmas! On Fri, Dec 24, 2010 at 01:16, Ricardo Ribalda Delgado ricardo.riba...@uam.es wrote: Hello  It is weird.  just fetch stefan/next from the repository and make fx12mm works with no problem (what is mainly what I use for tests). It is the MAKEALL script that fails. It is quite late now, but I will try to find out the differences tomorrow.    Best regards. On Thu, Dec 23, 2010 at 23:22, Wolfgang Denk w...@denx.de wrote: Dear Ricardo Ribalda Delgado, In message 1224606586-7538-1-git-send-email-ricardo.riba...@uam.es you wrote: As ppc44x: Unification of virtex5 pp440 boards did for the xilinx ppc440 boards, this patch presents a common architecture for all the xilinx ppc405 boards. Any custom xilinx ppc405 board can be added very easily with no code duplicity. This patch also adds a simple generic board, that can be used on almost any design with xilinx ppc405 replacing the file ppc405-generic/xparameters.h This patch is prepared to work with the latest version of EDK (10.1) Signed-off-by: Ricardo Ribalda Delgado ricardo.riba...@uam.es As it turns out this patch has obviously never been tested with an out-of-tree build. I get for example: MAKEALL_LOGDIR=/work/wd/tmp-ppc-LOG \ BUILD_DIR=/work/wd/tmp-ppc \ ./MAKEALL fx12mm Configuring for fx12mm - Board: fx12mm, Options: SYS_TEXT_BASE=0x0400,RESET_VECTOR_ADDRESS=0x03FC,INIT_TLB=board/xilinx/ppc405-generic/init.o Assembler messages: Fatal error: can't create /work/wd/tmp-ppc/board/avnet/fx12mm/../../xilinx/ppc405-generic/xilinx_ppc405_generic.o: No such file or directory make[1]: *** [/work/wd/tmp-ppc/board/avnet/fx12mm/../../xilinx/ppc405-generic/xilinx_ppc405_generic.o] Error 2 make[1]: *** Waiting for unfinished jobs make: *** [/work/wd/tmp-ppc/board/avnet/fx12mm/libfx12mm.o] Error 2 ppc_6xx-size: '/work/wd/tmp-ppc/u-boot': No such file This happens for all affected boards. Please provide a fix; alternatively, we can revert that commit. Thanks. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH,   MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de The game of life is a game of boomerangs.  Our  thoughts,  deeds  and words return to us sooner or later with astounding accuracy. -- Ricardo Ribalda http://www.eps.uam.es/~rribalda/ -- Ricardo Ribalda http://www.eps.uam.es/~rribalda/ ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] xilinx-ppc4xx-generic: Use common u-boot.lds
Use common ppc4xx linker script for xilinx ppc440 and ppc405 related boards. Signed-off-by: Ricardo Ribalda Delgado ricardo.riba...@gmail.com --- arch/powerpc/cpu/ppc4xx/start.S|2 +- arch/powerpc/cpu/ppc4xx/u-boot.lds |8 ++ board/xilinx/ppc405-generic/Makefile |4 +- board/xilinx/ppc405-generic/u-boot-ram.lds | 131 - board/xilinx/ppc405-generic/u-boot-rom.lds | 141 --- board/xilinx/ppc440-generic/Makefile |4 +- board/xilinx/ppc440-generic/u-boot-ram.lds | 132 -- board/xilinx/ppc440-generic/u-boot-rom.lds | 142 boards.cfg | 20 ++-- include/configs/xilinx-ppc.h |1 + 10 files changed, 26 insertions(+), 559 deletions(-) delete mode 100644 board/xilinx/ppc405-generic/u-boot-ram.lds delete mode 100644 board/xilinx/ppc405-generic/u-boot-rom.lds delete mode 100644 board/xilinx/ppc440-generic/u-boot-ram.lds delete mode 100644 board/xilinx/ppc440-generic/u-boot-rom.lds diff --git a/arch/powerpc/cpu/ppc4xx/start.S b/arch/powerpc/cpu/ppc4xx/start.S index 0e75794..d57225d 100644 --- a/arch/powerpc/cpu/ppc4xx/start.S +++ b/arch/powerpc/cpu/ppc4xx/start.S @@ -265,7 +265,7 @@ /* NOTREACHED - board_init_f() does not return */ #endif -#if defined(CONFIG_SYS_RAMBOOT) +#if defined(CONFIG_SYS_RAMBOOT) || defined(CONFIG_BOOT_FROM_XMD) /* * 4xx RAM-booting U-Boot image is started from offset 0 */ diff --git a/arch/powerpc/cpu/ppc4xx/u-boot.lds b/arch/powerpc/cpu/ppc4xx/u-boot.lds index dac0e5b..842ff5f 100644 --- a/arch/powerpc/cpu/ppc4xx/u-boot.lds +++ b/arch/powerpc/cpu/ppc4xx/u-boot.lds @@ -23,8 +23,12 @@ #include config.h/* CONFIG_BOARDDIR */ #ifndef RESET_VECTOR_ADDRESS +#ifdef CONFIG_RESET_VECTOR_ADDRESS +#define RESET_VECTOR_ADDRESS CONFIG_RESET_VECTOR_ADDRESS +#else #define RESET_VECTOR_ADDRESS 0xfffc #endif +#endif OUTPUT_ARCH(powerpc) @@ -100,7 +104,11 @@ SECTIONS * start.o, since the first shadow TLB only covers 4k * of address space. */ +#ifdef CONFIG_INIT_TLB +CONFIG_INIT_TLB (.bootpg) +#else CONFIG_BOARDDIR/init.o (.bootpg) +#endif } :text = 0x #endif diff --git a/board/xilinx/ppc405-generic/Makefile b/board/xilinx/ppc405-generic/Makefile index 4b8e4f4..717ffc9 100644 --- a/board/xilinx/ppc405-generic/Makefile +++ b/board/xilinx/ppc405-generic/Makefile @@ -41,7 +41,9 @@ SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) SOBJS := $(addprefix $(obj),$(SOBJS)) -$(LIB):$(OBJS) $(SOBJS) +all: $(LIB) $(SOBJS) + +$(LIB):$(OBJS) $(call cmd_link_o_target, $^) clean: diff --git a/board/xilinx/ppc405-generic/u-boot-ram.lds b/board/xilinx/ppc405-generic/u-boot-ram.lds deleted file mode 100644 index a7539fd..000 --- a/board/xilinx/ppc405-generic/u-boot-ram.lds +++ /dev/null @@ -1,131 +0,0 @@ -/* - * (C) Copyright 2000-2004 - * Wolfgang Denk, DENX Software Engineering, w...@denx.de. - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - -OUTPUT_ARCH(powerpc) -ENTRY(_start) - -SECTIONS -{ - /* Read-only sections, merged into text segment: */ - . = + SIZEOF_HEADERS; - .interp : { *(.interp) } - .hash : { *(.hash) } - .dynsym: { *(.dynsym)} - .dynstr: { *(.dynstr)} - .rel.text : { *(.rel.text) } - .rela.text : { *(.rela.text) } - .rel.data : { *(.rel.data) } - .rela.data : { *(.rela.data) } - .rel.rodata: { *(.rel.rodata)} - .rela.rodata : { *(.rela.rodata) } - .rel.got : { *(.rel.got) } - .rela.got : { *(.rela.got) } - .rel.ctors : { *(.rel.ctors) } - .rela.ctors: { *(.rela.ctors)} - .rel.dtors : { *(.rel.dtors) } - .rela.dtors: { *(.rela.dtors)} - .rel.bss : { *(.rel.bss) } - .rela.bss : { *(.rela.bss) } - .rel.plt : { *(.rel.plt) } - .rela.plt : { *(.rela.plt) } - .init : { *(.init) } - .plt
[U-Boot] [PATCH] ubifs.c: BUG: Error following links
The link_name variable is declared inside the if block and it is used outside it through the name pointer. Signed-off-by: Ricardo Ribalda Delgado ricardo.riba...@gmail.com --- fs/ubifs/ubifs.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c index 0f8128c..2bad027 100644 --- a/fs/ubifs/ubifs.c +++ b/fs/ubifs/ubifs.c @@ -386,6 +386,7 @@ static unsigned long ubifs_findfile(struct super_block *sb, char *filename) unsigned long root_inum = 1; unsigned long inum; int symlink_count = 0; /* Don't allow symlink recursion */ + char link_name[64]; strcpy(fpath, filename); @@ -422,7 +423,6 @@ static unsigned long ubifs_findfile(struct super_block *sb, char *filename) ui = ubifs_inode(inode); if ((inode-i_mode S_IFMT) == S_IFLNK) { - char link_name[64]; char buf[128]; /* We have some sort of symlink recursion, bail out */ -- 1.7.2.3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 3/3] ubifs: BUG: Blocks commpressed with zlib
Hello What is the situation now? We apply this patch and then make lzo parameter compatible? I am a bit lost -- Ricardo Ribalda http://www.eps.uam.es/~rribalda/ ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 2/2] ubifs: BUG: Blocks commpressed with zlib
Hello Mike: Who is in charge of the lib_generic stuff? Meanwhile there is no such a function I will leave it as an extra function. This must be solved ASAP, it is a simply bug that avoid many fs to be mounted properly. Best regards On Mon, Apr 27, 2009 at 08:59, Mike Frysinger vap...@gentoo.org wrote: On Friday 24 April 2009 10:36:06 Ricardo Ribalda Delgado wrote: Blocks compressed with zlib dont have the full gzip header. This patch adds a new function to properly handle blocks compressed with zlib. Without this patch, block compressed with zlib cannot be readed! this really should be a common function not specific to ubifs as there are many other opportunities for things to be compressed directly with zlib and not through gzip (splash/video images come to mind). -mike -- Ricardo Ribalda http://www.eps.uam.es/~rribalda/ ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/2] ubifs: BUG realpath string must be ended with NULL
If the memory used to copy the link_make is dirty the string wont be ended with NULL, throwing out multiple memory bugs. Signed-off-by: Ricardo Ribalda Delgado ricardo.riba...@uam.es --- v3: s/ZERO/NULL/, s/=/ = / v2: better doc and remove duplicated memcpy fs/ubifs/ubifs.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c index 32f9ff8..427d84a 100644 --- a/fs/ubifs/ubifs.c +++ b/fs/ubifs/ubifs.c @@ -641,6 +641,7 @@ int ubifs_load(char *filename, u32 addr, u32 size) ui = ubifs_inode(inode); if (((inode-i_mode S_IFMT) == S_IFLNK) ui-data_len) { memcpy(link_name, ui-data, ui-data_len); + link_name[ui-data_len] = '\0'; printf(%s is linked to %s!\n, filename, link_name); ubifs_iput(inode); -- 1.6.2.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 2/2] ubifs: BUG: Blocks commpressed with zlib
Hello I am creating a new function (zunzip). Where this function should be placed. In zlib.c or in gunzip.c? Best regards On Mon, Apr 27, 2009 at 09:36, Stefan Roese s...@denx.de wrote: On Monday 27 April 2009, Mike Frysinger wrote: Who is in charge of the lib_generic stuff? if there is no one specified in the MAINTAINERS file, then Wolfgang maintains it all. Â just send it to the u-boot list and someone will pick it up. Yes, Wolfgang is ion charge for all this stuff. Meanwhile there is no such a function I will leave it as an extra function. This must be solved ASAP, it is a simply bug that avoid many fs to be mounted properly. We should really fix this properly, as Mike suggested, by moving this function into a common/generic file. It shouldn't be a problem to get it accepted in this release since it's a bug fix. So please resubmit again, this time in lib_generic. Thanks. Best regards, Stefan = DENX Software Engineering GmbH, Â Â MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Â Email: off...@denx.de = -- Ricardo Ribalda http://www.eps.uam.es/~rribalda/ ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/2] lib_generic: gunzip: New function zunzip
Separate gunzip in gunzip: Find the end of the header and call zunzip. zunzip: Inflate gunzip block without header. Signed-off-by: Ricardo Ribalda Delgado ricardo.riba...@uam.es --- lib_generic/gunzip.c | 27 --- 1 files changed, 20 insertions(+), 7 deletions(-) diff --git a/lib_generic/gunzip.c b/lib_generic/gunzip.c index 01a4031..d59a448 100644 --- a/lib_generic/gunzip.c +++ b/lib_generic/gunzip.c @@ -39,6 +39,8 @@ int gunzip(void *, int, unsigned char *, unsigned long *); void *zalloc(void *, unsigned, unsigned); void zfree(void *, void *, unsigned); +int zunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp, + int stoponerr, int offset); void *zalloc(void *x, unsigned items, unsigned size) { @@ -59,8 +61,7 @@ void zfree(void *x, void *addr, unsigned nb) int gunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp) { - z_stream s; - int r, i, flags; + int i, flags; /* skip header */ i = 10; @@ -84,6 +85,18 @@ int gunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp) return (-1); } + return zunzip(dst, dstlen, src, lenp, 1, i); +} + +/* + * Uncompress blocks compressed with zlib without headers + */ +int zunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp, + int stoponerr, int offset) +{ + z_stream s; + int r; + s.zalloc = zalloc; s.zfree = zfree; #if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG) @@ -95,14 +108,14 @@ int gunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp) r = inflateInit2(s, -MAX_WBITS); if (r != Z_OK) { printf (Error: inflateInit2() returned %d\n, r); - return (-1); + return -1; } - s.next_in = src + i; - s.avail_in = *lenp - i; + s.next_in = src + offset; + s.avail_in = *lenp - offset; s.next_out = dst; s.avail_out = dstlen; r = inflate(s, Z_FINISH); - if (r != Z_STREAM_END) { + if ((r != Z_STREAM_END) (stoponerr==1)) { printf (Error: inflate() returned %d\n, r); inflateEnd(s); return (-1); @@ -110,5 +123,5 @@ int gunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp) *lenp = s.next_out - (unsigned char *) dst; inflateEnd(s); - return (0); + return 0; } -- 1.6.2.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/2] lib_generic: gunzip: New function zunzip
Hello Wolfgang UBI fs blocks can be compresed in lzo, zlib or no-compression. The current implementation of u-boot supported all the compressions but there was a bug in the implementation of zlib. UBIFS's Zlib blocks do not have header but they were compressed using gunzip, a function used to decompress gunzip files/sectors with a header. This patch creates a functions that is able of decompress such a blocks. Please comment what it means. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH,   MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de To the systems programmer,  users  and  applications  serve  only  to provide a test load. -- Ricardo Ribalda http://www.eps.uam.es/~rribalda/ ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/2] lib_generic: gunzip: New function zunzip
Hello Then please write this in the commit message of the patch. It is already written in the ubifs patch (#2) Shall I also add this to this patch (#1), that only touches the gunzip file? Regards Best regards, Wolfgang Denk -- DENX Software Engineering GmbH,   MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de Niklaus Wirth has lamented that, whereas Europeans pronounce his name correctly (Ni-klows Virt), Americans invariably mangle it into (Nick- les Worth). Which is to say that Europeans  call  him  by  name,  but Americans call him by value. -- Ricardo Ribalda http://www.eps.uam.es/~rribalda/ ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/2] lib_generic: gunzip: New function zunzip
Sorry for the mess. There were 2 patch 1/2 -: BUG realpath string must be ended with NULL posting? 2/2 -ubifs: BUG: Blocks commpressed with zlib Since 1/2 has been applied. And 2/2 needed to be separated in two patches 1/2 - lib_generic: gunzip: New function zunzip 2/2 - ubifs: BUG: Blocks commpressed with zlib 1/2 Creates a new zunzip function and 2/2 calls it. On Mon, Apr 27, 2009 at 12:26, Wolfgang Denk w...@denx.de wrote: Dear Ricardo, In message aa76a2be0904270234y4635b4dbj7de80cac751a2...@mail.gmail.com you wrote: UBI fs blocks can be compresed in lzo, zlib or no-compression. The current implementation of u-boot supported all the compressions but there was a bug in the implementation of zlib. UBIFS's Zlib blocks do not have header but they were compressed using gunzip, a function used to decompress gunzip files/sectors with a header. This patch creates a functions that is able of decompress such a blocks. BTW: what is patch 2/2 of this series? According to the References: header it's [PATCH 2/2] ubifs: BUG: Blocks commpressed with zlib. But then, what is the second patch for the [PATCH 1/2] ubifs: BUG realpath string must be ended with NULL posting? In other words, we have 2 x [PATCH 1/2] but only one [PATCH 2/2] - or am I missing something? Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, Â Â MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de What kind of love is that? Â Not to be loved; never to have shown love. Â Â Â Â -- Commissioner Nancy Hedford, Metamorphosis, Â Â Â Â Â stardate 3219.8 -- Ricardo Ribalda http://www.eps.uam.es/~rribalda/ ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/3] ubifs: BUG realpath string must be ended with NULL
If the memory used to copy the link_make is dirty the string wont be ended with NULL, throwing out multiple memory bugs. Signed-off-by: Ricardo Ribalda Delgado ricardo.riba...@uam.es --- fs/ubifs/ubifs.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c index 32f9ff8..427d84a 100644 --- a/fs/ubifs/ubifs.c +++ b/fs/ubifs/ubifs.c @@ -641,6 +641,7 @@ int ubifs_load(char *filename, u32 addr, u32 size) ui = ubifs_inode(inode); if (((inode-i_mode S_IFMT) == S_IFLNK) ui-data_len) { memcpy(link_name, ui-data, ui-data_len); + link_name[ui-data_len] = '\0'; printf(%s is linked to %s!\n, filename, link_name); ubifs_iput(inode); -- 1.6.2.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 2/3] lib_generic: gunzip: New function zunzip
Separate gunzip in gunzip: Find the end of the header and call zunzip. zunzip: Inflate gunzip block without header. UBI fs blocks can be compresed in lzo, zlib or no-compression. The current implementation of u-boot supported all the compressions but there was a bug in the implementation of the zlib blocks. UBIFS's Zlib blocks do not have header but they were compressed using gunzip, a function used to decompress gunzip files/sectors with a header. This patch adds a new function zunzip that uncompress a zlib block with no header. Signed-off-by: Ricardo Ribalda Delgado ricardo.riba...@uam.es --- v2: Better doc lib_generic/gunzip.c | 27 --- 1 files changed, 20 insertions(+), 7 deletions(-) diff --git a/lib_generic/gunzip.c b/lib_generic/gunzip.c index 01a4031..d59a448 100644 --- a/lib_generic/gunzip.c +++ b/lib_generic/gunzip.c @@ -39,6 +39,8 @@ int gunzip(void *, int, unsigned char *, unsigned long *); void *zalloc(void *, unsigned, unsigned); void zfree(void *, void *, unsigned); +int zunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp, + int stoponerr, int offset); void *zalloc(void *x, unsigned items, unsigned size) { @@ -59,8 +61,7 @@ void zfree(void *x, void *addr, unsigned nb) int gunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp) { - z_stream s; - int r, i, flags; + int i, flags; /* skip header */ i = 10; @@ -84,6 +85,18 @@ int gunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp) return (-1); } + return zunzip(dst, dstlen, src, lenp, 1, i); +} + +/* + * Uncompress blocks compressed with zlib without headers + */ +int zunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp, + int stoponerr, int offset) +{ + z_stream s; + int r; + s.zalloc = zalloc; s.zfree = zfree; #if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG) @@ -95,14 +108,14 @@ int gunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp) r = inflateInit2(s, -MAX_WBITS); if (r != Z_OK) { printf (Error: inflateInit2() returned %d\n, r); - return (-1); + return -1; } - s.next_in = src + i; - s.avail_in = *lenp - i; + s.next_in = src + offset; + s.avail_in = *lenp - offset; s.next_out = dst; s.avail_out = dstlen; r = inflate(s, Z_FINISH); - if (r != Z_STREAM_END) { + if ((r != Z_STREAM_END) (stoponerr==1)) { printf (Error: inflate() returned %d\n, r); inflateEnd(s); return (-1); @@ -110,5 +123,5 @@ int gunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp) *lenp = s.next_out - (unsigned char *) dst; inflateEnd(s); - return (0); + return 0; } -- 1.6.2.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 3/3] ubifs: BUG: Blocks commpressed with zlib
Blocks compressed with zlib dont have the full gzip header. Without this patch, block compressed with zlib cannot be readed! Signed-off-by: Ricardo Ribalda Delgado ricardo.riba...@uam.es --- v3: rename patch 2- patch 3 v2: remove unused parts.. fs/ubifs/ubifs.c |7 +-- fs/ubifs/ubifs.h |2 -- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c index 427d84a..739fb04 100644 --- a/fs/ubifs/ubifs.c +++ b/fs/ubifs/ubifs.c @@ -24,6 +24,7 @@ */ #include ubifs.h +#include u-boot/zlib.h #if !defined(CONFIG_SYS_64BIT_VSPRINTF) #warning Please define CONFIG_SYS_64BIT_VSPRINTF for correct output! @@ -33,15 +34,17 @@ DECLARE_GLOBAL_DATA_PTR; /* compress.c */ +int zunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp, + int stoponerr, int offset); /* - * We need a wrapper for gunzip() because the parameters are + * We need a wrapper for zunzip() because the parameters are * incompatible with the lzo decompressor. */ static int gzip_decompress(const unsigned char *in, size_t in_len, unsigned char *out, size_t *out_len) { unsigned long len = in_len; - return gunzip(out, *out_len, (unsigned char *)in, len); + return zunzip(out, *out_len, (unsigned char *)in, len, 0, 0); } /* Fake description object for the none compressor */ diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h index 91351de..a68e4c1 100644 --- a/fs/ubifs/ubifs.h +++ b/fs/ubifs/ubifs.h @@ -2172,6 +2172,4 @@ int ubifs_decompress(const void *buf, int len, void *out, int *out_len, /* todo: Move these to a common U-Boot header */ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, unsigned char *out, size_t *out_len); -int gunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp); - #endif /* !__UBIFS_H__ */ -- 1.6.2.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 3/3] ubifs: BUG: Blocks commpressed with zlib
Hello Wolfgang If the only purpose of zunzip() is to be used here, then why do we not make the parameters fit the intended purpose, thus avoiding an additional wrapper? The purpose of zunzip is to use it in more places. Like Mike Frysinger said: Mike this really should be a common function not specific to ubifs as there are many other opportunities for things to be compressed directly with zlib and not through gzip (splash/video images come to mind). /Mike Also, in order to be parameter compatible with lzo, we should keep this wrapper (am I right Stefan?) Best regards -- Ricardo Ribalda http://www.eps.uam.es/~rribalda/ ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/3] ubifs: BUG realpath string must be ended with NULL
If the memory used to copy the link_name is dirty the string wont be ended with NULL, throwing out multiple memory bugs. Signed-off-by: Ricardo Ribalda Delgado ricardo.riba...@uam.es --- v3: link_make - link_name fs/ubifs/ubifs.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c index 32f9ff8..427d84a 100644 --- a/fs/ubifs/ubifs.c +++ b/fs/ubifs/ubifs.c @@ -641,6 +641,7 @@ int ubifs_load(char *filename, u32 addr, u32 size) ui = ubifs_inode(inode); if (((inode-i_mode S_IFMT) == S_IFLNK) ui-data_len) { memcpy(link_name, ui-data, ui-data_len); + link_name[ui-data_len] = '\0'; printf(%s is linked to %s!\n, filename, link_name); ubifs_iput(inode); -- 1.6.2.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 2/3] lib_generic: gunzip: New function zunzip
Separate gunzip in gunzip: Find the end of the header and call zunzip. zunzip: Inflate gunzip block without header. UBI fs blocks can be compresed in lzo, zlib or no-compression. The current implementation of u-boot supported all the compressions but there was a bug in the implementation of the zlib blocks. UBIFS's Zlib blocks do not have header but they were compressed using gunzip, a function used to decompress gunzip files/sectors with a header. This patch adds a new function zunzip that uncompress a zlib block with no header. Signed-off-by: Ricardo Ribalda Delgado ricardo.riba...@uam.es --- v2- rename to patch 2/3 lib_generic/gunzip.c | 27 --- 1 files changed, 20 insertions(+), 7 deletions(-) diff --git a/lib_generic/gunzip.c b/lib_generic/gunzip.c index 01a4031..d59a448 100644 --- a/lib_generic/gunzip.c +++ b/lib_generic/gunzip.c @@ -39,6 +39,8 @@ int gunzip(void *, int, unsigned char *, unsigned long *); void *zalloc(void *, unsigned, unsigned); void zfree(void *, void *, unsigned); +int zunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp, + int stoponerr, int offset); void *zalloc(void *x, unsigned items, unsigned size) { @@ -59,8 +61,7 @@ void zfree(void *x, void *addr, unsigned nb) int gunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp) { - z_stream s; - int r, i, flags; + int i, flags; /* skip header */ i = 10; @@ -84,6 +85,18 @@ int gunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp) return (-1); } + return zunzip(dst, dstlen, src, lenp, 1, i); +} + +/* + * Uncompress blocks compressed with zlib without headers + */ +int zunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp, + int stoponerr, int offset) +{ + z_stream s; + int r; + s.zalloc = zalloc; s.zfree = zfree; #if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG) @@ -95,14 +108,14 @@ int gunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp) r = inflateInit2(s, -MAX_WBITS); if (r != Z_OK) { printf (Error: inflateInit2() returned %d\n, r); - return (-1); + return -1; } - s.next_in = src + i; - s.avail_in = *lenp - i; + s.next_in = src + offset; + s.avail_in = *lenp - offset; s.next_out = dst; s.avail_out = dstlen; r = inflate(s, Z_FINISH); - if (r != Z_STREAM_END) { + if ((r != Z_STREAM_END) (stoponerr==1)) { printf (Error: inflate() returned %d\n, r); inflateEnd(s); return (-1); @@ -110,5 +123,5 @@ int gunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp) *lenp = s.next_out - (unsigned char *) dst; inflateEnd(s); - return (0); + return 0; } -- 1.6.2.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 3/3] ubifs: BUG: Blocks commpressed with zlib
Blocks compressed with zlib dont have the full gzip header. Without this patch, block compressed with zlib cannot be readed! Signed-off-by: Ricardo Ribalda Delgado ricardo.riba...@uam.es --- v3: Move the prototype to the header file fs/ubifs/ubifs.c |5 +++-- fs/ubifs/ubifs.h |3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c index 427d84a..91fc574 100644 --- a/fs/ubifs/ubifs.c +++ b/fs/ubifs/ubifs.c @@ -24,6 +24,7 @@ */ #include ubifs.h +#include u-boot/zlib.h #if !defined(CONFIG_SYS_64BIT_VSPRINTF) #warning Please define CONFIG_SYS_64BIT_VSPRINTF for correct output! @@ -34,14 +35,14 @@ DECLARE_GLOBAL_DATA_PTR; /* compress.c */ /* - * We need a wrapper for gunzip() because the parameters are + * We need a wrapper for zunzip() because the parameters are * incompatible with the lzo decompressor. */ static int gzip_decompress(const unsigned char *in, size_t in_len, unsigned char *out, size_t *out_len) { unsigned long len = in_len; - return gunzip(out, *out_len, (unsigned char *)in, len); + return zunzip(out, *out_len, (unsigned char *)in, len, 0, 0); } /* Fake description object for the none compressor */ diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h index 91351de..43865aa 100644 --- a/fs/ubifs/ubifs.h +++ b/fs/ubifs/ubifs.h @@ -2172,6 +2172,7 @@ int ubifs_decompress(const void *buf, int len, void *out, int *out_len, /* todo: Move these to a common U-Boot header */ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, unsigned char *out, size_t *out_len); -int gunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp); +int zunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp, + int stoponerr, int offset); #endif /* !__UBIFS_H__ */ -- 1.6.2.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/9] ubifs: BUG: Blocks commpressed with zlib
Blocks compressed with zlib are not handled correctly. gunzip decompress blocks with the gzip header, but ubi blocks dont have header. --- fs/ubifs/ubifs.c | 43 ++- fs/ubifs/ubifs.h |2 -- 2 files changed, 42 insertions(+), 3 deletions(-) diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c index 32f9ff8..0708d90 100644 --- a/fs/ubifs/ubifs.c +++ b/fs/ubifs/ubifs.c @@ -24,6 +24,7 @@ */ #include ubifs.h +#include u-boot/zlib.h #if !defined(CONFIG_SYS_64BIT_VSPRINTF) #warning Please define CONFIG_SYS_64BIT_VSPRINTF for correct output! @@ -33,6 +34,10 @@ DECLARE_GLOBAL_DATA_PTR; /* compress.c */ +int ubi_gunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp); +void *zalloc(void *, unsigned, unsigned); +void zfree(void *, void *, unsigned); + /* * We need a wrapper for gunzip() because the parameters are * incompatible with the lzo decompressor. @@ -41,7 +46,7 @@ static int gzip_decompress(const unsigned char *in, size_t in_len, unsigned char *out, size_t *out_len) { unsigned long len = in_len; - return gunzip(out, *out_len, (unsigned char *)in, len); + return ubi_gunzip(out, *out_len, (unsigned char *)in, len); } /* Fake description object for the none compressor */ @@ -685,3 +690,39 @@ out: ubi_close_volume(c-ubi); return err; } + +int ubi_gunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp) +{ + z_stream s; + int r, i, flags; + i=0; + + s.zalloc = zalloc; + s.zfree = zfree; +#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG) + s.outcb = (cb_func)WATCHDOG_RESET; +#else + s.outcb = Z_NULL; +#endif /* CONFIG_HW_WATCHDOG */ + + r = inflateInit2(s, -MAX_WBITS); + if (r != Z_OK) { + printf (Error: inflateInit2() returned %d\n, r); + return (-1); + } + s.next_in = src + i; + s.avail_in = *lenp - i; + s.next_out = dst; + s.avail_out = dstlen; + r = inflate(s, Z_FINISH); + if (r != Z_STREAM_END) { + //printf (Error: inflate() returned %d\n, r); + //inflateEnd(s); + //return (-1); + } + *lenp = s.next_out - (unsigned char *) dst; + inflateEnd(s); + + return (0); + +} diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h index 91351de..a68e4c1 100644 --- a/fs/ubifs/ubifs.h +++ b/fs/ubifs/ubifs.h @@ -2172,6 +2172,4 @@ int ubifs_decompress(const void *buf, int len, void *out, int *out_len, /* todo: Move these to a common U-Boot header */ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, unsigned char *out, size_t *out_len); -int gunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp); - #endif /* !__UBIFS_H__ */ -- 1.6.2.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 9/9] ubifs: Add '\0' to the end of the realpath
--- fs/ubifs/ubifs.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c index 0708d90..4dc315e 100644 --- a/fs/ubifs/ubifs.c +++ b/fs/ubifs/ubifs.c @@ -646,6 +646,8 @@ int ubifs_load(char *filename, u32 addr, u32 size) ui = ubifs_inode(inode); if (((inode-i_mode S_IFMT) == S_IFLNK) ui-data_len) { memcpy(link_name, ui-data, ui-data_len); + link_name[ui-data_len]='\0'; + memcpy(link_name, ui-data, ui-data_len); printf(%s is linked to %s!\n, filename, link_name); ubifs_iput(inode); -- 1.6.2.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 2/2] ubifs: BUG: Blocks commpressed with zlib
Blocks compressed with zlib dont have the full gzip header. This patch adds a new function to properly handle blocks compressed with zlib. Without this patch, block compressed with zlib cannot be readed! Signed-off-by: Ricardo Ribalda Delgado ricardo.riba...@uam.es --- v2: remove unused parts.. fs/ubifs/ubifs.c | 36 +++- fs/ubifs/ubifs.h |2 -- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c index 3c8b5da..44bf651 100644 --- a/fs/ubifs/ubifs.c +++ b/fs/ubifs/ubifs.c @@ -24,6 +24,7 @@ */ #include ubifs.h +#include u-boot/zlib.h #if !defined(CONFIG_SYS_64BIT_VSPRINTF) #warning Please define CONFIG_SYS_64BIT_VSPRINTF for correct output! @@ -33,6 +34,10 @@ DECLARE_GLOBAL_DATA_PTR; /* compress.c */ +int ubi_gunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp); +void *zalloc(void *, unsigned, unsigned); +void zfree(void *, void *, unsigned); + /* * We need a wrapper for gunzip() because the parameters are * incompatible with the lzo decompressor. @@ -41,7 +46,7 @@ static int gzip_decompress(const unsigned char *in, size_t in_len, unsigned char *out, size_t *out_len) { unsigned long len = in_len; - return gunzip(out, *out_len, (unsigned char *)in, len); + return ubi_gunzip(out, *out_len, (unsigned char *)in, len); } /* Fake description object for the none compressor */ @@ -686,3 +691,32 @@ out: ubi_close_volume(c-ubi); return err; } + +int ubi_gunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp) +{ + z_stream s; + int r, flags; + + s.zalloc = zalloc; + s.zfree = zfree; +#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG) + s.outcb = (cb_func)WATCHDOG_RESET; +#else + s.outcb = Z_NULL; +#endif /* CONFIG_HW_WATCHDOG */ + + r = inflateInit2(s, -MAX_WBITS); + if (r != Z_OK) { + printf (Error: inflateInit2() returned %d\n, r); + return (-1); + } + s.next_in = src; + s.avail_in = *lenp; + s.next_out = dst; + s.avail_out = dstlen; + r = inflate(s, Z_FINISH); + *lenp = s.next_out - (unsigned char *) dst; + inflateEnd(s); + + return (0); +} diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h index 91351de..a68e4c1 100644 --- a/fs/ubifs/ubifs.h +++ b/fs/ubifs/ubifs.h @@ -2172,6 +2172,4 @@ int ubifs_decompress(const void *buf, int len, void *out, int *out_len, /* todo: Move these to a common U-Boot header */ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, unsigned char *out, size_t *out_len); -int gunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp); - #endif /* !__UBIFS_H__ */ -- 1.6.2.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/2] ubifs: BUG realpath string must be ended with ZERO
If the memory used to copy the link_make is dirty the string wont be ended with Zero, throwing out multiple memory bugs. Signed-off-by: Ricardo Ribalda Delgado ricardo.riba...@uam.es --- v2: better doc and remove duplicated memcpy fs/ubifs/ubifs.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c index 32f9ff8..3c8b5da 100644 --- a/fs/ubifs/ubifs.c +++ b/fs/ubifs/ubifs.c @@ -641,6 +641,7 @@ int ubifs_load(char *filename, u32 addr, u32 size) ui = ubifs_inode(inode); if (((inode-i_mode S_IFMT) == S_IFLNK) ui-data_len) { memcpy(link_name, ui-data, ui-data_len); + link_name[ui-data_len]='\0'; printf(%s is linked to %s!\n, filename, link_name); ubifs_iput(inode); -- 1.6.2.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 2/2] ubifs: BUG: Blocks commpressed with zlib
Blocks compressed with zlib dont have the full gzip header. This patch adds a new function to properly handle blocks compressed with zlib. Without this patch, block compressed with zlib cannot be readed! Signed-off-by: Ricardo Ribalda Delgado ricardo.riba...@uam.es --- v3: return is not a function. prototypes in header v2: remove unused parts.. fs/ubifs/ubifs.c | 32 +++- fs/ubifs/ubifs.h |5 +++-- 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c index 3c8b5da..d80774c 100644 --- a/fs/ubifs/ubifs.c +++ b/fs/ubifs/ubifs.c @@ -24,6 +24,7 @@ */ #include ubifs.h +#include u-boot/zlib.h #if !defined(CONFIG_SYS_64BIT_VSPRINTF) #warning Please define CONFIG_SYS_64BIT_VSPRINTF for correct output! @@ -41,7 +42,7 @@ static int gzip_decompress(const unsigned char *in, size_t in_len, unsigned char *out, size_t *out_len) { unsigned long len = in_len; - return gunzip(out, *out_len, (unsigned char *)in, len); + return ubi_gunzip(out, *out_len, (unsigned char *)in, len); } /* Fake description object for the none compressor */ @@ -686,3 +687,32 @@ out: ubi_close_volume(c-ubi); return err; } + +int ubi_gunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp) +{ + z_stream s; + int r, flags; + + s.zalloc = zalloc; + s.zfree = zfree; +#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG) + s.outcb = (cb_func)WATCHDOG_RESET; +#else + s.outcb = Z_NULL; +#endif /* CONFIG_HW_WATCHDOG */ + + r = inflateInit2(s, -MAX_WBITS); + if (r != Z_OK) { + printf (Error: inflateInit2() returned %d\n, r); + return -1; + } + s.next_in = src; + s.avail_in = *lenp; + s.next_out = dst; + s.avail_out = dstlen; + r = inflate(s, Z_FINISH); + *lenp = s.next_out - (unsigned char *) dst; + inflateEnd(s); + + return 0; +} diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h index 91351de..2e1680b 100644 --- a/fs/ubifs/ubifs.h +++ b/fs/ubifs/ubifs.h @@ -2172,6 +2172,7 @@ int ubifs_decompress(const void *buf, int len, void *out, int *out_len, /* todo: Move these to a common U-Boot header */ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, unsigned char *out, size_t *out_len); -int gunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp); - +int ubi_gunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp); +void *zalloc(void *, unsigned, unsigned); +void zfree(void *, void *, unsigned); #endif /* !__UBIFS_H__ */ -- 1.6.2.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] ppc4xx: merge xilinx-ppc440 and xilinx-ppc405 cfg
Xilinx ppc440 and ppc405 have many similarities. This patch merge the config files of both infrastuctures Signed-off-by: Ricardo Ribalda Delgado [EMAIL PROTECTED] --- board/avnet/fx12mm/xparameters.h |2 +- include/configs/fx12mm.h |3 - include/configs/ml507.h |6 +- include/configs/xilinx-ppc.h | 136 ++ include/configs/xilinx-ppc405.h | 91 +- include/configs/xilinx-ppc440.h | 88 ++--- 6 files changed, 147 insertions(+), 179 deletions(-) create mode 100644 include/configs/xilinx-ppc.h diff --git a/board/avnet/fx12mm/xparameters.h b/board/avnet/fx12mm/xparameters.h index f7031b3..4410f19 100644 --- a/board/avnet/fx12mm/xparameters.h +++ b/board/avnet/fx12mm/xparameters.h @@ -46,6 +46,6 @@ #define XPAR_DDR2_SDRAM_MEM_BASEADDR 0x /* FLASH */ -#define XPAR_FLASH_2MX16_MEM0_BASEADDR 0xFFC0 +#define XPAR_FLASH_MEM0_BASEADDR 0xFFC0 #endif diff --git a/include/configs/fx12mm.h b/include/configs/fx12mm.h index d45e7a0..8481c33 100644 --- a/include/configs/fx12mm.h +++ b/include/configs/fx12mm.h @@ -57,11 +57,8 @@ #define CONFIG_PREBOOT echo U-Boot is up and runnining; /*Flash*/ -#define CONFIG_SYS_FLASH_BASE XPAR_FLASH_2MX16_MEM0_BASEADDR #define CONFIG_SYS_FLASH_SIZE (4*1024*1024) #define CONFIG_SYS_MAX_FLASH_SECT 71 -#define CONFIG_SYS_FLASH_CFI 1 -#define CONFIG_FLASH_CFI_DRIVER1 #define MTDIDS_DEFAULT nor0=fx12mm-flash #define MTDPARTS_DEFAULT mtdparts=fx12mm-flash:-(user) diff --git a/include/configs/ml507.h b/include/configs/ml507.h index c637904..a7319e4 100644 --- a/include/configs/ml507.h +++ b/include/configs/ml507.h @@ -30,15 +30,15 @@ #defineCONFIG_ENV_IS_IN_FLASH 1 #defineCONFIG_ENV_SIZE 0x2 #defineCONFIG_ENV_SECT_SIZE0x2 -#define CONFIG_ENV_OFFSET 0x34 +#define CONFIG_ENV_OFFSET 0x34 #define CONFIG_ENV_ADDR (XPAR_FLASH_MEM0_BASEADDR+CONFIG_ENV_OFFSET) /*Misc*/ -#define CONFIG_SYS_PROMPT ml507:/# /* Monitor Command Prompt*/ +#define CONFIG_SYS_PROMPT ml507:/# /* Monitor Command Prompt*/ #define CONFIG_PREBOOT echo U-Boot is up and runnining; /*Flash*/ -#defineCONFIG_SYS_FLASH_SIZE (32*1024*1024) +#defineCONFIG_SYS_FLASH_SIZE (32*1024*1024) #defineCONFIG_SYS_MAX_FLASH_SECT 259 #define MTDIDS_DEFAULT nor0=ml507-flash #define MTDPARTS_DEFAULT mtdparts=ml507-flash:-(user) diff --git a/include/configs/xilinx-ppc.h b/include/configs/xilinx-ppc.h new file mode 100644 index 000..e7daa07 --- /dev/null +++ b/include/configs/xilinx-ppc.h @@ -0,0 +1,136 @@ +/* + * (C) Copyright 2008 + * Ricado Ribalda-Universidad Autonoma de [EMAIL PROTECTED] + * This work has been supported by: QTechnology http://qtec.com/ + * + * (C) Copyright 2008 + * Georg Schardt [EMAIL PROTECTED] + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. +*/ + +#ifndef __CONFIG_XLX_H +#define __CONFIG_XLX_H +/* +#define DEBUG +#define ET_DEBUG +*/ + +/*Mem Map*/ +#define CONFIG_SYS_SDRAM_BASE 0x0 +#define CONFIG_SYS_MONITOR_BASETEXT_BASE +#define CONFIG_SYS_MONITOR_LEN (192 * 1024) +#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128 * 1024) + +/*Cmd*/ +#include config_cmd_default.h +#define CONFIG_CMD_ASKENV +#define CONFIG_CMD_CACHE +#define CONFIG_CMD_DIAG +#define CONFIG_CMD_ELF +#define CONFIG_CMD_IRQ +#define CONFIG_CMD_REGINFO +#undef CONFIG_CMD_JFFS2 +#undef CONFIG_JFFS2_CMDLINE +#undef CONFIG_CMD_SPI +#undef CONFIG_CMD_I2C +#undef CONFIG_CMD_DTT +#undef CONFIG_CMD_NET +#undef CONFIG_CMD_PING +#undef CONFIG_CMD_DHCP +#undef CONFIG_CMD_EEPROM +#undef CONFIG_CMD_IMLS + +/*Misc*/ +#define CONFIG_BOOTDELAY 5/* autoboot after 5 seconds */ +#define CONFIG_SYS_LONGHELP/* undef to save memory */ +#if defined(CONFIG_CMD_KGDB) +#define CONFIG_SYS_CBSIZE 1024/* Console I/O Buffer Size */ +#else +#define CONFIG_SYS_CBSIZE 256/* Console I/O Buffer Size */ +#endif +#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE +\ + sizeof(CONFIG_SYS_PROMPT) + 16) +#define
[U-Boot] [PATCH] ppc4xx: Generic architecture for xilinx ppc405(v3)
As ppc44x: Unification of virtex5 pp440 boards did for the xilinx ppc440 boards, this patch presents a common architecture for all the xilinx ppc405 boards. Any custom xilinx ppc405 board can be added very easily with no code duplicity. This patch also adds a simple generic board, that can be used on almost any design with xilinx ppc405 replacing the file ppc405-generic/xparameters.h This patch is prepared to work with the latest version of EDK (10.1) Signed-off-by: Ricardo Ribalda Delgado [EMAIL PROTECTED] --- v2 Includes changes propossed by Stefan Roese -Remove unneeded init.S -PPC404 -PPC405 v3 rebased to ppc4xx/master CREDITS|1 + MAINTAINERS|1 + Makefile | 16 ++ board/xilinx/ppc405-generic/.gitignore |1 + board/xilinx/ppc405-generic/Makefile | 60 board/xilinx/ppc405-generic/config.mk | 25 board/xilinx/ppc405-generic/u-boot-ram.lds | 134 ++ board/xilinx/ppc405-generic/u-boot-rom.lds | 144 .../xilinx/ppc405-generic/xilinx_ppc405_generic.c | 59 board/xilinx/ppc405-generic/xparameters.h | 36 + cpu/ppc4xx/start.S |3 +- include/configs/xilinx-ppc405-generic.h| 58 include/configs/xilinx-ppc405.h| 126 + 13 files changed, 663 insertions(+), 1 deletions(-) create mode 100644 board/xilinx/ppc405-generic/.gitignore create mode 100644 board/xilinx/ppc405-generic/Makefile create mode 100644 board/xilinx/ppc405-generic/config.mk create mode 100644 board/xilinx/ppc405-generic/u-boot-ram.lds create mode 100644 board/xilinx/ppc405-generic/u-boot-rom.lds create mode 100644 board/xilinx/ppc405-generic/xilinx_ppc405_generic.c create mode 100644 board/xilinx/ppc405-generic/xparameters.h create mode 100644 include/configs/xilinx-ppc405-generic.h create mode 100644 include/configs/xilinx-ppc405.h diff --git a/CREDITS b/CREDITS index 3767322..9ddf0d2 100644 --- a/CREDITS +++ b/CREDITS @@ -407,6 +407,7 @@ N: Ricardo Ribalda Delgado E: [EMAIL PROTECTED] D: PPC440x5 (Virtex5), ML507 Board, eeprom_simul, adt7460, v5fx30teval D: Virtex ppc440 generic architecture +D: Virtex ppc405 generic architecture W: http://www.ii.uam.es/~rribalda N: Stefan Roese diff --git a/MAINTAINERS b/MAINTAINERS index 60cb6a6..a5d1038 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -320,6 +320,7 @@ Ricardo Ribalda [EMAIL PROTECTED] ml507 PPC440x5 v5fx30teval PPC440x5 xilinx-pp440-genericPPC440x5 + xilinx-pp405-genericPPC405 Stefan Roese [EMAIL PROTECTED] diff --git a/Makefile b/Makefile index fceb8a2..66922eb 100644 --- a/Makefile +++ b/Makefile @@ -1518,6 +1518,22 @@ sycamore_config: unconfig WUH405_config: unconfig @$(MKCONFIG) $(@:_config=) ppc ppc4xx wuh405 esd +xilinx-ppc405-generic_flash_config: unconfig + @mkdir -p $(obj)include $(obj)board/xilinx/ppc405-generic + @echo LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc405-generic/u-boot-rom.lds\ +$(obj)board/xilinx/ppc405-generic/config.tmp + @echo TEXT_BASE := 0xFE36 \ +$(obj)board/xilinx/ppc405-generic/config.tmp + @$(MKCONFIG) xilinx-ppc405-generic ppc ppc4xx ppc405-generic xilinx + +xilinx-ppc405-generic_config: unconfig + @mkdir -p $(obj)include $(obj)board/xilinx/ppc405-generic + @echo LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc405-generic/u-boot-ram.lds\ +$(obj)board/xilinx/ppc405-generic/config.tmp + @echo TEXT_BASE := 0x0400 \ +$(obj)board/xilinx/ppc405-generic/config.tmp + @$(MKCONFIG) xilinx-ppc405-generic ppc ppc4xx ppc405-generic xilinx + xilinx-ppc440-generic_flash_config: unconfig @mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic @echo LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-rom.lds\ diff --git a/board/xilinx/ppc405-generic/.gitignore b/board/xilinx/ppc405-generic/.gitignore new file mode 100644 index 000..b644f59 --- /dev/null +++ b/board/xilinx/ppc405-generic/.gitignore @@ -0,0 +1 @@ +config.tmp diff --git a/board/xilinx/ppc405-generic/Makefile b/board/xilinx/ppc405-generic/Makefile new file mode 100644 index 000..b56bb49 --- /dev/null +++ b/board/xilinx/ppc405-generic/Makefile @@ -0,0 +1,60 @@ +# +# (C) Copyright 2000-2006 +# Wolfgang Denk, DENX Software Engineering, [EMAIL PROTECTED] +# +# (C) Copyright 2008 +# Ricardo Ribalda-Universidad Autonoma de [EMAIL PROTECTED] +# Work supported by Qtechnology http://www.qtec.com +# +# See file CREDITS for list of people who contributed to this +# project. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free
[U-Boot] [PATCH] ppc4xx: Generic architecture for xilinx ppc405
As ppc44x: Unification of virtex5 pp440 boards did for the xilinx ppc440 boards, this patch presents a common architecture for all the xilinx ppc405 boards. Any custom xilinx ppc405 board can be added very easily with no code duplicity. This patch also adds a simple generic board, that can be used on almost any design with xilinx ppc405 replacing the file ppc405-generic/xparameters.h This patch is prepared to work with the latest version of EDK (10.1) Signed-off-by: Ricardo Ribalda Delgado [EMAIL PROTECTED] --- Please patch it against ppc4xx/next CREDITS|1 + MAINTAINERS|1 + Makefile | 16 ++ board/xilinx/ppc405-generic/.gitignore |1 + board/xilinx/ppc405-generic/Makefile | 62 + board/xilinx/ppc405-generic/config.mk | 25 board/xilinx/ppc405-generic/init.S | 32 + board/xilinx/ppc405-generic/u-boot-ram.lds | 134 ++ board/xilinx/ppc405-generic/u-boot-rom.lds | 144 .../xilinx/ppc405-generic/xilinx_ppc405_generic.c | 59 board/xilinx/ppc405-generic/xparameters.h | 36 + include/configs/xilinx-ppc405-generic.h| 58 include/configs/xilinx-ppc405.h| 123 + 13 files changed, 692 insertions(+), 0 deletions(-) create mode 100644 board/xilinx/ppc405-generic/.gitignore create mode 100644 board/xilinx/ppc405-generic/Makefile create mode 100644 board/xilinx/ppc405-generic/config.mk create mode 100644 board/xilinx/ppc405-generic/init.S create mode 100644 board/xilinx/ppc405-generic/u-boot-ram.lds create mode 100644 board/xilinx/ppc405-generic/u-boot-rom.lds create mode 100644 board/xilinx/ppc405-generic/xilinx_ppc405_generic.c create mode 100644 board/xilinx/ppc405-generic/xparameters.h create mode 100644 include/configs/xilinx-ppc405-generic.h create mode 100644 include/configs/xilinx-ppc405.h diff --git a/CREDITS b/CREDITS index 3767322..9ddf0d2 100644 --- a/CREDITS +++ b/CREDITS @@ -407,6 +407,7 @@ N: Ricardo Ribalda Delgado E: [EMAIL PROTECTED] D: PPC440x5 (Virtex5), ML507 Board, eeprom_simul, adt7460, v5fx30teval D: Virtex ppc440 generic architecture +D: Virtex ppc405 generic architecture W: http://www.ii.uam.es/~rribalda N: Stefan Roese diff --git a/MAINTAINERS b/MAINTAINERS index 0f9b213..dfc3b56 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -320,6 +320,7 @@ Ricardo Ribalda [EMAIL PROTECTED] ml507 PPC440x5 v5fx30teval PPC440x5 xilinx-pp440-genericPPC440x5 + xilinx-pp405-genericPPC404 Stefan Roese [EMAIL PROTECTED] diff --git a/Makefile b/Makefile index dc0a896..06ba2c6 100644 --- a/Makefile +++ b/Makefile @@ -1516,6 +1516,22 @@ sycamore_config: unconfig WUH405_config: unconfig @$(MKCONFIG) $(@:_config=) ppc ppc4xx wuh405 esd +xilinx-ppc405-generic_flash_config: unconfig + @mkdir -p $(obj)include $(obj)board/xilinx/ppc405-generic + @echo LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc405-generic/u-boot-rom.lds\ +$(obj)board/xilinx/ppc405-generic/config.tmp + @echo TEXT_BASE := 0xFE36 \ +$(obj)board/xilinx/ppc405-generic/config.tmp + @$(MKCONFIG) xilinx-ppc405-generic ppc ppc4xx ppc405-generic xilinx + +xilinx-ppc405-generic_config: unconfig + @mkdir -p $(obj)include $(obj)board/xilinx/ppc405-generic + @echo LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc405-generic/u-boot-ram.lds\ +$(obj)board/xilinx/ppc405-generic/config.tmp + @echo TEXT_BASE := 0x0400 \ +$(obj)board/xilinx/ppc405-generic/config.tmp + @$(MKCONFIG) xilinx-ppc405-generic ppc ppc4xx ppc405-generic xilinx + xilinx-ppc440-generic_flash_config: unconfig @mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic @echo LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-rom.lds\ diff --git a/board/xilinx/ppc405-generic/.gitignore b/board/xilinx/ppc405-generic/.gitignore new file mode 100644 index 000..b644f59 --- /dev/null +++ b/board/xilinx/ppc405-generic/.gitignore @@ -0,0 +1 @@ +config.tmp diff --git a/board/xilinx/ppc405-generic/Makefile b/board/xilinx/ppc405-generic/Makefile new file mode 100644 index 000..bda22e4 --- /dev/null +++ b/board/xilinx/ppc405-generic/Makefile @@ -0,0 +1,62 @@ +# +# (C) Copyright 2000-2006 +# Wolfgang Denk, DENX Software Engineering, [EMAIL PROTECTED] +# +# (C) Copyright 2008 +# Ricardo Ribalda-Universidad Autonoma de [EMAIL PROTECTED] +# Work supported by Qtechnology http://www.qtec.com +# +# See file CREDITS for list of people who contributed to this +# project. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation
Re: [U-Boot] [PATCH] ppc4xx: Generic architecture for xilinx ppc405
Hello Stefan Thanks for your comments. I have just uploaded v2 of the patch. How about the existing Xilinx PPC405 boards like ml300? Should they somehow use this new infrastructure? Yes, that is the idea, adapt them to use this. So we have less work to support them in the future. This should be done step by step... Right now there is one board incoming for this infrastructure (by Georg Schardt) Best regards -- Ricardo Ribalda http://www.eps.uam.es/~rribalda/ ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] ppc4xx:FIX in-tree build for ppc440-generic boards
Hi This patch solves a bug introduced by 880f6a5d7596f42db5ff8803b797b78ec5b146e0 ppc4xx: ppc440-generic-ALL: Fix out of tree build v2. Just in case the subject was not clear enough. Without this patch user cannot build: ml507, v5fx30tevel and ppc440-generic board normally. They only work out of three, Best regards On Wed, Sep 10, 2008 at 17:44, Ricardo Ribalda Delgado [EMAIL PROTECTED] wrote: Signed-off-by: Ricardo Ribalda Delgado [EMAIL PROTECTED] --- board/xilinx/ppc440-generic/config.mk |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/board/xilinx/ppc440-generic/config.mk b/board/xilinx/ppc440-generic/config.mk index 8d220da..6d76755 100644 --- a/board/xilinx/ppc440-generic/config.mk +++ b/board/xilinx/ppc440-generic/config.mk @@ -22,4 +22,4 @@ # MA 02111-1307 USA # -sinclude $(obj)/board/$(BOARDDIR)/config.tmp +sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp -- 1.5.6.5 -- Ricardo Ribalda http://www.eps.uam.es/~rribalda/ ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] ppc4xx: Fix compilation of v5fx30teval_flash
Signed-off-by: Ricardo Ribalda Delgado [EMAIL PROTECTED] --- Makefile |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e8bbd78..116d9e7 100644 --- a/Makefile +++ b/Makefile @@ -1488,9 +1488,9 @@ v5fx30teval_flash_config: unconfig @mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic @mkdir -p $(obj)include $(obj)board/avnet/v5fx30teval @echo LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-rom.lds\ -$(obj)/board/avnet/v5fx30teval/config.tmp +$(obj)board/avnet/v5fx30teval/config.tmp @echo TEXT_BASE := 0xFF1C \ -$(obj)/board/avnet/v5fx30teval/config.tmp +$(obj)board/avnet/v5fx30teval/config.tmp @$(MKCONFIG) v5fx30teval ppc ppc4xx v5fx30teval avnet VOH405_config: unconfig -- 1.5.6.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] ppc4xx: Add .gitignore file to xlnx-ppc440 boards
Signed-off-by: Ricardo Ribalda Delgado [EMAIL PROTECTED] --- board/avnet/v5fx30teval/.gitignore |1 + board/xilinx/ml507/.gitignore |1 + board/xilinx/ppc440-generic/.gitignore |1 + 3 files changed, 3 insertions(+), 0 deletions(-) create mode 100644 board/avnet/v5fx30teval/.gitignore create mode 100644 board/xilinx/ml507/.gitignore create mode 100644 board/xilinx/ppc440-generic/.gitignore diff --git a/board/avnet/v5fx30teval/.gitignore b/board/avnet/v5fx30teval/.gitignore new file mode 100644 index 000..f6418a0 --- /dev/null +++ b/board/avnet/v5fx30teval/.gitignore @@ -0,0 +1 @@ +/config.tmp diff --git a/board/xilinx/ml507/.gitignore b/board/xilinx/ml507/.gitignore new file mode 100644 index 000..f6418a0 --- /dev/null +++ b/board/xilinx/ml507/.gitignore @@ -0,0 +1 @@ +/config.tmp diff --git a/board/xilinx/ppc440-generic/.gitignore b/board/xilinx/ppc440-generic/.gitignore new file mode 100644 index 000..f6418a0 --- /dev/null +++ b/board/xilinx/ppc440-generic/.gitignore @@ -0,0 +1 @@ +/config.tmp -- 1.5.6.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] I2C EEPROM simulator v2
This driver provides access to a simulated i2c eeprom. This simulated eeprom could be very useful in boards with ddr2 memories and no i2c interfaces. Using this driver the user can simulate a spd eeprom of a ddr2 memory and use the ddr2 auto config. User can use the macros CONFIG_EEPROM_SIMUL_LEN and CONFIG_EEPROM_SIMUL_DATA to define the content of the simulated eeprom Signed-off-by: [EMAIL PROTECTED] [EMAIL PROTECTED] Signed-off-by: Ricardo Ribalda Delgado [EMAIL PROTECTED] --- drivers/i2c/Makefile |1 + drivers/i2c/eeprom_simul.c | 67 2 files changed, 68 insertions(+), 0 deletions(-) create mode 100644 drivers/i2c/eeprom_simul.c diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile index 6079c05..1732b7a 100644 --- a/drivers/i2c/Makefile +++ b/drivers/i2c/Makefile @@ -25,6 +25,7 @@ include $(TOPDIR)/config.mk LIB:= $(obj)libi2c.a +COBJS-$(CONFIG_EEPROM_SIMUL) += eeprom_simul.o COBJS-$(CONFIG_FSL_I2C) += fsl_i2c.o COBJS-$(CONFIG_I2C_MXC) += mxc_i2c.o COBJS-$(CONFIG_DRIVER_OMAP1510_I2C) += omap1510_i2c.o diff --git a/drivers/i2c/eeprom_simul.c b/drivers/i2c/eeprom_simul.c new file mode 100644 index 000..eefce48 --- /dev/null +++ b/drivers/i2c/eeprom_simul.c @@ -0,0 +1,67 @@ +/* +(C) Copyright 2008 +Ricado Ribalda-Universidad Autonoma de [EMAIL PROTECTED] +This work has been supported by: QTechnology http://qtec.com/ + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see http://www.gnu.org/licenses/. +*/ + +#include common.h +#include i2c.h + +#ifndef CONFIG_EEPROM_SIMUL_LEN +#define CONFIG_EEPROM_SIMUL_LEN 256 +#endif + +u8 eeprom_simul_buffer[CONFIG_EEPROM_SIMUL_LEN] +#ifdef CONFIG_EEPROM_SIMUL_DATA += CONFIG_EEPROM_SIMUL_DATA +#endif +; + +void i2c_init(int speed, int slaveaddr) +{ + return; +} + +int i2c_read(uchar chip, uint addr, int alen, uchar *buffer, int len) +{ + int i; + + if (addr + len CONFIG_EEPROM_SIMUL_LEN) + return -1; + + for (i = 0; i len; i++) + buffer[i] = eeprom_simul_buffer[i + addr]; + + return 0; +} + +int i2c_write(uchar chip, uint addr, int alen, uchar *buffer, int len) +{ + int i; + + if (addr + len CONFIG_EEPROM_SIMUL_LEN) + return -1; + + for (i = 0; i len; i++) + eeprom_simul_buffer[i + addr] = buffer[i]; + + return 0; +} + +int i2c_probe(uchar chip) +{ + return 0; +} -- 1.5.6.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] ppc4xx:FIX in-tree build for ppc440-generic boards
Signed-off-by: Ricardo Ribalda Delgado [EMAIL PROTECTED] --- board/xilinx/ppc440-generic/config.mk |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/board/xilinx/ppc440-generic/config.mk b/board/xilinx/ppc440-generic/config.mk index 8d220da..6d76755 100644 --- a/board/xilinx/ppc440-generic/config.mk +++ b/board/xilinx/ppc440-generic/config.mk @@ -22,4 +22,4 @@ # MA 02111-1307 USA # -sinclude $(obj)/board/$(BOARDDIR)/config.tmp +sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp -- 1.5.6.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] ppc4xx: ppc440-generic-ALL: Fix out of tree build
This patch solves the problems compiling ml507, v5fx30teval and ppc440-generic out of tree. Signed-off-by: Ricardo Ribalda Delgado [EMAIL PROTECTED] --- Makefile | 49 +++--- board/xilinx/ppc440-generic/Makefile |4 +- 2 files changed, 35 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index a342a88..c5ec313 100644 --- a/Makefile +++ b/Makefile @@ -1359,17 +1359,21 @@ ml300_config: unconfig @$(MKCONFIG) $(@:_config=) ppc ppc4xx ml300 xilinx ml507_flash_config: unconfig + @mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic @mkdir -p $(obj)include $(obj)board/xilinx/ml507 - @echo LDSCRIPT := $(obj)board/xilinx/ppc440-generic/u-boot-rom.lds \ -$(obj)board/xilinx/ml507/config.mk - @echo TEXT_BASE := 0xFE36 $(obj)board/xilinx/ml507/config.mk + @echo LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-rom.lds\ +$(SRCTREE)/board/xilinx/ml507/config.mk + @echo TEXT_BASE := 0xFE36 \ +$(SRCTREE)/board/xilinx/ml507/config.mk @$(MKCONFIG) ml507 ppc ppc4xx ml507 xilinx ml507_config: unconfig + @mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic @mkdir -p $(obj)include $(obj)board/xilinx/ml507 - @echo LDSCRIPT := $(obj)board/xilinx/ppc440-generic/u-boot-ram.lds \ -$(obj)board/xilinx/ml507/config.mk - @echo TEXT_BASE := 0x0400 $(obj)board/xilinx/ml507/config.mk + @echo LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-ram.lds\ +$(SRCTREE)/board/xilinx/ml507/config.mk + @echo TEXT_BASE := 0x0400 \ +$(SRCTREE)/board/xilinx/ml507/config.mk @$(MKCONFIG) ml507 ppc ppc4xx ml507 xilinx ocotea_config: unconfig @@ -1467,15 +1471,21 @@ taishan_config: unconfig @$(MKCONFIG) $(@:_config=) ppc ppc4xx taishan amcc v5fx30teval_config: unconfig + @mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic @mkdir -p $(obj)include $(obj)board/avnet/v5fx30teval - @echo LDSCRIPT := $(obj)board/xilinx/ppc440-generic/u-boot-ram.lds $(obj)board/avnet/v5fx30teval/config.mk - @echo TEXT_BASE := 0x0300 $(obj)board/avnet/v5fx30teval/config.mk + @echo LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-ram.lds\ +$(SRCTREE)/board/avnet/v5fx30teval/config.mk + @echo TEXT_BASE := 0x0300 \ +$(SRCTREE)/board/avnet/v5fx30teval/config.mk @$(MKCONFIG) v5fx30teval ppc ppc4xx v5fx30teval avnet v5fx30teval_flash_config: unconfig + @mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic @mkdir -p $(obj)include $(obj)board/avnet/v5fx30teval - @echo LDSCRIPT := $(obj)board/xilinx/ppc440-generic/u-boot-rom.lds $(obj)board/avnet/v5fx30teval/config.mk - @echo TEXT_BASE := 0xFF1C $(obj)board/avnet/v5fx30teval/config.mk + @echo LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-rom.lds\ +$(SRCTREE)/board/avnet/v5fx30teval/config.mk + @echo TEXT_BASE := 0xFF1C \ +$(SRCTREE)/board/avnet/v5fx30teval/config.mk @$(MKCONFIG) v5fx30teval ppc ppc4xx v5fx30teval avnet VOH405_config: unconfig @@ -1497,15 +1507,19 @@ WUH405_config: unconfig @$(MKCONFIG) $(@:_config=) ppc ppc4xx wuh405 esd xilinx-ppc440-generic_flash_config: unconfig - @mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic/ - @echo LDSCRIPT := $(obj)board/xilinx/ppc440-generic/u-boot-rom.lds $(obj)board/xilinx/ppc440-generic/config.mk - @echo TEXT_BASE := 0xFE36 $(obj)board/xilinx/ppc440-generic/config.mk + @mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic + @echo LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-rom.lds\ +$(SRCTREE)/board/xilinx/ppc440-generic/config.mk + @echo TEXT_BASE := 0xFE36 \ +$(SRCTREE)/board/xilinx/ppc440-generic/config.mk @$(MKCONFIG) xilinx-ppc440-generic ppc ppc4xx ppc440-generic xilinx xilinx-ppc440-generic_config: unconfig - @mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic/ - @echo LDSCRIPT := $(obj)board/xilinx/ppc440-generic/u-boot-ram.lds $(obj)board/xilinx/ppc440-generic/config.mk - @echo TEXT_BASE := 0x0400 $(obj)board/xilinx/ppc440-generic/config.mk + @mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic + @echo LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-ram.lds\ +$(SRCTREE)/board/xilinx/ppc440-generic/config.mk + @echo TEXT_BASE := 0x0400 \ +$(SRCTREE)/board/xilinx/ppc440-generic/config.mk @$(MKCONFIG) xilinx-ppc440-generic ppc ppc4xx ppc440-generic xilinx XPEDITE1K_config: unconfig @@ -3176,6 +3190,9 @@ clean: $(obj)board/trab/trab_fkt $(obj)board/voiceblue/eeprom
Re: [U-Boot] [PATCH] ppc4xx: ppc440-generic-ALL: Fix out of tree build
Hello Wolfgang I just wanted to avoid the creation of one config.mk per board. A new version is in the mailbox. Best regards On Tue, Sep 9, 2008 at 09:18, Wolfgang Denk [EMAIL PROTECTED] wrote: Dear Ricardo Ribalda Delgado, In message [EMAIL PROTECTED] you wrote: This patch solves the problems compiling ml507, v5fx30teval and ppc440-generic out of tree. Signed-off-by: Ricardo Ribalda Delgado [EMAIL PROTECTED] --- Makefile | 49 +++--- board/xilinx/ppc440-generic/Makefile |4 +- 2 files changed, 35 insertions(+), 18 deletions(-) NAK. This patch is definitely wrong. diff --git a/Makefile b/Makefile index a342a88..c5ec313 100644 --- a/Makefile +++ b/Makefile @@ -1359,17 +1359,21 @@ ml300_config: unconfig @$(MKCONFIG) $(@:_config=) ppc ppc4xx ml300 xilinx ml507_flash_config: unconfig + @mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic @mkdir -p $(obj)include $(obj)board/xilinx/ml507 - @echo LDSCRIPT := $(obj)board/xilinx/ppc440-generic/u-boot-rom.lds \ - $(obj)board/xilinx/ml507/config.mk - @echo TEXT_BASE := 0xFE36 $(obj)board/xilinx/ml507/config.mk + @echo LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-rom.lds\ + $(SRCTREE)/board/xilinx/ml507/config.mk + @echo TEXT_BASE := 0xFE36 \ + $(SRCTREE)/board/xilinx/ml507/config.mk SRCTREE is the source directory; when using out-of-tree builds, no file must ever written to or created in that directory tree. You are allowed to create only files in the $(obj) tree. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: [EMAIL PROTECTED] Our way is peace. -- Septimus, the Son Worshiper, Bread and Circuses, stardate 4040.7. -- Ricardo Ribalda http://www.eps.uam.es/~rribalda/ ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] ppc440: ml507: Add .gitignore
Hello Stefan You can forget about this patch. With the commit e07f4a8033b6270b8103049adb6456f660ff4a89 it is not again needed Best regards On Mon, Sep 8, 2008 at 08:56, Stefan Roese [EMAIL PROTECTED] wrote: On Friday 22 August 2008, Ricardo Ribalda Delgado wrote: Signed-off-by: Ricardo Ribalda Delgado [EMAIL PROTECTED] Does not apply anymore. Please rebase against current u-boot-ppc4xx repository and resubmit. Thanks. Best regards, Stefan = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: [EMAIL PROTECTED] = -- Ricardo Ribalda http://www.eps.uam.es/~rribalda/ ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] Remove gap fill in srec object v2
SREC files do not need gap fill: The load address is specified in the file. On the other hand, it can't be avoided in a .bin object. It has no information about memory location. diff in v2: -Change comment (wd) Signed-off-by: Ricardo Ribalda Delgado [EMAIL PROTECTED] --- Makefile |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 3869e79..c8c02dd 100644 --- a/Makefile +++ b/Makefile @@ -295,7 +295,7 @@ $(obj)u-boot.hex: $(obj)u-boot $(OBJCOPY) ${OBJCFLAGS} -O ihex $ $@ $(obj)u-boot.srec: $(obj)u-boot - $(OBJCOPY) ${OBJCFLAGS} -O srec $ $@ + $(OBJCOPY) -O srec $ $@ $(obj)u-boot.bin: $(obj)u-boot $(OBJCOPY) ${OBJCFLAGS} -O binary $ $@ -- 1.5.6.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] ppc44x: Unification of virtex5 pp440 boards v4
This patch provides an unificated way of handling xilinx v5 ppc440 boards. It unificates 3 different things: 1) Source code A new board called ppc440-generic has been created. This board includes a generic tlb initialization (Maps the whole memory into virtual) and defines board_pre_init, checkboard, initdram and get_sys_info weakly, so, they can be replaced by specific functions. If a new board needs to redefine any of the previous functions (specific initialization) it can create a new directory with the specific initializations needed. (see the example ml507 board). 2) Configuration file Common configurations are located under configs/xilinx-ppc440.h, this header file interpretes the xparameters file generated by EDK and configurates u-boot in correspondence. Example: if there is a Temac, allows CMD_CONFIG_NET Specific configuration are located under specific configuration file. (see the example ml507 board) 3) Makefile Some work has been done in order to not duplicate work in the Main Makefile. Please see the attached code. In order to support new boards they can be implemented in the next way: a) Simple Generic Board (90% of the time) Using EDK generates a new xparameters.h file, replace ppc440-generic/xparameters.h and run make xilinx-ppc440-generic_config make b) Simple Boards with special u-boot parameters (9 % of the time) Create a new file under configs for it (use ml507.h as example) and change your paramaters. Create a new Makefile paragraph and compile c) Complex boards (1% of the time) Create a new folder for the board, like the ml507 Finally, it adds support for the Avnet FX30T Evaluation board, following the new generic structure: Cheap board by Avnet for evaluating the Virtex5 FX technology. This patch adds support for: - UartLite - 16MB Flash - 64MB RAM Prior using U-boot in this board, read carefully the ERRATA by Avnet to solve some memory initialization issues. v2 diff: - Code Styling (Michal Simek) - Remove unnecesary xparameters lines (Michal Simek) - Avnet board documentation in patch v3 diff: - Description changed (wdenx) - Copyright issues - RFC-Patch Propossal v4 diff: - MAKEALL gives same output as other boards (stefan) - Simplify board configuration (wdenx) Signed-off-by: Ricardo Ribalda Delgado [EMAIL PROTECTED] --- CREDITS|3 +- MAINTAINERS|2 + MAKEALL|4 + Makefile | 45 +-- board/avnet/v5fx30teval/.gitignore |1 + board/avnet/v5fx30teval/Makefile | 27 board/avnet/v5fx30teval/v5fx30teval.c | 28 board/avnet/v5fx30teval/xparameters.h | 33 + board/xilinx/ml507/.gitignore |1 + board/xilinx/ml507/Makefile| 41 +- board/xilinx/ml507/config.mk | 27 board/xilinx/ml507/init.S | 53 --- board/xilinx/ml507/ml507.c | 21 +--- board/xilinx/ml507/u-boot-ram.lds | 134 -- board/xilinx/ml507/u-boot-rom.lds | 144 board/xilinx/ml507/xparameters.h | 17 +-- board/xilinx/ppc440-generic/.gitignore |1 + board/xilinx/ppc440-generic/Makefile | 62 + board/xilinx/ppc440-generic/init.S | 45 ++ board/xilinx/ppc440-generic/u-boot-ram.lds | 134 ++ board/xilinx/ppc440-generic/u-boot-rom.lds | 144 .../xilinx/ppc440-generic/xilinx_ppc440_generic.c | 52 +++ board/xilinx/ppc440-generic/xparameters.h | 34 + include/configs/ml507.h| 91 ++--- include/configs/v5fx30teval.h | 49 +++ include/configs/xilinx-ppc440-generic.h| 49 +++ include/configs/xilinx-ppc440.h| 106 ++ 27 files changed, 832 insertions(+), 516 deletions(-) create mode 100644 board/avnet/v5fx30teval/.gitignore create mode 100644 board/avnet/v5fx30teval/Makefile create mode 100644 board/avnet/v5fx30teval/v5fx30teval.c create mode 100644 board/avnet/v5fx30teval/xparameters.h create mode 100644 board/xilinx/ml507/.gitignore delete mode 100644 board/xilinx/ml507/config.mk delete mode 100644 board/xilinx/ml507/init.S delete mode 100644 board/xilinx/ml507/u-boot-ram.lds delete mode 100644 board/xilinx/ml507/u-boot-rom.lds create mode 100644 board/xilinx/ppc440-generic/.gitignore create mode 100644 board/xilinx/ppc440-generic/Makefile create mode 100644 board/xilinx/ppc440-generic/init.S create mode 100644 board/xilinx/ppc440-generic/u-boot-ram.lds create mode 100644 board/xilinx/ppc440-generic/u-boot-rom.lds create mode 100644 board/xilinx/ppc440
Re: [U-Boot] [PATCH] ppc44x: Unification of virtex5 pp440 boards v3
Dear Wolfgang: I believe that it is not setting any configuration information. In many boards the TEXT_BASE address is set up in the makefile depending if the user wants to compile u-boot for ram o for flash. Like the acadia (and many others) @echo TEXT_BASE = 0x0100 $(obj)board/amcc/acadia/config.tmp I have no problem in setting the Makefile in the classic way, I just wanted to create a new way with the less code replication possible. Shall I continue with this idea or I move back to the old way? Regards On Fri, Aug 29, 2008 at 07:41, Wolfgang Denk [EMAIL PROTECTED] wrote: Dear Ricardo, in message [EMAIL PROTECTED] you wrote: ml507_flash_config: unconfig BOARD_DIR=$(obj)board/xilinx/ml507 \ TEXT_BASE=0xFE36 \ LINK_SCRIPT=$(obj)board/xilinx/ppc440-generic/u-boot-rom.lds \ CONFIG_SCRIPT=ml507 ppc ppc4xx ml507 xilinx \ $(MAKE) xilinx_ppc440 xilinx_ppc440: unconfig @mkdir -p $(obj)include $(BOARD_DIR) @cp $(LINK_SCRIPT) $(BOARD_DIR)/u-boot.lds @echo TEXT_BASE = $(TEXT_BASE) $(BOARD_DIR)/config.mk @$(MKCONFIG) $(CONFIG_SCRIPT) The Makefile is not the right place to provide configuration information. It shouls select a target board, and build it, nothing more. All board specific configuration information should be kept in the board specific files only (please also keep in mind the next one who has to port Linux to a new board - config information should not be scattered over too many polaces, and especially no into common , central files). Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: [EMAIL PROTECTED] Change is the essential process of all existence. -- Spock, Let That Be Your Last Battlefield, stardate 5730.2 -- Ricardo Ribalda http://www.eps.uam.es/~rribalda/ ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] ppc44x: Unification of virtex5 pp440 boards v3
Hello Wolfgang Before this unification patch I send another path that did treat the avnet board as a new board (a lot of code replication). This is what I call the old way. Let me be more clear. What do we want: MODE A = ml507_config: unconfig BOARD_DIR=$(obj)board/xilinx/ml507 \ TEXT_BASE=0x300 \ LINK_SCRIPT=$(obj)board/xilinx/ppc440-generic/u-boot-ram.lds \ CONFIG_SCRIPT=ml507 ppc ppc4xx ml507 xilinx \ $(MAKE) xilinx_ppc440 ml507_flash_config: unconfig BOARD_DIR=$(obj)board/xilinx/ml507 \ TEXT_BASE=0xFE36 \ LINK_SCRIPT=$(obj)board/xilinx/ppc440-generic/u-boot-rom.lds \ CONFIG_SCRIPT=ml507 ppc ppc4xx ml507 xilinx \ $(MAKE) xilinx_ppc440 v5fx30teval: LIKE BEFORE v5fx30teval_flash: LIKE BEFORE xilinx_ppc440: unconfig @mkdir -p $(obj)include $(BOARD_DIR) @cp $(LINK_SCRIPT) $(BOARD_DIR)/u-boot.lds @echo TEXT_BASE = $(TEXT_BASE) $(BOARD_DIR)/config.mk @$(MKCONFIG) $(CONFIG_SCRIPT) MODE B == ml507: unconfig @mkdir -p $(obj)include $(obj)board/xilinx/ml507 @cp $(obj)board/xilinx/ppc440-generic/u-boot-rom.lds $(obj)board/xilinx/ml507/u-boot.lds @echo TEXT_BASE = 0x3000 $(obj)board/xilinx/ml507/config.mk @$(MKCONFIG) ml507 ppc ppc4xx ml507 xilinx ml507_flash: unconfig @mkdir -p $(obj)include $(obj)board/xilinx/ml507 @cp $(obj)board/xilinx/ppc440-generic/u-boot-rom.lds $(obj)board/xilinx/ml507/u-boot.lds @echo TEXT_BASE = 0x3000 $(obj)board/xilinx/ml507/config.mk @$(MKCONFIG) ml507 ppc ppc4xx ml507 xilinx v5fx30teval: LIKE BEFORE v5fx30teval_flash: LIKE BEFORE MODE C Please write your suggestion here. My opinion: Mode A is more magical: it calls the make program again, but it is easier to maintain and has less code duplication: There are 6 boards that have to be configured the same way. Nevertheless is your/Stefan choose. Regards On Fri, Aug 29, 2008 at 17:01, Wolfgang Denk [EMAIL PROTECTED] wrote: Dear Ricardo Ribalda Delgado, In message [EMAIL PROTECTED] you wrote: I have no problem in setting the Makefile in the classic way, I just wanted to create a new way with the less code replication possible. Shall I continue with this idea or I move back to the old way? I'm not sure if I really understand what the old and the new way is, but we must limit the growth of the Makefile; it is not a place to configura boards. Yes, this has been done in the past (when U-Boot supported only a fraction of the boards we have today), and maybe we even clean up the old boards one day, but at least don't let us add more of this stuff. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: [EMAIL PROTECTED] It takes all sorts of in out-door schooling to get adapted to my kind of fooling - R. Frost -- Ricardo Ribalda http://www.eps.uam.es/~rribalda/ ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] ppc44x: Unification of virtex5 pp440 boards v3
Dear Wolfgang Denk OK, just two questions. All the boards I am using use the same link script, shall I copy it to its specific directory? Do you really want this? It is not better to do it like the MODE B (cp common_script to board dir)? I want to create two different targets: ml507 and ml507_flash. Could you write an example of how to do this without writing the TEXT_BASE in the Makefile? I did it in this way because I didn't found any other method in the main Makefile Thank you very much for your help Regards On Fri, Aug 29, 2008 at 18:24, Wolfgang Denk [EMAIL PROTECTED] wrote: Dear Ricardo Ribalda Delgado, In message [EMAIL PROTECTED] you wrote: Before this unification patch I send another path that did treat the avnet board as a new board (a lot of code replication). This is what I call the old way. Let me be more clear. What do we want: MODE A = ml507_config: unconfig BOARD_DIR=$(obj)board/xilinx/ml507 \ TEXT_BASE=0x300 \ LINK_SCRIPT=$(obj)board/xilinx/ppc440-generic/u-boot-ram.lds \ CONFIG_SCRIPT=ml507 ppc ppc4xx ml507 xilinx \ $(MAKE) xilinx_ppc440 BOARD_DIR, TEXT_BASE, LINK_SCRIPT and CONFIG_SCRIPT have no place in the top level Makefile. Please move this to board specific directories. The normal entry for a board should consist of not more than name_config: unconfig @$(MKCONFIG) name ppc4xx xilinx name or similar. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: [EMAIL PROTECTED] Most people would like to be delivered from temptation but would like it to keep in touch. - Robert Orben -- Ricardo Ribalda http://www.eps.uam.es/~rribalda/ ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] ppc44x: Unification of virtex5 pp440 boards v3
This patch provides an unificated way of handling xilinx v5 ppc440 boards. It unificates 3 different things: 1) Source code A new board called ppc440-generic has been created. This board includes a generic tlb initialization (Maps the whole memory into virtual) and defines board_pre_init, checkboard, initdram and get_sys_info weakly, so, they can be replaced by specific functions. If a new board needs to redefine any of the previous functions (specific initialization) it can create a new directory with the specific initializations needed. (see the example ml507 board). 2) Configuration file Common configurations are located under configs/xilinx-ppc440.h, this header file interpretes the xparameters file generated by EDK and configurates u-boot in correspondence. Example: if there is a Temac, allows CMD_CONFIG_NET Specific configuration are located under specific configuration file. (see the example ml507 board) 3) Makefile Some work has been done in order to not duplicate work in the Main Makefile. Please see the attached code. In order to support new boards they can be implemented in the next way: a) Simple Generic Board (90% of the time) Using EDK generates a new xparameters.h file, replace ppc440-generic/xparameters.h and run make xilinx-ppc440-generic_config make b) Simple Boards with special u-boot parameters (9 % of the time) Create a new file under configs for it (use ml507.h as example) and change your paramaters. Create a new Makefile paragraph and compile c) Complex boards (1% of the time) Create a new folder for the board, like the ml507 Finally, it adds support for the Avnet FX30T Evaluation board, following the new generic structure: Cheap board by Avnet for evaluating the Virtex5 FX technology. This patch adds support for: - UartLite - 16MB Flash - 64MB RAM Prior using U-boot in this board, read carefully the ERRATA by Avnet to solve some memory initialization issues. v2 diff: - Code Styling (Michal Simek) - Remove unnecesary xparameters lines (Michal Simek) - Avnet board documentation in patch v3 diff: - Description changed (wdenx) - Copyright issues - RFC-Patch Propossal Signed-off-by: Ricardo Ribalda Delgado [EMAIL PROTECTED] --- CREDITS|3 +- MAINTAINERS|2 + MAKEALL|4 + Makefile | 58 +++-- board/avnet/v5fx30teval/.gitignore |3 + board/avnet/v5fx30teval/Makefile | 27 board/avnet/v5fx30teval/v5fx30teval.c | 28 board/avnet/v5fx30teval/xparameters.h | 33 + board/xilinx/ml507/.gitignore |3 + board/xilinx/ml507/Makefile| 41 +- board/xilinx/ml507/config.mk | 27 board/xilinx/ml507/init.S | 53 --- board/xilinx/ml507/ml507.c | 21 +--- board/xilinx/ml507/u-boot-ram.lds | 134 -- board/xilinx/ml507/u-boot-rom.lds | 144 board/xilinx/ml507/xparameters.h | 17 +-- board/xilinx/ppc440-generic/.gitignore |3 + board/xilinx/ppc440-generic/Makefile | 62 + board/xilinx/ppc440-generic/init.S | 45 ++ board/xilinx/ppc440-generic/u-boot-ram.lds | 134 ++ board/xilinx/ppc440-generic/u-boot-rom.lds | 144 .../xilinx/ppc440-generic/xilinx_ppc440_generic.c | 52 +++ board/xilinx/ppc440-generic/xparameters.h | 34 + include/configs/ml507.h| 91 ++--- include/configs/v5fx30teval.h | 49 +++ include/configs/xilinx-ppc440-generic.h| 49 +++ include/configs/xilinx-ppc440.h| 106 ++ 27 files changed, 851 insertions(+), 516 deletions(-) create mode 100644 board/avnet/v5fx30teval/.gitignore create mode 100644 board/avnet/v5fx30teval/Makefile create mode 100644 board/avnet/v5fx30teval/v5fx30teval.c create mode 100644 board/avnet/v5fx30teval/xparameters.h create mode 100644 board/xilinx/ml507/.gitignore delete mode 100644 board/xilinx/ml507/config.mk delete mode 100644 board/xilinx/ml507/init.S delete mode 100644 board/xilinx/ml507/u-boot-ram.lds delete mode 100644 board/xilinx/ml507/u-boot-rom.lds create mode 100644 board/xilinx/ppc440-generic/.gitignore create mode 100644 board/xilinx/ppc440-generic/Makefile create mode 100644 board/xilinx/ppc440-generic/init.S create mode 100644 board/xilinx/ppc440-generic/u-boot-ram.lds create mode 100644 board/xilinx/ppc440-generic/u-boot-rom.lds create mode 100644 board/xilinx/ppc440-generic/xilinx_ppc440_generic.c create mode 100644 board/xilinx/ppc440-generic/xparameters.h create
Re: [U-Boot] [PATCH] ppc440: New board: Avnet Virtex5 FXT Evaluation
Hello Again Michal, on xilinx boards almost everything can be handled by edk+xparameters, but in other boards this is not true. Last month I was working on a board that had a weird watchdog and a memory that needed to handled by a propietary IP, in this case, we need a board directory because the generic board should not support it: otherwise the generic board will have many defiles like #ifdef STRANGE_BOARD_USED_ONCE :) Waiting for your comments. -- Ricardo Ribalda http://www.eps.uam.es/~rribalda/ ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] ppc440: New board: Avnet Virtex5 FXT Evaluation
Cheap board by Avnet for evaluating the Virtex5 FX technology. This patch adds support for: - UartLite - 16MB Flash - 64MB RAM Prior using U-boot in this board, read carefully the ERRATA by Avnet to solve some memory initialization issues. Signed-off-by: Ricardo Ribalda Delgado [EMAIL PROTECTED] --- CREDITS|2 +- MAINTAINERS|1 + MAKEALL|2 + Makefile | 12 +++ board/avnet/v5fx30teval/.gitignore |2 + board/avnet/v5fx30teval/Makefile | 58 + board/avnet/v5fx30teval/config.mk | 27 ++ board/avnet/v5fx30teval/init.S | 58 + board/avnet/v5fx30teval/u-boot-ram.lds | 134 + board/avnet/v5fx30teval/u-boot-rom.lds | 144 board/avnet/v5fx30teval/v5fx30teval.c | 47 ++ board/avnet/v5fx30teval/xparameters.h | 36 include/configs/v5fx30teval.h | 121 +++ 13 files changed, 643 insertions(+), 1 deletions(-) create mode 100644 board/avnet/v5fx30teval/.gitignore create mode 100644 board/avnet/v5fx30teval/Makefile create mode 100644 board/avnet/v5fx30teval/config.mk create mode 100644 board/avnet/v5fx30teval/init.S create mode 100644 board/avnet/v5fx30teval/u-boot-ram.lds create mode 100644 board/avnet/v5fx30teval/u-boot-rom.lds create mode 100644 board/avnet/v5fx30teval/v5fx30teval.c create mode 100644 board/avnet/v5fx30teval/xparameters.h create mode 100644 include/configs/v5fx30teval.h diff --git a/CREDITS b/CREDITS index 4fe4e63..48be11b 100644 --- a/CREDITS +++ b/CREDITS @@ -405,7 +405,7 @@ D: Atmel AT91CAP9ADK support N: Ricardo Ribalda Delgado E: [EMAIL PROTECTED] -D: PPC440x5 (Virtex5), ML507 Board, eeprom_simul, adt7460 +D: PPC440x5 (Virtex5), ML507 Board, eeprom_simul, adt7460, v5fx30teval W: http://www.ii.uam.es/~rribalda N: Stefan Roese diff --git a/MAINTAINERS b/MAINTAINERS index 31493c2..4a950f1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -318,6 +318,7 @@ Daniel Poirot [EMAIL PROTECTED] Ricardo Ribalda [EMAIL PROTECTED] ml507 PPC440x5 + v5fx30teval PPC440x5 Stefan Roese [EMAIL PROTECTED] diff --git a/MAKEALL b/MAKEALL index edfee90..a1c1957 100755 --- a/MAKEALL +++ b/MAKEALL @@ -231,6 +231,8 @@ LIST_4xx= \ sequoia_nand\ taihu \ taishan \ + v5fx30teval \ + v5fx30teval_flash \ VOH405 \ VOM405 \ W7OLMC \ diff --git a/Makefile b/Makefile index f02ab65..7561eef 100644 --- a/Makefile +++ b/Makefile @@ -1456,6 +1456,18 @@ taihu_config:unconfig taishan_config:unconfig @$(MKCONFIG) $(@:_config=) ppc ppc4xx taishan amcc +v5fx30teval_flash_config: unconfig + @mkdir -p $(obj)include $(obj)board/avnet/v5fx30teval + @cp $(obj)board/avnet/v5fx30teval/u-boot-rom.lds $(obj)board/avnet/v5fx30teval/u-boot.lds + @echo TEXT_BASE = 0xFF1C $(obj)board/avnet/v5fx30teval/config.tmp + @$(MKCONFIG) $(@:_flash_config=) ppc ppc4xx v5fx30teval avnet + +v5fx30teval_config:unconfig + @mkdir -p $(obj)include $(obj)board/avnet/v5fx30teval + @cp $(obj)board/avnet/v5fx30teval/u-boot-ram.lds $(obj)board/avnet/v5fx30teval/u-boot.lds + @$(MKCONFIG) $(@:_config=) ppc ppc4xx v5fx30teval avnet + + VOH405_config: unconfig @$(MKCONFIG) $(@:_config=) ppc ppc4xx voh405 esd diff --git a/board/avnet/v5fx30teval/.gitignore b/board/avnet/v5fx30teval/.gitignore new file mode 100644 index 000..e3155c5 --- /dev/null +++ b/board/avnet/v5fx30teval/.gitignore @@ -0,0 +1,2 @@ +/u-boot.lds +/config.tmp diff --git a/board/avnet/v5fx30teval/Makefile b/board/avnet/v5fx30teval/Makefile new file mode 100644 index 000..7283704 --- /dev/null +++ b/board/avnet/v5fx30teval/Makefile @@ -0,0 +1,58 @@ +# +# (C) Copyright 2000-2006 +# Wolfgang Denk, DENX Software Engineering, [EMAIL PROTECTED] +# +# See file CREDITS for list of people who contributed to this +# project. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +# + +include $(TOPDIR)/config.mk +ifneq ($(OBJTREE),$(SRCTREE)) +endif + +INCS := +CFLAGS
[U-Boot] Fwd: [U-Boot-Users] [PATCH] (Resend)Allows negative offset in command loads
I think I did send this mail to the old mail list -- Forwarded message -- From: Ricardo Ribalda Delgado [EMAIL PROTECTED] Date: Tue, Aug 19, 2008 at 08:59 Subject: Re: [U-Boot-Users] [PATCH] (Resend)Allows negative offset in command loads To: Wolfgang Denk [EMAIL PROTECTED] Cc: u-boot@lists.denx.de Hi Wolfgang: Up to my knowledge, u-boot can load .bin, .elf and .srec binary files. .bin files are just raw binaries with no location info. When you load this file the offset mean the absolute address .srec files have info about location. The offset really mean offset, and is relative to the address specified in the file .elf files have info about location, but right now (UTMK), u-boot does not support offsets. I think that his patch is enough, other binaries should not be fixed because there is no reason to locate a .bin file in the address -0x234 What do you think? Best regards On Mon, Aug 18, 2008 at 18:02, Wolfgang Denk [EMAIL PROTECTED] wrote: Dear Ricardo Ribalda Delgado, In message [EMAIL PROTECTED] you wrote: Signed-off-by: Ricardo Ribalda Delgado [EMAIL PROTECTED] I think it makes little sense to change only one command and leave the other, similar commands unchanged. All commands that provide similar functions should behave the same. Previus commit had compiling warnings common/cmd_load.c | 10 +- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/cmd_load.c b/common/cmd_load.c index 1b75a7b..ae56543 100644 --- a/common/cmd_load.c +++ b/common/cmd_load.c @@ -38,7 +38,7 @@ static ulong load_serial_ymodem (ulong offset); ^^ So this one should be changed, too? Maybe others as well? Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: [EMAIL PROTECTED] Pardon me for breathing, which I never do anyway so I don't know why I bother to say it, oh God, I'm so depressed. Here's another of those self-satisfied doors. Life! Don't talk to me about life. - Marvin the Paranoid Android -- Ricardo Ribalda http://www.eps.uam.es/~rribalda/ -- Ricardo Ribalda http://www.eps.uam.es/~rribalda/ ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot