Re: [U-Boot] [PATCH 2/2] mpc5200, digsy_mtc: add support for rev5 board version
Dear Heiko Schocher,
In message <1294816806-32614-2-git-send-email...@denx.de> you wrote:
>
Global question: do we really need an CONFIG_DIGSY_REV5? Is there not
a way to determine the revision by probing the hardware? For example,
the RTC's show up at different addresses on the bus - but ther emight
be even easier ways?
> diff --git a/board/digsy_mtc/digsy_mtc.c b/board/digsy_mtc/digsy_mtc.c
> index cc6087b..2b0c574 100644
> --- a/board/digsy_mtc/digsy_mtc.c
> +++ b/board/digsy_mtc/digsy_mtc.c
> #endif /* CONFIG_IDE_RESET */
> +#endif /* CONFIG_CMD_IDE */
This looks wrong to me. You did not add a matching "#if" or
"#ifdef" anywhere?
> +/* Update the Flash Baseaddr settings */
> +int update_flash_size (int flash_size)
> +{
> + volatile struct mpc5xxx_mmap_ctl *mm =
> + (struct mpc5xxx_mmap_ctl *) CONFIG_SYS_MBAR;
> + flash_info_t*dev;
> + int i;
> + int size = 0;
> + unsigned long base = 0x0;
> + u32 *cs_reg = (u32 *)&mm->cs0_start;
> +
> + for (i = 0; i < 2; i++) {
> + dev = &flash_info[i];
> +
> + if (dev->size) {
> + /* calculate new base addr for this chipselect */
> + base -= dev->size;
> + out_be32(cs_reg, START_REG(base));
> + cs_reg++;
> + out_be32(cs_reg, STOP_REG(base, dev->size));
> + cs_reg++;
> + /* recalculate the sectoraddr in the cfi driver */
> + size += flash_get_size(base, i);
> + }
> + }
> +#if defined(CONFIG_DIGSY_REV5)
> + gd->bd->bi_flashstart = base;
> +#endif
Why is this #if needed? Why not always set bi_flashstart ?
> void ft_board_setup(void *blob, bd_t *bd)
> {
> ft_cpu_setup(blob, bd);
> + /* remove RTC */
> +#if defined(CONFIG_DIGSY_REV5)
> + ft_delete_node(blob, "dallas,ds1339");
> +#else
> + ft_delete_node(blob, "mc,rv3029c2");
> +#endif
You should add a comment here what you are doing, and why.
ft_delete_node() returns int - why do you ignore the return codes?
> +#if defined(CONFIG_SYS_UPDATE_FLASH_SIZE)
> + ft_adapt_flash_base(blob);
> +#endif
ft_adapt_flash_base() returns int - why do you ignore the return code?
> }
> #endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */
> -
> -#endif /* CONFIG_CMD_IDE */
Ah! So this is a bug fix?
> diff --git a/board/digsy_mtc/is45s16800a2.h b/board/digsy_mtc/is45s16800a2.h
> new file mode 100644
> index 000..029e6cd
> --- /dev/null
> +++ b/board/digsy_mtc/is45s16800a2.h
> @@ -0,0 +1,27 @@
> +/*
> + * (C) Copyright 2004-2009
> + * Mark Jonas, Freescale Semiconductor, mark.jo...@motorola.com.
Are you sure that Mark wrote any of this code?
> diff --git a/boards.cfg b/boards.cfg
> index 94b8745..9e1fc14 100644
> --- a/boards.cfg
> +++ b/boards.cfg
> @@ -241,6 +241,9 @@ cm5200 powerpc mpc5xxx
> digsy_mtcpowerpc mpc5xxx digsy_mtc
> digsy_mtc_LOWBOOTpowerpc mpc5xxx digsy_mtc -
>- digsy_mtc:SYS_TEXT_BASE=0xFF00
> digsy_mtc_RAMBOOTpowerpc mpc5xxx digsy_mtc -
>- digsy_mtc:SYS_TEXT_BASE=0x0010
> +digsy_mtc_rev5 powerpc mpc5xxx digsy_mtc -
>- digsy_mtc:DIGSY_REV5
> +digsy_mtc_rev5_LOWBOOT powerpc mpc5xxx digsy_mtc -
>- digsy_mtc:SYS_TEXT_BASE=0xFF00,DIGSY_REV5
> +digsy_mtc_rev5_RAMBOOT powerpc mpc5xxx digsy_mtc -
>- digsy_mtc:SYS_TEXT_BASE=0x0010,DIGSY_REV5
Do we really need all these 6 configurations for the digsy_mtc board?
Are all of them actively being used?
> diff --git a/doc/README.cfi b/doc/README.cfi
> new file mode 100644
> index 000..fa35108
> --- /dev/null
> +++ b/doc/README.cfi
> @@ -0,0 +1,15 @@
> +known issues:
> +
> +using M29W128GH from Numonyx:
> +
> +You need to add a board specific flash_cmd_reset() function
> +for this chip to work correctly. Something like this should
> +work (tested on the digsy_mtc board):
> +
> +void flash_cmd_reset(flash_info_t *info)
> +{
> +flash_write_cmd(info, 0, 0, AMD_CMD_RESET);
> +}
Stefan, can you please send an explicit ACK for this part?
> +#if defined(CONFIG_DIGSY_REV5)
> +#define CONFIG_SYS_FLASH_BASE0xFE00
> +#define CONFIG_SYS_FLASH_BASE_CS10xFC00
> +#define CONFIG_SYS_MAX_FLASH_BANKS 2
> +#define CONFIG_SYS_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE_CS1, \
> + CONFIG_SYS_FLASH_BASE}
> +#define CONFIG_SYS_UPDATE_FLASH_SIZE
> +#define CONFIG_FDT_FIXUP_NOR_FLASH_SIZE
> +#else
> #define CONFIG_SYS_FLASH_BASE0xFF00
> -#define CONFIG_SYS_FLASH_SIZE0x0100
> -
> #define CONFIG_SYS_MAX_FLASH_BANKS 1
> +#define CONFIG_SYS_FLASH_BANKS
Re: [U-Boot] uboot load ftb
Dear Wolfgang 2011/1/12 Wolfgang Denk : > Dear =?UTF-8?B?5byg5oms?=, > > In message you > wrote: >> I`ve got some issues with load ftb to work with my board >> (mpc8313erdb) >> My serial print errors as follow: >> ERROR: /chosen node create failed > > Is this the only message? Isn't there also some WARNING ? > >> I used the following command to generate my dtb# >> dtc -f -b 0 -O dtb -I dts -R 8 -S 0x3000 -o my.dtb my.dts > > Why don't you use the kernel's Makefile rule? Just run > > make my.dtb > > in your kernel tree. > i trying to sue the kernel's Makefile rule, but the issue is not solved. WARNING: could not set linux,stdout-path FDT_ERR_NOTFOUND. ERROR: /chosen node create failed - must RESET the board to recover. > > > 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 >> Is there a way to determine Yesterday's date using Unix utilities? > echo "what is yesterday's date?" | /bin/mail root > -- Randal L. Schwartz in > ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH][v3] PBL: add support for boot from SPI flash.
PBL(pre-boot loader): SPI flash used as RCW(Reset Configuration Word) and
PBI(pre-boot initialization) source, CPC(CoreNet Platform Cache) used as 1M SRAM
where PBL will copy whole U-BOOT image to, U-boot can boot from CPC after PBL
completes RCW and PBI phases.
Signed-off-by: Chunhe Lan
Signed-off-by: Mingkai Hu
Signed-off-by: Shaohui Xie
---
Use CONFIG_RAMBOOT_PBL instead of CONFIG_PBL_BOOT_INDIRECT according to Kumar's
comment.
arch/powerpc/cpu/mpc85xx/cpu_init.c | 19 +++
board/freescale/corenet_ds/config.mk |6 ++
board/freescale/corenet_ds/tlb.c |9 +
boards.cfg |1 +
include/configs/corenet_ds.h | 30 --
5 files changed, 63 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c
b/arch/powerpc/cpu/mpc85xx/cpu_init.c
index 4b8faa5..a58cd1a 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c
@@ -139,6 +139,22 @@ static void enable_cpc(void)
for (i = 0; i < CONFIG_SYS_NUM_CPC; i++, cpc++) {
u32 cpccfg0 = in_be32(&cpc->cpccfg0);
size += CPC_CFG0_SZ_K(cpccfg0);
+#ifdef CONFIG_RAMBOOT_PBL
+ if (in_be32(&cpc->cpcsrcr0) & CPC_SRCR0_SRAMEN) {
+ /* find and disable LAW of SRAM */
+ struct law_entry law =
find_law(CONFIG_SYS_INIT_L3_ADDR);
+
+ if (law.index == -1) {
+ printf("\nFatal error happened\n");
+ return;
+ }
+ disable_law(law.index);
+
+ clrbits_be32(&cpc->cpchdbcr0, CPC_HDBCR0_CDQ_SPEC_DIS);
+ out_be32(&cpc->cpccsr0, 0);
+ out_be32(&cpc->cpcsrcr0, 0);
+ }
+#endif
out_be32(&cpc->cpccsr0, CPC_CSR0_CE | CPC_CSR0_PE);
/* Read back to sync write */
@@ -155,6 +171,9 @@ void invalidate_cpc(void)
cpc_corenet_t *cpc = (cpc_corenet_t *)CONFIG_SYS_FSL_CPC_ADDR;
for (i = 0; i < CONFIG_SYS_NUM_CPC; i++, cpc++) {
+ /* skip CPC when it used as all SRAM */
+ if (in_be32(&cpc->cpcsrcr0) & CPC_SRCR0_SRAMEN)
+ continue;
/* Flash invalidate the CPC and clear all the locks */
out_be32(&cpc->cpccsr0, CPC_CSR0_FI | CPC_CSR0_LFC);
while (in_be32(&cpc->cpccsr0) & (CPC_CSR0_FI | CPC_CSR0_LFC))
diff --git a/board/freescale/corenet_ds/config.mk
b/board/freescale/corenet_ds/config.mk
index 15bbf20..918775d 100644
--- a/board/freescale/corenet_ds/config.mk
+++ b/board/freescale/corenet_ds/config.mk
@@ -24,4 +24,10 @@
# P4080DS board
#
+ifeq ($(CONFIG_RAMBOOT_PBL), y)
+RESET_VECTOR_ADDRESS = 0xfffc
+endif
+
+ifndef RESET_VECTOR_ADDRESS
RESET_VECTOR_ADDRESS = 0xeffc
+endif
diff --git a/board/freescale/corenet_ds/tlb.c b/board/freescale/corenet_ds/tlb.c
index 1ae0416..08f91a7 100644
--- a/board/freescale/corenet_ds/tlb.c
+++ b/board/freescale/corenet_ds/tlb.c
@@ -51,9 +51,18 @@ struct fsl_e_tlb_entry tlb_table[] = {
/* TLB 1 */
/* *I*** - Covers boot page */
+#if defined(CONFIG_SYS_RAMBOOT) && defined(CONFIG_SYS_INIT_L3_ADDR)
+ /* *I*G - L3SRAM. When L3 is used as 1M SRAM, the address of the
+* SRAM is at 0xfff0, it covered the 0xf000.
+* */
+ SET_TLB_ENTRY(1, CONFIG_SYS_INIT_L3_ADDR, CONFIG_SYS_INIT_L3_ADDR,
+ MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
+ 0, 0, BOOKE_PAGESZ_1M, 1),
+#else
SET_TLB_ENTRY(1, 0xf000, 0xf000,
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
0, 0, BOOKE_PAGESZ_4K, 1),
+#endif
/* *I*G* - CCSRBAR */
SET_TLB_ENTRY(1, CONFIG_SYS_CCSRBAR, CONFIG_SYS_CCSRBAR_PHYS,
diff --git a/boards.cfg b/boards.cfg
index 94b8745..2052efc 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -502,6 +502,7 @@ P2020RDB_NANDpowerpc mpc85xx
p1_p2_rdb freesca
P2020RDB_SDCARD powerpc mpc85xx p1_p2_rdb
freescale - P1_P2_RDB:P2020,SDCARD
P2020RDB_SPIFLASHpowerpc mpc85xx p1_p2_rdb
freescale - P1_P2_RDB:P2020,SPIFLASH
P4080DS powerpc mpc85xx corenet_ds
freescale
+P4080DS_RAMBOOT_PBLpowerpc mpc85xx corenet_ds freescale
- P4080DS:RAMBOOT_PBL,SYS_TEXT_BASE=0xFFF8
stxgp3 powerpc mpc85xx stxgp3 stx
stxssa powerpc mpc85xx stxssa stx
- stxssa
stxssa_4Mpowerpc mpc85xx stxssa stx
- stxssa:STXSSA_4M
diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index 454a30a..
Re: [U-Boot] Problem booting linux with device tree table
Dear =?UTF-8?B?5byg5oms?=, In message you wrote: > > i use dtc compiler with following command: > dtc -R 8 -b 0 -O dtb -I dts -S 0x3000 -o my.dtb my.dts > >Booting process gives following error and reset the board. >WARNING: could not create /chosen FDT_ERR_NOSPACE. Well, this is a pretty descriptive message, isn;t it? You don;t reserve enough space i your device tree. >somebody advises me to add a chosen node in my DTS file, but The > issue is not solved. Instead of yousing your custom dtc command, you should use the kernel's default rule which should work better. Now you've posted the same question 3 times. I hope this is enough. 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 use of anthropomorphic terminology when dealing with computing systems is a symptom of professional immaturity. -- Edsger Dijkstra ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [patch] u-boot powerpc build error
Dear gmane, In message <4d2d324c.3010...@gmail.com> you wrote: > Hello, > > I met this error (use GNU make 3.80). > > $ make MPC885ADS_config > $ make > /home/namsh/work/u-boot/arch/powerpc/config.mk:35: Extraneous text after > `else' directive > /home/namsh/work/u-boot/arch/powerpc/config.mk:37: *** only one `else' > per conditional. Stop. Can you please submit this as a proper patch, i. e. with a proper commit message and your Signed-off-by: line? Please see http://www.denx.de/wiki/U-Boot/Patches for details. And can you please extend the patch to fix _all_ places where such a construct is being used, i. e. at least these: arch/powerpc/config.mk:else ifdef CONFIG_NAND_SPL board/amcc/bamboo/config.mk:else ifdef CONFIG_NAND_U_BOOT board/amcc/sequoia/config.mk:else ifdef CONFIG_NAND_U_BOOT board/amcc/acadia/config.mk:else ifdef CONFIG_NAND_U_BOOT board/amcc/canyonlands/config.mk:else ifdef CONFIG_NAND_U_BOOT board/amcc/kilauea/config.mk:else ifdef CONFIG_NAND_U_BOOT And please make sure to run a "MAKEALL ppc" to verify you have found all occurrences. 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 If a packet hits a pocket on a socket on a port, And the bus is interrupted as a very last resort, And the address of the memory makes your floppy disk abort, Then the socket packet pocket has an error to report! - Ken Burchill? ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 2/2] mpc5200, digsy_mtc: add support for rev5 board version
difference to previous board version:
- M29W128GH flash from Numonyx
- SDRAM ISSI IS45S16800 (Option A2 105°C)
- rev5 uses RTC RV-3029-C2
- update cs0 and cs1 baseaddr and length
depending on the detected flash size.
- added Werner Pfister
as maintainer for the digsy board variants
- As the M29W128GH needs a special flash_cmd_reset()
document that in the new file doc/README.cfi.
Signed-off-by: Heiko Schocher
cc: Wolfgang Denk
cc: Stefan Roese
cc: Werner Pfister
---
MAINTAINERS|4 ++
board/digsy_mtc/digsy_mtc.c| 102 +++-
board/digsy_mtc/is45s16800a2.h | 27 +++
boards.cfg |3 +
doc/README.cfi | 15 ++
include/configs/digsy_mtc.h| 27 +-
6 files changed, 173 insertions(+), 5 deletions(-)
create mode 100644 board/digsy_mtc/is45s16800a2.h
create mode 100644 doc/README.cfi
diff --git a/MAINTAINERS b/MAINTAINERS
index 553930a..bd18f7b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -340,6 +340,10 @@ Denis Peter
MIP405 PPC4xx
PIP405 PPC4xx
+Werner Pfister
+ digsy_mtc mpc5200
+ digsy_mtc_rev5 mpc5200
+
Kim Phillips
MPC8349EMDS MPC8349
diff --git a/board/digsy_mtc/digsy_mtc.c b/board/digsy_mtc/digsy_mtc.c
index cc6087b..2b0c574 100644
--- a/board/digsy_mtc/digsy_mtc.c
+++ b/board/digsy_mtc/digsy_mtc.c
@@ -39,12 +39,29 @@
#include
#include
#include "eeprom.h"
+#if defined(CONFIG_DIGSY_REV5)
+#include "is45s16800a2.h"
+#include
+#else
#include "is42s16800a-7t.h"
+#endif
+#include
DECLARE_GLOBAL_DATA_PTR;
extern int usb_cpu_init(void);
+#if defined(CONFIG_DIGSY_REV5)
+/*
+ * The M29W128GH needs a specail reset command function,
+ * details see the doc/README.cfi file
+ */
+void flash_cmd_reset(flash_info_t *info)
+{
+ flash_write_cmd(info, 0, 0, AMD_CMD_RESET);
+}
+#endif
+
#ifndef CONFIG_SYS_RAMBOOT
static void sdram_start(int hi_addr)
{
@@ -175,6 +192,9 @@ int checkboard(void)
char *s = getenv("serial#");
puts ("Board: InterControl digsyMTC");
+#if defined(CONFIG_DIGSY_REV5)
+ puts (" rev5");
+#endif
if (s != NULL) {
puts(", ");
puts(s);
@@ -305,12 +325,90 @@ void ide_set_reset(int idereset)
setbits_be32((void *)MPC5XXX_WU_GPIO_ENABLE, (1 << 25));
}
#endif /* CONFIG_IDE_RESET */
+#endif /* CONFIG_CMD_IDE */
#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
+static int ft_delete_node(void *fdt, const char *compat)
+{
+ int off = -1;
+
+ off = fdt_node_offset_by_compatible(fdt, -1, compat);
+ if (off < 0)
+ return off;
+
+ return(fdt_del_node(fdt, off));
+}
+#if defined(CONFIG_SYS_UPDATE_FLASH_SIZE)
+static int ft_adapt_flash_base(void *blob)
+{
+ flash_info_t*dev = &flash_info[0];
+ int off;
+ struct fdt_property *prop;
+ int len;
+ u32 *reg, *reg2;
+
+ off = fdt_node_offset_by_compatible(blob, -1, "fsl,mpc5200b-lpb");
+ if (off < 0)
+ return off;
+
+ /* found compatible property */
+ prop = fdt_get_property_w(blob, off, "ranges", &len);
+ if (prop) {
+ reg = reg2 = (u32 *)&prop->data[0];
+
+ reg[2] = dev->start[0];
+ reg[3] = dev->size;
+ fdt_setprop(blob, off, "ranges", reg2, len);
+ }
+
+ return 0;
+}
+
+extern ulong flash_get_size (phys_addr_t base, int banknum);
+
+/* Update the Flash Baseaddr settings */
+int update_flash_size (int flash_size)
+{
+ volatile struct mpc5xxx_mmap_ctl *mm =
+ (struct mpc5xxx_mmap_ctl *) CONFIG_SYS_MBAR;
+ flash_info_t*dev;
+ int i;
+ int size = 0;
+ unsigned long base = 0x0;
+ u32 *cs_reg = (u32 *)&mm->cs0_start;
+
+ for (i = 0; i < 2; i++) {
+ dev = &flash_info[i];
+
+ if (dev->size) {
+ /* calculate new base addr for this chipselect */
+ base -= dev->size;
+ out_be32(cs_reg, START_REG(base));
+ cs_reg++;
+ out_be32(cs_reg, STOP_REG(base, dev->size));
+ cs_reg++;
+ /* recalculate the sectoraddr in the cfi driver */
+ size += flash_get_size(base, i);
+ }
+ }
+#if defined(CONFIG_DIGSY_REV5)
+ gd->bd->bi_flashstart = base;
+#endif
+ return 0;
+}
+#endif /* defined(CONFIG_SYS_UPDATE_FLASH_SIZE) */
+
void ft_board_setup(void *blob, bd_t *bd)
{
ft_cpu_setup(blob, bd);
+ /* remove RTC */
+#if defined(CONFIG_DIGSY_REV5)
+ ft_delete_node(blob, "dallas,ds1339");
+#else
+ ft_delete_node(blob, "mc,rv3029c2");
+#endif
+#if defined(CONFIG_SYS_UPDATE_FLASH_SIZE)
+ ft_adapt_flash_base(blob);
+#endif
}
#endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG
[U-Boot] [PATCH 1/2] rtc: add support for Micro Crystal RV-3029-C2 RTC
Signed-off-by: Heiko Schocher
---
drivers/rtc/Makefile |1 +
drivers/rtc/rv3029.c | 124 ++
2 files changed, 125 insertions(+), 0 deletions(-)
create mode 100644 drivers/rtc/rv3029.c
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
index 916d73f..e4be4a4 100644
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -60,6 +60,7 @@ COBJS-$(CONFIG_RTC_PL031) += pl031.o
COBJS-$(CONFIG_RTC_PT7C4338) += pt7c4338.o
COBJS-$(CONFIG_RTC_RS5C372A) += rs5c372.o
COBJS-$(CONFIG_RTC_RTC4543) += rtc4543.o
+COBJS-$(CONFIG_RTC_RV3029) += rv3029.o
COBJS-$(CONFIG_RTC_RX8025) += rx8025.o
COBJS-$(CONFIG_RTC_S3C24X0) += s3c24x0_rtc.o
COBJS-$(CONFIG_RTC_S3C44B0) += s3c44b0_rtc.o
diff --git a/drivers/rtc/rv3029.c b/drivers/rtc/rv3029.c
new file mode 100644
index 000..3ebc768
--- /dev/null
+++ b/drivers/rtc/rv3029.c
@@ -0,0 +1,124 @@
+/*
+ * (C) Copyright 2010
+ * Heiko Schocher, DENX Software Engineering, h...@denx.de
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+#include
+#include
+#include
+#include
+
+#define RTC_RV3029_CTRL_RESET 0x04
+#define RTC_RV3029_CTRL_SYS_R (1 << 4)
+
+#define RTC_RV3029_CLOCK_PAGE 0x08
+#define RTC_RV3029_PAGE_LEN7
+
+#define RV3029C2_W_SECONDS 0x00
+#define RV3029C2_W_MINUTES 0x01
+#define RV3029C2_W_HOURS 0x02
+#define RV3029C2_W_DATE0x03
+#define RV3029C2_W_DAYS0x04
+#define RV3029C2_W_MONTHS 0x05
+#define RV3029C2_W_YEARS 0x06
+
+#define RV3029C2_REG_HR_12_24 (1 << 6) /* 24h/12h mode */
+#define RV3029C2_REG_HR_PM (1 << 5) /* PM/AM bit in 12h mode */
+
+int rtc_get( struct rtc_time *tmp )
+{
+ int ret;
+ unsigned char buf[RTC_RV3029_PAGE_LEN];
+
+ ret = i2c_read(CONFIG_SYS_I2C_RTC_ADDR, RTC_RV3029_CLOCK_PAGE, 1, buf, \
+ RTC_RV3029_PAGE_LEN);
+ if (ret) {
+ printf("%s: error reading RTC: %x\n", __func__, ret);
+ return -1;
+ }
+ tmp->tm_sec = bcd2bin( buf[RV3029C2_W_SECONDS] & 0x7f);
+ tmp->tm_min = bcd2bin( buf[RV3029C2_W_MINUTES] & 0x7f);
+ if (buf[RV3029C2_W_HOURS] & RV3029C2_REG_HR_12_24) {
+ /* 12h format */
+ tmp->tm_hour = bcd2bin(buf[RV3029C2_W_HOURS] & 0x1f);
+ if (buf[RV3029C2_W_HOURS] & RV3029C2_REG_HR_PM)
+ /* PM flag set */
+ tmp->tm_hour += 12;
+ } else
+ tmp->tm_hour = bcd2bin(buf[RV3029C2_W_HOURS] & 0x3f);
+
+ tmp->tm_mday = bcd2bin( buf[RV3029C2_W_DATE] & 0x3F );
+ tmp->tm_mon = bcd2bin( buf[RV3029C2_W_MONTHS] & 0x1F );
+ tmp->tm_wday = bcd2bin( buf[RV3029C2_W_DAYS] & 0x07 );
+ /* RTC supports only years > 1999 */
+ tmp->tm_year = bcd2bin( buf[RV3029C2_W_YEARS]) + 2000;
+ tmp->tm_yday = 0;
+ tmp->tm_isdst = 0;
+
+#ifdef RTC_DEBUG
+ printf( "Get DATE: %4d-%02d-%02d (wday=%d) TIME: %2d:%02d:%02d\n",
+ tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_wday,
+ tmp->tm_hour, tmp->tm_min, tmp->tm_sec );
+
+#endif
+ return 0;
+}
+
+int rtc_set( struct rtc_time *tmp )
+{
+ int ret;
+ unsigned char buf[RTC_RV3029_PAGE_LEN];
+#ifdef RTC_DEBUG
+ printf( "Set DATE: %4d-%02d-%02d (wday=%d) TIME: %2d:%02d:%02d\n",
+ tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_wday,
+ tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
+#endif
+
+ if (tmp->tm_year < 2000) {
+ printf("RTC: year %d < 2000 not possible\n", tmp->tm_year);
+ return -1;
+ }
+ buf[RV3029C2_W_SECONDS] = bin2bcd(tmp->tm_sec);
+ buf[RV3029C2_W_MINUTES] = bin2bcd(tmp->tm_min);
+ buf[RV3029C2_W_HOURS] = bin2bcd(tmp->tm_hour);
+ /* set 24h format */
+ buf[RV3029C2_W_HOURS] &= ~RV3029C2_REG_HR_12_24;
+ buf[RV3029C2_W_DATE] = bin2bcd(tmp->tm_mday);
+ buf[RV3029C2_W_DAYS] = bin2bcd(tmp->tm_wday);
+ buf[RV3029C2_W_MONTHS] = bin2bcd(tmp->tm_mon);
+ tmp->tm_year -= 2000;
+ buf[RV3029C2_W_YEARS] = bin2bcd(tmp->tm_year);
+ ret = i2c_write(CONFIG_SYS_I2C_RTC_ADDR, RTC_RV3029_CLOCK_PAGE, 1,
+
Re: [U-Boot] uboot load ftb
Dear =?UTF-8?B?5byg5oms?=, In message you wrote: > I`ve got some issues with load ftb to work with my board > (mpc8313erdb) > My serial print errors as follow: >ERROR: /chosen node create failed Is this the only message? Isn't there also some WARNING ? > I used the following command to generate my dtb# > dtc -f -b 0 -O dtb -I dts -R 8 -S 0x3000 -o my.dtb my.dts Why don't you use the kernel's Makefile rule? Just run make my.dtb in your kernel 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: w...@denx.de > Is there a way to determine Yesterday's date using Unix utilities? echo "what is yesterday's date?" | /bin/mail root -- Randal L. Schwartz in ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] U-Boot on IMX.51 EVK
On 01/12/2011 02:34 AM, Thomas Besemer wrote:
> Hi Stefano -
>
Hi Thomas,
> Looks like the problem I was having is the Freescale SDK (LTIB) had a
> .config file that ended up with the wrong load address; was picking up
> the MX53 (0x70008000 versus 0x90008000) load/build addys.
Well, then it is clear why the board does not boot...
> Don't know
> why it ever worked
I can only say I have tested with Freescale's kernel, too, and it
worked. Probably I tried with a version before the introduction of MX53,
and the address was correct.
> I was also able to boot over network without issues.
>
> I don't install uImage on a partition, rather, hand install it on SD
> card with DD, and then load with this:
>
> bootcmd_mmc=run bootargs_base bootargs_mmc; mmc read 0 ${loadaddr}
> 0x800 0x1800;bootm
>
> Just pulls from an offset in SD card. Works fine.
Fine, thanks to report to the ML your results.
Best regards,
Stefano Babic
--
=
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
=
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Problem booting linux with device tree table
Hi all I am trying to boot mpc8313erdb with linux-2.6.35.4, i am using the last verion of u-boot from denx i use dtc compiler with following command: dtc -R 8 -b 0 -O dtb -I dts -S 0x3000 -o my.dtb my.dts Booting process gives following error and reset the board. WARNING: could not create /chosen FDT_ERR_NOSPACE. ERROR: /chosen node create failed - must RESET the board to recover. somebody advises me to add a chosen node in my DTS file，but The issue is not solved. Regards. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] U-Boot on IMX.51 EVK
Hi, Thomas 2011/1/12 Thomas Besemer : > Hi Stefano - > > Looks like the problem I was having is the Freescale SDK (LTIB) had a > .config file that ended up with the wrong load address; was picking up the > MX53 (0x70008000 versus 0x90008000) load/build addys. Don't know why it > ever worked I hacked the right address into Makefile.boot, and comes up > fine. Basic regression testing shows no issues right now. For picking up MX53 DDR address, it will due to that FSL BSP support i.mx5 family such as mx51/mx53/mx50 with one single image. So it take mx53 DDR address by default by kernel and uboot will make the adjustment if you take a look at the FSL uboot version. > > I was also able to boot over network without issues. > > Regards, > > tom > > ___ > U-Boot mailing list > U-Boot@lists.denx.de > http://lists.denx.de/mailman/listinfo/u-boot > > ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [patch] u-boot powerpc build error
Hello, I met this error (use GNU make 3.80). $ make MPC885ADS_config $ make /home/namsh/work/u-boot/arch/powerpc/config.mk:35: Extraneous text after `else' directive /home/namsh/work/u-boot/arch/powerpc/config.mk:37: *** only one `else' per conditional. Stop. Regards, namsh diff --git a/arch/powerpc/config.mk b/arch/powerpc/config.mk index 2912604..5eeba9a 100644 --- a/arch/powerpc/config.mk +++ b/arch/powerpc/config.mk @@ -32,13 +32,15 @@ PLATFORM_LDFLAGS += -n --gc-sections ifdef CONFIG_SYS_LDSCRIPT # need to strip off double quotes LDSCRIPT := $(subst ",,$(CONFIG_SYS_LDSCRIPT)) -else ifdef CONFIG_NAND_SPL +else +ifdef CONFIG_NAND_SPL LDSCRIPT := $(SRCTREE)/$(CONFIG_BOARDDIR)/u-boot-nand.lds else ifneq ($(wildcard $(SRCTREE)/arch/powerpc/cpu/$(CPU)/u-boot.lds),) LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/$(CPU)/u-boot.lds endif endif +endif # # When cross-compiling on NetBSD, we have to define __PPC__ or else we ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-BOOT] [PATCH] arm: fix flush cache function on arm926ejs
On Wed, Jan 12, 2011 at 12:27 PM, Lei Wen wrote:
> Hi Albert,
>
> On Wed, Jan 12, 2011 at 3:53 AM, Albert ARIBAUD
> wrote:
>> Hi,
>>
>> Le 11/01/2011 16:40, Lei Wen a écrit :
>>> flush_cache function should only be called when the dcache is on.
>>> And original flush method for arm926ejs seems don't work, replace
>>> it with new version.
>>>
>>> Test on Marvell Pantheon pxa920 board with usb ether function.
>>>
>>> Signed-off-by: Lei Wen
>>> ---
>>> arch/arm/lib/cache.c | 8
>>> 1 files changed, 4 insertions(+), 4 deletions(-)
>>>
>>> diff --git a/arch/arm/lib/cache.c b/arch/arm/lib/cache.c
>>> index 30686fe..b8d5eee 100644
>>> --- a/arch/arm/lib/cache.c
>>> +++ b/arch/arm/lib/cache.c
>>> @@ -27,16 +27,16 @@
>>>
>>> void flush_cache (unsigned long dummy1, unsigned long dummy2)
>>> {
>>> + if (!dcache_status())
>>> + return;
>>> #if defined(CONFIG_OMAP2420) || defined(CONFIG_ARM1136)
>>> void arm1136_cache_flush(void);
>>>
>>> arm1136_cache_flush();
>>> #endif
>>> #ifdef CONFIG_ARM926EJS
>>> - /* test and clean, page 2-23 of arm926ejs manual */
>>> - asm("0: mrc p15, 0, r15, c7, c10, 3\n\t" "bne 0b\n" : : : "memory");
>>> - /* disable write buffer as well (page 2-22) */
>>> - asm("mcr p15, 0, %0, c7, c10, 4" : : "r" (0));
>>> + /* clean& invalidate all D cache */
>>> + asm("mcr p15, 0, %0, c7, c14, 0" : : "r" (0));
>>
>> ARM's ARM926EJ-S r0p4/r0p5 TRM does not define "... c7, c14, 0". Where
>> did you find this exact cp15 instruction?
>>
>
> My mistake...
> Pantheon board's sheeva core modify the standard cp15 op code a bit...
> With one opcode, it could invalidate and clean the dcache all.
>
> So could I modify the original patch like below?
> asm("mcr p15, 0, %0, c7, c6, 0" : : "r" (0));
> This would only invalidate all dcache. Since current dcache enable is
> just write-through,
> I think it is safe to just do the invalidate operation.
>
> This also could works for my board.
I take my words back...
I forget to open the dcache... After dcache is on, the usb tftp still
cannot works...
Seems still do the clean cache operation...
Best regards,
Lei
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-BOOT] [PATCH] arm: fix flush cache function on arm926ejs
Hi Albert,
On Wed, Jan 12, 2011 at 3:53 AM, Albert ARIBAUD wrote:
> Hi,
>
> Le 11/01/2011 16:40, Lei Wen a écrit :
>> flush_cache function should only be called when the dcache is on.
>> And original flush method for arm926ejs seems don't work, replace
>> it with new version.
>>
>> Test on Marvell Pantheon pxa920 board with usb ether function.
>>
>> Signed-off-by: Lei Wen
>> ---
>> arch/arm/lib/cache.c | 8
>> 1 files changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/arch/arm/lib/cache.c b/arch/arm/lib/cache.c
>> index 30686fe..b8d5eee 100644
>> --- a/arch/arm/lib/cache.c
>> +++ b/arch/arm/lib/cache.c
>> @@ -27,16 +27,16 @@
>>
>> void flush_cache (unsigned long dummy1, unsigned long dummy2)
>> {
>> + if (!dcache_status())
>> + return;
>> #if defined(CONFIG_OMAP2420) || defined(CONFIG_ARM1136)
>> void arm1136_cache_flush(void);
>>
>> arm1136_cache_flush();
>> #endif
>> #ifdef CONFIG_ARM926EJS
>> - /* test and clean, page 2-23 of arm926ejs manual */
>> - asm("0: mrc p15, 0, r15, c7, c10, 3\n\t" "bne 0b\n" : : : "memory");
>> - /* disable write buffer as well (page 2-22) */
>> - asm("mcr p15, 0, %0, c7, c10, 4" : : "r" (0));
>> + /* clean& invalidate all D cache */
>> + asm("mcr p15, 0, %0, c7, c14, 0" : : "r" (0));
>
> ARM's ARM926EJ-S r0p4/r0p5 TRM does not define "... c7, c14, 0". Where
> did you find this exact cp15 instruction?
>
My mistake...
Pantheon board's sheeva core modify the standard cp15 op code a bit...
With one opcode, it could invalidate and clean the dcache all.
So could I modify the original patch like below?
asm("mcr p15, 0, %0, c7, c6, 0" : : "r" (0));
This would only invalidate all dcache. Since current dcache enable is
just write-through,
I think it is safe to just do the invalidate operation.
This also could works for my board.
Best regards,
Lei
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] USB LUN support crashes
Hi all, I applied the USB LUN support patch to u-boot and found that it crashes with the SanDisk Cruzer. From everything I can gather this looks like a broken device. It returns a maximum LUN of 1 rather than 0 which causes usb_stor_get_info to crash. This was applied to usb_storage.c on 10/5/2010. -Aaron Williams ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] uboot load ftb
Hi all I‘ve got some issues with load ftb to work with my board (mpc8313erdb) My serial print errors as follow: ERROR: /chosen node create failed I used the following command to generate my dtb。 dtc -f -b 0 -O dtb -I dts -R 8 -S 0x3000 -o my.dtb my.dts thanks ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] w90p...@gmail.com
Hi all I‘ve got some issues with load ftb to work with my board (mpc8313erdb) My serial print errors as follow: ERROR: /chosen node create failed I used the following command to generate my dtb。 dtc -f -b 0 -O dtb -I dts -R 8 -S 0x3000 -o my.dtb my.dts thanks ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 3/3] arm: Tegra2: Add support for NVIDIA Seaboard board Signed-off-by: Tom Warren
Hi Tom, We keep the U-Boot in sync with what is at http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=history;f=arch/arm/tools/mach-types;h=2fea897ebeb12959415120a7c1cdcaf5d8ac8fee;hb=4162cf64973df51fc885825bc9ca4d055891c49f I can see that the kernel does not have the updated name yet. Since it is only required while booting a kernel, i would just keep the old name for the time being. When the kernel has this update, we will update U-Boot and then you will have to send in a patch to reflect this change. In any case u mention that you have follow up patches. By the time u get all the patches accepted, the mach-types would have been updated in the kernel and in U-boot. Also in one of ur patches you had updates to serial driver. You will have to keep that change in a separte patch. Regards, Sandeep From: Tom Warren [twar...@nvidia.com] Sent: Tuesday, January 11, 2011 7:43 PM To: Paulraj, Sandeep; Tom Warren; u-boot@lists.denx.de Subject: RE: [U-Boot] [PATCH 3/3] arm: Tegra2: Add support for NVIDIA Seaboard board Signed-off-by: Tom Warren Thanks, Sandeep. As I understand it, one of our Tegra2 kernel jockeys (Allen Martin or similar) has already had the kernel version of mach-types.h updated for Seaboard - I was just attempting to use the correct #define (MACH_TYPE_SEABOARD - we dropped all of the MACH_TYPE_TEGRA_ names AFAIK) so my patch would build/boot. Of course this define doesn't matter until the kernel is booting w/the upstreamed U-Boot, which is a ways off (it boots fine here w/our private version of U-Boot based on V2010-09). Assuming I'm correct about the Linux version of mach-types already having been updated, how do I get a sync request in? And how is that phased in to match with my patches so that it all builds/boots? Thanks, Tom > -Original Message- > From: Paulraj, Sandeep [mailto:s-paul...@ti.com] > Sent: Tuesday, January 11, 2011 5:16 PM > To: Tom Warren; u-boot@lists.denx.de > Cc: Tom Warren > Subject: RE: [U-Boot] [PATCH 3/3] arm: Tegra2: Add support for NVIDIA > Seaboard board Signed-off-by: Tom Warren > > Hi Tom, > > Nice to see support for this board > > > #define MACH_TYPE_TI8148EVM3004 > >#define MACH_TYPE_TEGRA_SEABOARD 3005 > >+#define MACH_TYPE_SEABOARD 3005 > > > I don't think this is the way it is supposed to be done. > Patches should not contain an addition to mach-types.h. > What is generally done is you ask for an ARM sync request and in the past > Tom Rix and I have updated mach-types.h. > > I did this some weeks ago. > > Also i think we cannot have 2 EVMs with same MACH_TYPE_ > You should probably go to ARM Linux website and register as a separate EVM. > The Number you get from there should be used. I beleive you can also change > the name of the > board there; assu,ing you intend to use MACH_TYPE_SEABOARD instead of > MACH_TYPE_TEGRA_SEABOARD. > > It usually takes a little bit of time for the mach-types to be updated in > the > linux kernel. Once that is done we sync up with the kernel. > > Regards, > Sandeep --- This email message is for the sole use of the intended recipient(s) and may contain confidential information. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient, please contact the sender by reply email and destroy all copies of the original message. --- ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] U-Boot on IMX.51 EVK
Hi Stefano -
Thanks for your very quick response to my posting. I'm going to follow up
just for informational purposes, as I was able to get Freescale SDK (LTIB)
Kernel to boot find with current U-Boot.
> > - Should above "raw" load from SD work? Probably my preference, but
> have
> > an open mind.
>
> It should work, but I admit I tested booting from partitions and from
> network. Your assumption that CRC is ok let me think that there should
> be no problem to read the kernel from the SD card, even in raw mode.
>
> You could verify if your kernel boots independently from storage. Try to
> load the kernel from net instead from SD.
>
Looks like the problem I was having is the Freescale SDK (LTIB) had a
.config file that ended up with the wrong load address; was picking up the
MX53 (0x70008000 versus 0x90008000) load/build addys. Don't know why it
ever worked I hacked the right address into Makefile.boot, and comes up
fine. Basic regression testing shows no issues right now.
I was also able to boot over network without issues.
I don't install uImage on a partition, rather, hand install it on SD card
with DD, and then load with this:
bootcmd_mmc=run bootargs_base bootargs_mmc; mmc read 0 ${loadaddr} 0x800
0x1800;bootm
Just pulls from an offset in SD card. Works fine.
>
> > - The Freescale supplied SDK applies over 100 patches to the 8/09
> release
> > of U-Boot; wondering how many made it into current version of U-Boot, and
> > how much I should care.
>
>
> Rather if they are not pushed to this ML, they cannot be integrated in
> the official releases. However, are you sure they are related to the
> i.MX51 ? Most of them are probably related to other processors.
>
I spot checked this; yes, a lot of patches for other processors. I'm going
to spot check the key ones for MX51, and if I see needed installs (that are
missing), will do, and provide a clean patch set to this ML (with comment
tied back to the original FS patch set I found needs in).
>
> > End game:
> >
> > - Get the Splash Screen working on imx.51 EVK.
>
>
> As reference, take a closer look at the vision2 board. The IPU driver
> was ported from Freescale's 2.6.31 linux exactly for this goal. The
> splashimage is shown with the help of the "preboot" variable, because
> the image is stored on a device not directly addressable (SPI-Flash for
> vision2). It is the same for the mx51evk, because the image must be
> loaded (in raw mode or from a partition) from the SD card.
>
> > I will provide patch set
> > back to mailing list once I do. I will derive from vision2 board.
>
> There is already some work on this issue. A patchset was already sent to
> ML, but it requires changes to be included. You could use it as starting
> point ;-).
>
> http://www.mail-archive.com/u-boot@lists.denx.de/msg41631.html
>
> Technically, the actual IPU drive in u-boot supports only diu0 (required
> by the vision board). So changes are minimal in the IPU driver itself.
> However, please read the whole discussion on ML, so you can find which
> are the open points to be fixed.
>
>
Looked briefly at this list; thanks. I'm going to move forward now to get
IPU support going on EVK with both display ports so that Splash Screen works
on both.
I will post a clean patch set back to ML as I go on (or if I have trouble,
explain what I am seeing). I'll try to keep my work clean, so it does not
interfere with mainline development, possibly setting up environment
variables to pick output channel.
Thanks again for fast response.
Regards,
tom
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 3/3] arm: Tegra2: Add support for NVIDIA Seaboard board Signed-off-by: Tom Warren
Thanks, Sandeep. As I understand it, one of our Tegra2 kernel jockeys (Allen Martin or similar) has already had the kernel version of mach-types.h updated for Seaboard - I was just attempting to use the correct #define (MACH_TYPE_SEABOARD - we dropped all of the MACH_TYPE_TEGRA_ names AFAIK) so my patch would build/boot. Of course this define doesn't matter until the kernel is booting w/the upstreamed U-Boot, which is a ways off (it boots fine here w/our private version of U-Boot based on V2010-09). Assuming I'm correct about the Linux version of mach-types already having been updated, how do I get a sync request in? And how is that phased in to match with my patches so that it all builds/boots? Thanks, Tom > -Original Message- > From: Paulraj, Sandeep [mailto:s-paul...@ti.com] > Sent: Tuesday, January 11, 2011 5:16 PM > To: Tom Warren; u-boot@lists.denx.de > Cc: Tom Warren > Subject: RE: [U-Boot] [PATCH 3/3] arm: Tegra2: Add support for NVIDIA > Seaboard board Signed-off-by: Tom Warren > > Hi Tom, > > Nice to see support for this board > > > #define MACH_TYPE_TI8148EVM3004 > >#define MACH_TYPE_TEGRA_SEABOARD 3005 > >+#define MACH_TYPE_SEABOARD 3005 > > > I don't think this is the way it is supposed to be done. > Patches should not contain an addition to mach-types.h. > What is generally done is you ask for an ARM sync request and in the past > Tom Rix and I have updated mach-types.h. > > I did this some weeks ago. > > Also i think we cannot have 2 EVMs with same MACH_TYPE_ > You should probably go to ARM Linux website and register as a separate EVM. > The Number you get from there should be used. I beleive you can also change > the name of the > board there; assu,ing you intend to use MACH_TYPE_SEABOARD instead of > MACH_TYPE_TEGRA_SEABOARD. > > It usually takes a little bit of time for the mach-types to be updated in > the > linux kernel. Once that is done we sync up with the kernel. > > Regards, > Sandeep --- This email message is for the sole use of the intended recipient(s) and may contain confidential information. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient, please contact the sender by reply email and destroy all copies of the original message. --- ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 3/3] arm: Tegra2: Add support for NVIDIA Seaboard board Signed-off-by: Tom Warren
Hi Tom, Nice to see support for this board > #define MACH_TYPE_TI8148EVM3004 >#define MACH_TYPE_TEGRA_SEABOARD 3005 >+#define MACH_TYPE_SEABOARD 3005 I don't think this is the way it is supposed to be done. Patches should not contain an addition to mach-types.h. What is generally done is you ask for an ARM sync request and in the past Tom Rix and I have updated mach-types.h. I did this some weeks ago. Also i think we cannot have 2 EVMs with same MACH_TYPE_ You should probably go to ARM Linux website and register as a separate EVM. The Number you get from there should be used. I beleive you can also change the name of the board there; assu,ing you intend to use MACH_TYPE_SEABOARD instead of MACH_TYPE_TEGRA_SEABOARD. It usually takes a little bit of time for the mach-types to be updated in the linux kernel. Once that is done we sync up with the kernel. Regards, Sandeep ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/3] arm: Tegra2: Add generic Tegra2 SoC support Signed-off-by: Tom Warren
---
arch/arm/cpu/armv7/tegra2/Makefile | 48 +
arch/arm/cpu/armv7/tegra2/board.c| 91 ++
arch/arm/cpu/armv7/tegra2/config.mk | 28 +++
arch/arm/cpu/armv7/tegra2/lowlevel_init.S| 66 +++
arch/arm/cpu/armv7/tegra2/sys_info.c | 35
arch/arm/cpu/armv7/tegra2/timer.c| 122 +
arch/arm/include/asm/arch-tegra2/clk_rst.h | 155
arch/arm/include/asm/arch-tegra2/pinmux.h| 52 ++
arch/arm/include/asm/arch-tegra2/pmc.h | 126 +
arch/arm/include/asm/arch-tegra2/sys_proto.h | 33
arch/arm/include/asm/arch-tegra2/tegra2.h| 56 ++
arch/arm/include/asm/arch-tegra2/uart.h | 45 +
board/tegra2/common/board.c | 242 ++
board/tegra2/common/board.h | 59 +++
common/serial.c |3 +-
include/serial.h |3 +-
16 files changed, 1162 insertions(+), 2 deletions(-)
create mode 100644 arch/arm/cpu/armv7/tegra2/Makefile
create mode 100644 arch/arm/cpu/armv7/tegra2/board.c
create mode 100644 arch/arm/cpu/armv7/tegra2/config.mk
create mode 100644 arch/arm/cpu/armv7/tegra2/lowlevel_init.S
create mode 100644 arch/arm/cpu/armv7/tegra2/sys_info.c
create mode 100644 arch/arm/cpu/armv7/tegra2/timer.c
create mode 100644 arch/arm/include/asm/arch-tegra2/clk_rst.h
create mode 100644 arch/arm/include/asm/arch-tegra2/pinmux.h
create mode 100644 arch/arm/include/asm/arch-tegra2/pmc.h
create mode 100644 arch/arm/include/asm/arch-tegra2/sys_proto.h
create mode 100644 arch/arm/include/asm/arch-tegra2/tegra2.h
create mode 100644 arch/arm/include/asm/arch-tegra2/uart.h
create mode 100644 board/tegra2/common/board.c
create mode 100644 board/tegra2/common/board.h
diff --git a/arch/arm/cpu/armv7/tegra2/Makefile
b/arch/arm/cpu/armv7/tegra2/Makefile
new file mode 100644
index 000..75fba0b
--- /dev/null
+++ b/arch/arm/cpu/armv7/tegra2/Makefile
@@ -0,0 +1,48 @@
+#
+# (C) Copyright 2010,2011 Nvidia Corporation.
+#
+# (C) Copyright 2000-2003
+# 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
+#
+
+include $(TOPDIR)/config.mk
+
+LIB= $(obj)lib$(SOC).o
+
+SOBJS := lowlevel_init.o
+COBJS := sys_info.o board.o timer.o
+
+SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS := $(addprefix $(obj),$(COBJS) $(SOBJS))
+
+all:$(obj).depend $(LIB)
+
+$(LIB):$(OBJS)
+ $(AR) $(ARFLAGS) $@ $(OBJS)
+
+#
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
+
+#
diff --git a/arch/arm/cpu/armv7/tegra2/board.c
b/arch/arm/cpu/armv7/tegra2/board.c
new file mode 100644
index 000..e180f05
--- /dev/null
+++ b/arch/arm/cpu/armv7/tegra2/board.c
@@ -0,0 +1,91 @@
+/*
+ * (C) Copyright 2010,2011
+ * NVIDIA Corporation
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include
+#include
+#include
+#include
+#include
+
+DECLARE_GLOBAL_DATA_PTR;
+
+/*
+ * Boot ROM initializes the odmdata in APBDEV_PMC_SCRATCH20_0,
+ * so we are using this value to identify memory size.
+ */
+
+static unsigned int query_sdram_size(void)
+{
+ pmc_ctlr *const pmc = (pmc_ctlr *)NV_PA_PMC_BASE;
+ u32 reg;
+
+ reg = pmc->pmc_scrat
[U-Boot] [PATCH 3/3] arm: Tegra2: Add support for NVIDIA Seaboard board Signed-off-by: Tom Warren
--- MAINTAINERS |1 + arch/arm/include/asm/mach-types.h |1 + board/tegra2/seaboard/Makefile| 50 + boards.cfg|1 + include/configs/seaboard.h| 43 +++ 5 files changed, 96 insertions(+), 0 deletions(-) create mode 100644 board/tegra2/seaboard/Makefile create mode 100644 include/configs/seaboard.h diff --git a/MAINTAINERS b/MAINTAINERS index b5cff19..f4795d3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -844,6 +844,7 @@ Prafulla Wadaskar Tom Warren harmony Tegra2 (ARM7 & A9 Dual Core) + seaboardTegra2 (ARM7 & A9 Dual Core) Matthias Weisser diff --git a/arch/arm/include/asm/mach-types.h b/arch/arm/include/asm/mach-types.h index 8b0208a..45239f3 100644 --- a/arch/arm/include/asm/mach-types.h +++ b/arch/arm/include/asm/mach-types.h @@ -2984,6 +2984,7 @@ extern unsigned int __machine_arch_type; #define MACH_TYPE_AWM2 3003 #define MACH_TYPE_TI8148EVM3004 #define MACH_TYPE_TEGRA_SEABOARD 3005 +#define MACH_TYPE_SEABOARD 3005 #define MACH_TYPE_LINKSTATION_CHLV23006 #define MACH_TYPE_TERA_PRO2_RACK 3007 #define MACH_TYPE_RUBYS3008 diff --git a/board/tegra2/seaboard/Makefile b/board/tegra2/seaboard/Makefile new file mode 100644 index 000..3a146cb --- /dev/null +++ b/board/tegra2/seaboard/Makefile @@ -0,0 +1,50 @@ +# +# (C) Copyright 2010,2011 +# NVIDIA Corporation +# +# +# See file CREDITS for list of people who contributed to this +# project. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +# + +include $(TOPDIR)/config.mk + +LIB= $(obj)lib$(BOARD).o + +COBJS += ../common/board.o + +SRCS := $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) + +$(LIB):$(obj).depend $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) + +clean: + rm -f $(OBJS) + +distclean: clean + rm -f $(LIB) core *.bak $(obj).depend + +# + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +# diff --git a/boards.cfg b/boards.cfg index 6562bf5..abdb06d 100644 --- a/boards.cfg +++ b/boards.cfg @@ -123,6 +123,7 @@ omap4_sdp4430arm armv7 sdp4430 ti s5p_goni arm armv7 goni samsungs5pc1xx smdkc100 arm armv7 smdkc100 samsungs5pc1xx harmony arm armv7 harmony tegra2 tegra2 +seaboard arm armv7 seaboard tegra2 tegra2 actux1 arm ixp actux2 arm ixp actux3 arm ixp diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h new file mode 100644 index 000..f21849f --- /dev/null +++ b/include/configs/seaboard.h @@ -0,0 +1,43 @@ +/* + * (C) Copyright 2010,2011 + * NVIDIA Corporation + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#ifndef __CONFIG_H +#define __CONFIG_H + +#include +#include "nv-common.h" + +/* High-level configuration options */ +#define TEGRA2_SYSMEM "mem=3...@0m nvmem=1...@384m mem=5...@512m" +#define V_PROMPT "Tegra2 (SeaBoard) # " +#define CONFIG_TEGRA2_BOA
[U-Boot] [PATCH 2/3] arm: Tegra2: Add support for NVIDIA Harmony board Signed-off-by: Tom Warren
--- MAINTAINERS |4 + board/tegra2/harmony/Makefile | 50 boards.cfg|1 + include/configs/harmony.h | 48 include/configs/nv-common.h | 166 + 5 files changed, 269 insertions(+), 0 deletions(-) create mode 100644 board/tegra2/harmony/Makefile create mode 100644 include/configs/harmony.h create mode 100644 include/configs/nv-common.h diff --git a/MAINTAINERS b/MAINTAINERS index ba83f71..b5cff19 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -841,6 +841,10 @@ Prafulla Wadaskar rd6281a ARM926EJS (Kirkwood SoC) sheevaplug ARM926EJS (Kirkwood SoC) +Tom Warren + + harmony Tegra2 (ARM7 & A9 Dual Core) + Matthias Weisser jadecpu ARM926EJS (MB86R01 SoC) diff --git a/board/tegra2/harmony/Makefile b/board/tegra2/harmony/Makefile new file mode 100644 index 000..3a146cb --- /dev/null +++ b/board/tegra2/harmony/Makefile @@ -0,0 +1,50 @@ +# +# (C) Copyright 2010,2011 +# NVIDIA Corporation +# +# +# See file CREDITS for list of people who contributed to this +# project. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +# + +include $(TOPDIR)/config.mk + +LIB= $(obj)lib$(BOARD).o + +COBJS += ../common/board.o + +SRCS := $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) + +$(LIB):$(obj).depend $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) + +clean: + rm -f $(OBJS) + +distclean: clean + rm -f $(LIB) core *.bak $(obj).depend + +# + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +# diff --git a/boards.cfg b/boards.cfg index 94b8745..6562bf5 100644 --- a/boards.cfg +++ b/boards.cfg @@ -122,6 +122,7 @@ omap4_panda arm armv7 panda ti omap4_sdp4430arm armv7 sdp4430 ti omap4 s5p_goni arm armv7 goni samsungs5pc1xx smdkc100 arm armv7 smdkc100 samsungs5pc1xx +harmony arm armv7 harmony tegra2 tegra2 actux1 arm ixp actux2 arm ixp actux3 arm ixp diff --git a/include/configs/harmony.h b/include/configs/harmony.h new file mode 100644 index 000..781ea45 --- /dev/null +++ b/include/configs/harmony.h @@ -0,0 +1,48 @@ +/* + * (C) Copyright 2010,2011 + * NVIDIA Corporation + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#ifndef __CONFIG_H +#define __CONFIG_H + +#include +#include "nv-common.h" + +/* High-level configuration options */ +#define TEGRA2_SYSMEM "mem=3...@0m nvmem=1...@384m mem=5...@512m" +#define V_PROMPT "Tegra2 (Harmony) # " +#define CONFIG_TEGRA2_BOARD_STRING "NVIDIA Harmony" + +/* Board-specific serial config */ +#define CONFIG_SERIAL_MULTI +#define CONFIG_TEGRA2_ENABLE_UARTD 1 +#define CONFIG_TEGRA2_ENABLE_UARTA 0 + +/* UARTD: keyboard satellite board uart, default */ +#define CONFIG_SYS_NS16550_COM1NV_PA_APB_UARTD_BASE +/* UARTA: debug board uart */ +#define CONFIG_SYS_NS16550_COM2NV_PA_APB_UARTA_BASE + +#define CONFIG_MACH_TYPE MACH_TYPE_HAR
[U-Boot] [PATCH 0/3] Add basic NVIDIA Tegra2 SoC support
This series of patches adds preliminary/baseline support for NVIDIA's Tegra2 Soc. Basic CPU (AVP), RAM and UART init are covered so that the system (Harmony and/or Seaboard) can boot to the U-Boot serial prompt. Further support (for Coretex-A9 CPU(s), USB, SD/MMC, etc.) to follow. Tom Warren (3): arm: Tegra2: Add generic Tegra2 SoC support arm: Tegra2: Add support for NVIDIA Harmony board arm: Tegra2: Add support for NVIDIA Seaboard board Signed-off-by:Tom Warren MAINTAINERS |5 + arch/arm/cpu/armv7/tegra2/Makefile | 48 + arch/arm/cpu/armv7/tegra2/board.c| 91 ++ arch/arm/cpu/armv7/tegra2/config.mk | 28 +++ arch/arm/cpu/armv7/tegra2/lowlevel_init.S| 66 +++ arch/arm/cpu/armv7/tegra2/sys_info.c | 35 arch/arm/cpu/armv7/tegra2/timer.c| 122 + arch/arm/include/asm/arch-tegra2/clk_rst.h | 155 arch/arm/include/asm/arch-tegra2/pinmux.h| 52 ++ arch/arm/include/asm/arch-tegra2/pmc.h | 126 + arch/arm/include/asm/arch-tegra2/sys_proto.h | 33 arch/arm/include/asm/arch-tegra2/tegra2.h| 56 ++ arch/arm/include/asm/arch-tegra2/uart.h | 45 + arch/arm/include/asm/mach-types.h|1 + board/tegra2/common/board.c | 242 ++ board/tegra2/common/board.h | 59 +++ board/tegra2/harmony/Makefile| 50 ++ board/tegra2/seaboard/Makefile | 50 ++ boards.cfg |2 + common/serial.c |3 +- include/configs/harmony.h| 48 + include/configs/nv-common.h | 166 ++ include/configs/seaboard.h | 43 + include/serial.h |3 +- 24 files changed, 1527 insertions(+), 2 deletions(-) create mode 100644 arch/arm/cpu/armv7/tegra2/Makefile create mode 100644 arch/arm/cpu/armv7/tegra2/board.c create mode 100644 arch/arm/cpu/armv7/tegra2/config.mk create mode 100644 arch/arm/cpu/armv7/tegra2/lowlevel_init.S create mode 100644 arch/arm/cpu/armv7/tegra2/sys_info.c create mode 100644 arch/arm/cpu/armv7/tegra2/timer.c create mode 100644 arch/arm/include/asm/arch-tegra2/clk_rst.h create mode 100644 arch/arm/include/asm/arch-tegra2/pinmux.h create mode 100644 arch/arm/include/asm/arch-tegra2/pmc.h create mode 100644 arch/arm/include/asm/arch-tegra2/sys_proto.h create mode 100644 arch/arm/include/asm/arch-tegra2/tegra2.h create mode 100644 arch/arm/include/asm/arch-tegra2/uart.h create mode 100644 board/tegra2/common/board.c create mode 100644 board/tegra2/common/board.h create mode 100644 board/tegra2/harmony/Makefile create mode 100644 board/tegra2/seaboard/Makefile create mode 100644 include/configs/harmony.h create mode 100644 include/configs/nv-common.h create mode 100644 include/configs/seaboard.h -- 1.7.3.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] boot cmds: convert to getenv_yesno() with autostart
On Tuesday, January 11, 2011 15:04:37 Wolfgang Denk wrote: > Mike Frysinger wrote: > > On Tuesday, December 07, 2010 16:51:41 Wolfgang Denk wrote: > > > Mike Frysinger wrote: > > > > hrm, after running this through our test bench, it seems the old code > > > > and new code are not functionality equivalent. it boils down to > > > > default values when the env var is not set. some places interpret > > > > this to mean "yes" while others expect "no". getenv_yesno() takes > > > > the "no" default which doesnt always work. > > > > > > In addition to the default values, there is the difference that the > > > documentation states that "autostart" has to be set to "yes", i. e. a > > > plain "y" is not supposed to mean 'yes'. > > > > consider it an enhancement then ? i dont see a problem with making the > > values fuzzier. personally, i make funcs like this accept any of the > > common strings such as true/false/0/1/y/n/yes/no. > > > > > > i can update the API to take a 2nd arg (the default value), or we can > > > > punt this patch. it's in "next", so there's less pressure to get it > > > > fixed immediately ... > > > > > > I think the easiest way to fix this is to revert the commit. > > > > it's in "next", so it could even just be dropped > > As it was left unfixed until now I had no other choice but to revert > this commit. i explicitly asked about fixing it and you explicitly said you just wanted to revert. so i obviously didnt work on it. -mike signature.asc Description: This is a digitally signed message part. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] boot cmds: convert to getenv_yesno() with autostart
Dear Mike Frysinger, In message <201012071657.42065.vap...@gentoo.org> you wrote: > > On Tuesday, December 07, 2010 16:51:41 Wolfgang Denk wrote: > > Mike Frysinger wrote: > > > hrm, after running this through our test bench, it seems the old code and > > > new code are not functionality equivalent. it boils down to default > > > values when the env var is not set. some places interpret this to mean > > > "yes" while others expect "no". getenv_yesno() takes the "no" default > > > which doesnt always work. > > > > In addition to the default values, there is the difference that the > > documentation states that "autostart" has to be set to "yes", i. e. a > > plain "y" is not supposed to mean 'yes'. > > consider it an enhancement then ? i dont see a problem with making the > values > fuzzier. personally, i make funcs like this accept any of the common strings > such as true/false/0/1/y/n/yes/no. > > > > i can update the API to take a 2nd arg (the default value), or we can > > > punt this patch. it's in "next", so there's less pressure to get it > > > fixed immediately ... > > > > I think the easiest way to fix this is to revert the commit. > > it's in "next", so it could even just be dropped As it was left unfixed until now I had no other choice but to revert this commit. 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 universe does not have laws - it has habits, and habits can be broken. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-BOOT] [PATCH] arm: fix flush cache function on arm926ejs
Hi,
Le 11/01/2011 16:40, Lei Wen a écrit :
> flush_cache function should only be called when the dcache is on.
> And original flush method for arm926ejs seems don't work, replace
> it with new version.
>
> Test on Marvell Pantheon pxa920 board with usb ether function.
>
> Signed-off-by: Lei Wen
> ---
> arch/arm/lib/cache.c |8
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/lib/cache.c b/arch/arm/lib/cache.c
> index 30686fe..b8d5eee 100644
> --- a/arch/arm/lib/cache.c
> +++ b/arch/arm/lib/cache.c
> @@ -27,16 +27,16 @@
>
> void flush_cache (unsigned long dummy1, unsigned long dummy2)
> {
> + if (!dcache_status())
> + return;
> #if defined(CONFIG_OMAP2420) || defined(CONFIG_ARM1136)
> void arm1136_cache_flush(void);
>
> arm1136_cache_flush();
> #endif
> #ifdef CONFIG_ARM926EJS
> - /* test and clean, page 2-23 of arm926ejs manual */
> - asm("0: mrc p15, 0, r15, c7, c10, 3\n\t" "bne 0b\n" : : : "memory");
> - /* disable write buffer as well (page 2-22) */
> - asm("mcr p15, 0, %0, c7, c10, 4" : : "r" (0));
> + /* clean& invalidate all D cache */
> + asm("mcr p15, 0, %0, c7, c14, 0" : : "r" (0));
ARM's ARM926EJ-S r0p4/r0p5 TRM does not define "... c7, c14, 0". Where
did you find this exact cp15 instruction?
> #endif
> #ifdef CONFIG_OMAP34XX
> void v7_flush_cache_all(void);
Amicalement,
--
Albert.
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 2/2] ea20: fix undefined PHY_* errors
This patch fixes ea20 after 8ef583a0351590a91394499eb5ca2ab8a703d959 where
the u-boot custom PHY_ macros were replaced with those of linux/mii.h MII_
definitions except in the RMII support for davinci_emac. Probably also due to
the merge path of changes in 2010.12.
Signed-off-by: Ben Gardiner
CC: Mike Frysinger
---
drivers/net/davinci_emac.c |6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c
index 56cd2aa..533f7a4 100644
--- a/drivers/net/davinci_emac.c
+++ b/drivers/net/davinci_emac.c
@@ -247,10 +247,10 @@ static int gen_get_link_speed(int phy_addr)
(tmp & 0x04)) {
#if defined(CONFIG_DRIVER_TI_EMAC_USE_RMII) && \
defined(CONFIG_MACH_DAVINCI_DA850_EVM)
- davinci_eth_phy_read(phy_addr, PHY_ANLPAR, &tmp);
+ davinci_eth_phy_read(phy_addr, MII_LPA, &tmp);
/* Speed doesn't matter, there is no setting for it in EMAC. */
- if (tmp & (PHY_ANLPAR_TXFD | PHY_ANLPAR_10FD)) {
+ if (tmp & (LPA_100FULL | LPA_10FULL)) {
/* set EMAC for Full Duplex */
writel(EMAC_MACCONTROL_MIIEN_ENABLE |
EMAC_MACCONTROL_FULLDUPLEX_ENABLE,
@@ -261,7 +261,7 @@ static int gen_get_link_speed(int phy_addr)
&adap_emac->MACCONTROL);
}
- if (tmp & (PHY_ANLPAR_TXFD | PHY_ANLPAR_TX))
+ if (tmp & (LPA_100FULL | LPA_100HALF))
writel(readl(&adap_emac->MACCONTROL) |
EMAC_MACCONTROL_RMIISPEED_100,
&adap_emac->MACCONTROL);
--
1.7.0.4
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/2] ea20: fix libea20.o not found
This patch fixes ea20 after commit 6d8962e814c15807dd6ac5757904be2a02d187b8 where $(obj)lib$(BOARD).a was changed to $(obj)lib$(BOARD).o in almost all the Makefiles except ea20, probably due to merge path of the changes in 2010.12. Signed-off-by: Ben Gardiner CC: Sebastien Carlier --- board/davinci/ea20/Makefile |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/board/davinci/ea20/Makefile b/board/davinci/ea20/Makefile index ddd2564..67ec461 100644 --- a/board/davinci/ea20/Makefile +++ b/board/davinci/ea20/Makefile @@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk -LIB= $(obj)lib$(BOARD).a +LIB= $(obj)lib$(BOARD).o COBJS-y+= ea20.o -- 1.7.0.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 0/2] ea20: build fixes
There are two separate issues causing failure of ea20 builds. I discovered them while trying to build a da850evm load with RMII support. The second patch affects all boards that could use CONFIG_DRIVER_TI_EMAC_USE_RMII of which ea20 is the only one set default in u-boot. The first patch fixes the second problem I ran into trying to build ea20 after developping the RMII patch. Ben Gardiner (2): ea20: fix libea20.o not found ea20: fix undefined PHY_* errors board/davinci/ea20/Makefile |2 +- drivers/net/davinci_emac.c |6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V3] mpc83xx: fix pcie configuration space read/write
On Tue, 11 Jan 2011 19:51:41 +0800
Baidu Boy wrote:
> Hi, Scott
>
> 2011/1/11 Scott Wood :
> > On Mon, 10 Jan 2011 20:42:28 +0800
> > Baidu Boy wrote:
> >
> >> This patch fix a problem for the pcie enumeration when the mpc83xx pcie
> >> controller is
> >> connected with switch or we use both of the two pcie controller
> >>
> >> Signed-off-by: Baidu Boy
> >> ---
> >> Changes for V2:
> >> - Avoid line wrap in the patch
> >> Changes for V3
> >> - Add space between ) and {
> >
> > What about my comments?
> >
> > http://lists.denx.de/pipermail/u-boot/2011-January/084758.html
> >
>
> Actually, Your suggestion is better. But it will touch the common
> structure pci_controller.
That's OK, it's been touched by other PCI implementations too. Ideally
these custom fields would be replaced by a private-data pointer.
> And I just want to make the change only in the mpc83xx.
Don't be afraid to refactor at a larger scale when needed.
Your current approach only works during initial scanning. It won't
work if config accesses are done later.
-Scott
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] powerpc/85xx: Bump up the CONFIG_SYS_BOOTM_LEN to 16M on FSL 85xx boards
On Tue, Jan 11, 2011 at 12:44 AM, Kumar Gala wrote: > CONFIG_SYS_BOOTMAPSZ has been 16M on these boards for some time so we > should also allow the kernel image to be up to 16M decompressed. > > Signed-off-by: Kumar Gala > --- > include/configs/MPC8536DS.h | 3 ++- > include/configs/MPC8540ADS.h | 3 ++- > include/configs/MPC8541CDS.h | 3 ++- > include/configs/MPC8544DS.h | 3 ++- > include/configs/MPC8548CDS.h | 3 ++- > include/configs/MPC8555CDS.h | 3 ++- > include/configs/MPC8560ADS.h | 3 ++- > include/configs/MPC8568MDS.h | 3 ++- > include/configs/MPC8569MDS.h | 6 +++--- > include/configs/MPC8572DS.h | 3 ++- > include/configs/P1022DS.h | 3 ++- > include/configs/P1_P2_RDB.h | 3 ++- > include/configs/P2020DS.h | 3 ++- > include/configs/corenet_ds.h | 3 ++- > 14 files changed, 29 insertions(+), 16 deletions(-) Wouldn't it be simpler to do this in arch/powerpc/include/asm/config.h? -- Timur Tabi Linux kernel developer at Freescale ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [U-BOOT] [PATCH] arm: fix flush cache function on arm926ejs
flush_cache function should only be called when the dcache is on.
And original flush method for arm926ejs seems don't work, replace
it with new version.
Test on Marvell Pantheon pxa920 board with usb ether function.
Signed-off-by: Lei Wen
---
arch/arm/lib/cache.c |8
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/lib/cache.c b/arch/arm/lib/cache.c
index 30686fe..b8d5eee 100644
--- a/arch/arm/lib/cache.c
+++ b/arch/arm/lib/cache.c
@@ -27,16 +27,16 @@
void flush_cache (unsigned long dummy1, unsigned long dummy2)
{
+ if (!dcache_status())
+ return;
#if defined(CONFIG_OMAP2420) || defined(CONFIG_ARM1136)
void arm1136_cache_flush(void);
arm1136_cache_flush();
#endif
#ifdef CONFIG_ARM926EJS
- /* test and clean, page 2-23 of arm926ejs manual */
- asm("0: mrc p15, 0, r15, c7, c10, 3\n\t" "bne 0b\n" : : : "memory");
- /* disable write buffer as well (page 2-22) */
- asm("mcr p15, 0, %0, c7, c10, 4" : : "r" (0));
+ /* clean & invalidate all D cache */
+ asm("mcr p15, 0, %0, c7, c14, 0" : : "r" (0));
#endif
#ifdef CONFIG_OMAP34XX
void v7_flush_cache_all(void);
--
1.7.0.4
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [V2 patch 3/4] SMDK6400: Fix build error for nand_spl support
Add some relocation symbols to u-boot.lds and disable LED functions
in start.s to support nand_spl.
Signed-off-by: seedshope
diff --git a/arch/arm/cpu/arm1176/start.S b/arch/arm/cpu/arm1176/start.S
index 237dcfe..ae3706a 100644
--- a/arch/arm/cpu/arm1176/start.S
+++ b/arch/arm/cpu/arm1176/start.S
@@ -354,9 +354,11 @@ clbss_l:strr2, [r0]/* clear
loop...*/
cmp r0, r1
bne clbss_l
+#ifndef CONFIG_NAND_SPL
bl coloured_LED_init
bl red_LED_on
#endif
+#endif
/*
* We are done. Do not return, instead branch to second part of board
diff --git a/nand_spl/board/samsung/smdk6400/u-boot.lds
b/nand_spl/board/samsung/smdk6400/u-boot.lds
index 3ac6aa1..30b1573 100644
--- a/nand_spl/board/samsung/smdk6400/u-boot.lds
+++ b/nand_spl/board/samsung/smdk6400/u-boot.lds
@@ -55,7 +55,22 @@ SECTIONS
__u_boot_cmd_end = .;
. = ALIGN(4);
+
+ .rel.dyn : {
+ __rel_dyn_start = .;
+ *(.rel*)
+ __rel_dyn_end = .;
+ }
+
+ .dynsym : {
+ __dynsym_start = .;
+ *(.dynsym)
+ }
+
+ .bss __rel_dyn_start (OVERLAY) : {
__bss_start = .;
- .bss : { *(.bss) . = ALIGN(4); }
+ *(.bss)
+ . = ALIGN(4);
_end = .;
+ }
}
--
1.7.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [V2 patch 4/4] SMDK6400: Fix SMDK6400 SDRAM init
Since SDRAM init function have already change, So the SDRAM
initial function must be change.
Signed-off-by: seedshope
diff --git a/board/samsung/smdk6400/smdk6400.c
b/board/samsung/smdk6400/smdk6400.c
index 35aa40b..52b44a8 100644
--- a/board/samsung/smdk6400/smdk6400.c
+++ b/board/samsung/smdk6400/smdk6400.c
@@ -78,10 +78,18 @@ int board_init(void)
return 0;
}
-int dram_init(void)
+void dram_init_banksize(void)
{
+ DECLARE_GLOBAL_DATA_PTR;
+
gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
+}
+
+int dram_init(void)
+{
+ gd->ram_size = get_ram_size((volatile long *)CONFIG_SYS_SDRAM_BASE,
+ CONFIG_MAX_RAM_BANK_SIZE);
return 0;
}
--
1.7.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [V2 patch 2/4] SMDK6400: Fix some label undefined in build error
Start.s use some label,this defined u-boot.lds of arch/arm/cpu/arm1176.
But SMDK6400 use the link script board/samsung/smdk6400/u-boot-nand.lds.
So add some label form u-boot.lds to u-boot-nand.lds
Signed-off-by: seedshope
diff --git a/board/samsung/smdk6400/u-boot-nand.lds
b/board/samsung/smdk6400/u-boot-nand.lds
index 29a4f61..2b87fc6 100644
--- a/board/samsung/smdk6400/u-boot-nand.lds
+++ b/board/samsung/smdk6400/u-boot-nand.lds
@@ -55,8 +55,29 @@ SECTIONS
. = ALIGN(4);
.mmudata : { *(.mmudata) }
- . = ALIGN(4);
- __bss_start = .;
- .bss : { *(.bss) . = ALIGN(4); }
- _end = .;
+. = ALIGN(4);
+
+ .rel.dyn : {
+ __rel_dyn_start = .;
+ *(.rel*)
+ __rel_dyn_end = .;
+ }
+
+ .dynsym : {
+ __dynsym_start = .;
+ *(.dynsym)
+ }
+
+ .bss __rel_dyn_start (OVERLAY) : {
+ __bss_start = .;
+ *(.bss)
+ . = ALIGN(4);
+ _end = .;
+ }
+
+ /DISCARD/ : { *(.dynstr*) }
+ /DISCARD/ : { *(.dynamic*) }
+ /DISCARD/ : { *(.plt*) }
+ /DISCARD/ : { *(.interp*) }
+ /DISCARD/ : { *(.gnu*) }
}
--
1.7.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [V2 patch 1/4] SMDK6400: Fix CONFIG_SYS_INIT_SP_ADDR undefined
Fix CONFIG_SYS_INIT_SP_ADDR undefined issue. Signed-off-by: seedshope diff --git a/include/configs/smdk6400.h b/include/configs/smdk6400.h index 671f2c7..c9acf58 100644 --- a/include/configs/smdk6400.h +++ b/include/configs/smdk6400.h @@ -44,6 +44,11 @@ #define CONFIG_PERIPORT_BASE 0x7000 #define CONFIG_PERIPORT_SIZE 0x13 +#define CONFIG_SYS_IRAM_BASE0x0c00 /* Internal SRAM base address */ +#define CONFIG_SYS_IRAM_SIZE0x2000 /* 8 KB of internal SRAM memory */ +#define CONFIG_SYS_IRAM_END (CONFIG_SYS_IRAM_BASE + CONFIG_SYS_IRAM_SIZE) +#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_IRAM_END - GENERATED_GBL_DATA_SIZE) + #define CONFIG_SYS_SDRAM_BASE 0x5000 /* input clock of PLL: SMDK6400 has 12MHz input clock */ -- 1.7.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] RR v2 PATCH: SMDK6400 Fix some build bug
Subject: RR v2 PATCH: SMDK6400 Fix some build bug Change from V1: patch 1: patch 2: Delete some compile information from commit. patch 3: Add LED modify information and Delete some compile information from commit. patch 4: Add new patch for SDRAM init. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3 8/8] powerpc/85xx: Add SRIO support to P2020DS
On Jan 11, 2011, at 2:10 AM, Kumar Gala wrote: > From: Li Yang > > The P2020 has 2 SRIO ports and they are useable on the P2020 DS board. > Enable them using the common SRIO init code. > > Signed-off-by: Li Yang > Signed-off-by: Kumar Gala > --- > * Renamed CONFIG_SYS_HAS_SRIO -> CONFIG_SYS_SRIO > > include/configs/P2020DS.h | 24 +++- > 1 files changed, 23 insertions(+), 1 deletions(-) applied to 85xx - k ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3 6/8] powerpc/86xx: Convert MPC8641HPCN to use common SRIO init code
On Jan 11, 2011, at 2:10 AM, Kumar Gala wrote: > Signed-off-by: Kumar Gala > --- > * Renamed CONFIG_SYS_HAS_SRIO -> CONFIG_SYS_SRIO > > board/freescale/mpc8641hpcn/law.c |5 + > include/configs/MPC8641HPCN.h | 30 +- > 2 files changed, 14 insertions(+), 21 deletions(-) applied to 85xx - k ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3 7/8] powerpc/86xx: Convert SBC8641 to use common SRIO init code
On Jan 11, 2011, at 2:10 AM, Kumar Gala wrote: > Signed-off-by: Kumar Gala > Tested-by: Paul Gortmaker > --- > * Renamed CONFIG_SYS_HAS_SRIO -> CONFIG_SYS_SRIO > > board/sbc8641d/law.c |1 - > include/configs/sbc8641d.h | 15 +-- > 2 files changed, 9 insertions(+), 7 deletions(-) applied to 85xx - k ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3 5/8] powerpc/86xx: Enable common SRIO init code
On Jan 11, 2011, at 2:10 AM, Kumar Gala wrote: > Add the needed defines and code to utilize the common 8xxx srio init > code to setup LAWs and modify device tree if we have SRIO enabled on a > board. > > Signed-off-by: Kumar Gala > --- > * Renamed CONFIG_SYS_HAS_SRIO -> CONFIG_SYS_SRIO > > arch/powerpc/cpu/mpc86xx/cpu_init.c |7 ++- > arch/powerpc/cpu/mpc86xx/fdt.c|7 ++- > arch/powerpc/include/asm/immap_86xx.h |4 +++- > 3 files changed, 15 insertions(+), 3 deletions(-) applied to 85xx - k ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3 4/8] powerpc/85xx: Convert MPC8569MDS to use common SRIO init code
On Jan 11, 2011, at 2:10 AM, Kumar Gala wrote: > Signed-off-by: Kumar Gala > --- > * Renamed CONFIG_SYS_HAS_SRIO -> CONFIG_SYS_SRIO > > board/freescale/mpc8569mds/law.c |3 +-- > include/configs/MPC8569MDS.h | 12 > 2 files changed, 9 insertions(+), 6 deletions(-) applied to 85xx - k ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3 3/8] powerpc/85xx: Convert MPC8568MDS to use common SRIO init code
On Jan 11, 2011, at 2:10 AM, Kumar Gala wrote: > Signed-off-by: Kumar Gala > --- > * Renamed CONFIG_SYS_HAS_SRIO -> CONFIG_SYS_SRIO > > board/freescale/mpc8568mds/law.c |3 +-- > include/configs/MPC8568MDS.h | 12 > 2 files changed, 9 insertions(+), 6 deletions(-) applied to 85xx - k ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3 2/8] powerpc/85xx: Convert MPC8548CDS to use common SRIO init code
On Jan 11, 2011, at 2:10 AM, Kumar Gala wrote: > Signed-off-by: Kumar Gala > --- > * Renamed CONFIG_SYS_HAS_SRIO -> CONFIG_SYS_SRIO > > board/freescale/mpc8548cds/law.c |5 + > board/freescale/mpc8548cds/tlb.c |9 - > include/configs/MPC8548CDS.h | 15 --- > 3 files changed, 13 insertions(+), 16 deletions(-) applied to 85xx - k ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3 1/8] powerpc/8xxx: Refactor SRIO initialization into common code
On Jan 11, 2011, at 3:46 AM, Wolfgang Denk wrote: > Dear Kumar Gala, > > In message <1294733436-10264-1-git-send-email-ga...@kernel.crashing.org> you > wrote: >> Moved the SRIO init out of corenet_ds and into common code for >> 8xxx/QorIQ processors that have SRIO. We mimic what we do with PCIe >> controllers for SRIO. >> >> We utilize the fact that SRIO is over serdes to determine if its >> configured or not and thus can setup the LAWs needed for it dynamically. >> >> We additionally update the device tree (to remove the SRIO nodes) if the >> board doesn't have SRIO enabled. >> >> Introduced the following standard defines for board config.h: >> >> CONFIG_SYS_SRIO - Chip has SRIO or not >> CONFIG_SRIO1 - Board has SRIO 1 port available >> CONFIG_SRIO2 - Board has SRIO 2 port available >> >> (where 'n' is the port #) >> CONFIG_SYS_SRIOn_MEM_VIRT - virtual address in u-boot >> CONFIG_SYS_SRIOn_MEM_PHYS - physical address (for law setup) >> CONFIG_SYS_SRIOn_MEM_SIZE - size of window (for law setup) >> >> [ These mimic what we have for PCI and PCIe controllers ] >> >> Signed-off-by: Kumar Gala >> --- >> * Renamed CONFIG_SYS_HAS_SRIO -> CONFIG_SYS_SRIO >> * Added defines to README >> >> README | 18 +++ >> arch/powerpc/cpu/mpc85xx/cpu_init.c |8 +++- >> arch/powerpc/cpu/mpc85xx/fdt.c |7 ++- >> arch/powerpc/cpu/mpc8xxx/Makefile |1 + >> arch/powerpc/cpu/mpc8xxx/fdt.c | 23 - >> arch/powerpc/cpu/mpc8xxx/srio.c | 86 >> +++ >> arch/powerpc/include/asm/fsl_law.h |1 + >> board/freescale/corenet_ds/corenet_ds.c | 44 >> include/configs/corenet_ds.h| 19 --- >> 9 files changed, 151 insertions(+), 56 deletions(-) >> create mode 100644 arch/powerpc/cpu/mpc8xxx/srio.c > > Acked-by: Wolfgang Denk applied to 85xx - k ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] printf in u-boot cannot support %f
Dear "ITechnology",
In message <201101112113066880...@126.com> you wrote:
>
> The codes below:
>...
> double result1 = 3.14;
> printf("result1:%f\n", result1);// error
>
> turn out:
> result1:%f
Yes, this is to be expected.
> How can I get the correct result? Thanks a lot!
Youcannot. We do not use nor support any FP operations in U-Boot.
> I wan to a little more complex program in standalone mode in u-boot. Is
> it possilbe to port g-libc to u-boot standalone mode?
Everything is possible, assuming you throw enough manpower at it.
The real question however is if this makes sense. Usually, in such
situations it does not. You might find it more efficient to boot into
some OS instead.
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
NOTE: The Most Fundamental Particles in This Product Are Held
Together by a "Gluing" Force About Which Little is Currently Known
and Whose Adhesive Power Can Therefore Not Be Permanently Guaranteed.
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH V4 5/5] Pantheon: Add Board Support for Marvell dkb board
DKB is a Development Board for PANTHEON TD/TTC(pxa920/pxa910) with
* Processor upto 806Mhz
* LPDDR1/2
* x8/x16 SLC/MLC NAND
* Footprints for eMMC & MMC x8 card
With Peripherals:
* Parallel LCD I/F
* Audio codecs (88PM8607)
* MIPI CSI-2 camera
* Marvell 88W8787 802.11n/BT module
* Marvell 2G/3G RF
* Dual analog mics & speakers, headset jack, LED, ambient
* USB2.0 HS host, OTG (mini AB)
* GPIO, GPIO expander with DIP switches for easier selection
* UART serial over USB, CIR
This patch adds basic board support with DRAM and UART functionality
Signed-off-by: Lei Wen
---
V2:
V3:
Fix copyright claim year.
V4:
Add change log to each patch.
MAINTAINERS|4 +++
board/Marvell/dkb/Makefile | 51 +++
board/Marvell/dkb/dkb.c| 53
boards.cfg |1 +
include/configs/dkb.h | 64
5 files changed, 173 insertions(+), 0 deletions(-)
create mode 100644 board/Marvell/dkb/Makefile
create mode 100644 board/Marvell/dkb/dkb.c
create mode 100644 include/configs/dkb.h
diff --git a/MAINTAINERS b/MAINTAINERS
index 96fad4b..0a37a01 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -839,6 +839,10 @@ Prafulla Wadaskar
rd6281a ARM926EJS (Kirkwood SoC)
sheevaplug ARM926EJS (Kirkwood SoC)
+Lei Wen
+
+ dkb ARM926EJS (PANTHEON 88AP920 SOC)
+
Matthias Weisser
jadecpu ARM926EJS (MB86R01 SoC)
diff --git a/board/Marvell/dkb/Makefile b/board/Marvell/dkb/Makefile
new file mode 100644
index 000..2fafdb3
--- /dev/null
+++ b/board/Marvell/dkb/Makefile
@@ -0,0 +1,51 @@
+#
+# (C) Copyright 2011
+# Marvell Semiconductor
+# Written-by: Lei Wen
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301 USA
+#
+
+include $(TOPDIR)/config.mk
+
+LIB = $(obj)lib$(BOARD).o
+
+COBJS := dkb.o
+
+SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS := $(addprefix $(obj),$(COBJS))
+SOBJS := $(addprefix $(obj),$(SOBJS))
+
+$(LIB):$(obj).depend $(OBJS) $(SOBJS)
+ $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
+
+clean:
+ rm -f $(SOBJS) $(OBJS)
+
+distclean: clean
+ rm -f $(LIB) core *.bak .depend
+
+#
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
+
+#
diff --git a/board/Marvell/dkb/dkb.c b/board/Marvell/dkb/dkb.c
new file mode 100644
index 000..de1851f
--- /dev/null
+++ b/board/Marvell/dkb/dkb.c
@@ -0,0 +1,53 @@
+/*
+ * (C) Copyright 2011
+ * Marvell Semiconductor
+ * Written-by: Lei Wen
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ */
+
+#include
+#include
+#include
+
+DECLARE_GLOBAL_DATA_PTR;
+
+int board_early_init_f(void)
+{
+ u32 mfp_cfg[] = {
+ /* Enable Console on UART2 */
+ MFP47_UART2_RXD,
+ MFP48_UART2_TXD,
+
+ MFP_EOC /*End of configureation*/
+ };
+ /* configure MFP's */
+ mfp_config(mfp_cfg);
+
+ return 0;
+}
+
+int board_init(void)
+{
+ /* arch number of Board */
+ gd->bd->bi_arch_number = MACH_TYPE_TTC_DKB;
+ /* adress of boot parameters */
+ gd->bd->bi_boot_params = panth_sdram_base(0) + 0x100;
+ return 0;
+}
diff --git a/boards.cfg b/boards.cfg
index ee9a1a3..007175e 100644
--- a/boards.cfg
[U-Boot] [PATCH V4 4/5] mvmfp: add MFP configuration support for PANTHEON
This patch adds the support MFP support for Marvell PANTHEON SoCs Signed-off-by: Lei Wen --- V2: V3: Fix copyright claim year. V4: Add change log to each patch. arch/arm/include/asm/arch-pantheon/mfp.h | 42 ++ drivers/gpio/mvmfp.c |2 + 2 files changed, 44 insertions(+), 0 deletions(-) create mode 100644 arch/arm/include/asm/arch-pantheon/mfp.h diff --git a/arch/arm/include/asm/arch-pantheon/mfp.h b/arch/arm/include/asm/arch-pantheon/mfp.h new file mode 100644 index 000..170dcbb --- /dev/null +++ b/arch/arm/include/asm/arch-pantheon/mfp.h @@ -0,0 +1,42 @@ +/* + * Based on arch/arm/include/asm/arch-armada100/mfp.h + * (C) Copyright 2011 + * Marvell Semiconductor + * Written-by: Lei Wen + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA + */ + +#ifndef __PANTHEON_MFP_H +#define __PANTHEON_MFP_H + +/* + * Frequently used MFP Configuration macros for all PANTHEON family of +SoCs + * + * offset, pull,pF, drv,dF, edge,eF ,afn,aF + */ +/* UART2 */ +#define MFP47_UART2_RXDMFP_REG(0x198) | MFP_AF6 | MFP_DRIVE_MEDIUM +#define MFP48_UART2_TXDMFP_REG(0x19c) | MFP_AF6 | MFP_DRIVE_MEDIUM + +/* More macros can be defined here... */ + +#define MFP_PIN_MAX117 +#endif diff --git a/drivers/gpio/mvmfp.c b/drivers/gpio/mvmfp.c index 5646ed4..e7830c6 100644 --- a/drivers/gpio/mvmfp.c +++ b/drivers/gpio/mvmfp.c @@ -28,6 +28,8 @@ #include #ifdef CONFIG_ARMADA100 #include +#elif defined(CONFIG_PANTHEON) +#include #else #error Unsupported SoC... #endif -- 1.7.0.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH V4 2/5] ARM: Add Support for Marvell Pantheon Familiy SoCs
Pantheon Family processors are highly integrated SoCs
based on Sheeva_88SV331x-v5 PJ1 cpu core.
Ref:
http://www.marvell.com/products/processors/communications/marvell_pantheon_910_920_pb.pdf
SoC versions Supported:
1) PANTHEON920 (TD)
2) PANTHEON910 (TTC)
Signed-off-by: Lei Wen
---
V2:
V3:
Fix copyright claim year.
V4:
Add change log to each patch.
arch/arm/cpu/arm926ejs/pantheon/Makefile | 46 ++
arch/arm/cpu/arm926ejs/pantheon/cpu.c | 78 ++
arch/arm/cpu/arm926ejs/pantheon/dram.c| 130
arch/arm/cpu/arm926ejs/pantheon/timer.c | 204 +
arch/arm/include/asm/arch-pantheon/config.h | 44 ++
arch/arm/include/asm/arch-pantheon/cpu.h | 79 ++
arch/arm/include/asm/arch-pantheon/pantheon.h | 54 +++
7 files changed, 635 insertions(+), 0 deletions(-)
create mode 100644 arch/arm/cpu/arm926ejs/pantheon/Makefile
create mode 100644 arch/arm/cpu/arm926ejs/pantheon/cpu.c
create mode 100644 arch/arm/cpu/arm926ejs/pantheon/dram.c
create mode 100644 arch/arm/cpu/arm926ejs/pantheon/timer.c
create mode 100644 arch/arm/include/asm/arch-pantheon/config.h
create mode 100644 arch/arm/include/asm/arch-pantheon/cpu.h
create mode 100644 arch/arm/include/asm/arch-pantheon/pantheon.h
diff --git a/arch/arm/cpu/arm926ejs/pantheon/Makefile
b/arch/arm/cpu/arm926ejs/pantheon/Makefile
new file mode 100644
index 000..ab94985
--- /dev/null
+++ b/arch/arm/cpu/arm926ejs/pantheon/Makefile
@@ -0,0 +1,46 @@
+#
+# (C) Copyright 2011
+# Marvell Semiconductor
+# Written-by: Lei Wen
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301 USA
+#
+
+include $(TOPDIR)/config.mk
+
+LIB= $(obj)lib$(SOC).o
+
+COBJS-y= cpu.o timer.o dram.o
+
+SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
+OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS-y))
+
+all: $(obj).depend $(LIB)
+
+$(LIB):$(OBJS)
+ $(AR) $(ARFLAGS) $@ $(OBJS)
+
+#
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
+
+#
diff --git a/arch/arm/cpu/arm926ejs/pantheon/cpu.c
b/arch/arm/cpu/arm926ejs/pantheon/cpu.c
new file mode 100644
index 000..9ddc77c
--- /dev/null
+++ b/arch/arm/cpu/arm926ejs/pantheon/cpu.c
@@ -0,0 +1,78 @@
+/*
+ * (C) Copyright 2011
+ * Marvell Semiconductor
+ * Written-by: Lei Wen
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ */
+
+#include
+#include
+#include
+
+#define UARTCLK14745KHZ(APBC_APBCLK | APBC_FNCLK | APBC_FNCLKSEL(1))
+#define SET_MRVL_ID(1<<8)
+#define L2C_RAM_SEL(1<<4)
+
+int arch_cpu_init(void)
+{
+ u32 val;
+ struct panthcpu_registers *cpuregs =
+ (struct panthcpu_registers*) PANTHEON_CPU_BASE;
+
+ struct panthapb_registers *apbclkres =
+ (struct panthapb_registers*) PANTHEON_APBC_BASE;
+
+ struct panthmpmu_registers *mpmu =
+ (struct panthmpmu_registers*) PANTHEON_MPMU_BASE;
+
+ /* set SEL_MRVL_ID bit in PANTHEON_CPU_CONF register */
+ val = readl(&cpuregs->cpu_conf);
+ val = val | SET_MRVL_ID;
+ writel(val, &cpuregs->cpu_conf);
+
+ /* Turn on clock gating (PMUM_CCGR) */
+ writel(0x, &mpmu->ccgr);
+
+ /* Turn on clock gating (PMUM_ACGR) */
+ writel(0x, &mpmu->acgr);
+
+ /* Tu
[U-Boot] [PATCH V4 3/5] serial: add pantheon soc support
Signed-off-by: Lei Wen --- V2: V3: Fix copyright claim year. V4: Add change log to each patch. drivers/serial/serial.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c index cd3439e..4032dfd 100644 --- a/drivers/serial/serial.c +++ b/drivers/serial/serial.c @@ -33,6 +33,8 @@ #include #elif defined(CONFIG_ARMADA100) #include +#elif defined(CONFIG_PANTHEON) +#include #endif #if defined (CONFIG_SERIAL_MULTI) -- 1.7.0.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH V4 1/5] mv: seperate kirkwood and armada from common setting
Since there are lots of difference between kirkwood and armada series, it is better to seperate them but still keep the most common file shared by all marvell platform in the mv-common configure file. This patch move the kirkwood only driver definitoin in mv-common to the /config.h. This patch is tested with compilation for armada100 and guruplug. Signed-off-by: Lei Wen --- V2: This patch seris update the seperate mv_common part as suggested. V3: Fix config.h include place and copyright claim year. V4: Add change log to each patch. arch/arm/include/asm/arch-armada100/config.h | 50 + arch/arm/include/asm/arch-kirkwood/config.h | 145 + include/configs/aspenite.h |1 + include/configs/mv-common.h | 147 -- 4 files changed, 217 insertions(+), 126 deletions(-) create mode 100644 arch/arm/include/asm/arch-armada100/config.h create mode 100644 arch/arm/include/asm/arch-kirkwood/config.h diff --git a/arch/arm/include/asm/arch-armada100/config.h b/arch/arm/include/asm/arch-armada100/config.h new file mode 100644 index 000..02d72b4 --- /dev/null +++ b/arch/arm/include/asm/arch-armada100/config.h @@ -0,0 +1,50 @@ +/* + * (C) Copyright 2011 + * Marvell Semiconductor + * Written-by: Lei Wen + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA + */ + +/* + * This file should be included in board config header file. + * + * It supports common definitions for Armada100 platform + */ + +#ifndef _ARMD1_CONFIG_H +#define _ARMD1_CONFIG_H + +#define CONFIG_ARM926EJS 1 /* Basic Architecture */ + +#define CONFIG_SYS_TCLK(14745600) /* NS16550 clk config */ +#define CONFIG_SYS_HZ_CLOCK(325) /* Timer Freq. 3.25MHZ */ +#define CONFIG_MARVELL_MFP /* Enable mvmfp driver */ +#define MV_MFPR_BASE ARMD1_MFPR_BASE +#define MV_UART_CONSOLE_BASE ARMD1_UART1_BASE +#define CONFIG_SYS_NS16550_IER (1 << 6)/* Bit 6 in UART_IER register + represents UART Unit Enable */ +/* + * There is no internal RAM in ARMADA100, using DRAM + * TBD: dcache to be used for this + */ +#define CONFIG_SYS_INIT_SP_ADDR(CONFIG_SYS_TEXT_BASE - 0x0020) +#define CONFIG_NR_DRAM_BANKS_MAX 2 + +#endif /* _ARMD1_CONFIG_H */ diff --git a/arch/arm/include/asm/arch-kirkwood/config.h b/arch/arm/include/asm/arch-kirkwood/config.h new file mode 100644 index 000..71ba464 --- /dev/null +++ b/arch/arm/include/asm/arch-kirkwood/config.h @@ -0,0 +1,145 @@ +/* + * (C) Copyright 2011 + * Marvell Semiconductor + * Written-by: Lei Wen + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA + */ + +/* + * This file should be included in board config header file. + * + * It supports common definitions for Kirkwood platform + */ + +#ifndef _KW_CONFIG_H +#define _KW_CONFIG_H + +#if defined (CONFIG_KW88F6281) +#include +#elif defined (CONFIG_KW88F6192) +#include +#else +#error "SOC Name not defined" +#endif /* CONFIG_KW88F6281 */ + +#define CONFIG_ARM926EJS 1 /* Basic Architecture */ + +#define CONFIG_MD5 /* get_random_hex on krikwood needs MD5 support */ +#define CONFIG_KIRKWOOD_EGIGA_INIT /* Enable GbePort0/1 for kernel */ +#define CONFIG_KIRKWOOD_RGMII_PAD_1V8 /* Set RGMII Pad voltage to 1.8V */ +#define CONFIG_KIRKWOOD_PCIE_INIT /* Enable PCIE Port0 for kernel */ + +/* + * By default k
[U-Boot] [PATCH V4 0/5] Add Pantheon soc and dkb board support
This patch set add the Pantheon soc and dkb board support. V2: This patch seris update the seperate mv_common part as suggested. V3: Fix config.h include place and copyright claim year. V4: Add change log to each patch. Lei Wen (5): mv: seperate kirkwood and armada from common setting ARM: Add Support for Marvell Pantheon Familiy SoCs serial: add pantheon soc support mvmfp: add MFP configuration support for PANTHEON Pantheon: Add Board Support for Marvell dkb board MAINTAINERS |4 + arch/arm/cpu/arm926ejs/pantheon/Makefile | 46 ++ arch/arm/cpu/arm926ejs/pantheon/cpu.c | 78 ++ arch/arm/cpu/arm926ejs/pantheon/dram.c| 130 arch/arm/cpu/arm926ejs/pantheon/timer.c | 204 + arch/arm/include/asm/arch-armada100/config.h | 50 ++ arch/arm/include/asm/arch-kirkwood/config.h | 145 ++ arch/arm/include/asm/arch-pantheon/config.h | 44 ++ arch/arm/include/asm/arch-pantheon/cpu.h | 79 ++ arch/arm/include/asm/arch-pantheon/mfp.h | 42 + arch/arm/include/asm/arch-pantheon/pantheon.h | 54 +++ board/Marvell/dkb/Makefile| 51 ++ board/Marvell/dkb/dkb.c | 53 +++ boards.cfg|1 + drivers/gpio/mvmfp.c |2 + drivers/serial/serial.c |2 + include/configs/aspenite.h|1 + include/configs/dkb.h | 64 include/configs/mv-common.h | 147 +++--- 19 files changed, 1071 insertions(+), 126 deletions(-) create mode 100644 arch/arm/cpu/arm926ejs/pantheon/Makefile create mode 100644 arch/arm/cpu/arm926ejs/pantheon/cpu.c create mode 100644 arch/arm/cpu/arm926ejs/pantheon/dram.c create mode 100644 arch/arm/cpu/arm926ejs/pantheon/timer.c create mode 100644 arch/arm/include/asm/arch-armada100/config.h create mode 100644 arch/arm/include/asm/arch-kirkwood/config.h create mode 100644 arch/arm/include/asm/arch-pantheon/config.h create mode 100644 arch/arm/include/asm/arch-pantheon/cpu.h create mode 100644 arch/arm/include/asm/arch-pantheon/mfp.h create mode 100644 arch/arm/include/asm/arch-pantheon/pantheon.h create mode 100644 board/Marvell/dkb/Makefile create mode 100644 board/Marvell/dkb/dkb.c create mode 100644 include/configs/dkb.h ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] printf in u-boot cannot support %f
Hi,
The codes below:
...
double result1 = 3.14;
printf("result1:%f\n", result1);// error
turn out:
result1:%f
How can I get the correct result? Thanks a lot!
The U-boot version is:
=> ver
U-Boot 2008.10 (Jul 15 2009 - 21:56:05) MPC512X
I wan to a little more complex program in standalone mode in u-boot. Is it
possilbe to port g-libc to u-boot standalone mode?
Tanks.
Best regards,
Michael Franklin
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH RFC] armv7: fixloop: don't fixup if location is NULL
Dear Minkyu Kang, Am 11.01.2011 14:00, schrieb Andreas Bießmann: > Dear Minkyu Kang, > > Am 11.01.2011 11:57, schrieb Minkyu Kang: > >>> Regardless of the patch, if your code writes to panel_info or any other BSS >>> variable before relocation it will trash the relocation tables that exist at >>> BSS location at this point. >>> >>> IOW, accessing BSS before relocation is forbidden, not just out of fancy, >>> but for a serious reason. >> >> This patch is not for accessing BSS before relocation, >> it's for prevent exceptions. > > The real error is writing to BSS before relocation. This leads to a > corrupted .rel.dyn section which is placed at the same address as .bss > at this moment (bss is overloaded to save space). > > If you look in your ELF (e.g. readelf -R .rel.dyn u-boot) you may see, > that the .rel.dyn section does _not_ include a pointer to 0x0 with > relative relocation (0x17) as you showed in a previous post. > If you look in your u-boot.map you may find the function in question > (test_func() was it in your example) is placed in .bss section. Setting > the function pointer to 0 (e.g. test_func() = NULL, as described in > previous mail) before relocation will destroy your .rel.dyn section and > then you will see a zero in .rel.dyn section at some place ... please > investigate the ELF and do not step through the code to find those issues. You may have a look at http://patchwork.ozlabs.org/patch/73760 for an TEST approach to see the damaged .rel.dyn, if you like this hackish approach. regards Andreas Bießmann ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH RFC] armv7: fixloop: don't fixup if location is NULL
Dear Minkyu Kang, Am 11.01.2011 11:57, schrieb Minkyu Kang: >> Regardless of the patch, if your code writes to panel_info or any other BSS >> variable before relocation it will trash the relocation tables that exist at >> BSS location at this point. >> >> IOW, accessing BSS before relocation is forbidden, not just out of fancy, >> but for a serious reason. > > This patch is not for accessing BSS before relocation, > it's for prevent exceptions. The real error is writing to BSS before relocation. This leads to a corrupted .rel.dyn section which is placed at the same address as .bss at this moment (bss is overloaded to save space). If you look in your ELF (e.g. readelf -R .rel.dyn u-boot) you may see, that the .rel.dyn section does _not_ include a pointer to 0x0 with relative relocation (0x17) as you showed in a previous post. If you look in your u-boot.map you may find the function in question (test_func() was it in your example) is placed in .bss section. Setting the function pointer to 0 (e.g. test_func() = NULL, as described in previous mail) before relocation will destroy your .rel.dyn section and then you will see a zero in .rel.dyn section at some place ... please investigate the ELF and do not step through the code to find those issues. I may be wrong, please show it to us. regards Andreas Bießmann ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH V3] update VCMA9 port
This patch brings the VCMA9 port in sync with the latest U-Boot
version by doing the following:
- do the necessary adjustments to support the ARM relocation feature
- use the CFI flash driver (and removing the old one)
- various cleanups and coding style fixes
- remove the unneeded config.mk file
Signed-off-by: David Müller
---
Changes for V2:
- delete config.mk
Changes for V3:
- adjust patch meta info
diff --git a/board/mpl/vcma9/Makefile b/board/mpl/vcma9/Makefile
index 27cef1d..59c25f9 100644
--- a/board/mpl/vcma9/Makefile
+++ b/board/mpl/vcma9/Makefile
@@ -28,7 +28,7 @@ endif
LIB= $(obj)lib$(BOARD).o
-COBJS := vcma9.o flash.o cmd_vcma9.o
+COBJS := vcma9.o cmd_vcma9.o
COBJS += ../common/common_util.o
SOBJS := lowlevel_init.o
diff --git a/board/mpl/vcma9/cmd_vcma9.c b/board/mpl/vcma9/cmd_vcma9.c
index 0d5f46e..0f02b7e 100644
--- a/board/mpl/vcma9/cmd_vcma9.c
+++ b/board/mpl/vcma9/cmd_vcma9.c
@@ -43,7 +43,7 @@ static uchar cs8900_chksum(ushort data)
DECLARE_GLOBAL_DATA_PTR;
-extern void print_vcma9_info(void);
+extern void vcma9_print_info(void);
extern int vcma9_cantest(int);
extern int vcma9_nandtest(void);
extern int vcma9_nanderase(void);
@@ -60,7 +60,7 @@ int do_vcma9(cmd_tbl_t *cmdtp, int flag, int argc, char *
const argv[])
char cs8900_name[10];
if (strcmp(argv[1], "info") == 0)
{
- print_vcma9_info();
+ vcma9_print_info();
return 0;
}
#if defined(CONFIG_CS8900)
diff --git a/board/mpl/vcma9/config.mk b/board/mpl/vcma9/config.mk
deleted file mode 100644
index e345913..000
--- a/board/mpl/vcma9/config.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# (C) Copyright 2002, 2003
-# David Mueller, ELSOFT AG,
-#
-# MPL VCMA9 board with S3C2410X (ARM920T) cpu
-#
-# see http://www.mpl.ch/ for more information about the MPL VCMA9
-#
-
-#
-# MPL VCMA9 has 1 bank of minimal 16 MB DRAM
-# from 0x3000
-#
-# Linux-Kernel is expected to be at 3000'8000, entry 3000'8000
-# optionally with a ramdisk at 3040'
-#
-# we load ourself to 33F8'
-#
-# download area is 3080'
-#
-
-
-#CONFIG_SYS_TEXT_BASE = 0x30F8
-CONFIG_SYS_TEXT_BASE = 0x33F8
diff --git a/board/mpl/vcma9/flash.c b/board/mpl/vcma9/flash.c
deleted file mode 100644
index 7abf9cf..000
--- a/board/mpl/vcma9/flash.c
+++ /dev/null
@@ -1,432 +0,0 @@
-/*
- * (C) Copyright 2002
- * Sysgo Real-Time Solutions, GmbH
- * Alex Zuepke
- *
- * 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
-
-ulong myflush (void);
-
-
-#define FLASH_BANK_SIZEPHYS_FLASH_SIZE
-#define MAIN_SECT_SIZE 0x1/* 64 KB */
-
-flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS];
-
-
-#define CMD_READ_ARRAY 0x00F0
-#define CMD_UNLOCK10x00AA
-#define CMD_UNLOCK20x0055
-#define CMD_ERASE_SETUP0x0080
-#define CMD_ERASE_CONFIRM 0x0030
-#define CMD_PROGRAM0x00A0
-#define CMD_UNLOCK_BYPASS 0x0020
-
-#define MEM_FLASH_ADDR1(*(volatile u16
*)(CONFIG_SYS_FLASH_BASE + (0x0555 << 1)))
-#define MEM_FLASH_ADDR2(*(volatile u16
*)(CONFIG_SYS_FLASH_BASE + (0x02AA << 1)))
-
-#define BIT_ERASE_DONE 0x0080
-#define BIT_RDY_MASK 0x0080
-#define BIT_PROGRAM_ERROR 0x0020
-#define BIT_TIMEOUT0x8000 /* our flag */
-
-#define READY 1
-#define ERR 2
-#define TMO 4
-
-/*---
- */
-
-ulong flash_init (void)
-{
- int i, j;
- ulong size = 0;
-
- for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; i++) {
- ulong flashbase = 0;
-
- flash_info[i].flash_id =
-#if defined(CONFIG_AMD_LV400)
- (AMD_MANUFACT & FLASH_VENDMASK) |
- (AMD_ID_LV400B & FLASH_TYPEMASK);
-#elif defined(CONFIG_AMD_LV800)
- (AMD_MANUFACT & FLASH_VENDMASK) |
- (AMD_ID_LV800B & FLASH_TYPEMASK);
-#else
-#error "Unknown flash configured"
-#endif
- flash_info[i].size = FLASH_BANK_SIZE;
- flash_info[i].sector_count = CONFIG_SYS_MAX_
[U-Boot] [PATCH] mpc8378emds: correct the CS0 setting
The original CS0 OR configuration sets the reserved field. This patch is to correct the setting. Signed-off-by: Baidu Boy --- include/configs/MPC837XEMDS.h |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h index c237991..8ddccec 100644 --- a/include/configs/MPC837XEMDS.h +++ b/include/configs/MPC837XEMDS.h @@ -242,7 +242,6 @@ | (2 << BR_PS_SHIFT)/* 16 bit port size */ \ | BR_V )/* valid */ #define CONFIG_SYS_OR0_PRELIM ( (~(CONFIG_SYS_FLASH_SIZE - 1) << 20) \ - | OR_UPM_XAM \ | OR_GPCM_CSNT \ | OR_GPCM_ACS_DIV2 \ | OR_GPCM_XACS \ -- 1.7.3.1.msysgit.0 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH V3] update SMDK2410 port
This patch brings the SMDK2410 port in sync with the latest U-Boot
version by doing the following:
- do the necessary adjustments to support the ARM relocation feature
- use the CFI flash driver (and removing the old one)
- remove the unneeded config.mk file
Signed-off-by: David Müller
---
Changes for V2:
- deleted config.mk
Changes for V3:
- adjusted patch meta info
diff --git a/board/samsung/smdk2410/Makefile b/board/samsung/smdk2410/Makefile
index bda8898..0afe1e2 100644
--- a/board/samsung/smdk2410/Makefile
+++ b/board/samsung/smdk2410/Makefile
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
LIB= $(obj)lib$(BOARD).o
-COBJS := smdk2410.o flash.o
+COBJS := smdk2410.o
SOBJS := lowlevel_init.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
diff --git a/board/samsung/smdk2410/config.mk b/board/samsung/smdk2410/config.mk
deleted file mode 100644
index c8d1b1f..000
--- a/board/samsung/smdk2410/config.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# (C) Copyright 2002
-# Gary Jennejohn, DENX Software Engineering,
-# David Mueller, ELSOFT AG,
-#
-# SAMSUNG SMDK2410 board with S3C2410X (ARM920T) cpu
-#
-# see http://www.samsung.com/ for more information on SAMSUNG
-#
-
-#
-# SMDK2410 has 1 bank of 64 MB DRAM
-#
-# 3000' to 3400'
-#
-# Linux-Kernel is expected to be at 3000'8000, entry 3000'8000
-# optionally with a ramdisk at 3080'
-#
-# we load ourself to 33F8'
-#
-# download area is 3300'
-#
-
-
-CONFIG_SYS_TEXT_BASE = 0x33F8
diff --git a/board/samsung/smdk2410/flash.c b/board/samsung/smdk2410/flash.c
deleted file mode 100644
index 132d752..000
--- a/board/samsung/smdk2410/flash.c
+++ /dev/null
@@ -1,433 +0,0 @@
-/*
- * (C) Copyright 2002
- * Sysgo Real-Time Solutions, GmbH
- * Alex Zuepke
- *
- * 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
-
-ulong myflush (void);
-
-
-#define FLASH_BANK_SIZEPHYS_FLASH_SIZE
-#define MAIN_SECT_SIZE 0x1/* 64 KB */
-
-flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS];
-
-
-#define CMD_READ_ARRAY 0x00F0
-#define CMD_UNLOCK10x00AA
-#define CMD_UNLOCK20x0055
-#define CMD_ERASE_SETUP0x0080
-#define CMD_ERASE_CONFIRM 0x0030
-#define CMD_PROGRAM0x00A0
-#define CMD_UNLOCK_BYPASS 0x0020
-
-#define MEM_FLASH_ADDR1(*(volatile u16
*)(CONFIG_SYS_FLASH_BASE + (0x0555 << 1)))
-#define MEM_FLASH_ADDR2(*(volatile u16
*)(CONFIG_SYS_FLASH_BASE + (0x02AA << 1)))
-
-#define BIT_ERASE_DONE 0x0080
-#define BIT_RDY_MASK 0x0080
-#define BIT_PROGRAM_ERROR 0x0020
-#define BIT_TIMEOUT0x8000 /* our flag */
-
-#define READY 1
-#define ERR 2
-#define TMO 4
-
-/*---
- */
-
-ulong flash_init (void)
-{
- int i, j;
- ulong size = 0;
-
- for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; i++) {
- ulong flashbase = 0;
-
- flash_info[i].flash_id =
-#if defined(CONFIG_AMD_LV400)
- (AMD_MANUFACT & FLASH_VENDMASK) |
- (AMD_ID_LV400B & FLASH_TYPEMASK);
-#elif defined(CONFIG_AMD_LV800)
- (AMD_MANUFACT & FLASH_VENDMASK) |
- (AMD_ID_LV800B & FLASH_TYPEMASK);
-#else
-#error "Unknown flash configured"
-#endif
- flash_info[i].size = FLASH_BANK_SIZE;
- flash_info[i].sector_count = CONFIG_SYS_MAX_FLASH_SECT;
- memset (flash_info[i].protect, 0, CONFIG_SYS_MAX_FLASH_SECT);
- if (i == 0)
- flashbase = PHYS_FLASH_1;
- else
- panic ("configured too many flash banks!\n");
- for (j = 0; j < flash_info[i].sector_count; j++) {
- if (j <= 3) {
- /* 1st one is 16 KB */
- if (j == 0) {
- flash_info[i].start[j] =
- flashbase + 0;
- }
-
- /* 2nd and 3rd are both 8 KB
[U-Boot] Please pull u-boot-sh
Dear Wolfgang Denk, The following changes since commit 0e7790d45c1a2cda40458adb28707eaa5041: LAN91C*: Change chip names to fit the eth_device struct size (2011-01-10 22:38:36 +0100) are available in the git repository at: git://git.denx.de/u-boot-sh.git master Nobuhiro Iwamatsu (14): sh: serial: Update serial driver for SH sh: Add support SH7706 sh: Add support shmin board sh: Add support showing KByte of flash memory size sh: Remove SCIF/SCI register infomation sh: sh7722: Fix multiple definition of PSDR in serial_sh sh: serial_sh: Fix build in serial_sh sh: Delete the function that was not necessary sh: Divided macro for zImage and add asm/zimage.h sh: Add support zimageboot command for Renesas SH sh: sh7785lcr: Add support zimageboot sh: r2dplus: Add support zimageboot sh: Fix build of shmin board sh: Add support T-SH7706LSR board MAINTAINERS |1 + arch/sh/include/asm/cpu_sh3.h|6 +- arch/sh/include/asm/cpu_sh7706.h | 53 +++ arch/sh/include/asm/cpu_sh7722.h | 38 -- arch/sh/include/asm/cpu_sh7750.h | 16 - arch/sh/include/asm/cpu_sh7780.h | 21 +-- arch/sh/include/asm/zimage.h | 41 +++ arch/sh/lib/Makefile |3 + arch/sh/lib/board.c |8 +- arch/sh/lib/bootm.c | 21 +- arch/sh/lib/zimageboot.c | 80 + board/shmin/Makefile | 49 +++ board/shmin/config.mk| 27 ++ board/shmin/lowlevel_init.S | 36 ++ board/shmin/shmin.c | 108 ++ boards.cfg |1 + drivers/serial/serial_sh.c | 200 --- drivers/serial/serial_sh.h | 690 ++ include/configs/r2dplus.h|1 + include/configs/sh7785lcr.h |1 + include/configs/shmin.h | 128 +++ 21 files changed, 1307 insertions(+), 222 deletions(-) create mode 100644 arch/sh/include/asm/cpu_sh7706.h create mode 100644 arch/sh/include/asm/zimage.h create mode 100644 arch/sh/lib/zimageboot.c create mode 100644 board/shmin/Makefile create mode 100644 board/shmin/config.mk create mode 100644 board/shmin/lowlevel_init.S create mode 100644 board/shmin/shmin.c create mode 100644 drivers/serial/serial_sh.h create mode 100644 include/configs/shmin.h ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v3] Divides variable of linker flags to LDFLAGS-u-boot and LDFLAGS
Linker needs to use the proper endian/bfd flags even when doing partial linking. LDFLAGS_u-boot sets linker option which is called it when U-boot is built (u-boot final). LDFLAGS sets necessary option by partial linking (use in cmd_link_o_target). CC: Mike Frysinger Signed-off-by: Nobuhiro Iwamatsu --- V3: Remove trailing space. Makefile |2 +- arch/blackfin/config.mk |3 ++- arch/i386/config.mk |3 ++- arch/nios2/config.mk |2 +- arch/powerpc/config.mk|4 ++-- arch/sh/config.mk |2 +- arch/sh/cpu/sh2/config.mk |4 +++- config.mk |8 +--- 8 files changed, 17 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 9055028..d6884ea 100644 --- a/Makefile +++ b/Makefile @@ -369,7 +369,7 @@ $(obj)u-boot.dis: $(obj)u-boot GEN_UBOOT = \ UNDEF_SYM=`$(OBJDUMP) -x $(LIBBOARD) $(LIBS) | \ sed -n -e 's/.*\($(SYM_PREFIX)__u_boot_cmd_.*\)/-u\1/p'|sort|uniq`;\ - cd $(LNDIR) && $(LD) $(LDFLAGS) $$UNDEF_SYM $(__OBJS) \ + cd $(LNDIR) && $(LD) $(LDFLAGS) $(LDFLAGS_$(@F)) $$UNDEF_SYM $(__OBJS) \ --start-group $(__LIBS) --end-group $(PLATFORM_LIBS) \ -Map u-boot.map -o u-boot $(obj)u-boot: depend \ diff --git a/arch/blackfin/config.mk b/arch/blackfin/config.mk index ab117ca..0cba294 100644 --- a/arch/blackfin/config.mk +++ b/arch/blackfin/config.mk @@ -30,7 +30,8 @@ CONFIG_BFIN_BOOT_MODE := $(strip $(subst ",,$(CONFIG_BFIN_BOOT_MODE))) PLATFORM_RELFLAGS += -ffixed-P3 -fomit-frame-pointer -mno-fdpic PLATFORM_CPPFLAGS += -DCONFIG_BLACKFIN -LDFLAGS += --gc-sections -m elf32bfin +LDFLAGS_u-boot += --gc-sections +LDFLAGS += -m elf32bfin PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections PLATFORM_CPPFLAGS += -DBFIN_CPU='"$(CONFIG_BFIN_CPU)"' diff --git a/arch/i386/config.mk b/arch/i386/config.mk index 8743f1a..3fb97c1 100644 --- a/arch/i386/config.mk +++ b/arch/i386/config.mk @@ -35,5 +35,6 @@ PLATFORM_CPPFLAGS += $(call cc-option, -fno-stack-protector) PLATFORM_CPPFLAGS += $(call cc-option, -mpreferred-stack-boundary=2) PLATFORM_CPPFLAGS += -DCONFIG_I386 -D__I386__ -LDFLAGS += --cref --gc-sections +LDFLAGS += --cref +LDFLAGS_u-boot += --gc-sections PLATFORM_RELFLAGS += -ffunction-sections diff --git a/arch/nios2/config.mk b/arch/nios2/config.mk index aba96b3..fa93180 100644 --- a/arch/nios2/config.mk +++ b/arch/nios2/config.mk @@ -31,5 +31,5 @@ PLATFORM_CPPFLAGS += -G0 LDSCRIPT ?= $(SRCTREE)/$(CPUDIR)/u-boot.lds -LDFLAGS += --gc-sections +LDFLAGS_u-boot += --gc-sections PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections diff --git a/arch/powerpc/config.mk b/arch/powerpc/config.mk index 2912604..64191c7 100644 --- a/arch/powerpc/config.mk +++ b/arch/powerpc/config.mk @@ -24,10 +24,10 @@ CROSS_COMPILE ?= ppc_8xx- STANDALONE_LOAD_ADDR = 0x4 - +LDFLAGS_u-boot = --gc-sections PLATFORM_RELFLAGS += -mrelocatable -ffunction-sections -fdata-sections PLATFORM_CPPFLAGS += -DCONFIG_PPC -D__powerpc__ -PLATFORM_LDFLAGS += -n --gc-sections +PLATFORM_LDFLAGS += -n ifdef CONFIG_SYS_LDSCRIPT # need to strip off double quotes diff --git a/arch/sh/config.mk b/arch/sh/config.mk index 415c949..4ef85e3 100644 --- a/arch/sh/config.mk +++ b/arch/sh/config.mk @@ -30,5 +30,5 @@ endif PLATFORM_CPPFLAGS += -DCONFIG_SH -D__SH__ PLATFORM_LDFLAGS += -e $(CONFIG_SYS_TEXT_BASE) --defsym reloc_dst=$(CONFIG_SYS_TEXT_BASE) - +LDFLAGS_u-boot = --gc-sections LDSCRIPT := $(SRCTREE)/$(CPUDIR)/u-boot.lds diff --git a/arch/sh/cpu/sh2/config.mk b/arch/sh/cpu/sh2/config.mk index 52d5a0f..f2d40aa 100644 --- a/arch/sh/cpu/sh2/config.mk +++ b/arch/sh/cpu/sh2/config.mk @@ -21,6 +21,8 @@ # MA 02111-1307 USA # # +ENDIANNESS += -EB + PLATFORM_CPPFLAGS += -m3e -mb PLATFORM_RELFLAGS += -ffixed-r13 -PLATFORM_LDFLAGS += -EB +PLATFORM_LDFLAGS += $(ENDIANNESS) diff --git a/config.mk b/config.mk index 66f8fe6..5147c35 100644 --- a/config.mk +++ b/config.mk @@ -204,9 +204,11 @@ endif AFLAGS := $(AFLAGS_DEBUG) -D__ASSEMBLY__ $(CPPFLAGS) -LDFLAGS += -Bstatic -T $(obj)u-boot.lds $(PLATFORM_LDFLAGS) +LDFLAGS += $(PLATFORM_LDFLAGS) + +LDFLAGS_u-boot += -Bstatic -T $(obj)u-boot.lds $(PLATFORM_LDFLAGS) ifneq ($(CONFIG_SYS_TEXT_BASE),) -LDFLAGS += -Ttext $(CONFIG_SYS_TEXT_BASE) +LDFLAGS_u-boot += -Ttext $(CONFIG_SYS_TEXT_BASE) endif # Location of a usable BFD library, where we define "usable" as @@ -259,7 +261,7 @@ $(obj)%.s: %.c # If the list of objects to link is empty, just create an empty built-in.o cmd_link_o_target = $(if $(strip $1),\ - $(LD) -r -o $@ $1 ,\ + $(LD) $(LDFLAGS) -r -o $@ $1,\ rm -f $@; $(AR) rcs $@ ) # -- 1.7.2.3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-bo
Re: [U-Boot] [PATCH V3] mpc83xx: fix pcie configuration space read/write
Hi, Scott
2011/1/11 Scott Wood :
> On Mon, 10 Jan 2011 20:42:28 +0800
> Baidu Boy wrote:
>
>> This patch fix a problem for the pcie enumeration when the mpc83xx pcie
>> controller is
>> connected with switch or we use both of the two pcie controller
>>
>> Signed-off-by: Baidu Boy
>> ---
>> Changes for V2:
>> - Avoid line wrap in the patch
>> Changes for V3
>> - Add space between ) and {
>
> What about my comments?
>
> http://lists.denx.de/pipermail/u-boot/2011-January/084758.html
>
Actually, Your suggestion is better. But it will touch the common
structure pci_controller.
And I just want to make the change only in the mpc83xx.
Thanks
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH RFC] armv7: fixloop: don't fixup if location is NULL
Dear Minkyu Kang,
In message you
wrote:
>
> > Reservation of video memory is a standard task in the init sequence.
> > See this section in "arch/arm/lib/board.c":
> >
> > 358 #ifdef CONFIG_LCD
> > 359 /* reserve memory for LCD display (always full pages)> */
> > 360 addr = lcd_setmem (addr);
> > 361 gd->fb_base = addr;
> > 362 #endif /* CONFIG_LCD */
>
> Yes I know...
> This init sequence is run before the relocation, right?
Yes, immediately preceeding it: the reservation of the video memory is
part of the calculation of the relocation address.
> Please see lcd_setmem function.
> This function access panel_info that is uninitialized.
> Is it correct?
This is not correct, if panel_info is really not initialized.
Normally panel_info should be initialized; see for example here:
"drivers/video/mx3fb.c":
...
110 vidinfo_t panel_info = {
111 .vl_col = XRES,
112 .vl_row = YRES,
113 .vl_bpix= LCD_COLOR_IPU,
114 .cmap = colormap,
115 };
...
Here panel_info is initialized and located in the data segment; this
is still read-only here, but that is sufficient.
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
God runs electromagnetics by wave theory on Monday, Wednesday, and
Friday, and the Devil runs them by quantum theory on Tuesday, Thurs-
day, and Saturday. -- William Bragg
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH RFC] armv7: fixloop: don't fixup if location is NULL
On 11 January 2011 20:03, Wolfgang Denk wrote:
> Dear Minkyu Kang,
>
> In message you
> wrote:
>>
>> This problem is not belong to my code.
>> Move after relocation? it's easy.
>> but, how we can reserve the memory for LCD?
>
> Reservation of video memory is a standard task in the init sequence.
> See this section in "arch/arm/lib/board.c":
>
> 358 #ifdef CONFIG_LCD
> 359 /* reserve memory for LCD display (always full pages) */
> 360 addr = lcd_setmem (addr);
> 361 gd->fb_base = addr;
> 362 #endif /* CONFIG_LCD */
>
>
Yes I know...
This init sequence is run before the relocation, right?
Please see lcd_setmem function.
This function access panel_info that is uninitialized.
Is it correct?
438 ulong lcd_setmem (ulong addr)
439 {
440 ulong size;
441 int line_length = (panel_info.vl_col * NBITS
(panel_info.vl_bpix)) / 8;
442
443 debug ("LCD panel info: %d x %d, %d bit/pix\n",
444 panel_info.vl_col, panel_info.vl_row, NBITS
(panel_info.vl_bpix) );
445
446 size = line_length * panel_info.vl_row;
447
448 /* Round up to nearest full page */
449 size = (size + (PAGE_SIZE - 1)) & ~(PAGE_SIZE - 1);
450
451 /* Allocate pages for the frame buffer. */
452 addr -= size;
453
454 debug ("Reserving %ldk for LCD Framebuffer at: %08lx\n",
size>>10, addr);
455
456 return (addr);
457 }
Thanks
Minkyu Kang.
--
from. prom.
www.promsoft.net
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH RFC] armv7: fixloop: don't fixup if location is NULL
Dear Minkyu Kang, In message you wrote: > > This problem is not belong to my code. > Move after relocation? it's easy. > but, how we can reserve the memory for LCD? Reservation of video memory is a standard task in the init sequence. See this section in "arch/arm/lib/board.c": 358 #ifdef CONFIG_LCD 359 /* reserve memory for LCD display (always full pages) */ 360 addr = lcd_setmem (addr); 361 gd->fb_base = addr; 362 #endif /* CONFIG_LCD */ 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 "I haven't lost my mind - it's backed up on tape somewhere." ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH RFC] armv7: fixloop: don't fixup if location is NULL
Dear Albert ARIBAUD, On 11 January 2011 02:21, Albert ARIBAUD wrote: > Le 10/01/2011 15:04, Minkyu Kang a écrit : > How about lcd_setmem function? panel_info is located at bss area, but lcd_setmem access this structure. Is it illegal? >>> >>> This must not be done before relocation. >> >> No, please see 360 line of arch/arm/lib/board.c >> This function is called before relocation. > > Then it cannot access panel_info, which is "not there yet" at the time > lcd_setmem() executes. No, access for reserve the memory for LCD and we got wrong values. Did you test about it? > > You must either move the call to lcd_setmem() to after relocation, or find a > way not to depend on BSS. This problem is not belong to my code. Move after relocation? it's easy. but, how we can reserve the memory for LCD? > >> And how about init_func_i2c()? >> This function is called twice, before the relocation and after relocation. >> When we use board_i2c_init function then, there is possibility that >> use symbols in bss because of this function is called after >> relocation. > > If it is used both before and after relocation, then it has to respect the > strictest case, which is before relocation, and not access BSS. > >> If we ignore this exception, it will be a big constraint. >> >> btw, there are any side effects on my patch? >> I think.. It is just a little safety feature. > > Regardless of the patch, if your code writes to panel_info or any other BSS > variable before relocation it will trash the relocation tables that exist at > BSS location at this point. > > IOW, accessing BSS before relocation is forbidden, not just out of fancy, > but for a serious reason. This patch is not for accessing BSS before relocation, it's for prevent exceptions. Thanks Minkyu Kang -- from. prom. www.promsoft.net ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] U-Boot on IMX.51 EVK
On 01/11/2011 03:02 AM, Thomas Besemer wrote: > Hi Group - > Hi Thomas, > - Is above version of U-Boot known to work on EVK? As far as I know, yes. > It appears that this > version supports DOS partitions on SD card, They are additional features, as reading files from a formatted SD is very common on several boards. > and default command line is to > load from those. But, I can't find any documentation on how to partition > the SD card to try this. Help on how to set up the SD card appreciated. There is some hidden documentation. How to prepare a SD card (partition table, u-boot image) is described in doc/README.imximage. Getting files form the SD card is a generic issue, and it is not board specific. You find examples for fatload in code. > - Should above "raw" load from SD work? Probably my preference, but have > an open mind. It should work, but I admit I tested booting from partitions and from network. Your assumption that CRC is ok let me think that there should be no problem to read the kernel from the SD card, even in raw mode. You could verify if your kernel boots independently from storage. Try to load the kernel from net instead from SD. > My Root FS is on two partitions that U-Boot does not need to > know about; Correct. u-boot does not need to read the root partition. It is enough to pass the correct root device to the kernel. > one is primary/recovery, one is working copy on release. > > - The Freescale supplied SDK applies over 100 patches to the 8/09 release > of U-Boot; wondering how many made it into current version of U-Boot, and > how much I should care. Rather if they are not pushed to this ML, they cannot be integrated in the official releases. However, are you sure they are related to the i.MX51 ? Most of them are probably related to other processors. > - I pulled the 2.6.37 Kernel from kernel.org to maybe try that with > current U-Boot, but it doesn't seem to have IPU support, I know, but as I see on Linux ARM ML, there is already someone working on this issue. > End game: > > - Get the Splash Screen working on imx.51 EVK. As reference, take a closer look at the vision2 board. The IPU driver was ported from Freescale's 2.6.31 linux exactly for this goal. The splashimage is shown with the help of the "preboot" variable, because the image is stored on a device not directly addressable (SPI-Flash for vision2). It is the same for the mx51evk, because the image must be loaded (in raw mode or from a partition) from the SD card. > I will provide patch set > back to mailing list once I do. I will derive from vision2 board. There is already some work on this issue. A patchset was already sent to ML, but it requires changes to be included. You could use it as starting point ;-). http://www.mail-archive.com/u-boot@lists.denx.de/msg41631.html Technically, the actual IPU drive in u-boot supports only diu0 (required by the vision board). So changes are minimal in the IPU driver itself. However, please read the whole discussion on ML, so you can find which are the open points to be fixed. > - Get it to boot old 2.6.31 SDK supplied Kernel (which also has a bunch of > Freescale patches that don't seem to have made it into kernel.org). > > Any help on this appreciated; I will be more than happy to provide patch set > work for anything I do for EVK back to this list for evaluation and > incorporation. Best regards, Stefano Babic -- = 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 = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Please pull u-boot-ubi/master
Hi Wolfgang, The following changes since commit 0e7790d45c1a2cda40458adb28707eaa5041: LAN91C*: Change chip names to fit the eth_device struct size (2011-01-10 22:38:36 +0100) are available in the git repository at: git://www.denx.de/git/u-boot-ubi.git master Dirk Behme (1): UBIFS: Fix dereferencing type-punned pointer compiler warning fs/ubifs/misc.h |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] UBIFS: Fix dereferencing type-punned pointer compiler warning
On Saturday 25 December 2010 10:58:46 Dirk Behme wrote: > Fix compiler warning > > In file included from ubifs.h:2137:0, > from ubifs.c:26: > misc.h: In function 'ubifs_idx_key': > misc.h:263:26: warning: dereferencing type-punned pointer will break > strict-aliasing rules > > seen with gcc version 4.5.1 (Sourcery G++ Lite 2010.09-50). > > No functional change. Applied to u-boot-ubi. Thanks. Cheers, 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 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Please pull u-boot-ppc4xx (Update)
Hi Wolfgang, The following changes since commit 89c95f0cd3f8140f3b8a82a22a6a144c148d09c6: asm-offsets: generate bd_t size (2011-01-09 18:08:20 +0100) are available in the git repository at: git://www.denx.de/git/u-boot-ppc4xx.git master Felix Radensky (1): PPC4xx: Reduce NAND TLB window size on Canyonlands Ricardo Ribalda Delgado (1): xilinx-ppc4xx-generic: Fix Makefile to work with MAKEALL Stefan Roese (2): ppc4xx: Remove PCI support from lwmon5 ppc4xx: Fix compilation breakage in miiphy.c arch/powerpc/cpu/ppc4xx/miiphy.c |2 +- board/amcc/canyonlands/init.S|2 +- board/xilinx/ppc405-generic/Makefile | 11 +++ board/xilinx/ppc440-generic/Makefile | 14 -- include/configs/lwmon5.h | 17 - 5 files changed, 9 insertions(+), 37 deletions(-) ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] xilinx-ppc4xx-generic: Fix Makefile to work with MAKEALL
On Friday 24 December 2010 01:38:10 Ricardo Ribalda Delgado wrote: > 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. Applied to u-boot-ppc4xx/master. Thanks. Cheers, 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 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V3 1/5] mv: seperate kirkwood and armada from common setting
Dear Lei Wen, In message <1294730744-29211-2-git-send-email-lei...@marvell.com> you wrote: > Since there are lots of difference between kirkwood and armada series, > it is better to seperate them but still keep the most common file > shared by all marvell platform in the mv-common configure file. > > This patch move the kirkwood only driver definitoin in mv-common to > the /config.h. > > This patch is tested with compilation for armada100 and guruplug. > > Signed-off-by: Lei Wen > --- > arch/arm/include/asm/arch-armada100/config.h | 50 + > arch/arm/include/asm/arch-kirkwood/config.h | 145 + > include/configs/aspenite.h |1 + > include/configs/mv-common.h | 147 > -- > 4 files changed, 217 insertions(+), 126 deletions(-) > create mode 100644 arch/arm/include/asm/arch-armada100/config.h > create mode 100644 arch/arm/include/asm/arch-kirkwood/config.h NAK for the whole patch series. I'm not going to review that. Please stick to the rules. When submitting a new version of the patch you are supposed to descibe what has been changed. For details please see http://www.denx.de/wiki/view/U-Boot/Patches#Sending_updated_patch_versions 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 While money can't buy happiness, it certainly lets you choose your own form of misery. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3 1/8] powerpc/8xxx: Refactor SRIO initialization into common code
Dear Kumar Gala, In message <1294733436-10264-1-git-send-email-ga...@kernel.crashing.org> you wrote: > Moved the SRIO init out of corenet_ds and into common code for > 8xxx/QorIQ processors that have SRIO. We mimic what we do with PCIe > controllers for SRIO. > > We utilize the fact that SRIO is over serdes to determine if its > configured or not and thus can setup the LAWs needed for it dynamically. > > We additionally update the device tree (to remove the SRIO nodes) if the > board doesn't have SRIO enabled. > > Introduced the following standard defines for board config.h: > > CONFIG_SYS_SRIO - Chip has SRIO or not > CONFIG_SRIO1 - Board has SRIO 1 port available > CONFIG_SRIO2 - Board has SRIO 2 port available > > (where 'n' is the port #) > CONFIG_SYS_SRIOn_MEM_VIRT - virtual address in u-boot > CONFIG_SYS_SRIOn_MEM_PHYS - physical address (for law setup) > CONFIG_SYS_SRIOn_MEM_SIZE - size of window (for law setup) > > [ These mimic what we have for PCI and PCIe controllers ] > > Signed-off-by: Kumar Gala > --- > * Renamed CONFIG_SYS_HAS_SRIO -> CONFIG_SYS_SRIO > * Added defines to README > > README | 18 +++ > arch/powerpc/cpu/mpc85xx/cpu_init.c |8 +++- > arch/powerpc/cpu/mpc85xx/fdt.c |7 ++- > arch/powerpc/cpu/mpc8xxx/Makefile |1 + > arch/powerpc/cpu/mpc8xxx/fdt.c | 23 - > arch/powerpc/cpu/mpc8xxx/srio.c | 86 > +++ > arch/powerpc/include/asm/fsl_law.h |1 + > board/freescale/corenet_ds/corenet_ds.c | 44 > include/configs/corenet_ds.h| 19 --- > 9 files changed, 151 insertions(+), 56 deletions(-) > create mode 100644 arch/powerpc/cpu/mpc8xxx/srio.c Acked-by: Wolfgang Denk 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 Syntactic sugar causes cancer of the semicolon. - Epigrams in Programming, ACM SIGPLAN Sept. 1982 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Please pull u-boot-cfi-flash
Hi Wolfgang, The following changes since commit 0e7790d45c1a2cda40458adb28707eaa5041: LAN91C*: Change chip names to fit the eth_device struct size (2011-01-10 22:38:36 +0100) are available in the git repository at: git://www.denx.de/git/u-boot-cfi-flash.git master David Müller (1): add AM29F400BB to table of supported legacy flashs drivers/mtd/jedec_flash.c | 18 ++ 1 files changed, 18 insertions(+), 0 deletions(-) ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] add AM29F400BB to table of supported legacy flashs
On Tuesday 21 December 2010 10:09:56 David Müller wrote: > Signed-off-by: David Mueller Applied to u-boot-cfi-flash. Thanks. Cheers, 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 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Please pull u-boot-ppc4xx/master
Hi Wolfgang, The following changes since commit 89c95f0cd3f8140f3b8a82a22a6a144c148d09c6: asm-offsets: generate bd_t size (2011-01-09 18:08:20 +0100) are available in the git repository at: git://www.denx.de/git/u-boot-ppc4xx.git master Felix Radensky (1): PPC4xx: Reduce NAND TLB window size on Canyonlands Stefan Roese (2): ppc4xx: Remove PCI support from lwmon5 ppc4xx: Fix compilation breakage in miiphy.c arch/powerpc/cpu/ppc4xx/miiphy.c |2 +- board/amcc/canyonlands/init.S|2 +- include/configs/lwmon5.h | 17 - 3 files changed, 2 insertions(+), 19 deletions(-) ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V2] update SMDK2410 port
Dear =?UTF-8?q?David=20M=C3=BCller?=, In message <1294731662-1844-1-git-send-email-d.muel...@elsoft.ch> you wrote: > --===0819632582== > > > This patch brings the SMDK2410 port in sync with the latest U-Boot > version by doing the following: > - do the necessary adjustments to support the ARM relocation feature > - use the CFI flash driver (and removing the old one) > - remove the unneeded config.mk file > > Signed-off-by: David Müller > > diff --git a/board/samsung/smdk2410/Makefile b/board/samsung/smdk2410/Makefile > index bda8898..0afe1e2 100644 > --- a/board/samsung/smdk2410/Makefile > +++ b/board/samsung/smdk2410/Makefile NAK. I'm not going to review that. Please stick to the rules. When submitting a new version of the patch you are supposed to descibe what has been changed. For details please see http://www.denx.de/wiki/view/U-Boot/Patches#Sending_updated_patch_versions 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 F u cn rd ths u cnt spl wrth a dm! ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V2] update VCMA9 port
Dear =?UTF-8?q?David=20M=C3=BCller?=, In message <1294732049-1877-1-git-send-email-d.muel...@elsoft.ch> you wrote: > --===1318198764== > > > This patch brings the VCMA9 port in sync with the latest U-Boot > version by doing the following: > - do the necessary adjustments to support the ARM relocation feature > - use the CFI flash driver (and removing the old one) > - remove the unneeded config.mk file > - various cleanups and coding style fixes > > Signed-off-by: David Müller > > diff --git a/board/mpl/vcma9/Makefile b/board/mpl/vcma9/Makefile NAK. I'm not going to review that. Please stick to the rules. When submitting a new version of the patch you are supposed to descibe what has been changed. For details please see http://www.denx.de/wiki/view/U-Boot/Patches#Sending_updated_patch_versions 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 A year spent in artificial intelligence is enough to make one believe in God. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] ppc4xx: Fix compilation breakage in miiphy.c
On Monday 10 January 2011 12:58:16 Stefan Roese wrote: > Patch 8ef583a0 [miiphy: convert to linux/mii.h] introduced a small > problem in the ppc4xx miiphy.c version. This patch fixes this problem. Applied to u-boot-ppc4xx. Thanks. Cheers, 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 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2 1/7] powerpc/8xxx: Refactor SRIO initialization into common code
On Jan 11, 2011, at 1:09 AM, Wolfgang Denk wrote: > Dear Kumar Gala, > > In message <1294607813-27723-1-git-send-email-ga...@kernel.crashing.org> you > wrote: >> Moved the SRIO init out of corenet_ds and into common code for >> 8xxx/QorIQ processors that have SRIO. We mimic what we do with PCIe >> controllers for SRIO. >> >> We utilize the fact that SRIO is over serdes to determine if its >> configured or not and thus can setup the LAWs needed for it dynamically. >> >> We additionally update the device tree (to remove the SRIO nodes) if the >> board doesn't have SRIO enabled. >> >> Introduced the following standard defines for board config.h: >> >> CONFIG_SYS_HAS_SRIO - Chip has SRIO or not > > We don't use a "CONFIG_SYS_HAS_*" normally; can we use plain > CONFIG_SYS_SRIO instead? (yes, I am aware of the > CONFIG_SYS_HAS_SERDES precedent, which escaped my attantion during > review - that should be fixed, too). > >> CONFIG_SRIO1 - Board has SRIO 1 port available >> CONFIG_SRIO2 - Board has SRIO 2 port available >> >> (where 'n' is the port #) >> CONFIG_SYS_SRIOn_MEM_VIRT - virtual address in u-boot >> CONFIG_SYS_SRIOn_MEM_PHYS - physical address (for law setup) >> CONFIG_SYS_SRIOn_MEM_SIZE - size of window (for law setup) > > These need to be documented (README). Changes made, please ACK the first patch in the series. - k ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v3 8/8] powerpc/85xx: Add SRIO support to P2020DS
From: Li Yang The P2020 has 2 SRIO ports and they are useable on the P2020 DS board. Enable them using the common SRIO init code. Signed-off-by: Li Yang Signed-off-by: Kumar Gala --- * Renamed CONFIG_SYS_HAS_SRIO -> CONFIG_SYS_SRIO include/configs/P2020DS.h | 24 +++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/include/configs/P2020DS.h b/include/configs/P2020DS.h index 24f2498..c2636af 100644 --- a/include/configs/P2020DS.h +++ b/include/configs/P2020DS.h @@ -1,5 +1,5 @@ /* - * Copyright 2007-2010 Freescale Semiconductor, Inc. + * Copyright 2007-2011 Freescale Semiconductor, Inc. * * See file CREDITS for list of people who contributed to this * project. @@ -45,6 +45,10 @@ #define CONFIG_SYS_TEXT_BASE 0xeff8 #endif +#define CONFIG_SYS_SRIO +#define CONFIG_SRIO1 /* SRIO port 1 */ +#define CONFIG_SRIO2 /* SRIO port 2 */ + #define CONFIG_FSL_ELBC1 /* Has Enhanced localbus controller */ #define CONFIG_PCI 1 /* Enable PCI/PCIE */ #define CONFIG_PCIE1 1 /* PCIE controler 1 (slot 1) */ @@ -472,6 +476,24 @@ #define CONFIG_SYS_ISA_IO_BASE_ADDRESS VIDEO_IO_OFFSET #endif +/* SRIO1 uses the same window as PCIE2 mem window */ +#define CONFIG_SYS_SRIO1_MEM_VIRT 0xa000 +#ifdef CONFIG_PHYS_64BIT +#define CONFIG_SYS_SRIO1_MEM_PHYS 0xc2000ull +#else +#define CONFIG_SYS_SRIO1_MEM_PHYS 0xa000 +#endif +#define CONFIG_SYS_SRIO1_MEM_SIZE 0x2000 /* 512M */ + +/* SRIO2 uses the same window as PCIE1 mem window */ +#define CONFIG_SYS_SRIO2_MEM_VIRT 0xc000 +#ifdef CONFIG_PHYS_64BIT +#define CONFIG_SYS_SRIO2_MEM_PHYS 0xc4000ull +#else +#define CONFIG_SYS_SRIO2_MEM_PHYS 0xc000 +#endif +#define CONFIG_SYS_SRIO2_MEM_SIZE 0x2000 /* 512M */ + #define CONFIG_NET_MULTI #define CONFIG_PCI_PNP /* do pci plug-and-play */ -- 1.7.2.3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v3 3/8] powerpc/85xx: Convert MPC8568MDS to use common SRIO init code
Signed-off-by: Kumar Gala
---
* Renamed CONFIG_SYS_HAS_SRIO -> CONFIG_SYS_SRIO
board/freescale/mpc8568mds/law.c |3 +--
include/configs/MPC8568MDS.h | 12
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/board/freescale/mpc8568mds/law.c b/board/freescale/mpc8568mds/law.c
index e24b72b..c5cf7ba 100644
--- a/board/freescale/mpc8568mds/law.c
+++ b/board/freescale/mpc8568mds/law.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2008, 2010 Freescale Semiconductor, Inc.
+ * Copyright 2008, 2010-2011 Freescale Semiconductor, Inc.
*
* (C) Copyright 2000
* Wolfgang Denk, DENX Software Engineering, w...@denx.de.
@@ -50,7 +50,6 @@
*/
struct law_entry law_table[] = {
- SET_LAW(CONFIG_SYS_SRIO_MEM_PHYS, LAW_SIZE_512M, LAW_TRGT_IF_RIO),
/* LBC window - maps 256M. That's SDRAM, BCSR, PIBs, and Flash */
SET_LAW(CONFIG_SYS_LBC_SDRAM_BASE, LAW_SIZE_256M, LAW_TRGT_IF_LBC),
};
diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h
index a491650..f684e79 100644
--- a/include/configs/MPC8568MDS.h
+++ b/include/configs/MPC8568MDS.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2004-2007, 2010 Freescale Semiconductor.
+ * Copyright 2004-2007, 2010-2011 Freescale Semiconductor.
*
* See file CREDITS for list of people who contributed to this
* project.
@@ -35,6 +35,9 @@
#defineCONFIG_SYS_TEXT_BASE0xfff8
+#define CONFIG_SYS_SRIO
+#define CONFIG_SRIO1 /* SRIO port 1 */
+
#define CONFIG_PCI 1 /* Enable PCI/PCIE */
#define CONFIG_PCI11 /* PCI controller */
#define CONFIG_PCIE1 1 /* PCIE controller */
@@ -303,9 +306,10 @@ extern unsigned long get_clock_freq(void);
#define CONFIG_SYS_PCIE1_IO_PHYS 0xe280
#define CONFIG_SYS_PCIE1_IO_SIZE 0x0080 /* 8M */
-#define CONFIG_SYS_SRIO_MEM_VIRT 0xc000
-#define CONFIG_SYS_SRIO_MEM_BUS0xc000
-#define CONFIG_SYS_SRIO_MEM_PHYS 0xc000
+#define CONFIG_SYS_SRIO1_MEM_VIRT 0xC000
+#define CONFIG_SYS_SRIO1_MEM_BUS 0xC000
+#define CONFIG_SYS_SRIO1_MEM_PHYS CONFIG_SYS_SRIO1_MEM_BUS
+#define CONFIG_SYS_SRIO1_MEM_SIZE 0x2000 /* 512M */
#ifdef CONFIG_QE
/*
--
1.7.2.3
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v3 6/8] powerpc/86xx: Convert MPC8641HPCN to use common SRIO init code
Signed-off-by: Kumar Gala
---
* Renamed CONFIG_SYS_HAS_SRIO -> CONFIG_SYS_SRIO
board/freescale/mpc8641hpcn/law.c |5 +
include/configs/MPC8641HPCN.h | 30 +-
2 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/board/freescale/mpc8641hpcn/law.c
b/board/freescale/mpc8641hpcn/law.c
index 30a7b70..08f1eb2 100644
--- a/board/freescale/mpc8641hpcn/law.c
+++ b/board/freescale/mpc8641hpcn/law.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2008,2010 Freescale Semiconductor, Inc.
+ * Copyright 2008,2010-2011 Freescale Semiconductor, Inc.
*
* (C) Copyright 2000
* Wolfgang Denk, DENX Software Engineering, w...@denx.de.
@@ -53,9 +53,6 @@ struct law_entry law_table[] = {
#if !defined(CONFIG_SPD_EEPROM)
SET_LAW(CONFIG_SYS_DDR_SDRAM_BASE, LAW_SIZE_256M, LAW_TRGT_IF_DDR_1),
#endif
-#if defined(CONFIG_RIO)
- SET_LAW(CONFIG_SYS_RIO_MEM_PHYS, LAW_SIZE_512M, LAW_TRGT_IF_RIO),
-#endif
SET_LAW(PIXIS_BASE_PHYS, LAW_SIZE_64K, LAW_TRGT_IF_LBC),
SET_LAW(CONFIG_SYS_FLASH_BASE_PHYS, LAW_SIZE_8M, LAW_TRGT_IF_LBC),
};
diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h
index fea0876..0cca603 100644
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2006, 2010 Freescale Semiconductor.
+ * Copyright 2006, 2010-2011 Freescale Semiconductor.
*
* Srikanth Srinivasan (srikanth.sriniva...@freescale.com)
*
@@ -57,18 +57,14 @@
*/
#define CONFIG_SYS_SCRATCH_VA 0xe000
-/*
- * set this to enable Rapid IO. PCI and RIO are mutually exclusive
- */
-/*#define CONFIG_RIO 1*/
+#define CONFIG_SYS_SRIO
+#define CONFIG_SRIO1 /* SRIO port 1 */
-#ifndef CONFIG_RIO /* RIO/PCI are mutually exclusive */
#define CONFIG_PCI 1 /* Enable PCI/PCIE */
#define CONFIG_PCIE1 1 /* PCIE controler 1 (ULI bridge) */
#define CONFIG_PCIE2 1 /* PCIE controler 2 (slot) */
#define CONFIG_FSL_PCI_INIT1 /* Use common FSL init code */
#define CONFIG_SYS_PCI_64BIT 1 /* enable 64-bit PCI resources */
-#endif
#define CONFIG_FSL_LAW 1 /* Use common FSL law init code */
#define CONFIG_TSEC_ENET /* tsec ethernet support */
@@ -319,13 +315,13 @@ extern unsigned long get_board_sys_clk(unsigned long
dummy);
/*
* RapidIO MMU
*/
-#define CONFIG_SYS_RIO_MEM_BASE0x8000 /* base address */
+#define CONFIG_SYS_SRIO1_MEM_BASE 0x8000 /* base address */
#ifdef CONFIG_PHYS_64BIT
-#define CONFIG_SYS_RIO_MEM_PHYS 0x000cULL
+#define CONFIG_SYS_SRIO1_MEM_PHYS 0x000cULL
#else
-#define CONFIG_SYS_RIO_MEM_PHYSCONFIG_SYS_RIO_MEM_BASE
+#define CONFIG_SYS_SRIO1_MEM_PHYS CONFIG_SYS_SRIO1_MEM_BASE
#endif
-#define CONFIG_SYS_RIO_MEM_SIZE0x2000 /* 128M */
+#define CONFIG_SYS_SRIO1_MEM_SIZE 0x2000 /* 128M */
/*
* General PCI
@@ -514,18 +510,18 @@ extern unsigned long get_board_sys_clk(unsigned long
dummy);
| BATL_PP_RW | BATL_CACHEINHIBIT)
#define CONFIG_SYS_IBAT2U CONFIG_SYS_DBAT2U
#else /* CONFIG_RIO */
-#define CONFIG_SYS_DBAT2L (BAT_PHYS_ADDR(CONFIG_SYS_RIO_MEM_PHYS) \
+#define CONFIG_SYS_DBAT2L (BAT_PHYS_ADDR(CONFIG_SYS_SRIO1_MEM_PHYS) \
| BATL_PP_RW | BATL_CACHEINHIBIT | \
BATL_GUARDEDSTORAGE)
-#define CONFIG_SYS_DBAT2U (CONFIG_SYS_RIO_MEM_BASE | BATU_BL_512M \
+#define CONFIG_SYS_DBAT2U (CONFIG_SYS_SRIO1_MEM_BASE | BATU_BL_512M \
| BATU_VS | BATU_VP)
-#define CONFIG_SYS_IBAT2L (BAT_PHYS_ADDR(CONFIG_SYS_RIO_MEM_PHYS) \
+#define CONFIG_SYS_IBAT2L (BAT_PHYS_ADDR(CONFIG_SYS_SRIO1_MEM_PHYS) \
| BATL_PP_RW | BATL_CACHEINHIBIT)
-#define CONFIG_SYS_DBAT2L (CONFIG_SYS_RIO_MEM_PHYS | BATL_PP_RW \
+#define CONFIG_SYS_DBAT2L (CONFIG_SYS_SRIO1_MEM_PHYS | BATL_PP_RW \
| BATL_CACHEINHIBIT | BATL_GUARDEDSTORAGE)
-#define CONFIG_SYS_DBAT2U (CONFIG_SYS_RIO_MEM_PHYS | BATU_BL_512M |
BATU_VS | BATU_VP)
-#define CONFIG_SYS_IBAT2L (CONFIG_SYS_RIO_MEM_PHYS | BATL_PP_RW |
BATL_CACHEINHIBIT)
+#define CONFIG_SYS_DBAT2U (CONFIG_SYS_SRIO1_MEM_PHYS | BATU_BL_512M |
BATU_VS | BATU_VP)
+#define CONFIG_SYS_IBAT2L (CONFIG_SYS_SRIO1_MEM_PHYS | BATL_PP_RW |
BATL_CACHEINHIBIT)
#define CONFIG_SYS_IBAT2U CONFIG_SYS_DBAT2U
#endif
--
1.7.2.3
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v3 1/8] powerpc/8xxx: Refactor SRIO initialization into common code
Moved the SRIO init out of corenet_ds and into common code for 8xxx/QorIQ processors that have SRIO. We mimic what we do with PCIe controllers for SRIO. We utilize the fact that SRIO is over serdes to determine if its configured or not and thus can setup the LAWs needed for it dynamically. We additionally update the device tree (to remove the SRIO nodes) if the board doesn't have SRIO enabled. Introduced the following standard defines for board config.h: CONFIG_SYS_SRIO - Chip has SRIO or not CONFIG_SRIO1 - Board has SRIO 1 port available CONFIG_SRIO2 - Board has SRIO 2 port available (where 'n' is the port #) CONFIG_SYS_SRIOn_MEM_VIRT - virtual address in u-boot CONFIG_SYS_SRIOn_MEM_PHYS - physical address (for law setup) CONFIG_SYS_SRIOn_MEM_SIZE - size of window (for law setup) [ These mimic what we have for PCI and PCIe controllers ] Signed-off-by: Kumar Gala --- * Renamed CONFIG_SYS_HAS_SRIO -> CONFIG_SYS_SRIO * Added defines to README README | 18 +++ arch/powerpc/cpu/mpc85xx/cpu_init.c |8 +++- arch/powerpc/cpu/mpc85xx/fdt.c |7 ++- arch/powerpc/cpu/mpc8xxx/Makefile |1 + arch/powerpc/cpu/mpc8xxx/fdt.c | 23 - arch/powerpc/cpu/mpc8xxx/srio.c | 86 +++ arch/powerpc/include/asm/fsl_law.h |1 + board/freescale/corenet_ds/corenet_ds.c | 44 include/configs/corenet_ds.h| 19 --- 9 files changed, 151 insertions(+), 56 deletions(-) create mode 100644 arch/powerpc/cpu/mpc8xxx/srio.c diff --git a/README b/README index 68f5fb0..b30df12 100644 --- a/README +++ b/README @@ -2771,6 +2771,24 @@ Low Level (hardware related) configuration options: Disable PCI-Express on systems where it is supported but not required. +- CONFIG_SYS_SRIO: + Chip has SRIO or not + +- CONFIG_SRIO1: + Board has SRIO 1 port available + +- CONFIG_SRIO2: + Board has SRIO 2 port available + +- CONFIG_SYS_SRIOn_MEM_VIRT: + Virtual Address of SRIO port 'n' memory region + +- CONFIG_SYS_SRIOn_MEM_PHYS: + Physical Address of SRIO port 'n' memory region + +- CONFIG_SYS_SRIOn_MEM_SIZE: + Size of SRIO port 'n' memory region + - CONFIG_SPD_EEPROM Get DDR timing information from an I2C EEPROM. Common with pluggable memory modules such as SODIMMs diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c index 4a6cc65..1d016c4 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c @@ -1,5 +1,5 @@ /* - * Copyright 2007-2010 Freescale Semiconductor, Inc. + * Copyright 2007-2011 Freescale Semiconductor, Inc. * * (C) Copyright 2003 Motorola Inc. * Modified by Xianghua Xiao, x.x...@motorola.com @@ -40,6 +40,8 @@ DECLARE_GLOBAL_DATA_PTR; +extern void srio_init(void); + #ifdef CONFIG_QE extern qe_iop_conf_t qe_iop_conf_tab[]; extern void qe_config_iopin(u8 port, u8 pin, int dir, @@ -384,6 +386,10 @@ int cpu_init_r(void) /* needs to be in ram since code uses global static vars */ fsl_serdes_init(); +#ifdef CONFIG_SYS_SRIO + srio_init(); +#endif + #if defined(CONFIG_MP) setup_mp(); #endif diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c index 53e0596..00fa752 100644 --- a/arch/powerpc/cpu/mpc85xx/fdt.c +++ b/arch/powerpc/cpu/mpc85xx/fdt.c @@ -1,5 +1,5 @@ /* - * Copyright 2007-2010 Freescale Semiconductor, Inc. + * Copyright 2007-2011 Freescale Semiconductor, Inc. * * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, w...@denx.de. @@ -38,6 +38,7 @@ DECLARE_GLOBAL_DATA_PTR; extern void ft_qe_setup(void *blob); extern void ft_fixup_num_cores(void *blob); +extern void ft_srio_setup(void *blob); #ifdef CONFIG_MP #include "mp.h" @@ -478,4 +479,8 @@ void ft_cpu_setup(void *blob, bd_t *bd) fdt_fixup_qportals(blob); #endif + +#ifdef CONFIG_SYS_SRIO + ft_srio_setup(blob); +#endif } diff --git a/arch/powerpc/cpu/mpc8xxx/Makefile b/arch/powerpc/cpu/mpc8xxx/Makefile index 95c73be..5dfd65b 100644 --- a/arch/powerpc/cpu/mpc8xxx/Makefile +++ b/arch/powerpc/cpu/mpc8xxx/Makefile @@ -16,6 +16,7 @@ endif COBJS-$(CONFIG_OF_LIBFDT) += fdt.o COBJS-$(CONFIG_FSL_LBC) += fsl_lbc.o +COBJS-$(CONFIG_SYS_SRIO) += srio.o SRCS := $(START:.o=.S) $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y)) diff --git a/arch/powerpc/cpu/mpc8xxx/fdt.c b/arch/powerpc/cpu/mpc8xxx/fdt.c index 54e60bb..0c166fd 100644 --- a/arch/powerpc/cpu/mpc8xxx/fdt.c +++ b/arch/powerpc/cpu/mpc8xxx/fdt.c @@ -1,5 +1,5 @@ /* - * Copyright 2009-2010 Freescale Semiconductor, Inc. + * Copyright 2009-2011 Freescale Semiconductor, Inc. * * This file is derived from arch/powerpc/cpu/mpc85xx/cpu.c and * arch/powerpc/cpu/mpc86xx/cpu.c. Basically this file contains @
[U-Boot] [PATCH v3 7/8] powerpc/86xx: Convert SBC8641 to use common SRIO init code
Signed-off-by: Kumar Gala
Tested-by: Paul Gortmaker
---
* Renamed CONFIG_SYS_HAS_SRIO -> CONFIG_SYS_SRIO
board/sbc8641d/law.c |1 -
include/configs/sbc8641d.h | 15 +--
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/board/sbc8641d/law.c b/board/sbc8641d/law.c
index a6f60ee..14259d6 100644
--- a/board/sbc8641d/law.c
+++ b/board/sbc8641d/law.c
@@ -51,7 +51,6 @@ struct law_entry law_table[] = {
#endif
SET_LAW(0xf800, LAW_SIZE_2M, LAW_TRGT_IF_LBC),
SET_LAW(0xfe00, LAW_SIZE_32M, LAW_TRGT_IF_LBC),
- SET_LAW(CONFIG_SYS_RIO_MEM_PHYS, LAW_SIZE_512M, LAW_TRGT_IF_RIO)
};
int num_law_entries = ARRAY_SIZE(law_table);
diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h
index 90d84eb..8d9f931 100644
--- a/include/configs/sbc8641d.h
+++ b/include/configs/sbc8641d.h
@@ -57,6 +57,9 @@
*/
#define CONFIG_SYS_SCRATCH_VA 0xe800
+#define CONFIG_SYS_SRIO
+#define CONFIG_SRIO1 /* SRIO port 1 */
+
#define CONFIG_PCI 1 /* Enable PCIE */
#define CONFIG_PCIE1 1 /* PCIE controler 1 (slot 1) */
#define CONFIG_PCIE2 1 /* PCIE controler 2 (slot 2) */
@@ -297,9 +300,9 @@
/*
* RapidIO MMU
*/
-#define CONFIG_SYS_RIO_MEM_BASE0xc000 /* base address */
-#define CONFIG_SYS_RIO_MEM_PHYSCONFIG_SYS_RIO_MEM_BASE
-#define CONFIG_SYS_RIO_MEM_SIZE0x2000 /* 128M */
+#define CONFIG_SYS_SRIO1_MEM_BASE 0xc000 /* base address */
+#define CONFIG_SYS_SRIO1_MEM_PHYS CONFIG_SYS_SRIO1_MEM_BASE
+#define CONFIG_SYS_SRIO1_MEM_SIZE 0x2000 /* 128M */
/*
* General PCI
@@ -417,10 +420,10 @@
* BAT2 512M Cache-inhibited, guarded
* 0xc000_ 512M RapidIO Memory
*/
-#define CONFIG_SYS_DBAT2L (CONFIG_SYS_RIO_MEM_BASE | BATL_PP_RW \
+#define CONFIG_SYS_DBAT2L (CONFIG_SYS_SRIO1_MEM_BASE | BATL_PP_RW \
| BATL_CACHEINHIBIT | BATL_GUARDEDSTORAGE)
-#define CONFIG_SYS_DBAT2U (CONFIG_SYS_RIO_MEM_BASE | BATU_BL_512M |
BATU_VS | BATU_VP)
-#define CONFIG_SYS_IBAT2L (CONFIG_SYS_RIO_MEM_BASE | BATL_PP_RW |
BATL_CACHEINHIBIT)
+#define CONFIG_SYS_DBAT2U (CONFIG_SYS_SRIO1_MEM_BASE | BATU_BL_512M |
BATU_VS | BATU_VP)
+#define CONFIG_SYS_IBAT2L (CONFIG_SYS_SRIO1_MEM_BASE | BATL_PP_RW |
BATL_CACHEINHIBIT)
#define CONFIG_SYS_IBAT2U CONFIG_SYS_DBAT2U
/*
--
1.7.2.3
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v3 5/8] powerpc/86xx: Enable common SRIO init code
Add the needed defines and code to utilize the common 8xxx srio init
code to setup LAWs and modify device tree if we have SRIO enabled on a
board.
Signed-off-by: Kumar Gala
---
* Renamed CONFIG_SYS_HAS_SRIO -> CONFIG_SYS_SRIO
arch/powerpc/cpu/mpc86xx/cpu_init.c |7 ++-
arch/powerpc/cpu/mpc86xx/fdt.c|7 ++-
arch/powerpc/include/asm/immap_86xx.h |4 +++-
3 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/arch/powerpc/cpu/mpc86xx/cpu_init.c
b/arch/powerpc/cpu/mpc86xx/cpu_init.c
index 1d35c0c..8022024 100644
--- a/arch/powerpc/cpu/mpc86xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc86xx/cpu_init.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2004,2009-2010 Freescale Semiconductor, Inc.
+ * Copyright 2004,2009-2011 Freescale Semiconductor, Inc.
* Jeff Brown
* Srikanth Srinivasan (srikanth.sriniva...@freescale.com)
*
@@ -34,6 +34,7 @@
#include
#include
+extern void srio_init(void);
void setup_bats(void);
DECLARE_GLOBAL_DATA_PTR;
@@ -80,6 +81,10 @@ int cpu_init_r(void)
/* needs to be in ram since code uses global static vars */
fsl_serdes_init();
+#ifdef CONFIG_SYS_SRIO
+ srio_init();
+#endif
+
#if defined(CONFIG_MP)
setup_mp();
#endif
diff --git a/arch/powerpc/cpu/mpc86xx/fdt.c b/arch/powerpc/cpu/mpc86xx/fdt.c
index ff89ee5..61f5110 100644
--- a/arch/powerpc/cpu/mpc86xx/fdt.c
+++ b/arch/powerpc/cpu/mpc86xx/fdt.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2008,2010 Freescale Semiconductor, Inc.
+ * Copyright 2008, 2011 Freescale Semiconductor, Inc.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -14,6 +14,7 @@
DECLARE_GLOBAL_DATA_PTR;
extern void ft_fixup_num_cores(void *blob);
+extern void ft_srio_setup(void *blob);
void ft_cpu_setup(void *blob, bd_t *bd)
{
@@ -58,4 +59,8 @@ void ft_cpu_setup(void *blob, bd_t *bd)
ft_fixup_num_cores(blob);
#endif
+
+#ifdef CONFIG_SYS_SRIO
+ ft_srio_setup(blob);
+#endif
}
diff --git a/arch/powerpc/include/asm/immap_86xx.h
b/arch/powerpc/include/asm/immap_86xx.h
index 4e60cbb..cc338e4 100644
--- a/arch/powerpc/include/asm/immap_86xx.h
+++ b/arch/powerpc/include/asm/immap_86xx.h
@@ -1,7 +1,7 @@
/*
* MPC86xx Internal Memory Map
*
- * Copyright 2004 Freescale Semiconductor
+ * Copyright 2004, 2011 Freescale Semiconductor
* Jeff Brown (jeff...@freescale.com)
* Srikanth Srinivasan (srikanth.sriniva...@freescale.com)
*
@@ -1205,6 +1205,8 @@ typedef struct ccsr_gur {
#define MPC86xx_DEVDISR_PCI1 0x8000
#define MPC86xx_DEVDISR_PCIE1 0x4000
#define MPC86xx_DEVDISR_PCIE2 0x2000
+#define MPC86xx_DEVDISR_SRIO 0x0008
+#define MPC86xx_DEVDISR_RMSG 0x0004
#define MPC86xx_DEVDISR_CPU0 0x8000
#define MPC86xx_DEVDISR_CPU1 0x4000
#define MPC86xx_RSTCR_HRST_REQ 0x0002
--
1.7.2.3
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v3 4/8] powerpc/85xx: Convert MPC8569MDS to use common SRIO init code
Signed-off-by: Kumar Gala
---
* Renamed CONFIG_SYS_HAS_SRIO -> CONFIG_SYS_SRIO
board/freescale/mpc8569mds/law.c |3 +--
include/configs/MPC8569MDS.h | 12
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/board/freescale/mpc8569mds/law.c b/board/freescale/mpc8569mds/law.c
index bcd0311..4f4a93b 100644
--- a/board/freescale/mpc8569mds/law.c
+++ b/board/freescale/mpc8569mds/law.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2009-2010 Freescale Semiconductor, Inc.
+ * Copyright 2009-2011 Freescale Semiconductor, Inc.
*
* (C) Copyright 2000
* Wolfgang Denk, DENX Software Engineering, w...@denx.de.
@@ -52,7 +52,6 @@ struct law_entry law_table[] = {
SET_LAW(CONFIG_SYS_DDR_SDRAM_BASE, LAW_SIZE_1G, LAW_TRGT_IF_DDR),
#endif
SET_LAW(CONFIG_SYS_BCSR_BASE_PHYS, LAW_SIZE_128M, LAW_TRGT_IF_LBC),
- SET_LAW(CONFIG_SYS_SRIO_MEM_PHYS, LAW_SIZE_512M, LAW_TRGT_IF_RIO),
};
int num_law_entries = ARRAY_SIZE(law_table);
diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h
index 814c175..3372d18 100644
--- a/include/configs/MPC8569MDS.h
+++ b/include/configs/MPC8569MDS.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009-2010 Freescale Semiconductor, Inc.
+ * Copyright 2009-2011 Freescale Semiconductor, Inc.
*
* See file CREDITS for list of people who contributed to this
* project.
@@ -35,6 +35,9 @@
#define CONFIG_FSL_ELBC1 /* Has Enhance localbus
controller */
+#define CONFIG_SYS_SRIO
+#define CONFIG_SRIO1 /* SRIO port 1 */
+
#define CONFIG_PCI 1 /* Disable PCI/PCIE */
#define CONFIG_PCIE1 1 /* PCIE controller */
#define CONFIG_FSL_PCI_INIT1 /* use common fsl pci init code */
@@ -355,9 +358,10 @@ extern unsigned long get_clock_freq(void);
#define CONFIG_SYS_PCIE1_IO_PHYS 0xe280
#define CONFIG_SYS_PCIE1_IO_SIZE 0x0080 /* 8M */
-#define CONFIG_SYS_SRIO_MEM_VIRT 0xc000
-#define CONFIG_SYS_SRIO_MEM_BUS0xc000
-#define CONFIG_SYS_SRIO_MEM_PHYS 0xc000
+#define CONFIG_SYS_SRIO1_MEM_VIRT 0xC000
+#define CONFIG_SYS_SRIO1_MEM_BUS 0xC000
+#define CONFIG_SYS_SRIO1_MEM_PHYS CONFIG_SYS_SRIO1_MEM_BUS
+#define CONFIG_SYS_SRIO1_MEM_SIZE 0x2000 /* 512M */
#ifdef CONFIG_QE
/*
--
1.7.2.3
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v3 2/8] powerpc/85xx: Convert MPC8548CDS to use common SRIO init code
Signed-off-by: Kumar Gala
---
* Renamed CONFIG_SYS_HAS_SRIO -> CONFIG_SYS_SRIO
board/freescale/mpc8548cds/law.c |5 +
board/freescale/mpc8548cds/tlb.c |9 -
include/configs/MPC8548CDS.h | 15 ---
3 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/board/freescale/mpc8548cds/law.c b/board/freescale/mpc8548cds/law.c
index e59fee8..5b6943d 100644
--- a/board/freescale/mpc8548cds/law.c
+++ b/board/freescale/mpc8548cds/law.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2008,2010 Freescale Semiconductor, Inc.
+ * Copyright 2008,2010-2011 Freescale Semiconductor, Inc.
*
* (C) Copyright 2000
* Wolfgang Denk, DENX Software Engineering, w...@denx.de.
@@ -57,9 +57,6 @@ struct law_entry law_table[] = {
#endif
/* LBC window - maps 256M 0xf000 -> 0x */
SET_LAW(CONFIG_SYS_LBC_SDRAM_BASE, LAW_SIZE_256M, LAW_TRGT_IF_LBC),
-#ifdef CONFIG_SYS_RIO_MEM_PHYS
- SET_LAW(CONFIG_SYS_RIO_MEM_PHYS, LAW_SIZE_512M, LAW_TRGT_IF_RIO),
-#endif
};
int num_law_entries = ARRAY_SIZE(law_table);
diff --git a/board/freescale/mpc8548cds/tlb.c b/board/freescale/mpc8548cds/tlb.c
index 2267ad7..b2c1b31 100644
--- a/board/freescale/mpc8548cds/tlb.c
+++ b/board/freescale/mpc8548cds/tlb.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2008 Freescale Semiconductor, Inc.
+ * Copyright 2008, 2011 Freescale Semiconductor, Inc.
*
* (C) Copyright 2000
* Wolfgang Denk, DENX Software Engineering, w...@denx.de.
@@ -58,21 +58,20 @@ struct fsl_e_tlb_entry tlb_table[] = {
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
0, 1, BOOKE_PAGESZ_1G, 1),
-#ifdef CONFIG_SYS_RIO_MEM_PHYS
/*
* TLB 2: 256MNon-cacheable, guarded
*/
- SET_TLB_ENTRY(1, CONFIG_SYS_RIO_MEM_VIRT, CONFIG_SYS_RIO_MEM_PHYS,
+ SET_TLB_ENTRY(1, CONFIG_SYS_SRIO1_MEM_VIRT, CONFIG_SYS_SRIO1_MEM_PHYS,
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
0, 2, BOOKE_PAGESZ_256M, 1),
/*
* TLB 3: 256MNon-cacheable, guarded
*/
- SET_TLB_ENTRY(1, CONFIG_SYS_RIO_MEM_VIRT + 0x1000,
CONFIG_SYS_RIO_MEM_PHYS + 0x1000,
+ SET_TLB_ENTRY(1, CONFIG_SYS_SRIO1_MEM_VIRT + 0x1000,
CONFIG_SYS_SRIO1_MEM_PHYS + 0x1000,
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
0, 3, BOOKE_PAGESZ_256M, 1),
-#endif
+
/*
* TLB 5: 64M Non-cacheable, guarded
* 0xe000_ 1M CCSRBAR
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index 4c5b998..ececa38 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2004, 2007, 2010 Freescale Semiconductor.
+ * Copyright 2004, 2007, 2010-2011 Freescale Semiconductor.
*
* See file CREDITS for list of people who contributed to this
* project.
@@ -40,10 +40,12 @@
#define CONFIG_SYS_TEXT_BASE 0xfff8
#endif
+#define CONFIG_SYS_SRIO
+#define CONFIG_SRIO1 /* SRIO port 1 */
+
#define CONFIG_PCI /* enable any pci type devices */
#define CONFIG_PCI1/* PCI controller 1 */
#define CONFIG_PCIE1 /* PCIE controler 1 (slot 1) */
-#undef CONFIG_RIO
#undef CONFIG_PCI2
#define CONFIG_FSL_PCI_INIT1 /* Use common FSL init code */
#define CONFIG_FSL_PCIE_RESET 1 /* need PCIe reset errata */
@@ -364,14 +366,13 @@ extern unsigned long get_clock_freq(void);
#define CONFIG_SYS_PCIE1_IO_SIZE 0x0010 /* 1M */
#endif
-#ifdef CONFIG_RIO
/*
* RapidIO MMU
*/
-#define CONFIG_SYS_RIO_MEM_VIRT0xC000
-#define CONFIG_SYS_RIO_MEM_BUS 0xC000
-#define CONFIG_SYS_RIO_MEM_SIZE0x2000 /* 512M */
-#endif
+#define CONFIG_SYS_SRIO1_MEM_VIRT 0xC000
+#define CONFIG_SYS_SRIO1_MEM_BUS 0xC000
+#define CONFIG_SYS_SRIO1_MEM_PHYS CONFIG_SYS_SRIO1_MEM_BUS
+#define CONFIG_SYS_SRIO1_MEM_SIZE 0x2000 /* 512M */
#ifdef CONFIG_LEGACY
#define BRIDGE_ID 17
--
1.7.2.3
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
