Re: [U-Boot] [PATCH] S5PC2XX: GPIO Macro Values Corrected.
Dear Chander Kashyap, On 18 April 2011 12:50, Chander Kashyap wrote: > > No need to change. As existing gpio configuration is as per s5pc1xx > specification. According to S5PC110 TRM, DRV levels are as following, 00 = 1x 10 = 2x 01 = 3x 11 = 4x Please fix it at s5pc1xx also. 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] S5PC2XX: GPIO Macro Values Corrected.
Dear Chander Kashyap, On 18 April 2011 13:53, Chander Kashyap wrote: > Macro values for Pull Up and Driver Strength were wrong. > Signed-off-by: Chander Kashyap > --- > arch/arm/include/asm/arch-s5pc2xx/gpio.h | 7 +++ > 1 files changed, 3 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/include/asm/arch-s5pc2xx/gpio.h > b/arch/arm/include/asm/arch-s5pc2xx/gpio.h > index 05e5b3e..38303e4 100644 > --- a/arch/arm/include/asm/arch-s5pc2xx/gpio.h > +++ b/arch/arm/include/asm/arch-s5pc2xx/gpio.h Please see "Sending updated patch versions" and please fix it. http://www.denx.de/wiki/view/U-Boot/Patches#Sending_updated_patch_versions 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] S5P:SROM config code moved to s5p-common directory
Dear Chander Kashyap, On 15 April 2011 14:05, Chander Kashyap wrote: > SROM config code is made common for S5P series of boards. > smdkc100.c now refers to s5p-common/sromc.c for SROM related > subroutines. > > Signed-off-by: Chander Kashyap > --- > arch/arm/cpu/armv7/s5p-common/Makefile | 3 +- > arch/arm/cpu/armv7/s5p-common/sromc.c | 49 ++ > arch/arm/cpu/armv7/s5pc1xx/Makefile | 1 - > arch/arm/cpu/armv7/s5pc1xx/sromc.c | 49 -- > arch/arm/include/asm/arch-s5pc1xx/smc.h | 53 > - > arch/arm/include/asm/arch-s5pc1xx/sromc.h | 53 > + Why you renamed this file? > board/samsung/smdkc100/smdkc100.c | 4 +- > 7 files changed, 106 insertions(+), 106 deletions(-) > create mode 100644 arch/arm/cpu/armv7/s5p-common/sromc.c > delete mode 100644 arch/arm/cpu/armv7/s5pc1xx/sromc.c > delete mode 100644 arch/arm/include/asm/arch-s5pc1xx/smc.h > create mode 100644 arch/arm/include/asm/arch-s5pc1xx/sromc.h > 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 V4 1/2] MX5: factor out boot cause funciton to common code
Hi, Stefano, 2011/4/16 Jason Liu : > From: Liu Hui-R64343 > > factor out boot cause funciton to common code to avoid > the duplicate code in each board support package > > Signed-off-by: Jason Liu > --- > changes since v3: > - add full boot reset cause Ping, any comments? > 1.7.1 > > > ___ > 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
Re: [U-Boot] [PATCH V4 2/2] MX53: support for freescale MX53LOCO board
Hi, Stefano, 2011/4/16 Jason Liu : > From: Liu Hui-R64343 > > This patch add initial support for freescale MX53LOCO board. > Network(FEC),SD/MMC, UART have been supported by this patch. > > Signed-off-by: Jason Liu > --- > changes since v3: > - include other two small patch into this commit, > mx53loco: set mmc env to MMC slot1 > MX5: Enable flat-device-tree support on mx53 loco board > > changes since V2: > -factor out the boot cause function to common code, > -fix gd->ram_size with full memory size > -remove the '1' from all #defines that just enable features > -correct memory test end address value > Ping, any comments? > > > ___ > 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
Re: [U-Boot] [PATCH] S5PC2XX: GPIO Macro Values Corrected.
Dear Minkyu, On 18 April 2011 13:00, Minkyu Kang wrote: > Dear Chander Kashyap, > > On 18 April 2011 12:50, Chander Kashyap > wrote: > > > > No need to change. As existing gpio configuration is as per s5pc1xx > > specification. > > According to S5PC110 TRM, DRV levels are as following, > > 00 = 1x > 10 = 2x > 01 = 3x > 11 = 4x > > Please fix it at s5pc1xx also. > As per the s5pc110 user manual I have existing configuration is right. If you are sure then I will change it and resubmit the patch. > > Thanks > Minkyu Kang. > -- > from. prom. > www.promsoft.net > regards, Chander ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 3/8 v2] ppc4xx: Enable LM64 on DLVision 10G
Signed-off-by: Dirk Eibach
---
Changes since v1:
- original Subject was "hwmon: Extend lm63.c to support LM64"
- separated LM64 implementation from this patch series
include/configs/dlvision-10g.h |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/include/configs/dlvision-10g.h b/include/configs/dlvision-10g.h
index f7609d7..ae209fa 100644
--- a/include/configs/dlvision-10g.h
+++ b/include/configs/dlvision-10g.h
@@ -111,7 +111,7 @@
/* Temp sensor/hwmon/dtt */
#define CONFIG_DTT_LM631 /* National LM63*/
-#define CONFIG_DTT_SENSORS { 0 } /* Sensor addresses */
+#define CONFIG_DTT_SENSORS { 0x4c, 0x4e } /* Sensor addresses */
#define CONFIG_DTT_PWM_LOOKUPTABLE \
{ { 40, 10 }, { 50, 20 }, { 60, 40 } }
#define CONFIG_DTT_TACH_LIMIT 0xa10
--
1.5.6.5
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] hwmon: Extend lm63.c to support LM64
This patch adds support for the National LM64 temperature
sensor with integrated fan control to lm63.c.
Main difference between LM63 and LM64 is 16°C offset in sensor
readings.
Signed-off-by: Dirk Eibach
---
drivers/hwmon/lm63.c | 28
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/drivers/hwmon/lm63.c b/drivers/hwmon/lm63.c
index 03616e1..2f1f3cf 100644
--- a/drivers/hwmon/lm63.c
+++ b/drivers/hwmon/lm63.c
@@ -23,14 +23,15 @@
*/
/*
- * National LM63 Temperature Sensor
+ * National LM63/LM64 Temperature Sensor
+ * Main difference: LM 64 has -16 Kelvin temperature offset
*/
#include
#include
#include
-#define DTT_I2C_DEV_CODE 0x4C /* National LM63 device */
+#define DTT_I2C_LM63_ADDR 0x4C/* National LM63 device */
#define DTT_READ_TEMP_RMT_MSB 0x01
#define DTT_CONFIG 0x03
@@ -58,7 +59,8 @@ int dtt_read(int sensor, int reg)
/*
* Calculate sensor address and register.
*/
- sensor = DTT_I2C_DEV_CODE; /* address of lm63 is not adjustable */
+ if (!sensor)
+ sensor = DTT_I2C_LM63_ADDR; /* legacy config */
dlen = 1;
@@ -79,7 +81,8 @@ int dtt_write(int sensor, int reg, int val)
/*
* Calculate sensor address and register.
*/
- sensor = DTT_I2C_DEV_CODE; /* address of lm63 is not adjustable */
+ if (!sensor)
+ sensor = DTT_I2C_LM63_ADDR; /* legacy config */
dlen = 1;
data[0] = (char)(val & 0xff);
@@ -93,6 +96,11 @@ int dtt_write(int sensor, int reg, int val)
return 0;
} /* dtt_write() */
+static int is_lm64(int sensor)
+{
+ return sensor && (sensor != DTT_I2C_LM63_ADDR);
+}
+
static int _dtt_init(int sensor)
{
int i;
@@ -117,14 +125,23 @@ static int _dtt_init(int sensor)
return 1;
/*
+* Make sure PWM Lookup-Table is writeable
+*/
+ if (dtt_write(sensor, DTT_FAN_CONFIG, 0x20) != 0)
+ return 1;
+
+ /*
* Setup PWM Lookup-Table
*/
for (i = 0; i < sizeof(pwm_lookup) / sizeof(struct pwm_lookup_entry);
i++) {
int address = DTT_PWM_LOOKUP_BASE + 2 * i;
val = pwm_lookup[i].temp;
+ if (is_lm64(sensor))
+ val -= 16;
if (dtt_write(sensor, address, val) != 0)
return 1;
+ val = dtt_read(sensor, address);
val = pwm_lookup[i].pwm;
if (dtt_write(sensor, address + 1, val) != 0)
return 1;
@@ -152,6 +169,9 @@ int dtt_get_temp(int sensor)
s16 temp = (dtt_read(sensor, DTT_READ_TEMP_RMT_MSB) << 8)
| (dtt_read(sensor, DTT_READ_TEMP_RMT_LSB));
+ if (is_lm64(sensor))
+ temp += 16 << 8;
+
/* Ignore LSB for now, U-Boot only prints natural numbers */
return temp >> 8;
}
--
1.5.6.5
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3 2/3] MX31: Introduce get_reset_cause()
Hi Fabio and Stefan, > On 04/15/2011 04:21 AM, Fabio Estevam wrote: >> Introduce get_reset_cause() function to indicate the source of the reset. >> >> Signed-off-by: Fabio Estevam >> --- >> arch/arm/cpu/arm1136/mx31/generic.c | 26 ++ >> arch/arm/include/asm/arch-mx31/imx-regs.h |2 ++ >> 2 files changed, 28 insertions(+), 0 deletions(-) >> > > Hi Fabio, > >> diff --git a/arch/arm/include/asm/arch-mx31/imx-regs.h >> b/arch/arm/include/asm/arch-mx31/imx-regs.h >> index 7f2..2b0881d 100644 >> --- a/arch/arm/include/asm/arch-mx31/imx-regs.h >> +++ b/arch/arm/include/asm/arch-mx31/imx-regs.h >> @@ -27,6 +27,8 @@ >> #if !(defined(__KERNEL_STRICT_NAMES) || defined(__ASSEMBLY__)) >> #include >> >> +extern char *get_reset_cause(void); >> + > > The imx-regs.h contains only defines and structures for the processor, > and no prototypes. Function prototypes are then listed in sys_proto.h, > not only for i.MX processor. I prefer to maintain this rule and to not > add prototypes to this file. Why can't we have this code in the cpu specific code _without_ any call from a board so _ecery_ board gets the additional information for free? See for example arch/powerpc/cpu/mpc512x/cpu.c where this is done for RSR on 5121. I do not understand what the problem is here, can someone enlighten me please? Cheers Detlev -- The X approach to device independence is to treat everything like a MicroVAX framebuffer on acid. -- The UNIX Haters Handbook -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-40 Fax: (+49)-8142-66989-80 Email: d...@denx.de ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Question about relocation
Me: >> but the calculation is done to move to end of ram, so dest is always >> higher than source. Albert: > I guess I can live with this if you put a big fat comment in the code to > explain *why* the copy is done end-to-beginning, so that if one day the > assumption stops holding, readers of the code can tell if they should > keep or change the direction. Actually, I was wrong. Since the display buffer is allocated over u-boot, we may already be too high. This never happens for current boards, which lived before relocation was there (I rember having lowered the u-boot address to fit a bigger display buffer above it) but may happen in the future. So, with the comment the thing may work (like "please for new boards load it low now that it relocates high by itself"). However, the copy is made in 35 assembly files. Only ARM has 14 almost-identical copies of the code (some of them are really identical), so I won't dare touching it. The only thing I can do is not making the copy by forcing dest = source if we will overlap ourselves, because the assembly will detect this: adr r0, _start cmp r0, r6 beq clear_bss /* skip relocation */ [I don't understand why here is _start and in C is _TEXT_BASE, which are different by 0x40 bytes, but it unexpectedly works] For me it is working, but the code is not clean at all. I'm sending the patches anyways. I found the the overwrite was only for the stack, which is the lowest address in the relocated place, so I compared some space below the would-be stack with bss_start. /alessandro ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V3 1/2] MX5: factor out boot cause funciton to common code
Hi Stefano,
> On 04/15/2011 02:47 PM, Fabio Estevam wrote:
>>> +char *get_reset_cause(void)
>>> +{
>>> +u32 cause;
>>> +struct src *src_regs = (struct src
>>> *)SRC_BASE_ADDR;
>>> +
>>> +cause = readl(&src_regs->srsr);
>>
>> You need to mask the 7 LSB of SRSR register.
>>
>> If you don´t bit 16 can still affect its result.
>
> Why ? As this becomes a general function for i.MX5, should we not
> provide a way to check all significant bits ? Why should we exclude the
> "warm boot" bit to be checked and printed out ?
And _please_ (as indictated in my i.MX31 mail) use the code for _all_
iMX51 boards withoput the need for them to call a function and print the
result.
Thanks!
Detlev
--
Choosing which tool to use is a problem for most users. Therefore
when one tool came along that did everything Perl (Ugly) it took over.
-- Rob Pike
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-40 Fax: (+49)-8142-66989-80 Email: d...@denx.de
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/4] atmel_dataflash: remove use of get_timer_masked
Commit 5dca710a3d7703e41da0e9894f2d71f9e25bea6b removed get_timer_masked for at91. The dataflash driver was still using it and so stopped compiling. This blindly fixes the compilation problem (I am not currently using dataflash). Signed-off-by: Alessandro Rubini --- drivers/spi/atmel_dataflash_spi.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/spi/atmel_dataflash_spi.c b/drivers/spi/atmel_dataflash_spi.c index 4a5c4aa..d5215c0 100644 --- a/drivers/spi/atmel_dataflash_spi.c +++ b/drivers/spi/atmel_dataflash_spi.c @@ -158,12 +158,12 @@ unsigned int AT91F_SpiWrite(AT91PS_DataflashDesc pDesc) } /* arm simple, non interrupt dependent timer */ - reset_timer_masked(); + reset_timer(); timeout = 0; writel(AT91_SPI_TXTEN + AT91_SPI_RXTEN, AT91_BASE_SPI + AT91_SPI_PTCR); while (!(readl(AT91_BASE_SPI + AT91_SPI_SR) & AT91_SPI_RXBUFF) && - ((timeout = get_timer_masked()) < CONFIG_SYS_SPI_WRITE_TOUT)); + ((timeout = get_timer(0)) < CONFIG_SYS_SPI_WRITE_TOUT)); writel(AT91_SPI_TXTDIS + AT91_SPI_RXTDIS, AT91_BASE_SPI + AT91_SPI_PTCR); pDesc->state = IDLE; -- 1.5.6.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 2/4] ARM: don't relocate if we are already too high
Signed-off-by: Alessandro Rubini
---
arch/arm/lib/board.c | 23 ++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c
index dc46e21..dab70b5 100644
--- a/arch/arm/lib/board.c
+++ b/arch/arm/lib/board.c
@@ -423,8 +423,29 @@ void board_init_f (ulong bootflag)
gd->relocaddr = addr;
gd->start_addr_sp = addr_sp;
gd->reloc_off = addr - _TEXT_BASE;
+
+ /*
+* Destination is higher than current address, but may overlap
+* our address range. If so, pass the source address as destination
+* address so the asm will not relocate and only clear bss
+*/
+ if ((addr_sp - 256) < _bss_start_ofs+_TEXT_BASE) {
+ debug("Won't fit above us: disabling relocation\n");
+ if (gd->reloc_off < 0) {
+ printf("Can't relocate to lower ram, currently\n");
+ hang();
+ }
+ addr -= gd->reloc_off;
+ addr_sp -= gd->reloc_off;
+ gd->start_addr_sp = addr_sp;
+ id -= gd->reloc_off;
+ gd->reloc_off = 0;
+ }
+
+
debug ("relocation Offset is: %08lx\n", gd->reloc_off);
- memcpy (id, (void *)gd, sizeof (gd_t));
+ if (id != (void *)gd)
+ memcpy (id, (void *)gd, sizeof (gd_t));
relocate_code (addr_sp, id, addr);
--
1.5.6.5
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 3/4] at91sam9261/g10: support relocation
This adds support for relocation, but won't work for the default
settings whereas AT91Boot loads u-boot to the last meg and it then
tries to relocate slightly later, thus overwriting itself.
Signed-off-by: Alessandro Rubini
---
board/atmel/at91sam9261ek/at91sam9261ek.c |3 +--
include/configs/at91sam9261ek.h |4
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/board/atmel/at91sam9261ek/at91sam9261ek.c
b/board/atmel/at91sam9261ek/at91sam9261ek.c
index de5cfae..ec1d2a3 100644
--- a/board/atmel/at91sam9261ek/at91sam9261ek.c
+++ b/board/atmel/at91sam9261ek/at91sam9261ek.c
@@ -273,8 +273,7 @@ int board_eth_init(bd_t *bis)
int dram_init(void)
{
- gd->bd->bi_dram[0].start = PHYS_SDRAM;
- gd->bd->bi_dram[0].size = PHYS_SDRAM_SIZE;
+ gd->ram_size = get_ram_size(PHYS_SDRAM, PHYS_SDRAM_SIZE);
return 0;
}
diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
index 401478b..71a4357 100644
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
@@ -30,6 +30,7 @@
#define CONFIG_AT91_LEGACY
/* ARM asynchronous clock */
+#define CONFIG_AT91FAMILY
#define CONFIG_SYS_AT91_MAIN_CLOCK 18432000/* 18.432 MHz crystal */
#define CONFIG_SYS_HZ 1000
@@ -110,6 +111,9 @@
#define CONFIG_NR_DRAM_BANKS 1
#define PHYS_SDRAM 0x2000
#define PHYS_SDRAM_SIZE0x0400 /* 64 megs */
+#define CONFIG_SYS_SDRAM_BASE 0x2000
+#define CONFIG_SYS_INIT_SP_ADDR0x2010 /* within RAM
is ok */
+
/* DataFlash */
#define CONFIG_ATMEL_DATAFLASH_SPI
--
1.5.6.5
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 4/4] at91sam9261/g10: move config from Makefile to boards.cfg
This moves config targets, but defines DATAFLASH_CS0 for "dataflash_cs0" configs and DATAFLASH_CS3 for "dataflash_cs3" configs, whereas the Makefile targets had it swapped. Signed-off-by: Alessandro Rubini --- Makefile | 22 -- boards.cfg |8 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/Makefile b/Makefile index 584105c..93c33c7 100644 --- a/Makefile +++ b/Makefile @@ -803,28 +803,6 @@ at91sam9xeek_config: unconfig fi; @$(MKCONFIG) -n $@ -a at91sam9260ek arm arm926ejs at91sam9260ek atmel at91 -at91sam9261ek_nandflash_config \ -at91sam9261ek_dataflash_cs0_config \ -at91sam9261ek_dataflash_cs3_config \ -at91sam9261ek_config \ -at91sam9g10ek_nandflash_config \ -at91sam9g10ek_dataflash_cs0_config \ -at91sam9g10ek_dataflash_cs3_config \ -at91sam9g10ek_config : unconfig - @mkdir -p $(obj)include - @if [ "$(findstring 9g10,$@)" ] ; then \ - echo "#define CONFIG_AT91SAM9G10EK 1" >>$(obj)include/config.h ; \ - else \ - echo "#define CONFIG_AT91SAM9261EK 1" >>$(obj)include/config.h ; \ - fi; - @if [ "$(findstring _nandflash,$@)" ] ; then \ - echo "#define CONFIG_SYS_USE_NANDFLASH 1" >>$(obj)include/config.h ; \ - elif [ "$(findstring dataflash_cs0,$@)" ] ; then \ - echo "#define CONFIG_SYS_USE_DATAFLASH_CS3 1" >>$(obj)include/config.h ; \ - else \ - echo "#define CONFIG_SYS_USE_DATAFLASH_CS0 1" >>$(obj)include/config.h ; \ - fi; - @$(MKCONFIG) -n $@ -a at91sam9261ek arm arm926ejs at91sam9261ek atmel at91 at91sam9263ek_norflash_config \ at91sam9263ek_norflash_boot_config \ diff --git a/boards.cfg b/boards.cfg index 9194610..80488b8 100644 --- a/boards.cfg +++ b/boards.cfg @@ -73,6 +73,14 @@ omap1510inn arm arm925t - ti aspenite arm arm926ejs - Marvellarmada100 afeb9260 arm arm926ejs - - at91 at91cap9adk arm arm926ejs - atmel at91 +at91sam9261ekarm arm926ejs - atmel at91at91sam9261ek:AT91SAM9261EK,SYS_USE_DATAFLASH_CS0 +at91sam9261ek_dataflash_cs0 arm arm926ejs - atmel at91at91sam9261ek:AT91SAM9261EK,SYS_USE_DATAFLASH_CS0 +at91sam9261ek_dataflash_cs3 arm arm926ejs - atmel at91at91sam9261ek:AT91SAM9261EK,SYS_USE_DATAFLASH_CS3 +at91sam9261ek_nandflash arm arm926ejs - atmel at91at91sam9261ek:AT91SAM9261EK,SYS_USE_NANDFLASH +at91sam92g10ek arm arm926ejs - atmel at91at91sam9261ek:AT91SAM9G10EK,SYS_USE_DATAFLASH_CS0 +at91sam92g10ek_dataflash_cs0 arm arm926ejs - atmel at91at91sam9261ek:AT91SAM9G10EK,SYS_USE_DATAFLASH_CS0 +at91sam92g10ek_dataflash_cs3 arm arm926ejs - atmel at91at91sam9261ek:AT91SAM9G10EK,SYS_USE_DATAFLASH_CS3 +at91sam92g10ek_nandflash arm arm926ejs - atmel at91at91sam9261ek:AT91SAM9G10EK,SYS_USE_NANDFLASH top9000eval_xe arm arm926ejs top9000 emk at91top9000:EVAL9000 top9000su_xe arm arm926ejs top9000 emk at91top9000:SU9000 meescarm arm926ejs - esd at91 -- 1.5.6.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 3/4] at91sam9261/g10: support relocation
Dear Alessandro Rubini,
Am 18.04.2011 11:21, schrieb Alessandro Rubini:
> This adds support for relocation, but won't work for the default
> settings whereas AT91Boot loads u-boot to the last meg and it then
> tries to relocate slightly later, thus overwriting itself.
>
> Signed-off-by: Alessandro Rubini
> ---
> board/atmel/at91sam9261ek/at91sam9261ek.c |3 +--
> include/configs/at91sam9261ek.h |4
> 2 files changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/board/atmel/at91sam9261ek/at91sam9261ek.c
> b/board/atmel/at91sam9261ek/at91sam9261ek.c
> index de5cfae..ec1d2a3 100644
> --- a/board/atmel/at91sam9261ek/at91sam9261ek.c
> +++ b/board/atmel/at91sam9261ek/at91sam9261ek.c
> @@ -273,8 +273,7 @@ int board_eth_init(bd_t *bis)
>
> int dram_init(void)
> {
> - gd->bd->bi_dram[0].start = PHYS_SDRAM;
> - gd->bd->bi_dram[0].size = PHYS_SDRAM_SIZE;
> + gd->ram_size = get_ram_size(PHYS_SDRAM, PHYS_SDRAM_SIZE);
please stop using this PHYS_SDRAM macros. They where replaced by
CONFIG_SYS_SDRAM_(BASE|SIZE).
> return 0;
> }
>
> diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
> index 401478b..71a4357 100644
> --- a/include/configs/at91sam9261ek.h
> +++ b/include/configs/at91sam9261ek.h
> @@ -30,6 +30,7 @@
> #define CONFIG_AT91_LEGACY
>
> /* ARM asynchronous clock */
> +#define CONFIG_AT91FAMILY
CONFIG_AT91FAMILY is defined in some asm/arch/hardware.h files. You will
get 'double definition' errors here. The best solution is currently to
include asm/hardware.h in board config right after the correct SoC
define. I have started a discussion on that problem yesterday evening ->
http://article.gmane.org/gmane.comp.boot-loaders.u-boot/97903
> #define CONFIG_SYS_AT91_MAIN_CLOCK 18432000/* 18.432 MHz crystal */
I guess SLOW_CLOCK is missing here ...
> #define CONFIG_SYS_HZ1000
>
> @@ -110,6 +111,9 @@
> #define CONFIG_NR_DRAM_BANKS 1
> #define PHYS_SDRAM 0x2000
> #define PHYS_SDRAM_SIZE 0x0400 /* 64 megs */
> +#define CONFIG_SYS_SDRAM_BASE0x2000
just replace the PHYS_SDRAM defines by CONFIG_SYS_SDRAM defines.
> +#define CONFIG_SYS_INIT_SP_ADDR 0x2010 /* within RAM
> is ok */
> +
I recommend to use SRAM here, see top900(0) header for example.
>
> /* DataFlash */
> #define CONFIG_ATMEL_DATAFLASH_SPI
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 1/3] ARM: don't panic if no flash is there
Would it be possible to introduce a QEMU Versatile board in U-Boot derived from the regular Versatile board's config? It would disable the things that aren't (yet) supported in QEMU or too painful to support. -- Loïc Minier ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2] S5P: GPIO Macro Values Corrected.
S5PC2XX: Macro values for Pull Up and Driver Strength were wrong. S5PC1XX: Macro values for Driver Strength were wrong. Signed-off-by: Chander Kashyap --- Changes for V2: - Macro value order fixed. - Added Changes for S5PC1XX. arch/arm/include/asm/arch-s5pc1xx/gpio.h |4 ++-- arch/arm/include/asm/arch-s5pc2xx/gpio.h |7 +++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/arch/arm/include/asm/arch-s5pc1xx/gpio.h b/arch/arm/include/asm/arch-s5pc1xx/gpio.h index 2df33a6..485b9bf 100644 --- a/arch/arm/include/asm/arch-s5pc1xx/gpio.h +++ b/arch/arm/include/asm/arch-s5pc1xx/gpio.h @@ -149,8 +149,8 @@ void gpio_set_rate(struct s5p_gpio_bank *bank, int gpio, int mode); /* Drive Strength level */ #define GPIO_DRV_1X0x0 -#define GPIO_DRV_2X0x1 -#define GPIO_DRV_3X0x2 +#define GPIO_DRV_3X0x1 +#define GPIO_DRV_2X0x2 #define GPIO_DRV_4X0x3 #define GPIO_DRV_FAST 0x0 #define GPIO_DRV_SLOW 0x1 diff --git a/arch/arm/include/asm/arch-s5pc2xx/gpio.h b/arch/arm/include/asm/arch-s5pc2xx/gpio.h index 05e5b3e..38303e4 100644 --- a/arch/arm/include/asm/arch-s5pc2xx/gpio.h +++ b/arch/arm/include/asm/arch-s5pc2xx/gpio.h @@ -99,14 +99,13 @@ void gpio_set_rate(struct s5p_gpio_bank *bank, int gpio, int mode); /* Pull mode */ #define GPIO_PULL_NONE 0x0 #define GPIO_PULL_DOWN 0x1 -#define GPIO_PULL_UP 0x2 +#define GPIO_PULL_UP 0x3 /* Drive Strength level */ #define GPIO_DRV_1X0x0 -#define GPIO_DRV_2X0x1 -#define GPIO_DRV_3X0x2 +#define GPIO_DRV_3X0x1 +#define GPIO_DRV_2X0x2 #define GPIO_DRV_4X0x3 #define GPIO_DRV_FAST 0x0 #define GPIO_DRV_SLOW 0x1 - #endif -- 1.7.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/2] Fix timer usage of the Atmel SPI dataflash driver
Dear Remy Bohmer,
> Signed-off-by: Remy Bohmer
> ---
> drivers/spi/atmel_dataflash_spi.c |8
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/spi/atmel_dataflash_spi.c
> b/drivers/spi/atmel_dataflash_spi.c
> index 4a5c4aa..2f23f54 100644
> --- a/drivers/spi/atmel_dataflash_spi.c
> +++ b/drivers/spi/atmel_dataflash_spi.c
> @@ -133,7 +133,7 @@ unsigned int AT91F_SpiWrite1(AT91PS_DataflashDesc pDesc);
>
> unsigned int AT91F_SpiWrite(AT91PS_DataflashDesc pDesc)
> {
> - unsigned int timeout;
> + u32 time_start, timeout;
>
> pDesc->state = BUSY;
>
> @@ -158,12 +158,12 @@ unsigned int AT91F_SpiWrite(AT91PS_DataflashDesc pDesc)
> }
>
> /* arm simple, non interrupt dependent timer */
> - reset_timer_masked();
> - timeout = 0;
> + time_start = get_timer(0);
>
> writel(AT91_SPI_TXTEN + AT91_SPI_RXTEN, AT91_BASE_SPI + AT91_SPI_PTCR);
> while (!(readl(AT91_BASE_SPI + AT91_SPI_SR) & AT91_SPI_RXBUFF) &&
> - ((timeout = get_timer_masked()) < CONFIG_SYS_SPI_WRITE_TOUT));
> + ((timeout = get_timer(time_start)) <
> CONFIG_SYS_SPI_WRITE_TOUT));
> +
> writel(AT91_SPI_TXTDIS + AT91_SPI_RXTDIS, AT91_BASE_SPI +
> AT91_SPI_PTCR);
> pDesc->state = IDLE;
This issue had already been fixed by the ATMEL rework.
But you are welcome to further "fix" this driver to use structure SoC access ;)
Best Regards, Reinhard
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/4] atmel_dataflash: remove use of get_timer_masked
Dear Alessandro Rubini: > Commit 5dca710a3d7703e41da0e9894f2d71f9e25bea6b removed > get_timer_masked for at91. The dataflash driver was still > using it and so stopped compiling. This blindly fixes > the compilation problem (I am not currently using dataflash). > > Signed-off-by: Alessandro Rubini > --- > drivers/spi/atmel_dataflash_spi.c |4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/spi/atmel_dataflash_spi.c > b/drivers/spi/atmel_dataflash_spi.c > index 4a5c4aa..d5215c0 100644 > --- a/drivers/spi/atmel_dataflash_spi.c > +++ b/drivers/spi/atmel_dataflash_spi.c > @@ -158,12 +158,12 @@ unsigned int AT91F_SpiWrite(AT91PS_DataflashDesc pDesc) > } > > /* arm simple, non interrupt dependent timer */ > - reset_timer_masked(); > + reset_timer(); > timeout = 0; > > writel(AT91_SPI_TXTEN + AT91_SPI_RXTEN, AT91_BASE_SPI + AT91_SPI_PTCR); > while (!(readl(AT91_BASE_SPI + AT91_SPI_SR) & AT91_SPI_RXBUFF) && > - ((timeout = get_timer_masked()) < CONFIG_SYS_SPI_WRITE_TOUT)); > + ((timeout = get_timer(0)) < CONFIG_SYS_SPI_WRITE_TOUT)); > writel(AT91_SPI_TXTDIS + AT91_SPI_RXTDIS, AT91_BASE_SPI + > AT91_SPI_PTCR); > pDesc->state = IDLE; > a) reset_timer(), and all *_masked() timer functions are depreciated and have been removed from AT91 timer code b) the problem has already been fixed in current u-boot-atmel/next Best Regards, Reinhard ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 2/3] avr32: fix linking
Dear Andreas Bießmann: > This patch fixes following error: > > ---8<--- > avr32-linux-ld: --gc-sections and -r may not be used together > --->8--- > > Since 8aba9dceebb14144e07d19593111ee3a999c37fc all avr32 boards are broken due > to linking error as seen above. > > Signed-off-by: Andreas Bießmann > --- > arch/avr32/config.mk |2 +- > board/atmel/atngw100/config.mk |1 - > board/atmel/atstk1000/config.mk|1 - > board/earthlcd/favr-32-ezkit/config.mk |1 - > board/mimc/mimc200/config.mk |1 - > board/miromico/hammerhead/config.mk|1 - > 6 files changed, 1 insertions(+), 6 deletions(-) Applied to u-boot-atmel/next, thanks. Reinhard ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Beagle mux config: nCS5 vs. DMAREQ2?
Hi, The mux configuration in board/ti/beagle/beagle.h says MUX_VAL(CP(GPMC_NCS5), (IDIS | PTD | DIS | M0)) /*GPMC_nCS5*/ MUX_VAL(CP(GPMC_NCS6), (IEN | PTD | DIS | M1)) /*SYS_nDMA_REQ2*/ The TRM (spruf98p) says sys_ndmareq2 is mux mode 1 for ncs5, not ncs6. (Possibly not a concern for the BeagleBoard; I'm trying to get dmareq2 working on a custom 3730 board.) Thanks, Orjan -- Orjan Friberg FlatFrog Laboratories AB ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/3] ARM: don't panic if no flash is there
Le 18/04/2011 11:40, Loïc Minier a écrit : > Would it be possible to introduce a QEMU Versatile board in U-Boot > derived from the regular Versatile board's config? It would disable > the things that aren't (yet) supported in QEMU or too painful to > support. Either that or introduce a config option for versatile that will allow the same code to support both the real and the QEMUed version -- although I tend to side with Wolfgang in saying that the interest of QEMU is its ability to emulate systems, so if the real versatile has NOR, it should have it too under QEMU. Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] subscribe me to this list
Dear All, Please consider this as my request to join u-boot user's list. Regards, Ratheendran ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] subscribe me to this list
Hi, On Mon, 18 Apr 2011 16:59:13 +0530 Ratheendran R wrote: > Dear All, > > Please consider this as my request to join u-boot user's list. This is something you are supposed to do yourself. Please see [1] for more details. Best regards, Anatolij [1] 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
Re: [U-Boot] [PATCH 00/15] [REWORK AVR32/AT91] additional changes for avr32
Dear Andreas Bießmann,
> This series do some cleanup all avr32 boards. This series is on top of 'Get
> AVR32 boards working with partial linking' rebased to
> u-boot-atmel/rework110202.
>
> In summary the board specific config.mk and u-boot.lds files are deleted in
> favor of a version at architecture level. Theses files had all the same
> content cause they where pure copies of the atstk100x ones.
>
> I have splitted the patches to each board cause some of them should be
> actively maintained and the respectively maintainer should have a chance to
> give some feedback.
>
> Andreas Bießmann (15):
> avr32/config.mk: simplify PLATFORM_RELFLAGS
> avr32: use single linker script
> atngw100: fix "#define 1"
> atstk1002: fix "#define 1"
> atstk1003: fix "#define 1"
> atstk1004: fix "#define 1"
> atstk1006: fix "#define 1"
> favr-32-ezkit: fix "#define 1"
> hammerhead: fix "#define 1"
> mimc200: fix "#define 1"
> atngw100: move CONFIG_SYS_TEXT_BASE to header
> atstk100x: move CONFIG_SYS_TEXT_BASE to header
> favr-32-ezkit: move CONFIG_SYS_TEXT_BASE to header
> mimc200: move CONFIG_SYS_TEXT_BASE to header
> hammerhead: move CONFIG_SYS_TEXT_BASE to header
>
> arch/avr32/config.mk |4 +
> .../atmel/atstk1000 => arch/avr32/cpu}/u-boot.lds |0
> board/atmel/atngw100/config.mk |2 -
> board/atmel/atngw100/u-boot.lds| 72
>
> board/atmel/atstk1000/config.mk|3 -
> board/earthlcd/favr-32-ezkit/config.mk |3 -
> board/earthlcd/favr-32-ezkit/u-boot.lds| 70 ---
> board/mimc/mimc200/config.mk |2 -
> board/mimc/mimc200/u-boot.lds | 72
>
> board/miromico/hammerhead/config.mk|2 -
> board/miromico/hammerhead/u-boot.lds | 72
>
> include/configs/atngw100.h | 55 ---
> include/configs/atstk1002.h| 49 +++---
> include/configs/atstk1003.h| 43 ++--
> include/configs/atstk1004.h| 43 ++--
> include/configs/atstk1006.h| 49 +++---
> include/configs/favr-32-ezkit.h| 47 +++--
> include/configs/hammerhead.h | 49 +++---
> include/configs/mimc200.h | 57
> 19 files changed, 204 insertions(+), 490 deletions(-)
> rename {board/atmel/atstk1000 => arch/avr32/cpu}/u-boot.lds (100%)
> delete mode 100644 board/atmel/atngw100/config.mk
> delete mode 100644 board/atmel/atngw100/u-boot.lds
> delete mode 100644 board/atmel/atstk1000/config.mk
> delete mode 100644 board/earthlcd/favr-32-ezkit/config.mk
> delete mode 100644 board/earthlcd/favr-32-ezkit/u-boot.lds
> delete mode 100644 board/mimc/mimc200/config.mk
> delete mode 100644 board/mimc/mimc200/u-boot.lds
> delete mode 100644 board/miromico/hammerhead/config.mk
> delete mode 100644 board/miromico/hammerhead/u-boot.lds
Some of the patches did not apply. What did apply is now found in
u-boot-atmel/next2.
I have no idea why they do not apply, since the AVR32 part has not changed
since 110202.
Can you please rebase the series against next or resubmit the failed parts
against next2?
Best Regards,
Reinhard
reinhard@sieb:~/embedded/u-boot-atmel$ git am U-Boot-2-3-avr32-fix-linking.patch
Applying avr32: fix linking
reinhard@sieb:~/embedded/u-boot-atmel$ git am
U-Boot-01-15-avr32-config.mk-simplify-PLATFORM_RELFLAGS.patch
Applying avr32/config.mk: simplify PLATFORM_RELFLAGS
reinhard@sieb:~/embedded/u-boot-atmel$ git am
U-Boot-02-15-avr32-use-single-linker-script.patch
Applying avr32: use single linker script
error: patch failed: board/atmel/atngw100/u-boot.lds:1
error: board/atmel/atngw100/u-boot.lds: patch does not apply
error: patch failed: board/earthlcd/favr-32-ezkit/u-boot.lds:1
error: board/earthlcd/favr-32-ezkit/u-boot.lds: patch does not apply
error: patch failed: board/mimc/mimc200/u-boot.lds:1
error: board/mimc/mimc200/u-boot.lds: patch does not apply
error: patch failed: board/miromico/hammerhead/u-boot.lds:1
error: board/miromico/hammerhead/u-boot.lds: patch does not apply
Patch failed at 0001.
When you have resolved this problem run "git-am --resolved".
If you would prefer to skip this patch, instead run "git-am --skip".
reinhard@sieb:~/embedded/u-boot-atmel$ git am --skip
Nothing to do.
reinhard@sieb:~/embedded/u-boot-atmel$ git am
U-Boot-03-15-atngw100-fix-define--1.patch
Applying atngw100: fix "#define 1"
reinhard@sieb:~/embedded/u-boot-atmel$ git am
U-Boot-04-15-atstk1002-fix-define--1.patch
Applying atstk1002: fix "#define 1"
reinhard@sieb:~/embedded/u-boot-atmel$ git am
U-Boot-05-15-atstk1
Re: [U-Boot] [PATCH 00/15] [REWORK AVR32/AT91] additional changes for avr32
Dear Reinhard Meyer, Am 18.04.2011 14:49, schrieb Reinhard Meyer: > Dear Andreas Bießmann, > Some of the patches did not apply. What did apply is now found in > u-boot-atmel/next2. > > I have no idea why they do not apply, since the AVR32 part has not changed > since 110202. I can check that and will rebase on u-boot-atmel/next. BTW I personally dislike your inflationary creation of new branches. The last days I could not understand why there are that much reworkXXX branches for AT91 stuff. I hope only the one with latest timestamp is worth to work with. Isn't that reworked stuff already in next branch? Or are there some tasks not yet in next branch? > Can you please rebase the series against next or resubmit the failed parts > against next2? I will rebase on u-boot-atmel/next, you can delete next2 branch, it makes no sense to me. best regards Andreas Bießmann ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH V2 01/15] avr32/config.mk: simplify PLATFORM_RELFLAGS
This patch removes PLATFORM_RELFLAGS from board specific config.mk files and define them in arch specific config.mk file. Signed-off-by: Andreas Bießmann --- No changes since V1 arch/avr32/config.mk |2 ++ board/atmel/atngw100/config.mk |1 - board/atmel/atstk1000/config.mk|1 - board/earthlcd/favr-32-ezkit/config.mk |1 - board/mimc/mimc200/config.mk |1 - board/miromico/hammerhead/config.mk|1 - 6 files changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/avr32/config.mk b/arch/avr32/config.mk index 51b9995..eab4b49 100644 --- a/arch/avr32/config.mk +++ b/arch/avr32/config.mk @@ -26,4 +26,6 @@ CROSS_COMPILE ?= avr32-linux- STANDALONE_LOAD_ADDR = 0x PLATFORM_RELFLAGS += -ffixed-r5 -fPIC -mno-init-got -mrelax +PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections + LDFLAGS_u-boot = --gc-sections --relax diff --git a/board/atmel/atngw100/config.mk b/board/atmel/atngw100/config.mk index c3c7433..34b709a 100644 --- a/board/atmel/atngw100/config.mk +++ b/board/atmel/atngw100/config.mk @@ -1,2 +1 @@ CONFIG_SYS_TEXT_BASE = 0x -PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections diff --git a/board/atmel/atstk1000/config.mk b/board/atmel/atstk1000/config.mk index bec7b7d..bcc0886 100644 --- a/board/atmel/atstk1000/config.mk +++ b/board/atmel/atstk1000/config.mk @@ -1,3 +1,2 @@ -PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections CONFIG_SYS_TEXT_BASE = 0x LDSCRIPT = $(src)board/atmel/atstk1000/u-boot.lds diff --git a/board/earthlcd/favr-32-ezkit/config.mk b/board/earthlcd/favr-32-ezkit/config.mk index eb607ee..838660f 100644 --- a/board/earthlcd/favr-32-ezkit/config.mk +++ b/board/earthlcd/favr-32-ezkit/config.mk @@ -1,3 +1,2 @@ -PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections CONFIG_SYS_TEXT_BASE = 0x LDSCRIPT = $(src)board/earthlcd/favr-32-ezkit/u-boot.lds diff --git a/board/mimc/mimc200/config.mk b/board/mimc/mimc200/config.mk index c3c7433..34b709a 100644 --- a/board/mimc/mimc200/config.mk +++ b/board/mimc/mimc200/config.mk @@ -1,2 +1 @@ CONFIG_SYS_TEXT_BASE = 0x -PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections diff --git a/board/miromico/hammerhead/config.mk b/board/miromico/hammerhead/config.mk index c3c7433..34b709a 100644 --- a/board/miromico/hammerhead/config.mk +++ b/board/miromico/hammerhead/config.mk @@ -1,2 +1 @@ CONFIG_SYS_TEXT_BASE = 0x -PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections -- 1.7.2.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH V2 11/15] atngw100: move CONFIG_SYS_TEXT_BASE to header
Signed-off-by: Andreas Bießmann --- No changes since V1 board/atmel/atngw100/config.mk |1 - include/configs/atngw100.h |1 + 2 files changed, 1 insertions(+), 1 deletions(-) delete mode 100644 board/atmel/atngw100/config.mk diff --git a/board/atmel/atngw100/config.mk b/board/atmel/atngw100/config.mk deleted file mode 100644 index 34b709a..000 --- a/board/atmel/atngw100/config.mk +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SYS_TEXT_BASE = 0x diff --git a/include/configs/atngw100.h b/include/configs/atngw100.h index 70f1e8a..bda6eed 100644 --- a/include/configs/atngw100.h +++ b/include/configs/atngw100.h @@ -149,6 +149,7 @@ #define CONFIG_SYS_MAX_FLASH_SECT 135 #define CONFIG_SYS_MONITOR_BASECONFIG_SYS_FLASH_BASE +#define CONFIG_SYS_TEXT_BASE 0x #define CONFIG_SYS_INTRAM_BASE INTERNAL_SRAM_BASE #define CONFIG_SYS_INTRAM_SIZE INTERNAL_SRAM_SIZE -- 1.7.2.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH V2 13/15] favr-32-ezkit: move CONFIG_SYS_TEXT_BASE to header
Signed-off-by: Andreas Bießmann --- No changes since V1 board/earthlcd/favr-32-ezkit/config.mk |1 - include/configs/favr-32-ezkit.h|1 + 2 files changed, 1 insertions(+), 1 deletions(-) delete mode 100644 board/earthlcd/favr-32-ezkit/config.mk diff --git a/board/earthlcd/favr-32-ezkit/config.mk b/board/earthlcd/favr-32-ezkit/config.mk deleted file mode 100644 index 34b709a..000 --- a/board/earthlcd/favr-32-ezkit/config.mk +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SYS_TEXT_BASE = 0x diff --git a/include/configs/favr-32-ezkit.h b/include/configs/favr-32-ezkit.h index f364dad..4c30b39 100644 --- a/include/configs/favr-32-ezkit.h +++ b/include/configs/favr-32-ezkit.h @@ -170,6 +170,7 @@ #define CONFIG_SYS_MAX_FLASH_SECT 135 #define CONFIG_SYS_MONITOR_BASECONFIG_SYS_FLASH_BASE +#define CONFIG_SYS_TEXT_BASE 0x #define CONFIG_SYS_INTRAM_BASE INTERNAL_SRAM_BASE #define CONFIG_SYS_INTRAM_SIZE INTERNAL_SRAM_SIZE -- 1.7.2.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH V2 08/15] favr-32-ezkit: fix "#define XXXX 1"
Signed-off-by: Andreas Bießmann --- No changes since V1 include/configs/favr-32-ezkit.h | 46 +++--- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/include/configs/favr-32-ezkit.h b/include/configs/favr-32-ezkit.h index e723ad1..f364dad 100644 --- a/include/configs/favr-32-ezkit.h +++ b/include/configs/favr-32-ezkit.h @@ -24,12 +24,12 @@ #include -#define CONFIG_AVR32 1 -#define CONFIG_AT32AP 1 -#define CONFIG_AT32AP7000 1 -#define CONFIG_FAVR32_EZKIT1 +#define CONFIG_AVR32 +#define CONFIG_AT32AP +#define CONFIG_AT32AP7000 +#define CONFIG_FAVR32_EZKIT -#define CONFIG_FAVR32_EZKIT_EXT_FLASH 1 +#define CONFIG_FAVR32_EZKIT_EXT_FLASH /* * Timer clock frequency. We're using the CPU-internal COUNT register @@ -43,8 +43,8 @@ * PLL frequency. * (CONFIG_SYS_OSC0_HZ * CONFIG_SYS_PLL0_MUL) / CONFIG_SYS_PLL0_DIV = PLL MHz */ -#define CONFIG_PLL 1 -#define CONFIG_SYS_POWER_MANAGER 1 +#define CONFIG_PLL +#define CONFIG_SYS_POWER_MANAGER #define CONFIG_SYS_OSC0_HZ 2000 #define CONFIG_SYS_PLL0_DIV1 #define CONFIG_SYS_PLL0_MUL7 @@ -86,11 +86,11 @@ #define CONFIG_USART_ID3 /* User serviceable stuff */ -#define CONFIG_DOS_PARTITION 1 +#define CONFIG_DOS_PARTITION -#define CONFIG_CMDLINE_TAG 1 -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 +#define CONFIG_CMDLINE_TAG +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_INITRD_TAG #define CONFIG_STACKSIZE (2048) @@ -106,8 +106,8 @@ * data on the serial line may interrupt the boot sequence. */ #define CONFIG_BOOTDELAY 1 -#define CONFIG_AUTOBOOT1 -#define CONFIG_AUTOBOOT_KEYED 1 +#define CONFIG_AUTOBOOT +#define CONFIG_AUTOBOOT_KEYED #define CONFIG_AUTOBOOT_PROMPT \ "Press SPACE to abort autoboot in %d seconds\n", bootdelay #define CONFIG_AUTOBOOT_DELAY_STR "d" @@ -118,8 +118,8 @@ * should be generated and assigned to the environment variables * "ethaddr" and "eth1addr". This is normally done during production. */ -#define CONFIG_OVERWRITE_ETHADDR_ONCE 1 -#define CONFIG_NET_MULTI 1 +#define CONFIG_OVERWRITE_ETHADDR_ONCE +#define CONFIG_NET_MULTI /* * BOOTP options @@ -145,13 +145,13 @@ #undef CONFIG_CMD_SOURCE #undef CONFIG_CMD_XIMG -#define CONFIG_ATMEL_USART 1 -#define CONFIG_MACB1 -#define CONFIG_PORTMUX_PIO 1 +#define CONFIG_ATMEL_USART +#define CONFIG_MACB +#define CONFIG_PORTMUX_PIO #define CONFIG_SYS_NR_PIOS 5 -#define CONFIG_SYS_HSDRAMC 1 -#define CONFIG_MMC 1 -#define CONFIG_ATMEL_MCI 1 +#define CONFIG_SYS_HSDRAMC +#define CONFIG_MMC +#define CONFIG_ATMEL_MCI #define CONFIG_SYS_DCACHE_LINESZ 32 #define CONFIG_SYS_ICACHE_LINESZ 32 @@ -175,7 +175,7 @@ #define CONFIG_SYS_INTRAM_SIZE INTERNAL_SRAM_SIZE #define CONFIG_SYS_SDRAM_BASE EBI_SDRAM_BASE -#define CONFIG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SIZE65536 #define CONFIG_ENV_ADDR(CONFIG_SYS_FLASH_BASE + CONFIG_SYS_FLASH_SIZE - CONFIG_ENV_SIZE) @@ -193,7 +193,7 @@ #define CONFIG_SYS_CBSIZE 256 #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) -#define CONFIG_SYS_LONGHELP1 +#define CONFIG_SYS_LONGHELP #define CONFIG_SYS_MEMTEST_START EBI_SDRAM_BASE #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x70) -- 1.7.2.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH V2 15/15] hammerhead: move CONFIG_SYS_TEXT_BASE to header
Signed-off-by: Andreas Bießmann --- No changes since V1 board/miromico/hammerhead/config.mk |1 - include/configs/hammerhead.h|1 + 2 files changed, 1 insertions(+), 1 deletions(-) delete mode 100644 board/miromico/hammerhead/config.mk diff --git a/board/miromico/hammerhead/config.mk b/board/miromico/hammerhead/config.mk deleted file mode 100644 index 34b709a..000 --- a/board/miromico/hammerhead/config.mk +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SYS_TEXT_BASE = 0x diff --git a/include/configs/hammerhead.h b/include/configs/hammerhead.h index 5a2d146..bfdfc0a 100644 --- a/include/configs/hammerhead.h +++ b/include/configs/hammerhead.h @@ -141,6 +141,7 @@ #define CONFIG_SYS_MAX_FLASH_SECT 135 #define CONFIG_SYS_MONITOR_BASECONFIG_SYS_FLASH_BASE +#define CONFIG_SYS_TEXT_BASE 0x #define CONFIG_SYS_INTRAM_BASE 0x2400 #define CONFIG_SYS_INTRAM_SIZE 0x8000 -- 1.7.2.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH V2 07/15] atstk1006: fix "#define XXXX 1"
Signed-off-by: Andreas Bießmann --- No changes since V1 include/configs/atstk1006.h | 48 +- 1 files changed, 24 insertions(+), 24 deletions(-) diff --git a/include/configs/atstk1006.h b/include/configs/atstk1006.h index e8553fc..d681929 100644 --- a/include/configs/atstk1006.h +++ b/include/configs/atstk1006.h @@ -26,13 +26,13 @@ #include -#define CONFIG_AVR32 1 -#define CONFIG_AT32AP 1 -#define CONFIG_AT32AP7000 1 -#define CONFIG_ATSTK1006 1 -#define CONFIG_ATSTK1000 1 +#define CONFIG_AVR32 +#define CONFIG_AT32AP +#define CONFIG_AT32AP7000 +#define CONFIG_ATSTK1006 +#define CONFIG_ATSTK1000 -#define CONFIG_ATSTK1000_EXT_FLASH 1 +#define CONFIG_ATSTK1000_EXT_FLASH /* * Timer clock frequency. We're using the CPU-internal COUNT register @@ -46,8 +46,8 @@ * PLL frequency. * (CONFIG_SYS_OSC0_HZ * CONFIG_SYS_PLL0_MUL) / CONFIG_SYS_PLL0_DIV = PLL MHz */ -#define CONFIG_PLL 1 -#define CONFIG_SYS_POWER_MANAGER 1 +#define CONFIG_PLL +#define CONFIG_SYS_POWER_MANAGER #define CONFIG_SYS_OSC0_HZ 2000 #define CONFIG_SYS_PLL0_DIV1 #define CONFIG_SYS_PLL0_MUL7 @@ -89,11 +89,11 @@ #define CONFIG_USART_ID1 /* User serviceable stuff */ -#define CONFIG_DOS_PARTITION 1 +#define CONFIG_DOS_PARTITION -#define CONFIG_CMDLINE_TAG 1 -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 +#define CONFIG_CMDLINE_TAG +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_INITRD_TAG #define CONFIG_STACKSIZE (2048) @@ -109,8 +109,8 @@ * data on the serial line may interrupt the boot sequence. */ #define CONFIG_BOOTDELAY 1 -#define CONFIG_AUTOBOOT1 -#define CONFIG_AUTOBOOT_KEYED 1 +#define CONFIG_AUTOBOOT +#define CONFIG_AUTOBOOT_KEYED #define CONFIG_AUTOBOOT_PROMPT \ "Press SPACE to abort autoboot in %d seconds\n", bootdelay #define CONFIG_AUTOBOOT_DELAY_STR "d" @@ -121,8 +121,8 @@ * should be generated and assigned to the environment variables * "ethaddr" and "eth1addr". This is normally done during production. */ -#define CONFIG_OVERWRITE_ETHADDR_ONCE 1 -#define CONFIG_NET_MULTI 1 +#define CONFIG_OVERWRITE_ETHADDR_ONCE +#define CONFIG_NET_MULTI /* * BOOTP options @@ -148,13 +148,13 @@ #undef CONFIG_CMD_SOURCE #undef CONFIG_CMD_XIMG -#define CONFIG_ATMEL_USART 1 -#define CONFIG_MACB1 -#define CONFIG_PORTMUX_PIO 1 +#define CONFIG_ATMEL_USART +#define CONFIG_MACB +#define CONFIG_PORTMUX_PIO #define CONFIG_SYS_NR_PIOS 5 -#define CONFIG_SYS_HSDRAMC 1 -#define CONFIG_MMC 1 -#define CONFIG_ATMEL_MCI 1 +#define CONFIG_SYS_HSDRAMC +#define CONFIG_MMC +#define CONFIG_ATMEL_MCI #define CONFIG_SYS_DCACHE_LINESZ 32 #define CONFIG_SYS_ICACHE_LINESZ 32 @@ -178,7 +178,7 @@ #define CONFIG_SYS_INTRAM_SIZE INTERNAL_SRAM_SIZE #define CONFIG_SYS_SDRAM_BASE EBI_SDRAM_BASE -#define CONFIG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SIZE65536 #define CONFIG_ENV_ADDR(CONFIG_SYS_FLASH_BASE + CONFIG_SYS_FLASH_SIZE - CONFIG_ENV_SIZE) @@ -196,7 +196,7 @@ #define CONFIG_SYS_CBSIZE 256 #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) -#define CONFIG_SYS_LONGHELP1 +#define CONFIG_SYS_LONGHELP #define CONFIG_SYS_MEMTEST_START EBI_SDRAM_BASE #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x3f0) -- 1.7.2.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH-V2 1/2] at91: reworked support for meesc board
The meesc board support was broken. Within this opportunity, I completely
reworked the board files.
Signed-off-by: Daniel Gorsulowski
---
This patch is based on u-boot-atmel/rework101229 branch (minus the last 5
patches) plus the 'at91: fixed at91sam9263 system file' patch in
u-boot-atmel/next branch.
V2: -fixed commit description
board/esd/meesc/config.mk |1 -
board/esd/meesc/meesc.c | 49 ++-
boards.cfg|3 +-
include/configs/meesc.h | 208 ++---
4 files changed, 149 insertions(+), 112 deletions(-)
delete mode 100644 board/esd/meesc/config.mk
diff --git a/board/esd/meesc/config.mk b/board/esd/meesc/config.mk
deleted file mode 100644
index 2077692..000
--- a/board/esd/meesc/config.mk
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SYS_TEXT_BASE = 0x21f0
diff --git a/board/esd/meesc/meesc.c b/board/esd/meesc/meesc.c
index 41fa3e1..e016b68 100644
--- a/board/esd/meesc/meesc.c
+++ b/board/esd/meesc/meesc.c
@@ -3,7 +3,7 @@
* Stelian Pop
* Lead Tech Design
*
- * (C) Copyright 2009-2010
+ * (C) Copyright 2009-2011
* Daniel Gorsulowski
* esd electronic system design gmbh
*
@@ -27,7 +27,7 @@
*/
#include
-#include
+#include
#include
#include
#include
@@ -35,8 +35,6 @@
#include
#include
#include
-#include
-#include
#include
DECLARE_GLOBAL_DATA_PTR;
@@ -67,8 +65,8 @@ int get_hw_rev(void)
static void meesc_nand_hw_init(void)
{
unsigned long csa;
- at91_smc_t *smc= (at91_smc_t *) AT91_SMC0_BASE;
- at91_matrix_t *matrix = (at91_matrix_t *) AT91_MATRIX_BASE;
+ at91_smc_t *smc= (at91_smc_t *) ATMEL_BASE_SMC0;
+ at91_matrix_t *matrix = (at91_matrix_t *) ATMEL_BASE_MATRIX;
/* Enable CS3 */
csa = readl(&matrix->csa[0]) | AT91_MATRIX_CSA_EBI_CS3A;
@@ -88,7 +86,7 @@ static void meesc_nand_hw_init(void)
writel(AT91_SMC_MODE_RM_NRD | AT91_SMC_MODE_WM_NWE |
AT91_SMC_MODE_EXNW_DISABLE |
AT91_SMC_MODE_DBW_8 |
- AT91_SMC_MODE_TDF_CYCLE(2),
+ AT91_SMC_MODE_TDF_CYCLE(3),
&smc->cs[3].mode);
/* Configure RDY/BSY */
@@ -102,9 +100,9 @@ static void meesc_nand_hw_init(void)
#ifdef CONFIG_MACB
static void meesc_macb_hw_init(void)
{
- at91_pmc_t *pmc= (at91_pmc_t *) AT91_PMC_BASE;
+ at91_pmc_t *pmc= (at91_pmc_t *) ATMEL_BASE_PMC;
/* Enable clock */
- writel(1 << AT91SAM9263_ID_EMAC, &pmc->pcer);
+ writel(1 << ATMEL_ID_EMAC, &pmc->pcer);
at91_macb_hw_init();
}
#endif
@@ -117,7 +115,7 @@ static void meesc_macb_hw_init(void)
*/
static void meesc_ethercat_hw_init(void)
{
- at91_smc_t *smc1 = (at91_smc_t *) AT91_SMC1_BASE;
+ at91_smc_t *smc1 = (at91_smc_t *) ATMEL_BASE_SMC1;
/* Configure SMC EBI1_CS0 for EtherCAT */
writel(AT91_SMC_SETUP_NWE(0) | AT91_SMC_SETUP_NCS_WR(0) |
@@ -142,8 +140,9 @@ static void meesc_ethercat_hw_init(void)
int dram_init(void)
{
- gd->bd->bi_dram[0].start = PHYS_SDRAM;
- gd->bd->bi_dram[0].size = get_ram_size((long *) PHYS_SDRAM, (1 << 27));
+ gd->ram_size = get_ram_size(
+ (void *)CONFIG_SYS_SDRAM_BASE,
+ CONFIG_SYS_SDRAM_SIZE);
return 0;
}
@@ -151,7 +150,7 @@ int board_eth_init(bd_t *bis)
{
int rc = 0;
#ifdef CONFIG_MACB
- rc = macb_eth_initialize(0, (void *)AT91_EMAC_BASE, 0x00);
+ rc = macb_eth_initialize(0, (void *)ATMEL_BASE_EMAC, 0x00);
#endif
return rc;
}
@@ -225,7 +224,7 @@ int misc_init_r(void)
{
char*str;
charbuf[32];
- at91_pmc_t *pmc = (at91_pmc_t *) AT91_PMC_BASE;
+ at91_pmc_t *pmc = (at91_pmc_t *) ATMEL_BASE_PMC;
/*
* Normally the processor clock has a divisor of 2.
@@ -246,24 +245,28 @@ int misc_init_r(void)
}
#endif /* CONFIG_MISC_INIT_R */
-int board_init(void)
+int board_early_init_f(void)
{
- at91_pmc_t *pmc= (at91_pmc_t *) AT91_PMC_BASE;
+ at91_pmc_t *pmc= (at91_pmc_t *) ATMEL_BASE_PMC;
- /* Peripheral Clock Enable Register */
- writel(1 << AT91SAM9263_ID_PIOA |
- 1 << AT91SAM9263_ID_PIOB |
- 1 << AT91SAM9263_ID_PIOCDE |
- 1 << AT91SAM9263_ID_UHP,
+ /* enable all clocks */
+ writel((1 << ATMEL_ID_PIOA) | (1 << ATMEL_ID_PIOB) |
+ (1 << ATMEL_ID_PIOCDE) | (1 << ATMEL_ID_UHP),
&pmc->pcer);
+ at91_seriald_hw_init();
+
+ return 0;
+}
+
+int board_init(void)
+{
/* initialize ET1100 Controller */
meesc_ethercat_hw_init();
/* adress of boot parameters */
- gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
+ gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
- at91_serial_hw_init();
#ifdef CONFIG_CMD_NAND
meesc_nand_hw_init();
#endif
diff -
[U-Boot] [PATCH V2 09/15] hammerhead: fix "#define XXXX 1"
Signed-off-by: Andreas Bießmann --- No changes since V1 include/configs/hammerhead.h | 48 +- 1 files changed, 24 insertions(+), 24 deletions(-) diff --git a/include/configs/hammerhead.h b/include/configs/hammerhead.h index 1f20fff..5a2d146 100644 --- a/include/configs/hammerhead.h +++ b/include/configs/hammerhead.h @@ -24,10 +24,10 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_AVR32 1 -#define CONFIG_AT32AP 1 -#define CONFIG_AT32AP7000 1 -#define CONFIG_HAMMERHEAD 1 +#define CONFIG_AVR32 +#define CONFIG_AT32AP +#define CONFIG_AT32AP7000 +#define CONFIG_HAMMERHEAD #define CONFIG_SYS_HZ 1000 @@ -36,8 +36,8 @@ * frequency, the HSB and PBB busses to run at 1/2 the PLL frequency * and the PBA bus to run at 1/4 the PLL frequency. */ -#define CONFIG_PLL 1 -#define CONFIG_SYS_POWER_MANAGER 1 +#define CONFIG_PLL +#define CONFIG_SYS_POWER_MANAGER #define CONFIG_SYS_OSC0_HZ 2500 #define CONFIG_SYS_PLL0_DIV1 #define CONFIG_SYS_PLL0_MUL5 @@ -65,11 +65,11 @@ #define CONFIG_HOSTNAMEhammerhead /* User serviceable stuff */ -#define CONFIG_DOS_PARTITION 1 +#define CONFIG_DOS_PARTITION -#define CONFIG_CMDLINE_TAG 1 -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 +#define CONFIG_CMDLINE_TAG +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_INITRD_TAG #define CONFIG_STACKSIZE (2048) @@ -84,8 +84,8 @@ * data on the serial line may interrupt the boot sequence. */ #define CONFIG_BOOTDELAY 1 -#define CONFIG_AUTOBOOT1 -#define CONFIG_AUTOBOOT_KEYED 1 +#define CONFIG_AUTOBOOT +#define CONFIG_AUTOBOOT_KEYED #define CONFIG_AUTOBOOT_PROMPT \ "Press SPACE to abort autoboot in %d seconds\n", bootdelay #define CONFIG_AUTOBOOT_DELAY_STR "d" @@ -96,8 +96,8 @@ * should be generated and assigned to the environment variables * "ethaddr". This is normally done during production. */ -#define CONFIG_OVERWRITE_ETHADDR_ONCE 1 -#define CONFIG_NET_MULTI 1 +#define CONFIG_OVERWRITE_ETHADDR_ONCE +#define CONFIG_NET_MULTI /* * BOOTP/DHCP options @@ -119,21 +119,21 @@ #undef CONFIG_CMD_FPGA #undef CONFIG_CMD_SETGETDCR -#define CONFIG_ATMEL_USART 1 -#define CONFIG_MACB1 -#define CONFIG_PORTMUX_PIO 1 +#define CONFIG_ATMEL_USART +#define CONFIG_MACB +#define CONFIG_PORTMUX_PIO #define CONFIG_SYS_NR_PIOS 5 -#define CONFIG_SYS_HSDRAMC 1 -#define CONFIG_MMC 1 -#define CONFIG_ATMEL_MCI 1 +#define CONFIG_SYS_HSDRAMC +#define CONFIG_MMC +#define CONFIG_ATMEL_MCI #define CONFIG_SYS_DCACHE_LINESZ 32 #define CONFIG_SYS_ICACHE_LINESZ 32 #define CONFIG_NR_DRAM_BANKS 1 -#define CONFIG_SYS_FLASH_CFI 1 -#define CONFIG_FLASH_CFI_DRIVER1 +#define CONFIG_SYS_FLASH_CFI +#define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_BASE 0x #define CONFIG_SYS_FLASH_SIZE 0x80 @@ -147,7 +147,7 @@ #define CONFIG_SYS_SDRAM_BASE 0x1000 -#define CONFIG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SIZE65536 #define CONFIG_ENV_ADDR(CONFIG_SYS_FLASH_BASE + CONFIG_SYS_FLASH_SIZE - CONFIG_ENV_SIZE) @@ -166,7 +166,7 @@ #define CONFIG_SYS_CBSIZE 256 #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) -#define CONFIG_SYS_LONGHELP1 +#define CONFIG_SYS_LONGHELP #define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x1f0) -- 1.7.2.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH V2 03/15] atngw100: fix "#define XXXX 1"
Signed-off-by: Andreas Bießmann --- No changes since V1 include/configs/atngw100.h | 54 ++-- 1 files changed, 27 insertions(+), 27 deletions(-) diff --git a/include/configs/atngw100.h b/include/configs/atngw100.h index a93ba8b..70f1e8a 100644 --- a/include/configs/atngw100.h +++ b/include/configs/atngw100.h @@ -26,10 +26,10 @@ #include -#define CONFIG_AVR32 1 -#define CONFIG_AT32AP 1 -#define CONFIG_AT32AP7000 1 -#define CONFIG_ATNGW1001 +#define CONFIG_AVR32 +#define CONFIG_AT32AP +#define CONFIG_AT32AP7000 +#define CONFIG_ATNGW100 #define CONFIG_SYS_HZ 1000 @@ -38,8 +38,8 @@ * frequency, the HSB and PBB busses to run at 1/2 the PLL frequency * and the PBA bus to run at 1/4 the PLL frequency. */ -#define CONFIG_PLL 1 -#define CONFIG_SYS_POWER_MANAGER 1 +#define CONFIG_PLL +#define CONFIG_SYS_POWER_MANAGER #define CONFIG_SYS_OSC0_HZ 2000 #define CONFIG_SYS_PLL0_DIV1 #define CONFIG_SYS_PLL0_MUL7 @@ -64,11 +64,11 @@ #define CONFIG_USART_BASE ATMEL_BASE_USART1 #define CONFIG_USART_ID1 /* User serviceable stuff */ -#define CONFIG_DOS_PARTITION 1 +#define CONFIG_DOS_PARTITION -#define CONFIG_CMDLINE_TAG 1 -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 +#define CONFIG_CMDLINE_TAG +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_INITRD_TAG #define CONFIG_STACKSIZE (2048) @@ -83,8 +83,8 @@ * data on the serial line may interrupt the boot sequence. */ #define CONFIG_BOOTDELAY 1 -#define CONFIG_AUTOBOOT1 -#define CONFIG_AUTOBOOT_KEYED 1 +#define CONFIG_AUTOBOOT +#define CONFIG_AUTOBOOT_KEYED #define CONFIG_AUTOBOOT_PROMPT \ "Press SPACE to abort autoboot in %d seconds\n", bootdelay #define CONFIG_AUTOBOOT_DELAY_STR "d" @@ -95,8 +95,8 @@ * should be generated and assigned to the environment variables * "ethaddr" and "eth1addr". This is normally done during production. */ -#define CONFIG_OVERWRITE_ETHADDR_ONCE 1 -#define CONFIG_NET_MULTI 1 +#define CONFIG_OVERWRITE_ETHADDR_ONCE +#define CONFIG_NET_MULTI /* * BOOTP/DHCP options @@ -123,25 +123,25 @@ #undef CONFIG_CMD_SOURCE #undef CONFIG_CMD_XIMG -#define CONFIG_ATMEL_USART 1 -#define CONFIG_MACB1 -#define CONFIG_PORTMUX_PIO 1 +#define CONFIG_ATMEL_USART +#define CONFIG_MACB +#define CONFIG_PORTMUX_PIO #define CONFIG_SYS_NR_PIOS 5 -#define CONFIG_SYS_HSDRAMC 1 -#define CONFIG_MMC 1 -#define CONFIG_ATMEL_MCI 1 -#define CONFIG_ATMEL_SPI 1 +#define CONFIG_SYS_HSDRAMC +#define CONFIG_MMC +#define CONFIG_ATMEL_MCI +#define CONFIG_ATMEL_SPI -#define CONFIG_SPI_FLASH 1 -#define CONFIG_SPI_FLASH_ATMEL 1 +#define CONFIG_SPI_FLASH +#define CONFIG_SPI_FLASH_ATMEL #define CONFIG_SYS_DCACHE_LINESZ 32 #define CONFIG_SYS_ICACHE_LINESZ 32 #define CONFIG_NR_DRAM_BANKS 1 -#define CONFIG_SYS_FLASH_CFI 1 -#define CONFIG_FLASH_CFI_DRIVER1 +#define CONFIG_SYS_FLASH_CFI +#define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_BASE 0x #define CONFIG_SYS_FLASH_SIZE 0x80 @@ -154,7 +154,7 @@ #define CONFIG_SYS_INTRAM_SIZE INTERNAL_SRAM_SIZE #define CONFIG_SYS_SDRAM_BASE EBI_SDRAM_BASE -#define CONFIG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SIZE65536 #define CONFIG_ENV_ADDR(CONFIG_SYS_FLASH_BASE + CONFIG_SYS_FLASH_SIZE - CONFIG_ENV_SIZE) @@ -172,7 +172,7 @@ #define CONFIG_SYS_CBSIZE 256 #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) -#define CONFIG_SYS_LONGHELP1 +#define CONFIG_SYS_LONGHELP #define CONFIG_SYS_MEMTEST_START EBI_SDRAM_BASE #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x1f0) -- 1.7.2.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH V2 00/15] *** SUBJECT HERE ***
This series do some cleanup all avr32 boards. This series is on top of
u-boot-atmel/next 4c91fde1ddf92a9bd08175936971f98ad23b250e
All boards are build-tested (MAKEALL); atstk1002 is tested on my eval board.
In summary the board specific config.mk and u-boot.lds files are deleted in
favor of a version at architecture level. Theses files had all the same
content cause they where pure copies of the atstk100x ones.
I have splitted the patches to each board cause some of them should be
actively maintained and the respectively maintainer should have a chance to
give some feedback.
Andreas Bießmann (15):
avr32/config.mk: simplify PLATFORM_RELFLAGS
avr32: use single linker script
atngw100: fix "#define 1"
atstk1002: fix "#define 1"
atstk1003: fix "#define 1"
atstk1004: fix "#define 1"
atstk1006: fix "#define 1"
favr-32-ezkit: fix "#define 1"
hammerhead: fix "#define 1"
mimc200: fix "#define 1"
atngw100: move CONFIG_SYS_TEXT_BASE to header
atstk100x: move CONFIG_SYS_TEXT_BASE to header
favr-32-ezkit: move CONFIG_SYS_TEXT_BASE to header
mimc200: move CONFIG_SYS_TEXT_BASE to header
hammerhead: move CONFIG_SYS_TEXT_BASE to header
arch/avr32/config.mk |4 +
.../atmel/atstk1000 => arch/avr32/cpu}/u-boot.lds |0
board/atmel/atngw100/config.mk |2 -
board/atmel/atngw100/u-boot.lds| 72
board/atmel/atstk1000/config.mk|3 -
board/earthlcd/favr-32-ezkit/config.mk |3 -
board/earthlcd/favr-32-ezkit/u-boot.lds| 70 ---
board/mimc/mimc200/config.mk |2 -
board/mimc/mimc200/u-boot.lds | 72
board/miromico/hammerhead/config.mk|2 -
board/miromico/hammerhead/u-boot.lds | 72
include/configs/atngw100.h | 55 ---
include/configs/atstk1002.h| 49 +++---
include/configs/atstk1003.h| 43 ++--
include/configs/atstk1004.h| 43 ++--
include/configs/atstk1006.h| 49 +++---
include/configs/favr-32-ezkit.h| 47 +++--
include/configs/hammerhead.h | 49 +++---
include/configs/mimc200.h | 57
19 files changed, 204 insertions(+), 490 deletions(-)
rename {board/atmel/atstk1000 => arch/avr32/cpu}/u-boot.lds (100%)
delete mode 100644 board/atmel/atngw100/config.mk
delete mode 100644 board/atmel/atngw100/u-boot.lds
delete mode 100644 board/atmel/atstk1000/config.mk
delete mode 100644 board/earthlcd/favr-32-ezkit/config.mk
delete mode 100644 board/earthlcd/favr-32-ezkit/u-boot.lds
delete mode 100644 board/mimc/mimc200/config.mk
delete mode 100644 board/mimc/mimc200/u-boot.lds
delete mode 100644 board/miromico/hammerhead/config.mk
delete mode 100644 board/miromico/hammerhead/u-boot.lds
--
1.7.2.5
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH V2 04/15] atstk1002: fix "#define XXXX 1"
Signed-off-by: Andreas Bießmann --- No changes since V1 include/configs/atstk1002.h | 48 +- 1 files changed, 24 insertions(+), 24 deletions(-) diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h index ba1b56c..997e9dd 100644 --- a/include/configs/atstk1002.h +++ b/include/configs/atstk1002.h @@ -26,13 +26,13 @@ #include -#define CONFIG_AVR32 1 -#define CONFIG_AT32AP 1 -#define CONFIG_AT32AP7000 1 -#define CONFIG_ATSTK1002 1 -#define CONFIG_ATSTK1000 1 +#define CONFIG_AVR32 +#define CONFIG_AT32AP +#define CONFIG_AT32AP7000 +#define CONFIG_ATSTK1002 +#define CONFIG_ATSTK1000 -#define CONFIG_ATSTK1000_EXT_FLASH 1 +#define CONFIG_ATSTK1000_EXT_FLASH /* * Timer clock frequency. We're using the CPU-internal COUNT register @@ -46,8 +46,8 @@ * PLL frequency. * (CONFIG_SYS_OSC0_HZ * CONFIG_SYS_PLL0_MUL) / CONFIG_SYS_PLL0_DIV = PLL MHz */ -#define CONFIG_PLL 1 -#define CONFIG_SYS_POWER_MANAGER 1 +#define CONFIG_PLL +#define CONFIG_SYS_POWER_MANAGER #define CONFIG_SYS_OSC0_HZ 2000 #define CONFIG_SYS_PLL0_DIV1 #define CONFIG_SYS_PLL0_MUL7 @@ -89,11 +89,11 @@ #define CONFIG_USART_ID1 /* User serviceable stuff */ -#define CONFIG_DOS_PARTITION 1 +#define CONFIG_DOS_PARTITION -#define CONFIG_CMDLINE_TAG 1 -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 +#define CONFIG_CMDLINE_TAG +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_INITRD_TAG #define CONFIG_STACKSIZE (2048) @@ -109,8 +109,8 @@ * data on the serial line may interrupt the boot sequence. */ #define CONFIG_BOOTDELAY 1 -#define CONFIG_AUTOBOOT1 -#define CONFIG_AUTOBOOT_KEYED 1 +#define CONFIG_AUTOBOOT +#define CONFIG_AUTOBOOT_KEYED #define CONFIG_AUTOBOOT_PROMPT \ "Press SPACE to abort autoboot in %d seconds\n", bootdelay #define CONFIG_AUTOBOOT_DELAY_STR "d" @@ -121,8 +121,8 @@ * should be generated and assigned to the environment variables * "ethaddr" and "eth1addr". This is normally done during production. */ -#define CONFIG_OVERWRITE_ETHADDR_ONCE 1 -#define CONFIG_NET_MULTI 1 +#define CONFIG_OVERWRITE_ETHADDR_ONCE +#define CONFIG_NET_MULTI /* * BOOTP options @@ -148,13 +148,13 @@ #undef CONFIG_CMD_SOURCE #undef CONFIG_CMD_XIMG -#define CONFIG_ATMEL_USART 1 -#define CONFIG_MACB1 -#define CONFIG_PORTMUX_PIO 1 +#define CONFIG_ATMEL_USART +#define CONFIG_MACB +#define CONFIG_PORTMUX_PIO #define CONFIG_SYS_NR_PIOS 5 -#define CONFIG_SYS_HSDRAMC 1 -#define CONFIG_MMC 1 -#define CONFIG_ATMEL_MCI 1 +#define CONFIG_SYS_HSDRAMC +#define CONFIG_MMC +#define CONFIG_ATMEL_MCI #define CONFIG_SYS_DCACHE_LINESZ 32 #define CONFIG_SYS_ICACHE_LINESZ 32 @@ -178,7 +178,7 @@ #define CONFIG_SYS_INTRAM_SIZE INTERNAL_SRAM_SIZE #define CONFIG_SYS_SDRAM_BASE EBI_SDRAM_BASE -#define CONFIG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SIZE65536 #define CONFIG_ENV_ADDR(CONFIG_SYS_FLASH_BASE + CONFIG_SYS_FLASH_SIZE - CONFIG_ENV_SIZE) @@ -196,7 +196,7 @@ #define CONFIG_SYS_CBSIZE 256 #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) -#define CONFIG_SYS_LONGHELP1 +#define CONFIG_SYS_LONGHELP #define CONFIG_SYS_MEMTEST_START EBI_SDRAM_BASE #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x70) -- 1.7.2.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH V2 10/15] mimc200: fix "#define XXXX 1"
Signed-off-by: Andreas Bießmann --- No changes since V1 include/configs/mimc200.h | 56 ++-- 1 files changed, 28 insertions(+), 28 deletions(-) diff --git a/include/configs/mimc200.h b/include/configs/mimc200.h index f004ec8..66b9477 100644 --- a/include/configs/mimc200.h +++ b/include/configs/mimc200.h @@ -26,12 +26,12 @@ #include -#define CONFIG_AVR32 1 -#define CONFIG_AT32AP 1 -#define CONFIG_AT32AP7000 1 -#define CONFIG_MIMC200 1 +#define CONFIG_AVR32 +#define CONFIG_AT32AP +#define CONFIG_AT32AP7000 +#define CONFIG_MIMC200 -#define CONFIG_MIMC200_EXT_FLASH 1 +#define CONFIG_MIMC200_EXT_FLASH #define CONFIG_SYS_HZ 1000 @@ -40,8 +40,8 @@ * frequency, the HSB and PBB busses to run at 1/2 the PLL frequency * and the PBA bus to run at 1/4 the PLL frequency. */ -#define CONFIG_PLL 1 -#define CONFIG_SYS_POWER_MANAGER 1 +#define CONFIG_PLL +#define CONFIG_SYS_POWER_MANAGER #define CONFIG_SYS_OSC0_HZ 1000 #define CONFIG_SYS_PLL0_DIV1 #define CONFIG_SYS_PLL0_MUL15 @@ -69,11 +69,11 @@ #define CONFIG_MIMC200_DBGLINK 1 /* User serviceable stuff */ -#define CONFIG_DOS_PARTITION 1 +#define CONFIG_DOS_PARTITION -#define CONFIG_CMDLINE_TAG 1 -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 +#define CONFIG_CMDLINE_TAG +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_INITRD_TAG #define CONFIG_STACKSIZE (2048) @@ -83,9 +83,9 @@ #define CONFIG_BOOTCOMMAND \ "fsload boot/uImage; bootm" -#define CONFIG_SILENT_CONSOLE 1 /* enable silent startup */ -#define CONFIG_DISABLE_CONSOLE 1 /* disable console */ -#define CONFIG_SYS_DEVICE_NULLDEV 1 /* include nulldev device */ +#define CONFIG_SILENT_CONSOLE /* enable silent startup */ +#define CONFIG_DISABLE_CONSOLE /* disable console */ +#define CONFIG_SYS_DEVICE_NULLDEV /* include nulldev device */ #define CONFIG_LCD 1 @@ -94,16 +94,16 @@ * data on the serial line may interrupt the boot sequence. */ #define CONFIG_BOOTDELAY 0 -#define CONFIG_ZERO_BOOTDELAY_CHECK1 -#define CONFIG_AUTOBOOT1 +#define CONFIG_ZERO_BOOTDELAY_CHECK +#define CONFIG_AUTOBOOT /* * After booting the board for the first time, new ethernet addresses * should be generated and assigned to the environment variables * "ethaddr" and "eth1addr". This is normally done during production. */ -#define CONFIG_OVERWRITE_ETHADDR_ONCE 1 -#define CONFIG_NET_MULTI 1 +#define CONFIG_OVERWRITE_ETHADDR_ONCE +#define CONFIG_NET_MULTI /* * BOOTP/DHCP options @@ -124,13 +124,13 @@ #define CONFIG_CMD_MMC #define CONFIG_CMD_NET -#define CONFIG_ATMEL_USART 1 -#define CONFIG_MACB1 -#define CONFIG_PORTMUX_PIO 1 +#define CONFIG_ATMEL_USART +#define CONFIG_MACB +#define CONFIG_PORTMUX_PIO #define CONFIG_SYS_NR_PIOS 5 -#define CONFIG_SYS_HSDRAMC 1 -#define CONFIG_MMC 1 -#define CONFIG_ATMEL_MCI 1 +#define CONFIG_SYS_HSDRAMC +#define CONFIG_MMC +#define CONFIG_ATMEL_MCI #if defined(CONFIG_LCD) #define CONFIG_CMD_BMP @@ -151,8 +151,8 @@ #define CONFIG_NR_DRAM_BANKS 1 -#define CONFIG_SYS_FLASH_CFI 1 -#define CONFIG_FLASH_CFI_DRIVER1 +#define CONFIG_SYS_FLASH_CFI +#define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_BASE 0x #define CONFIG_SYS_FLASH_SIZE 0x80 @@ -168,7 +168,7 @@ #define CONFIG_SYS_FRAM_BASE 0x0800 #define CONFIG_SYS_FRAM_SIZE 0x2 -#define CONFIG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SIZE65536 #define CONFIG_ENV_ADDR(CONFIG_SYS_FLASH_BASE + CONFIG_SYS_FLASH_SIZE - CONFIG_ENV_SIZE) @@ -186,7 +186,7 @@ #define CONFIG_SYS_CBSIZE 256 #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) -#define CONFIG_SYS_LONGHELP1 +#define CONFIG_SYS_LONGHELP #define CONFIG_SYS_MEMTEST_START EBI_SDRAM_BASE #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x1f0) -- 1.7.2.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH V2 12/15] atstk100x: move CONFIG_SYS_TEXT_BASE to header
Signed-off-by: Andreas Bießmann --- No changes since V1 board/atmel/atstk1000/config.mk |1 - include/configs/atstk1002.h |1 + include/configs/atstk1003.h |1 + include/configs/atstk1004.h |1 + include/configs/atstk1006.h |1 + 5 files changed, 4 insertions(+), 1 deletions(-) delete mode 100644 board/atmel/atstk1000/config.mk diff --git a/board/atmel/atstk1000/config.mk b/board/atmel/atstk1000/config.mk deleted file mode 100644 index 34b709a..000 --- a/board/atmel/atstk1000/config.mk +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SYS_TEXT_BASE = 0x diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h index 997e9dd..c17d107 100644 --- a/include/configs/atstk1002.h +++ b/include/configs/atstk1002.h @@ -173,6 +173,7 @@ #define CONFIG_SYS_MAX_FLASH_SECT 135 #define CONFIG_SYS_MONITOR_BASECONFIG_SYS_FLASH_BASE +#define CONFIG_SYS_TEXT_BASE 0x #define CONFIG_SYS_INTRAM_BASE INTERNAL_SRAM_BASE #define CONFIG_SYS_INTRAM_SIZE INTERNAL_SRAM_SIZE diff --git a/include/configs/atstk1003.h b/include/configs/atstk1003.h index 9cc5cb9..a77d52e 100644 --- a/include/configs/atstk1003.h +++ b/include/configs/atstk1003.h @@ -156,6 +156,7 @@ #define CONFIG_SYS_MAX_FLASH_SECT 135 #define CONFIG_SYS_MONITOR_BASECONFIG_SYS_FLASH_BASE +#define CONFIG_SYS_TEXT_BASE 0x #define CONFIG_SYS_INTRAM_BASE INTERNAL_SRAM_BASE #define CONFIG_SYS_INTRAM_SIZE INTERNAL_SRAM_SIZE diff --git a/include/configs/atstk1004.h b/include/configs/atstk1004.h index a225395..cc00a0a 100644 --- a/include/configs/atstk1004.h +++ b/include/configs/atstk1004.h @@ -156,6 +156,7 @@ #define CONFIG_SYS_MAX_FLASH_SECT 135 #define CONFIG_SYS_MONITOR_BASECONFIG_SYS_FLASH_BASE +#define CONFIG_SYS_TEXT_BASE 0x #define CONFIG_SYS_INTRAM_BASE INTERNAL_SRAM_BASE #define CONFIG_SYS_INTRAM_SIZE INTERNAL_SRAM_SIZE diff --git a/include/configs/atstk1006.h b/include/configs/atstk1006.h index d681929..2cff140 100644 --- a/include/configs/atstk1006.h +++ b/include/configs/atstk1006.h @@ -173,6 +173,7 @@ #define CONFIG_SYS_MAX_FLASH_SECT 135 #define CONFIG_SYS_MONITOR_BASECONFIG_SYS_FLASH_BASE +#define CONFIG_SYS_TEXT_BASE 0x #define CONFIG_SYS_INTRAM_BASE INTERNAL_SRAM_BASE #define CONFIG_SYS_INTRAM_SIZE INTERNAL_SRAM_SIZE -- 1.7.2.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH V2 05/15] atstk1003: fix "#define XXXX 1"
Signed-off-by: Andreas Bießmann --- No changes since V1 include/configs/atstk1003.h | 42 +- 1 files changed, 21 insertions(+), 21 deletions(-) diff --git a/include/configs/atstk1003.h b/include/configs/atstk1003.h index 85337bf..9cc5cb9 100644 --- a/include/configs/atstk1003.h +++ b/include/configs/atstk1003.h @@ -26,13 +26,13 @@ #include -#define CONFIG_AVR32 1 -#define CONFIG_AT32AP 1 -#define CONFIG_AT32AP7001 1 -#define CONFIG_ATSTK1003 1 -#define CONFIG_ATSTK1000 1 +#define CONFIG_AVR32 +#define CONFIG_AT32AP +#define CONFIG_AT32AP7001 +#define CONFIG_ATSTK1003 +#define CONFIG_ATSTK1000 -#define CONFIG_ATSTK1000_EXT_FLASH 1 +#define CONFIG_ATSTK1000_EXT_FLASH /* * Timer clock frequency. We're using the CPU-internal COUNT register @@ -46,8 +46,8 @@ * PLL frequency. * (CONFIG_SYS_OSC0_HZ * CONFIG_SYS_PLL0_MUL) / CONFIG_SYS_PLL0_DIV = PLL MHz */ -#define CONFIG_PLL 1 -#define CONFIG_SYS_POWER_MANAGER 1 +#define CONFIG_PLL +#define CONFIG_SYS_POWER_MANAGER #define CONFIG_SYS_OSC0_HZ 2000 #define CONFIG_SYS_PLL0_DIV1 #define CONFIG_SYS_PLL0_MUL7 @@ -89,11 +89,11 @@ #define CONFIG_USART_ID1 /* User serviceable stuff */ -#define CONFIG_DOS_PARTITION 1 +#define CONFIG_DOS_PARTITION -#define CONFIG_CMDLINE_TAG 1 -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 +#define CONFIG_CMDLINE_TAG +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_INITRD_TAG #define CONFIG_STACKSIZE (2048) @@ -109,8 +109,8 @@ * data on the serial line may interrupt the boot sequence. */ #define CONFIG_BOOTDELAY 1 -#define CONFIG_AUTOBOOT1 -#define CONFIG_AUTOBOOT_KEYED 1 +#define CONFIG_AUTOBOOT +#define CONFIG_AUTOBOOT_KEYED #define CONFIG_AUTOBOOT_PROMPT \ "Press SPACE to abort autoboot in %d seconds\n", bootdelay #define CONFIG_AUTOBOOT_DELAY_STR "d" @@ -133,11 +133,11 @@ #undef CONFIG_CMD_SETGETDCR #undef CONFIG_CMD_XIMG -#define CONFIG_ATMEL_USART 1 -#define CONFIG_PORTMUX_PIO 1 -#define CONFIG_SYS_HSDRAMC 1 -#define CONFIG_MMC 1 -#define CONFIG_ATMEL_MCI 1 +#define CONFIG_ATMEL_USART +#define CONFIG_PORTMUX_PIO +#define CONFIG_SYS_HSDRAMC +#define CONFIG_MMC +#define CONFIG_ATMEL_MCI #define CONFIG_SYS_DCACHE_LINESZ 32 #define CONFIG_SYS_ICACHE_LINESZ 32 @@ -161,7 +161,7 @@ #define CONFIG_SYS_INTRAM_SIZE INTERNAL_SRAM_SIZE #define CONFIG_SYS_SDRAM_BASE EBI_SDRAM_BASE -#define CONFIG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SIZE65536 #define CONFIG_ENV_ADDR(CONFIG_SYS_FLASH_BASE + CONFIG_SYS_FLASH_SIZE - CONFIG_ENV_SIZE) @@ -178,7 +178,7 @@ #define CONFIG_SYS_CBSIZE 256 #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) -#define CONFIG_SYS_LONGHELP1 +#define CONFIG_SYS_LONGHELP #define CONFIG_SYS_MEMTEST_START EBI_SDRAM_BASE #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x70) -- 1.7.2.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH V2 06/15] atstk1004: fix "#define XXXX 1"
Signed-off-by: Andreas Bießmann --- No changes since V1 include/configs/atstk1004.h | 42 +- 1 files changed, 21 insertions(+), 21 deletions(-) diff --git a/include/configs/atstk1004.h b/include/configs/atstk1004.h index 344ba8f..a225395 100644 --- a/include/configs/atstk1004.h +++ b/include/configs/atstk1004.h @@ -26,13 +26,13 @@ #include -#define CONFIG_AVR32 1 -#define CONFIG_AT32AP 1 -#define CONFIG_AT32AP7002 1 -#define CONFIG_ATSTK1004 1 -#define CONFIG_ATSTK1000 1 +#define CONFIG_AVR32 +#define CONFIG_AT32AP +#define CONFIG_AT32AP7002 +#define CONFIG_ATSTK1004 +#define CONFIG_ATSTK1000 -#define CONFIG_ATSTK1000_EXT_FLASH 1 +#define CONFIG_ATSTK1000_EXT_FLASH /* * Timer clock frequency. We're using the CPU-internal COUNT register @@ -46,8 +46,8 @@ * PLL frequency. * (CONFIG_SYS_OSC0_HZ * CONFIG_SYS_PLL0_MUL) / CONFIG_SYS_PLL0_DIV = PLL MHz */ -#define CONFIG_PLL 1 -#define CONFIG_SYS_POWER_MANAGER 1 +#define CONFIG_PLL +#define CONFIG_SYS_POWER_MANAGER #define CONFIG_SYS_OSC0_HZ 2000 #define CONFIG_SYS_PLL0_DIV1 #define CONFIG_SYS_PLL0_MUL7 @@ -89,11 +89,11 @@ #define CONFIG_USART_ID1 /* User serviceable stuff */ -#define CONFIG_DOS_PARTITION 1 +#define CONFIG_DOS_PARTITION -#define CONFIG_CMDLINE_TAG 1 -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 +#define CONFIG_CMDLINE_TAG +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_INITRD_TAG #define CONFIG_STACKSIZE (2048) @@ -109,8 +109,8 @@ * data on the serial line may interrupt the boot sequence. */ #define CONFIG_BOOTDELAY 1 -#define CONFIG_AUTOBOOT1 -#define CONFIG_AUTOBOOT_KEYED 1 +#define CONFIG_AUTOBOOT +#define CONFIG_AUTOBOOT_KEYED #define CONFIG_AUTOBOOT_PROMPT \ "Press SPACE to abort autoboot in %d seconds\n", bootdelay #define CONFIG_AUTOBOOT_DELAY_STR "d" @@ -133,11 +133,11 @@ #undef CONFIG_CMD_SETGETDCR #undef CONFIG_CMD_XIMG -#define CONFIG_ATMEL_USART 1 -#define CONFIG_PORTMUX_PIO 1 -#define CONFIG_SYS_HSDRAMC 1 -#define CONFIG_MMC 1 -#define CONFIG_ATMEL_MCI 1 +#define CONFIG_ATMEL_USART +#define CONFIG_PORTMUX_PIO +#define CONFIG_SYS_HSDRAMC +#define CONFIG_MMC +#define CONFIG_ATMEL_MCI #define CONFIG_SYS_DCACHE_LINESZ 32 #define CONFIG_SYS_ICACHE_LINESZ 32 @@ -161,7 +161,7 @@ #define CONFIG_SYS_INTRAM_SIZE INTERNAL_SRAM_SIZE #define CONFIG_SYS_SDRAM_BASE EBI_SDRAM_BASE -#define CONFIG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SIZE65536 #define CONFIG_ENV_ADDR(CONFIG_SYS_FLASH_BASE + CONFIG_SYS_FLASH_SIZE - CONFIG_ENV_SIZE) @@ -178,7 +178,7 @@ #define CONFIG_SYS_CBSIZE 256 #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) -#define CONFIG_SYS_LONGHELP1 +#define CONFIG_SYS_LONGHELP #define CONFIG_SYS_MEMTEST_START EBI_SDRAM_BASE #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x70) -- 1.7.2.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH V2 14/15] mimc200: move CONFIG_SYS_TEXT_BASE to header
Signed-off-by: Andreas Bießmann --- No changes since V1 board/mimc/mimc200/config.mk |1 - include/configs/mimc200.h|1 + 2 files changed, 1 insertions(+), 1 deletions(-) delete mode 100644 board/mimc/mimc200/config.mk diff --git a/board/mimc/mimc200/config.mk b/board/mimc/mimc200/config.mk deleted file mode 100644 index 34b709a..000 --- a/board/mimc/mimc200/config.mk +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SYS_TEXT_BASE = 0x diff --git a/include/configs/mimc200.h b/include/configs/mimc200.h index 66b9477..6c52769 100644 --- a/include/configs/mimc200.h +++ b/include/configs/mimc200.h @@ -160,6 +160,7 @@ #define CONFIG_SYS_MAX_FLASH_SECT 135 #define CONFIG_SYS_MONITOR_BASECONFIG_SYS_FLASH_BASE +#define CONFIG_SYS_TEXT_BASE 0x #define CONFIG_SYS_INTRAM_BASE INTERNAL_SRAM_BASE #define CONFIG_SYS_INTRAM_SIZE INTERNAL_SRAM_SIZE -- 1.7.2.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH V2 02/15] avr32: use single linker script
This patch move the atstk100x linker script to $(CPUDIR) and delete other
pure copies of this file in each board directory.
Signed-off-by: Andreas Bießmann
---
Changes since V1:
- use LDSCRIPT = ... in favor of LDSCRIPT := ...
- rebased on u-boot-atmel/next (dunno why this was necessary, there where no
changes upstream since lkast submission)
arch/avr32/config.mk |2 +
.../atmel/atstk1000 => arch/avr32/cpu}/u-boot.lds |0
board/atmel/atngw100/u-boot.lds| 72
board/atmel/atstk1000/config.mk|1 -
board/earthlcd/favr-32-ezkit/config.mk |1 -
board/earthlcd/favr-32-ezkit/u-boot.lds| 70 ---
board/mimc/mimc200/u-boot.lds | 72
board/miromico/hammerhead/u-boot.lds | 72
8 files changed, 2 insertions(+), 288 deletions(-)
rename {board/atmel/atstk1000 => arch/avr32/cpu}/u-boot.lds (100%)
delete mode 100644 board/atmel/atngw100/u-boot.lds
delete mode 100644 board/earthlcd/favr-32-ezkit/u-boot.lds
delete mode 100644 board/mimc/mimc200/u-boot.lds
delete mode 100644 board/miromico/hammerhead/u-boot.lds
diff --git a/arch/avr32/config.mk b/arch/avr32/config.mk
index eab4b49..f640769 100644
--- a/arch/avr32/config.mk
+++ b/arch/avr32/config.mk
@@ -29,3 +29,5 @@ PLATFORM_RELFLAGS += -ffixed-r5 -fPIC -mno-init-got
-mrelax
PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections
LDFLAGS_u-boot = --gc-sections --relax
+
+LDSCRIPT = $(SRCTREE)/$(CPUDIR)/u-boot.lds
diff --git a/board/atmel/atstk1000/u-boot.lds b/arch/avr32/cpu/u-boot.lds
similarity index 100%
rename from board/atmel/atstk1000/u-boot.lds
rename to arch/avr32/cpu/u-boot.lds
diff --git a/board/atmel/atngw100/u-boot.lds b/board/atmel/atngw100/u-boot.lds
deleted file mode 100644
index 0a1a8e1..000
--- a/board/atmel/atngw100/u-boot.lds
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -*- Fundamental -*-
- *
- * Copyright (C) 2005-2006 Atmel 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
- */
-OUTPUT_FORMAT("elf32-avr32", "elf32-avr32", "elf32-avr32")
-OUTPUT_ARCH(avr32)
-ENTRY(_start)
-
-SECTIONS
-{
- . = 0;
- _text = .;
- .text : {
- *(.exception.text)
- *(.text)
- *(.text.*)
- }
- _etext = .;
-
- .rodata : {
- *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
- }
-
- . = ALIGN(8);
- _data = .;
- .data : {
- *(.data)
- *(.data.*)
- }
-
- . = ALIGN(4);
- __u_boot_cmd_start = .;
- .u_boot_cmd : {
- KEEP(*(.u_boot_cmd))
- }
- __u_boot_cmd_end = .;
-
- . = ALIGN(4);
- _got = .;
- .got : {
- *(.got)
- }
- _egot = .;
-
- . = ALIGN(8);
- _edata = .;
-
- .bss : {
- *(.bss)
- *(.bss.*)
- }
- . = ALIGN(8);
- __bss_end__ = .;
-}
diff --git a/board/atmel/atstk1000/config.mk b/board/atmel/atstk1000/config.mk
index bcc0886..34b709a 100644
--- a/board/atmel/atstk1000/config.mk
+++ b/board/atmel/atstk1000/config.mk
@@ -1,2 +1 @@
CONFIG_SYS_TEXT_BASE = 0x
-LDSCRIPT = $(src)board/atmel/atstk1000/u-boot.lds
diff --git a/board/earthlcd/favr-32-ezkit/config.mk
b/board/earthlcd/favr-32-ezkit/config.mk
index 838660f..34b709a 100644
--- a/board/earthlcd/favr-32-ezkit/config.mk
+++ b/board/earthlcd/favr-32-ezkit/config.mk
@@ -1,2 +1 @@
CONFIG_SYS_TEXT_BASE = 0x
-LDSCRIPT = $(src)board/earthlcd/favr-32-ezkit/u-boot.lds
diff --git a/board/earthlcd/favr-32-ezkit/u-boot.lds
b/board/earthlcd/favr-32-ezkit/u-boot.lds
deleted file mode 100644
index 20e3631..000
--- a/board/earthlcd/favr-32-ezkit/u-boot.lds
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- Fundamental -*-
- *
- * Copyright (C) 2008 Atmel 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 Genera
[U-Boot] [PATCH-V2 2/2] at91: reworked support for otc570 board
The otc570 board support was broken. Within this opportunity, I completely
reworked the board files.
Signed-off-by: Daniel Gorsulowski
---
This patch is based on u-boot-atmel/rework101229 branch (minus the last 5
patches) plus the 'at91: fixed at91sam9263 system file' patch in
u-boot-atmel/next branch.
V2: -fixed commit description
board/esd/otc570/config.mk |1 -
board/esd/otc570/otc570.c | 106 ++
boards.cfg |3 +-
include/configs/otc570.h | 265 +---
4 files changed, 211 insertions(+), 164 deletions(-)
delete mode 100644 board/esd/otc570/config.mk
diff --git a/board/esd/otc570/config.mk b/board/esd/otc570/config.mk
deleted file mode 100644
index e554a45..000
--- a/board/esd/otc570/config.mk
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SYS_TEXT_BASE = 0x23f0
diff --git a/board/esd/otc570/otc570.c b/board/esd/otc570/otc570.c
index 410d8b4..f025fc9 100644
--- a/board/esd/otc570/otc570.c
+++ b/board/esd/otc570/otc570.c
@@ -1,5 +1,5 @@
/*
- * (C) Copyright 2010
+ * (C) Copyright 2010-2011
* Daniel Gorsulowski
* esd electronic system design gmbh
*
@@ -27,7 +27,7 @@
*/
#include
-#include
+#include
#include
#include
#include
@@ -35,14 +35,14 @@
#include
#include
#include
-#include
-#include
-#include
-#include
#include
-#ifdef CONFIG_LCD_INFO
-#include
-#include
+#ifdef CONFIG_LCD
+# include
+# include
+# ifdef CONFIG_LCD_INFO
+# include
+# include
+# endif
#endif
DECLARE_GLOBAL_DATA_PTR;
@@ -73,8 +73,8 @@ int get_hw_rev(void)
static void otc570_nand_hw_init(void)
{
unsigned long csa;
- at91_smc_t *smc= (at91_smc_t *) AT91_SMC0_BASE;
- at91_matrix_t *matrix = (at91_matrix_t *) AT91_MATRIX_BASE;
+ at91_smc_t *smc= (at91_smc_t *) ATMEL_BASE_SMC0;
+ at91_matrix_t *matrix = (at91_matrix_t *) ATMEL_BASE_MATRIX;
/* Enable CS3 */
csa = readl(&matrix->csa[0]) | AT91_MATRIX_CSA_EBI_CS3A;
@@ -93,8 +93,8 @@ static void otc570_nand_hw_init(void)
&smc->cs[3].cycle);
writel(AT91_SMC_MODE_RM_NRD | AT91_SMC_MODE_WM_NWE |
AT91_SMC_MODE_EXNW_DISABLE |
- AT91_SMC_MODE_DBW_8 |
- AT91_SMC_MODE_TDF_CYCLE(2),
+ AT91_SMC_MODE_DBW_8 |
+ AT91_SMC_MODE_TDF_CYCLE(3),
&smc->cs[3].mode);
/* Configure RDY/BSY */
@@ -108,9 +108,9 @@ static void otc570_nand_hw_init(void)
#ifdef CONFIG_MACB
static void otc570_macb_hw_init(void)
{
- at91_pmc_t *pmc= (at91_pmc_t *) AT91_PMC_BASE;
+ at91_pmc_t *pmc= (at91_pmc_t *) ATMEL_BASE_PMC;
/* Enable clock */
- writel(1 << AT91SAM9263_ID_EMAC, &pmc->pcer);
+ writel(1 << ATMEL_ID_EMAC, &pmc->pcer);
at91_macb_hw_init();
}
#endif
@@ -123,7 +123,7 @@ static void otc570_macb_hw_init(void)
*/
static void otc570_ethercat_hw_init(void)
{
- at91_smc_t *smc1 = (at91_smc_t *) AT91_SMC1_BASE;
+ at91_smc_t *smc1 = (at91_smc_t *) ATMEL_BASE_SMC1;
/* Configure SMC EBI1_CS0 for EtherCAT */
writel(AT91_SMC_SETUP_NWE(0) | AT91_SMC_SETUP_NCS_WR(0) |
@@ -155,7 +155,7 @@ vidinfo_t panel_info = {
.vl_sync = ATMEL_LCDC_INVLINE_INVERTED |
ATMEL_LCDC_INVFRAME_INVERTED,
- .vl_bpix = 3, /* Bits per pixel, 0 = 1bit, 3 = 8bit */
+ .vl_bpix = LCD_BPP,/* Bits per pixel, 0 = 1bit, 3 = 8bit */
.vl_tft = 1, /* 0 = passive, 1 = TFT */
.vl_vsync_len = 1, /* Length of vertical sync in NOL */
.vl_upper_margin = 35, /* Idle lines at the frame start */
@@ -164,22 +164,22 @@ vidinfo_t panel_info = {
.vl_left_margin = 112,/* Idle cycles at the line beginning */
.vl_right_margin = 1, /* Idle cycles at the end of the line */
- .mmio = AT91SAM9263_LCDC_BASE,
+ .mmio = ATMEL_BASE_LCDC,
};
void lcd_enable(void)
{
- at91_set_pio_value(AT91_PIO_PORTA, 30, 0); /* power up */
+ at91_set_pio_value(AT91_PIO_PORTA, 30, 0); /* power up */
}
void lcd_disable(void)
{
- at91_set_pio_value(AT91_PIO_PORTA, 30, 1); /* power down */
+ at91_set_pio_value(AT91_PIO_PORTA, 30, 1); /* power down */
}
static void otc570_lcd_hw_init(void)
{
- at91_pmc_t *pmc= (at91_pmc_t *) AT91_PMC_BASE;
+ at91_pmc_t *pmc= (at91_pmc_t *) ATMEL_BASE_PMC;
at91_set_a_periph(AT91_PIO_PORTC, 0, 0);/* LCDVSYNC */
at91_set_a_periph(AT91_PIO_PORTC, 1, 0);/* LCDHSYNC */
@@ -206,8 +206,7 @@ static void otc570_lcd_hw_init(void)
at91_set_a_periph(AT91_PIO_PORTC, 27, 0); /* LCDD23 */
at91_set_pio_output(AT91_PIO_PORTA, 30, 1); /* PCI */
- writel(1 << AT91SAM9263_ID_LCDC, &pmc-
Re: [U-Boot] [Patch v1] ARMV7: AM3517/05: Add support for CraneBoard.
Dear Wolfgang,
I did not receive any comments for this patch, Please let us know your
suggestions/comments/acceptance.
With Regards
Srinath
-Original Message-
From: srin...@mistralsolutions.com [mailto:srin...@mistralsolutions.com]
Sent: Friday, April 01, 2011 6:13 PM
To: u-boot@lists.denx.de
Cc: w...@denx.de; nagen...@mistralsolutions.com; ume...@mistralsolutions.com;
Srinath
Subject: [U-Boot][Patch v1] ARMV7: AM3517/05: Add support for CraneBoard.
From: Srinath
It is a low cost reference design based on Sitara AM3517 SoC from Texas
Instruments
Please refer to for more details.
Signed-off-by: Srinath
---
MAINTAINERS|4 +
MAKEALL|1 +
board/ti/am3517crane/Makefile | 46
board/ti/am3517crane/am3517crane.c | 75 +++
board/ti/am3517crane/am3517crane.h | 395
board/ti/am3517crane/config.mk | 29 +++
boards.cfg |1 +
include/configs/am3517_crane.h | 340 +++
8 files changed, 891 insertions(+), 0 deletions(-)
create mode 100644 board/ti/am3517crane/Makefile
create mode 100644 board/ti/am3517crane/am3517crane.c
create mode 100644 board/ti/am3517crane/am3517crane.h
create mode 100644 board/ti/am3517crane/config.mk
create mode 100644 include/configs/am3517_crane.h
diff --git a/MAINTAINERS b/MAINTAINERS
index 4756f14..13cbc95 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -726,6 +726,10 @@ Eric Millbrandt
galaxy5200 mpc5200
+Nagendra T S
+
+ am3517_craneARM ARMV7 (AM35x SoC)
+
Rolf Offermanns
shannon SA1100
diff --git a/MAKEALL b/MAKEALL
index a732e6a..cb59b22 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -418,6 +418,7 @@ LIST_ARM11="\
## ARMV7 Systems
#
LIST_ARMV7=" \
+ am3517_crane\
am3517_evm \
ca9x4_ct_vxp\
devkit8000 \
diff --git a/board/ti/am3517crane/Makefile b/board/ti/am3517crane/Makefile
new file mode 100644
index 000..1fe2bca
--- /dev/null
+++ b/board/ti/am3517crane/Makefile
@@ -0,0 +1,46 @@
+#
+# Author: Srinath R
+#
+# Based on logicpd/am3517evm/Makefile
+#
+# Copyright (C) 2011 Mistral Solutions Pvt Ltd
+#
+# 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+
+include $(TOPDIR)/config.mk
+
+LIB= $(obj)lib$(BOARD).o
+
+COBJS := am3517crane.o
+
+SRCS := $(COBJS:.o=.c)
+OBJS := $(addprefix $(obj),$(COBJS))
+
+$(LIB):$(obj).depend $(OBJS)
+ $(call cmd_link_o_target, $(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/board/ti/am3517crane/am3517crane.c
b/board/ti/am3517crane/am3517crane.c
new file mode 100644
index 000..d007044
--- /dev/null
+++ b/board/ti/am3517crane/am3517crane.c
@@ -0,0 +1,75 @@
+/*
+ * am3517crane.c - board file for AM3517 CraneBoard
+ *
+ * Author: Srinath.R
+ *
+ * Based on logicpd/am3517evm/am3517evm.c
+ *
+ * Copyright (C) 2011 Mistral Solutions Pvt Ltd
+ *
+ * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include "am3517crane.h"
+
+DECLARE_GLOBAL_DATA_PTR;
+
+/*
+ * Routine: board_init
+ * Description: Early hardware init.
+ */
+int board_init(void)
+{
+ gpmc_init(); /* in SRAM or SDRAM, finish GPMC */
+ /* bo
[U-Boot] [PATCHv2 1/2] MMC: make b_max unconditional
Make existing field b_max field in struct mmc unconditional
and use it instead of CONFIG_SYS_MMC_MAX_BLK_COUNT in mmc_bread
and mmc_bwrite.
Initialize b_max to CONFIG_SYS_MMC_MAX_BLK_COUNT in mmc_register
if it has not been initialized by the hw driver.
Initialize b_max to 0 in all callers to mmc_register.
Signed-off-by: John Rigby
---
V2: Split generic b_max support from omap specific use of b_max
drivers/mmc/bfin_sdh.c |2 ++
drivers/mmc/davinci_mmc.c |3 +--
drivers/mmc/gen_atmel_mci.c |2 ++
drivers/mmc/mmc.c |8
drivers/mmc/mxcmmc.c|2 ++
drivers/mmc/omap_hsmmc.c|2 ++
drivers/mmc/s5p_mmc.c |1 +
include/mmc.h |2 --
8 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/drivers/mmc/bfin_sdh.c b/drivers/mmc/bfin_sdh.c
index 31b6459..bc9057f 100644
--- a/drivers/mmc/bfin_sdh.c
+++ b/drivers/mmc/bfin_sdh.c
@@ -257,6 +257,8 @@ int bfin_mmc_init(bd_t *bis)
mmc->f_min = mmc->f_max >> 9;
mmc->block_dev.part_type = PART_TYPE_DOS;
+ mmc->b_max = 0;
+
mmc_register(mmc);
return 0;
diff --git a/drivers/mmc/davinci_mmc.c b/drivers/mmc/davinci_mmc.c
index d5d19eb..5d918e6 100644
--- a/drivers/mmc/davinci_mmc.c
+++ b/drivers/mmc/davinci_mmc.c
@@ -394,9 +394,8 @@ int davinci_mmc_init(bd_t *bis, struct davinci_mmc *host)
mmc->voltages = host->voltages;
mmc->host_caps = host->host_caps;
-#ifdef CONFIG_MMC_MBLOCK
mmc->b_max = DAVINCI_MAX_BLOCKS;
-#endif
+
mmc_register(mmc);
return 0;
diff --git a/drivers/mmc/gen_atmel_mci.c b/drivers/mmc/gen_atmel_mci.c
index 2984d64..6577925 100644
--- a/drivers/mmc/gen_atmel_mci.c
+++ b/drivers/mmc/gen_atmel_mci.c
@@ -348,6 +348,8 @@ int atmel_mci_init(void *regs)
mmc->f_min = get_mci_clk_rate() / (2*256);
mmc->f_max = get_mci_clk_rate() / (2*1);
+ mmc->b_max = 0;
+
mmc_register(mmc);
return 0;
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index f27b7c7..f6d31f5 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -243,8 +243,7 @@ mmc_bwrite(int dev_num, ulong start, lbaint_t blkcnt, const
void*src)
return 0;
do {
- cur = (blocks_todo > CONFIG_SYS_MMC_MAX_BLK_COUNT) ?
- CONFIG_SYS_MMC_MAX_BLK_COUNT : blocks_todo;
+ cur = (blocks_todo > mmc->b_max) ? mmc->b_max : blocks_todo;
if(mmc_write_blocks(mmc, start, cur, src) != cur)
return 0;
blocks_todo -= cur;
@@ -320,8 +319,7 @@ static ulong mmc_bread(int dev_num, ulong start, lbaint_t
blkcnt, void *dst)
return 0;
do {
- cur = (blocks_todo > CONFIG_SYS_MMC_MAX_BLK_COUNT) ?
- CONFIG_SYS_MMC_MAX_BLK_COUNT : blocks_todo;
+ cur = (blocks_todo > mmc->b_max) ? mmc->b_max : blocks_todo;
if(mmc_read_blocks(mmc, dst, start, cur) != cur)
return 0;
blocks_todo -= cur;
@@ -1029,6 +1027,8 @@ int mmc_register(struct mmc *mmc)
mmc->block_dev.removable = 1;
mmc->block_dev.block_read = mmc_bread;
mmc->block_dev.block_write = mmc_bwrite;
+ if (!mmc->b_max)
+ mmc->b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT;
INIT_LIST_HEAD (&mmc->link);
diff --git a/drivers/mmc/mxcmmc.c b/drivers/mmc/mxcmmc.c
index 5963953..ab1fc82 100644
--- a/drivers/mmc/mxcmmc.c
+++ b/drivers/mmc/mxcmmc.c
@@ -511,6 +511,8 @@ static int mxcmci_initialize(bd_t *bis)
mmc->f_min = imx_get_perclk2() >> 7;
mmc->f_max = imx_get_perclk2() >> 1;
+ mmc->b_max = 0;
+
mmc_register(mmc);
return 0;
diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c
index 6f2280a..dcbde89 100644
--- a/drivers/mmc/omap_hsmmc.c
+++ b/drivers/mmc/omap_hsmmc.c
@@ -465,6 +465,8 @@ int omap_mmc_init(int dev_index)
mmc->f_min = 40;
mmc->f_max = 5200;
+ mmc->b_max = 0;
+
mmc_register(mmc);
return 0;
diff --git a/drivers/mmc/s5p_mmc.c b/drivers/mmc/s5p_mmc.c
index 0323800..668c28b 100644
--- a/drivers/mmc/s5p_mmc.c
+++ b/drivers/mmc/s5p_mmc.c
@@ -466,6 +466,7 @@ static int s5p_mmc_initialize(int dev_index, int bus_width)
mmc_host[dev_index].clock = 0;
mmc_host[dev_index].reg = s5p_get_base_mmc(dev_index);
+ mmc->m_bmax = 0;
mmc_register(mmc);
return 0;
diff --git a/include/mmc.h b/include/mmc.h
index e0a56d9..b4197a7 100644
--- a/include/mmc.h
+++ b/include/mmc.h
@@ -283,9 +283,7 @@ struct mmc {
struct mmc_cmd *cmd, struct mmc_data *data);
void (*set_ios)(struct mmc *mmc);
int (*init)(struct mmc *mmc);
-#ifdef CONFIG_MMC_MBLOCK
uint b_max;
-#endif
};
int mmc_register(struct mmc *mmc);
--
1.7.1
___
U-Boot mailing list
U-Boot@lists.denx.de
ht
[U-Boot] [PATCHv2 2/2] mmc: omap_hsmmc.c: disable multiblock rw on old rev omap34xx silicon
Signed-off-by: John Rigby --- V2: split out omap_hsmmc use of b_max into separate patch drivers/mmc/omap_hsmmc.c |8 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c index dcbde89..a2a6d55 100644 --- a/drivers/mmc/omap_hsmmc.c +++ b/drivers/mmc/omap_hsmmc.c @@ -467,6 +467,14 @@ int omap_mmc_init(int dev_index) mmc->b_max = 0; +#if defined(CONFIG_OMAP34XX) + /* +* Silicon revs 2.1 and older do not support multiblock transfers. +*/ + if (get_cpu_rev() <= CPU_3XX_ES21) + mmc->b_max = 1; +#endif + mmc_register(mmc); return 0; -- 1.7.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 0/6] TFTP server
Hi,
here's the tftpsrv patch series, with checkpatch warnings fixed.
Only patches 2 and 3 are actually changed. Patch 1 is unchanged and patches 4-6
have been simply rebased.
There are still a few checkpatch issues (!), though, that I think can be ignored
and I'm not going to fix unless there's a specific request.
Here they are:
> WARNING: consider using kstrto* in preference to simple_strtol
> #125: FILE: net/tftp.c:619:
> + TftpRemotePort = simple_strtol(ep, NULL, 10);
Which is Linux-only
> WARNING: do not add new typedefs
> #61: FILE: include/net.h:367:
> +typedef enum { BOOTP, RARP, ARP, TFTP, DHCP, PING, DNS, NFS, CDP, NETCONS,
> SNTP,
Is a typedef *enum* considered bad in U-Boot?
Luca
Luca Ceresoli (6):
README: remove spurious line
NET: pass source IP address to packet handlers
TFTP: rename "server" to "remote"
TFTP: rename STATE_RRQ to STATE_SEND_RRQ
TFTP: net/tftp.c: add server mode receive
TFTP: add tftpsrv command
README |2 +-
common/cmd_net.c | 14 +
drivers/net/netconsole.c |5 +-
include/net.h| 18 +--
net/bootp.c |9 ++-
net/dns.c|2 +-
net/net.c| 40 +--
net/nfs.c|2 +-
net/rarp.c |3 +-
net/sntp.c |3 +-
net/tftp.c | 123 +++---
net/tftp.h |6 ++
12 files changed, 167 insertions(+), 60 deletions(-)
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 1/6] README: remove spurious line
Signed-off-by: Luca Ceresoli Cc: Wolfgang Denk --- Changes in v2: none. README |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/README b/README index 4917e26..b9b0fcb 100644 --- a/README +++ b/README @@ -1299,7 +1299,6 @@ The following options need to be configured: driver in use must provide a function: mcast() to join/leave a multicast group. - CONFIG_BOOTP_RANDOM_DELAY - BOOTP Recovery Mode: CONFIG_BOOTP_RANDOM_DELAY -- 1.7.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 2/6] NET: pass source IP address to packet handlers
This is needed for the upcoming TFTP server implementation.
This also simplifies PingHandler() and fixes rxhand_f documentation.
Signed-off-by: Luca Ceresoli
Cc: Wolfgang Denk
---
Changes in v2:
- fixed checkpatch issues.
drivers/net/netconsole.c |5 +++--
include/net.h| 15 ++-
net/bootp.c |9 ++---
net/dns.c|2 +-
net/net.c| 30 +-
net/nfs.c|2 +-
net/rarp.c |3 ++-
net/sntp.c |3 ++-
net/tftp.c |3 ++-
9 files changed, 44 insertions(+), 28 deletions(-)
diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index e27bb3e..e40efb8 100644
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -40,13 +40,14 @@ static short nc_port; /*
source/target port */
static const char *output_packet; /* used by first send udp */
static int output_packet_len = 0;
-static void nc_wait_arp_handler (uchar * pkt, unsigned dest, unsigned src,
+static void nc_wait_arp_handler(uchar *pkt, unsigned dest,
+IPaddr_t sip, unsigned src,
unsigned len)
{
NetState = NETLOOP_SUCCESS; /* got arp reply - quit net loop */
}
-static void nc_handler (uchar * pkt, unsigned dest, unsigned src,
+static void nc_handler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src,
unsigned len)
{
if (input_size)
diff --git a/include/net.h b/include/net.h
index 95ef8ab..01f7159 100644
--- a/include/net.h
+++ b/include/net.h
@@ -72,12 +72,17 @@
typedef ulong IPaddr_t;
-/*
- * The current receive packet handler. Called with a pointer to the
- * application packet, and a protocol type (PORT_BOOTPC or PORT_TFTP).
- * All other packets are dealt with without calling the handler.
+/**
+ * An incoming packet handler.
+ * @param pktpointer to the application packet
+ * @param dport destination UDP port
+ * @param sipsource IP address
+ * @param sport source UDP port
+ * @param lenpacket length
*/
-typedef void rxhand_f(uchar *, unsigned, unsigned, unsigned);
+typedef void rxhand_f(uchar *pkt, unsigned dport,
+ IPaddr_t sip, unsigned sport,
+ unsigned len);
/*
* A timeout handler. Called after time interval has expired.
diff --git a/net/bootp.c b/net/bootp.c
index 87b027e..4db63cb 100644
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -44,7 +44,8 @@ ulong seed1, seed2;
dhcp_state_t dhcp_state = INIT;
unsigned long dhcp_leasetime = 0;
IPaddr_t NetDHCPServerIP = 0;
-static void DhcpHandler(uchar * pkt, unsigned dest, unsigned src, unsigned
len);
+static void DhcpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src,
+ unsigned len);
/* For Debug */
#if 0
@@ -282,7 +283,8 @@ static void BootpVendorProcess (u8 * ext, int size)
* Handle a BOOTP received packet.
*/
static void
-BootpHandler(uchar * pkt, unsigned dest, unsigned src, unsigned len)
+BootpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src,
+unsigned len)
{
Bootp_t *bp;
char*s;
@@ -858,7 +860,8 @@ static void DhcpSendRequestPkt(Bootp_t *bp_offer)
* Handle DHCP received packets.
*/
static void
-DhcpHandler(uchar * pkt, unsigned dest, unsigned src, unsigned len)
+DhcpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src,
+ unsigned len)
{
Bootp_t *bp = (Bootp_t *)pkt;
diff --git a/net/dns.c b/net/dns.c
index bb3e3f5..b51d1bd 100644
--- a/net/dns.c
+++ b/net/dns.c
@@ -101,7 +101,7 @@ DnsTimeout(void)
}
static void
-DnsHandler(uchar *pkt, unsigned dest, unsigned src, unsigned len)
+DnsHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src, unsigned len)
{
struct header *header;
const unsigned char *p, *e, *s;
diff --git a/net/net.c b/net/net.c
index a609632..132f99b 100644
--- a/net/net.c
+++ b/net/net.c
@@ -555,7 +555,8 @@ startAgainTimeout(void)
}
static void
-startAgainHandler(uchar * pkt, unsigned dest, unsigned src, unsigned len)
+startAgainHandler(uchar *pkt, unsigned dest, IPaddr_t sip,
+ unsigned src, unsigned len)
{
/* Totally ignore the packet */
}
@@ -752,13 +753,10 @@ PingTimeout (void)
}
static void
-PingHandler (uchar * pkt, unsigned dest, unsigned src, unsigned len)
+PingHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src,
+ unsigned len)
{
- IPaddr_t tmp;
- volatile IP_t *ip = (volatile IP_t *)pkt;
-
- tmp = NetReadIP((void *)&ip->ip_src);
- if (tmp != NetPingIP)
+ if (sip != NetPingIP)
return;
NetState = NETLOOP_SUCCESS;
@@ -990,7 +988,8 @@ CDPTimeout (void)
}
static void
-CDPDummyHandler (uchar * pkt, unsigned dest, unsigned src, unsigned len)
+CDPDummyHandler(uchar *pkt, unsigned dest,
[U-Boot] [PATCH v2 3/6] TFTP: rename "server" to "remote"
With the upcoming TFTP server implementation, the remote node can be
either a client or a server, so avoid ambiguities.
Signed-off-by: Luca Ceresoli
Cc: Wolfgang Denk
---
Changes in v2:
- fixed checkpatch issues.
net/tftp.c | 42 +-
1 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/net/tftp.c b/net/tftp.c
index 00abec3..da545c6 100644
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -55,18 +55,18 @@ enum {
TFTP_ERR_FILE_ALREADY_EXISTS = 6,
};
-static IPaddr_t TftpServerIP;
-static int TftpServerPort; /* The UDP port at their end
*/
-static int TftpOurPort;/* The UDP port at our end
*/
+static IPaddr_t TftpRemoteIP;
+static int TftpRemotePort; /* The UDP port at their end*/
+static int TftpOurPort;/* The UDP port at our end */
static int TftpTimeoutCount;
-static ulong TftpBlock; /* packet sequence number
*/
-static ulong TftpLastBlock; /* last packet sequence number received
*/
-static ulong TftpBlockWrap; /* count of sequence number wraparounds
*/
-static ulong TftpBlockWrapOffset;/* memory offset due to wrapping
*/
+static ulong TftpBlock; /* packet sequence number */
+static ulong TftpLastBlock; /* last packet sequence number received */
+static ulong TftpBlockWrap; /* count of sequence number wraparounds */
+static ulong TftpBlockWrapOffset; /* memory offset due to wrapping */
static int TftpState;
#ifdef CONFIG_TFTP_TSIZE
-static int TftpTsize; /* The file size reported by the server
*/
-static short TftpNumchars; /* The number of hashes we printed
*/
+static int TftpTsize; /* The file size reported by the server */
+static short TftpNumchars; /* The number of hashes we printed */
#endif
#define STATE_RRQ 1
@@ -273,7 +273,8 @@ TftpSend (void)
break;
}
- NetSendUDPPacket(NetServerEther, TftpServerIP, TftpServerPort,
TftpOurPort, len);
+ NetSendUDPPacket(NetServerEther, TftpRemoteIP, TftpRemotePort,
+TftpOurPort, len);
}
@@ -292,9 +293,8 @@ TftpHandler(uchar *pkt, unsigned dest, IPaddr_t sip,
unsigned src,
#endif
return;
}
- if (TftpState != STATE_RRQ && src != TftpServerPort) {
+ if (TftpState != STATE_RRQ && src != TftpRemotePort)
return;
- }
if (len < 2) {
return;
@@ -318,7 +318,7 @@ TftpHandler(uchar *pkt, unsigned dest, IPaddr_t sip,
unsigned src,
pkt,
pkt + strlen((char *)pkt) + 1);
TftpState = STATE_OACK;
- TftpServerPort = src;
+ TftpRemotePort = src;
/*
* Check for 'blksize' option.
* Careful: "i" is signed, "len" is unsigned, thus
@@ -386,7 +386,7 @@ TftpHandler(uchar *pkt, unsigned dest, IPaddr_t sip,
unsigned src,
if (TftpState == STATE_RRQ || TftpState == STATE_OACK) {
/* first block received */
TftpState = STATE_DATA;
- TftpServerPort = src;
+ TftpRemotePort = src;
TftpLastBlock = 0;
TftpBlockWrap = 0;
TftpBlockWrapOffset = 0;
@@ -421,7 +421,7 @@ TftpHandler(uchar *pkt, unsigned dest, IPaddr_t sip,
unsigned src,
/*
* Acknoledge the block just received, which will prompt
-* the server for the next one.
+* the remote for the next one.
*/
#ifdef CONFIG_MCAST_TFTP
/* if I am the MasterClient, actively calculate what my next
@@ -548,7 +548,7 @@ TftpStart (void)
debug("TFTP blocksize = %i, timeout = %ld ms\n",
TftpBlkSizeOption, TftpTimeoutMSecs);
- TftpServerIP = NetServerIP;
+ TftpRemoteIP = NetServerIP;
if (BootFile[0] == '\0') {
sprintf(default_filename, "%02lX%02lX%02lX%02lX.img",
NetOurIP & 0xFF,
@@ -568,7 +568,7 @@ TftpStart (void)
strncpy(tftp_filename, BootFile, MAX_LEN);
tftp_filename[MAX_LEN-1] = 0;
} else {
- TftpServerIP = string_to_ip (BootFile);
+ TftpRemoteIP = string_to_ip(BootFile);
strncpy(tftp_filename, p + 1, MAX_LEN);
tftp_filename[MAX_LEN-1] = 0;
}
@@ -578,12 +578,12 @@ TftpStart (void)
printf ("Using %s device\n", eth_get_name());
#endif
printf("TFTP from server %pI4"
- "; our IP address is %pI4", &TftpServerIP, &NetOurIP);
+ "; our IP address is %pI4", &TftpRemoteIP, &Ne
[U-Boot] [PATCH v2 4/6] TFTP: rename STATE_RRQ to STATE_SEND_RRQ
With the upcoming TFTP server implementation, requests can be either
outgoing or incoming, so avoid ambiguities.
Signed-off-by: Luca Ceresoli
Cc: Wolfgang Denk
---
Changes in v2: none.
net/tftp.c | 12 ++--
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/net/tftp.c b/net/tftp.c
index da545c6..e166a63 100644
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -69,7 +69,7 @@ static intTftpTsize; /* The file size reported by
the server */
static short TftpNumchars; /* The number of hashes we printed */
#endif
-#define STATE_RRQ 1
+#define STATE_SEND_RRQ 1
#define STATE_DATA 2
#define STATE_TOO_LARGE3
#define STATE_BAD_MAGIC4
@@ -200,7 +200,7 @@ TftpSend (void)
switch (TftpState) {
- case STATE_RRQ:
+ case STATE_SEND_RRQ:
xp = pkt;
s = (ushort *)pkt;
*s++ = htons(TFTP_RRQ);
@@ -293,7 +293,7 @@ TftpHandler(uchar *pkt, unsigned dest, IPaddr_t sip,
unsigned src,
#endif
return;
}
- if (TftpState != STATE_RRQ && src != TftpRemotePort)
+ if (TftpState != STATE_SEND_RRQ && src != TftpRemotePort)
return;
if (len < 2) {
@@ -380,10 +380,10 @@ TftpHandler(uchar *pkt, unsigned dest, IPaddr_t sip,
unsigned src,
}
}
- if (TftpState == STATE_RRQ)
+ if (TftpState == STATE_SEND_RRQ)
debug("Server did not acknowledge timeout option!\n");
- if (TftpState == STATE_RRQ || TftpState == STATE_OACK) {
+ if (TftpState == STATE_SEND_RRQ || TftpState == STATE_OACK) {
/* first block received */
TftpState = STATE_DATA;
TftpRemotePort = src;
@@ -610,7 +610,7 @@ TftpStart (void)
TftpRemotePort = WELL_KNOWN_PORT;
TftpTimeoutCount = 0;
- TftpState = STATE_RRQ;
+ TftpState = STATE_SEND_RRQ;
/* Use a pseudo-random port unless a specific port is set */
TftpOurPort = 1024 + (get_timer(0) % 3072);
--
1.7.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 6/6] TFTP: add tftpsrv command
Signed-off-by: Luca Ceresoli
Cc: Wolfgang Denk
---
Changes in v2: none.
README |1 +
common/cmd_net.c | 14 ++
include/net.h|3 ++-
net/net.c| 10 --
4 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/README b/README
index b9b0fcb..83dcb2a 100644
--- a/README
+++ b/README
@@ -685,6 +685,7 @@ The following options need to be configured:
(requires CONFIG_CMD_MEMORY)
CONFIG_CMD_SOURCE "source" command Support
CONFIG_CMD_SPI * SPI serial bus support
+ CONFIG_CMD_TFTPSRV * TFTP transfer in server mode
CONFIG_CMD_USB * USB support
CONFIG_CMD_VFD * VFD support (TRAB)
CONFIG_CMD_CDP * Cisco Discover Protocol support
diff --git a/common/cmd_net.c b/common/cmd_net.c
index 8c6f5c8..053162a 100644
--- a/common/cmd_net.c
+++ b/common/cmd_net.c
@@ -52,6 +52,20 @@ U_BOOT_CMD(
"[loadAddress] [[hostIPaddr:]bootfilename]"
);
+#ifdef CONFIG_CMD_TFTPSRV
+int do_tftpsrv(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+{
+ return netboot_common(TFTPSRV, cmdtp, argc, argv);
+}
+
+U_BOOT_CMD(
+ tftpsrv,2, 1, do_tftpsrv,
+ "boot image via network acting as a TFTP server",
+ "[loadAddress]"
+);
+#endif
+
+
#ifdef CONFIG_CMD_RARP
int do_rarpb (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
diff --git a/include/net.h b/include/net.h
index 01f7159..018a744 100644
--- a/include/net.h
+++ b/include/net.h
@@ -364,7 +364,8 @@ extern int NetState; /* Network loop
state */
extern int NetRestartWrap; /* Tried all network devices
*/
#endif
-typedef enum { BOOTP, RARP, ARP, TFTP, DHCP, PING, DNS, NFS, CDP, NETCONS,
SNTP } proto_t;
+typedef enum { BOOTP, RARP, ARP, TFTP, DHCP, PING, DNS, NFS, CDP, NETCONS,
SNTP,
+ TFTPSRV } proto_t;
/* from net/net.c */
extern charBootFile[128]; /* Boot File name
*/
diff --git a/net/net.c b/net/net.c
index 132f99b..17eb06f 100644
--- a/net/net.c
+++ b/net/net.c
@@ -388,7 +388,11 @@ restart:
/* always use ARP to get server ethernet address */
TftpStart();
break;
-
+#ifdef CONFIG_CMD_TFTPSRV
+ case TFTPSRV:
+ TftpStartServer();
+ break;
+#endif
#if defined(CONFIG_CMD_DHCP)
case DHCP:
BootpTry = 0;
@@ -1731,7 +1735,9 @@ static int net_check_prereq (proto_t protocol)
#if defined(CONFIG_CMD_PING) || defined(CONFIG_CMD_SNTP)
common:
#endif
-
+#ifdef CONFIG_CMD_TFTPSRV
+ case TFTPSRV:
+#endif
if (NetOurIP == 0) {
puts ("*** ERROR: `ipaddr' not set\n");
return (1);
--
1.7.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 5/6] TFTP: net/tftp.c: add server mode receive
Signed-off-by: Luca Ceresoli
Cc: Wolfgang Denk
---
Changes in v2: none.
net/tftp.c | 72 ---
net/tftp.h |6 +
2 files changed, 74 insertions(+), 4 deletions(-)
diff --git a/net/tftp.c b/net/tftp.c
index e166a63..87eb0b8 100644
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -2,6 +2,8 @@
* Copyright 1994, 1995, 2000 Neil Russell.
* (See License)
* Copyright 2000, 2001 DENX Software Engineering, Wolfgang Denk,
w...@denx.de
+ * Copyright 2011 Comelit Group SpA,
+ *Luca Ceresoli
*/
#include
@@ -74,6 +76,7 @@ static short TftpNumchars; /* The number of hashes we
printed */
#define STATE_TOO_LARGE3
#define STATE_BAD_MAGIC4
#define STATE_OACK 5
+#define STATE_RECV_WRQ 6
#define TFTP_BLOCK_SIZE512 /* default TFTP
block size */
#define TFTP_SEQUENCE_SIZE ((ulong)(1<<16))/* sequence number is 16
bit */
@@ -241,6 +244,10 @@ TftpSend (void)
TftpBlock=ext2_find_next_zero_bit(Bitmap,(Mapsize*8),0);
/*..falling..*/
#endif
+
+#ifdef CONFIG_CMD_TFTPSRV
+ case STATE_RECV_WRQ:
+#endif
case STATE_DATA:
xp = pkt;
s = (ushort *)pkt;
@@ -293,7 +300,11 @@ TftpHandler(uchar *pkt, unsigned dest, IPaddr_t sip,
unsigned src,
#endif
return;
}
- if (TftpState != STATE_SEND_RRQ && src != TftpRemotePort)
+ if (TftpState != STATE_SEND_RRQ &&
+#ifdef CONFIG_CMD_TFTPSRV
+ TftpState != STATE_RECV_WRQ &&
+#endif
+ src != TftpRemotePort)
return;
if (len < 2) {
@@ -307,12 +318,24 @@ TftpHandler(uchar *pkt, unsigned dest, IPaddr_t sip,
unsigned src,
switch (ntohs(proto)) {
case TFTP_RRQ:
- case TFTP_WRQ:
case TFTP_ACK:
break;
default:
break;
+#ifdef CONFIG_CMD_TFTPSRV
+ case TFTP_WRQ:
+ debug("Got WRQ\n");
+ TftpRemoteIP = sip;
+ TftpRemotePort = src;
+ TftpOurPort = 1024 + (get_timer(0) % 3072);
+ TftpLastBlock = 0;
+ TftpBlockWrap = 0;
+ TftpBlockWrapOffset = 0;
+ TftpSend(); /* Send ACK(0) */
+ break;
+#endif
+
case TFTP_OACK:
debug("Got OACK: %s %s\n",
pkt,
@@ -383,7 +406,11 @@ TftpHandler(uchar *pkt, unsigned dest, IPaddr_t sip,
unsigned src,
if (TftpState == STATE_SEND_RRQ)
debug("Server did not acknowledge timeout option!\n");
- if (TftpState == STATE_SEND_RRQ || TftpState == STATE_OACK) {
+ if (TftpState == STATE_SEND_RRQ ||
+#ifdef CONFIG_CMD_TFTPSRV
+ TftpState == STATE_RECV_WRQ ||
+#endif
+ TftpState == STATE_OACK) {
/* first block received */
TftpState = STATE_DATA;
TftpRemotePort = src;
@@ -518,7 +545,10 @@ TftpTimeout (void)
} else {
puts ("T ");
NetSetTimeout (TftpTimeoutMSecs, TftpTimeout);
- TftpSend ();
+#ifdef CONFIG_CMD_TFTPSRV
+ if (TftpState != STATE_RECV_WRQ)
+#endif
+ TftpSend();
}
}
@@ -639,6 +669,40 @@ TftpStart (void)
TftpSend ();
}
+#ifdef CONFIG_CMD_TFTPSRV
+void
+TftpStartServer(void)
+{
+ tftp_filename[0] = 0;
+
+#if defined(CONFIG_NET_MULTI)
+ printf("Using %s device\n", eth_get_name());
+#endif
+ printf("Listening for TFTP transfer on %pI4\n", &NetOurIP);
+ printf("Load address: 0x%lx\n", load_addr);
+
+ puts("Loading: *\b");
+
+ TftpTimeoutCountMax = TIMEOUT_COUNT;
+ TftpTimeoutCount = 0;
+ TftpTimeoutMSecs = TIMEOUT;
+ NetSetTimeout(TftpTimeoutMSecs, TftpTimeout);
+
+ /* Revert TftpBlkSize to dflt */
+ TftpBlkSize = TFTP_BLOCK_SIZE;
+ TftpBlock = 0;
+ TftpOurPort = WELL_KNOWN_PORT;
+
+#ifdef CONFIG_TFTP_TSIZE
+ TftpTsize = 0;
+ TftpNumchars = 0;
+#endif
+
+ TftpState = STATE_RECV_WRQ;
+ NetSetHandler(TftpHandler);
+}
+#endif /* CONFIG_CMD_TFTPSRV */
+
#ifdef CONFIG_MCAST_TFTP
/* Credits: atftp project.
*/
diff --git a/net/tftp.h b/net/tftp.h
index e3dfb26..3abdf7b 100644
--- a/net/tftp.h
+++ b/net/tftp.h
@@ -2,6 +2,8 @@
* LiMon - BOOTP/TFTP.
*
* Copyright 1994, 1995, 2000 Neil Russell.
+ * Copyright 2011 Comelit Group SpA
+ *Luca Ceresoli
* (See License)
*/
@@ -16,6 +18,10 @@
/* tftp.c */
extern voidTftpStart (void); /* Begin TFTP get */
+#ifdef CONFIG_CMD_TFTPSRV
+extern voidTftpStartServer(void); /* Wait for incoming TFTP put */
+#endif
+
/**/
#endif /* __TFTP_H__ */
--
1.7.1
_
[U-Boot] [PATCH] MX31: mx31pdk: Make the board name simpler.
Signed-off-by: Fabio Estevam
---
board/freescale/mx31pdk/mx31pdk.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/board/freescale/mx31pdk/mx31pdk.c
b/board/freescale/mx31pdk/mx31pdk.c
index 3f291fc..826fb4a 100644
--- a/board/freescale/mx31pdk/mx31pdk.c
+++ b/board/freescale/mx31pdk/mx31pdk.c
@@ -70,7 +70,7 @@ int board_init(void)
int checkboard(void)
{
- printf("Board: i.MX31 MAX PDK (3DS)\n");
+ printf("Board: MX31PDK\n");
return 0;
}
--
1.6.0.4
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v5] MX31: Introduce get_reset_cause()
Signed-off-by: Fabio Estevam
---
Changes since v4:
- Make get_reset_cause CPU specific code and no need to
add any board specific call.
arch/arm/cpu/arm1136/mx31/generic.c | 29 -
1 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/arch/arm/cpu/arm1136/mx31/generic.c
b/arch/arm/cpu/arm1136/mx31/generic.c
index 9b7a7a2..a92731e 100644
--- a/arch/arm/cpu/arm1136/mx31/generic.c
+++ b/arch/arm/cpu/arm1136/mx31/generic.c
@@ -132,11 +132,38 @@ char *get_cpu_rev(void)
return "unknown";
}
+char *get_reset_cause(void)
+{
+ /* read RCSR register from CCM module */
+ struct clock_control_regs *ccm =
+ (struct clock_control_regs *)CCM_BASE;
+
+ u32 cause = readl(&ccm->rcsr) & 0x07;
+
+ switch (cause) {
+ case 0x:
+ return "POR";
+ break;
+ case 0x0001:
+ return "RST";
+ break;
+ case 0x0002:
+ return "WDOG";
+ break;
+ case 0x0006:
+ return "JTAG";
+ break;
+ default:
+ return "unknown reset";
+ }
+}
+
#if defined(CONFIG_DISPLAY_CPUINFO)
int print_cpuinfo (void)
{
- printf("CPU: Freescale i.MX31 rev %s at %d MHz\n",
+ printf("CPU: Freescale i.MX31 rev %s at %d MHz.",
get_cpu_rev(), mx31_get_mcu_main_clk() / 100);
+ printf("Reset cause: %s\n", get_reset_cause());
return 0;
}
#endif
--
1.6.0.4
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v4 2/5] Add Ethernet hardware MAC address framework to usbnet
Hi, 2011/4/14 Simon Glass : > Built-in Ethernet adapters support setting the mac address by means of a > ethaddr environment variable for each interface (ethaddr, eth1addr, eth2addr). > > This adds similar support to the USB network side, using the names > usbethaddr, usbeth1addr, etc. They are kept separate since we don't want > a USB device taking the MAC address of a built-in device or vice versa. > > TEST=build, test on harmony, with setenv usbethaddr c0:c1:c0:13:0b:b8, bootp, > tftp ... > > Signed-off-by: Simon Glass > --- > board/davinci/common/misc.c | 2 +- > drivers/net/designware.c | 2 +- > drivers/usb/eth/usb_ether.c | 9 - > include/net.h | 25 - > net/eth.c | 65 ++ 3 subsystems within 1 single patch (net + usb + davinci-boards). How are we gonna deal with it? Since the remainder of the series is USB tree related, I would suggest to include it in the u-boot-usb tree, but then I need the Ack of Ben and Sandeep. Kind regards, Remy ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v4 1/5] Add support for SMSC95XX USB 2.0 10/100MBit Ethernet Adapter
Dear Simon Glass,
In message <1302748176-4324-1-git-send-email-...@chromium.org> you wrote:
> The SMSC95XX is a USB hub with a built-in Ethernet adapter. This adds support
> for this, using the USB host network framework.
>
> TEST=usb start; bootp; tftp ...
>
> Signed-off-by: Simon Glass
...
> +#define TX_CMD_A_FIRST_SEG_ (0x2000)
> +#define TX_CMD_A_LAST_SEG_ (0x1000)
> +
> +/* Rx status word */
> +#define RX_STS_FL_ (0x3FFF)/* Frame Length */
> +#define RX_STS_ES_ (0x8000)/* Error Summary */
...
Please drop the parens around all these constants. Please fix
globally.
> +/* SCSRs */
> +#define ID_REV (0x00)
> +
> +#define INT_STS (0x08)
> +
> +#define TX_CFG (0x10)
> +#define TX_CFG_ON_ (0x0004)
> +
> +#define HW_CFG (0x14)
> +#define HW_CFG_BIR_ (0x1000)
> +#define HW_CFG_RXDOFF_ (0x0600)
> +#define HW_CFG_MEF_ (0x0020)
> +#define HW_CFG_BCE_ (0x0002)
> +#define HW_CFG_LRST_ (0x0008)
> +
> +#define PM_CTRL (0x20)
> +#define PM_CTL_PHY_RST_ (0x0010)
> +
> +#define AFC_CFG (0x2C)
> +
> +/*
> + * Hi watermark = 15.5Kb (~10 mtu pkts)
> + * low watermark = 3k (~2 mtu pkts)
> + * backpressure duration = ~ 350us
> + * Apply FC on any frame.
> + */
> +#define AFC_CFG_DEFAULT (0x00F830A1)
> +
> +#define E2P_CMD (0x30)
> +#define E2P_CMD_BUSY_(0x8000)
> +#define E2P_CMD_READ_(0x)
> +#define E2P_CMD_TIMEOUT_ (0x0400)
> +#define E2P_CMD_LOADED_ (0x0200)
> +#define E2P_CMD_ADDR_(0x01FF)
> +
> +#define E2P_DATA (0x34)
> +
> +#define BURST_CAP(0x38)
> +
> +#define INT_EP_CTL (0x68)
> +#define INT_EP_CTL_PHY_INT_ (0x8000)
> +
> +#define BULK_IN_DLY (0x6C)
> +
> +/* MAC CSRs */
> +#define MAC_CR (0x100)
> +#define MAC_CR_MCPAS_(0x0008)
> +#define MAC_CR_PRMS_ (0x0004)
> +#define MAC_CR_HPFILT_ (0x2000)
> +#define MAC_CR_TXEN_ (0x0008)
> +#define MAC_CR_RXEN_ (0x0004)
> +
> +#define ADDRH(0x104)
> +
> +#define ADDRL(0x108)
> +
> +#define MII_ADDR (0x114)
> +#define MII_WRITE_ (0x02)
> +#define MII_BUSY_(0x01)
> +#define MII_READ_(0x00) /* ~of MII Write bit */
> +
> +#define MII_DATA (0x118)
> +
> +#define FLOW (0x11C)
> +
> +#define VLAN1(0x120)
> +
> +#define COE_CR (0x130)
> +#define Tx_COE_EN_ (0x0001)
> +#define Rx_COE_EN_ (0x0001)
> +
> +/* Vendor-specific PHY Definitions */
> +#define PHY_INT_SRC (29)
> +
> +#define PHY_INT_MASK (30)
> +#define PHY_INT_MASK_ANEG_COMP_ ((u16)0x0040)
> +#define PHY_INT_MASK_LINK_DOWN_ ((u16)0x0010)
> +#define PHY_INT_MASK_DEFAULT_(PHY_INT_MASK_ANEG_COMP_ | \
> + PHY_INT_MASK_LINK_DOWN_)
> +
> +/* USB Vendor Requests */
> +#define USB_VENDOR_REQUEST_WRITE_REGISTER0xA0
...
> + ret = smsc95xx_read_reg(dev, HW_CFG, &read_buf);
> + if (ret < 0) {
> + debug("Failed to read HW_CFG: %d\n", ret);
> + return ret;
> + }
> + debug("Read Value from HW_CFG : 0x%08x\n", read_buf);
> +
> + read_buf |= HW_CFG_BIR_;
> + ret = smsc95xx_write_reg(dev, HW_CFG, read_buf);
> + if (ret < 0) {
> + debug("Failed to write HW_CFG_BIR_ bit in HW_CFG "
> + "register, ret = %d\n", ret);
> + return ret;
> + }
You repeat these sequences of smsc95xx_read_reg() resp.
smsc95xx_write_reg() followed by the "if (ret < 0)" part about 20
times.
Please move the respective debug() message for the failure case into
the functions, and consider using a loop here instead.
> + read_buf = DEFAULT_BULK_IN_DELAY;
> + ret = smsc95xx_write_reg(dev, BULK_IN_DLY, read_buf);
> + if (ret < 0) {
> + debug("ret = %d", ret);
> + return ret;
> + }
Is it intentional to use the read_buf with a smsc95xx_write_reg()
call?
> + ret = smsc95xx_write_reg(dev, HW_CFG, read_buf);
> + if (ret < 0) {
> + debug("Failed to write HW_CFG register, ret=%d\n", ret);
> + retu
Re: [U-Boot] [PATCH v4 2/5] Add Ethernet hardware MAC address framework to usbnet
Dear Simon Glass,
In message <1302748176-4324-2-git-send-email-...@chromium.org> you wrote:
> Built-in Ethernet adapters support setting the mac address by means of a
> ethaddr environment variable for each interface (ethaddr, eth1addr, eth2addr).
>
> This adds similar support to the USB network side, using the names
> usbethaddr, usbeth1addr, etc. They are kept separate since we don't want
> a USB device taking the MAC address of a built-in device or vice versa.
>
> TEST=build, test on harmony, with setenv usbethaddr c0:c1:c0:13:0b:b8, bootp,
> tftp ...
>
> Signed-off-by: Simon Glass
> ---
> board/davinci/common/misc.c |2 +-
> drivers/net/designware.c|2 +-
> drivers/usb/eth/usb_ether.c |9 -
> include/net.h | 25 -
> net/eth.c | 65 ++
> 5 files changed, 73 insertions(+), 30 deletions(-)
...
> diff --git a/drivers/usb/eth/usb_ether.c b/drivers/usb/eth/usb_ether.c
> index 7b55da3..6565ea5 100644
> --- a/drivers/usb/eth/usb_ether.c
> +++ b/drivers/usb/eth/usb_ether.c
> @@ -80,6 +80,7 @@ int is_eth_dev_on_usb_host(void)
> */
> static void probe_valid_drivers(struct usb_device *dev)
> {
> + struct eth_device *eth;
> int j;
>
> for (j = 0; prob_dev[j].probe && prob_dev[j].get_info; j++) {
> @@ -88,9 +89,10 @@ static void probe_valid_drivers(struct usb_device *dev)
> /*
>* ok, it is a supported eth device. Get info and fill it in
>*/
> + eth = &usb_eth[usb_max_eth_dev].eth_dev;
Index for eth is usb_max_eth_dev.
> @@ -100,7 +102,10 @@ static void probe_valid_drivers(struct usb_device *dev)
>* call since eth_current_changed (internally called)
>* relies on it
>*/
> - eth_register(&usb_eth[usb_max_eth_dev - 1].eth_dev);
> + eth_register(eth);
You change the behaviour here. Please confirmt his is really
intentional.
> diff --git a/include/net.h b/include/net.h
> index 95ef8ab..9256a46 100644
> --- a/include/net.h
> +++ b/include/net.h
> @@ -123,7 +123,18 @@ extern int eth_get_dev_index (void); /* get
> the device index */
> extern void eth_parse_enetaddr(const char *addr, uchar *enetaddr);
> extern int eth_getenv_enetaddr(char *name, uchar *enetaddr);
> extern int eth_setenv_enetaddr(char *name, const uchar *enetaddr);
> -extern int eth_getenv_enetaddr_by_index(int index, uchar *enetaddr);
> +
> +/*
> + * Get the hardware address for an ethernet interface .
> + * Args:
> + * base_name - base name for device (NULL for "eth")
This is an atitifical decision for the API which is difficult to
understand. It just makes the code and understanding it more
difficult. Just pass "eth" when you mean it.
> +int eth_write_hwaddr(struct eth_device *dev, const char *base_name,
> +int eth_number)
> +{
> + unsigned char env_enetaddr[6];
> + int ret = 0;
> +
> + eth_getenv_enetaddr_by_index(base_name, eth_number, env_enetaddr);
Add error handling, or write
(void)eth_getenv_enetaddr_by_index(...);
to indicate that you intentionally ignore the return value.
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
Philosophy is a game with objectives and no rules.
Mathematics is a game with rules and no objectives.
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v4 2/5] Add Ethernet hardware MAC address framework to usbnet
Dear Remy Bohmer, In message you wrote: > > > board/davinci/common/misc.c |2 +- > > drivers/net/designware.c|2 +- > > drivers/usb/eth/usb_ether.c |9 - > > include/net.h | 25 - > > net/eth.c | 65 +++= > +++ > > 3 subsystems within 1 single patch (net + usb + davinci-boards). How > are we gonna deal with it? > Since the remainder of the series is USB tree related, I would suggest > to include it in the u-boot-usb tree, but then I need the Ack of Ben > and Sandeep. I'm standing in for the network custodian as long as we haven't found a better one. I think it will be indeed the best to pull this though your tree. But I just requested some more changes. 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 How many seconds are there in a year? If I tell you there are 3.155 x 10^7, you won't even try to remember it. On the other hand, who could forget that, to within half a percent, pi seconds is a nanocentury. - Tom Duff, Bell Labs ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] GPIO: Tegra2: add GPIO driver for Seaboard and Harmony
Signed-off-by: Tom Warren
---
arch/arm/include/asm/arch-tegra2/gpio.h | 236 -
drivers/gpio/Makefile |1 +
drivers/gpio/tegra2_gpio.c | 301 +++
include/configs/harmony.h |3 +
include/configs/seaboard.h |3 +
5 files changed, 540 insertions(+), 4 deletions(-)
create mode 100644 drivers/gpio/tegra2_gpio.c
diff --git a/arch/arm/include/asm/arch-tegra2/gpio.h
b/arch/arm/include/asm/arch-tegra2/gpio.h
index 0fb8f0d..0d7d7f8 100644
--- a/arch/arm/include/asm/arch-tegra2/gpio.h
+++ b/arch/arm/include/asm/arch-tegra2/gpio.h
@@ -47,13 +47,241 @@ struct gpio_ctlr {
#define GPIO_BANK(x) ((x) >> 5)
#define GPIO_PORT(x) (((x) >> 3) & 0x3)
+#define GPIO_PORT8(x) ((x) >> 3)
#define GPIO_BIT(x)((x) & 0x7)
+#define GPIO_PA00 /* port A (0), pin 0 */
+#define GPIO_PA11
+#define GPIO_PA22
+#define GPIO_PA33
+#define GPIO_PA44
+#define GPIO_PA55
+#define GPIO_PA66
+#define GPIO_PA77
+#define GPIO_PB08
+#define GPIO_PB19
+#define GPIO_PB210
+#define GPIO_PB311
+#define GPIO_PB412
+#define GPIO_PB513
+#define GPIO_PB614
+#define GPIO_PB715
+#define GPIO_PC016
+#define GPIO_PC117
+#define GPIO_PC218
+#define GPIO_PC319
+#define GPIO_PC420
+#define GPIO_PC521
+#define GPIO_PC622
+#define GPIO_PC723
+#define GPIO_PD024
+#define GPIO_PD125
+#define GPIO_PD226
+#define GPIO_PD327
+#define GPIO_PD428
+#define GPIO_PD529
+#define GPIO_PD630
+#define GPIO_PD731
+#define GPIO_PE032
+#define GPIO_PE133
+#define GPIO_PE234
+#define GPIO_PE335
+#define GPIO_PE436
+#define GPIO_PE537
+#define GPIO_PE638
+#define GPIO_PE739
+#define GPIO_PF040
+#define GPIO_PF141
+#define GPIO_PF242
+#define GPIO_PF343
+#define GPIO_PF444
+#define GPIO_PF545
+#define GPIO_PF646
+#define GPIO_PF747
+#define GPIO_PG048
+#define GPIO_PG149
+#define GPIO_PG250
+#define GPIO_PG351
+#define GPIO_PG452
+#define GPIO_PG553
+#define GPIO_PG654
+#define GPIO_PG755
+#define GPIO_PH056
+#define GPIO_PH157
+#define GPIO_PH258
+#define GPIO_PH359
+#define GPIO_PH460
+#define GPIO_PH561
+#define GPIO_PH662
+#define GPIO_PH763
+#define GPIO_PI064
+#define GPIO_PI165
+#define GPIO_PI266
+#define GPIO_PI367
+#define GPIO_PI468
+#define GPIO_PI569
+#define GPIO_PI670
+#define GPIO_PI771
+#define GPIO_PJ072
+#define GPIO_PJ173
+#define GPIO_PJ274
+#define GPIO_PJ375
+#define GPIO_PJ476
+#define GPIO_PJ577
+#define GPIO_PJ678
+#define GPIO_PJ779
+#define GPIO_PK080
+#define GPIO_PK181
+#define GPIO_PK282
+#define GPIO_PK383
+#define GPIO_PK484
+#define GPIO_PK585
+#define GPIO_PK686
+#define GPIO_PK787
+#define GPIO_PL088
+#define GPIO_PL189
+#define GPIO_PL290
+#define GPIO_PL391
+#define GPIO_PL492
+#define GPIO_PL593
+#define GPIO_PL694
+#define GPIO_PL795
+#define GPIO_PM096
+#define GPIO_PM197
+#define GPIO_PM298
+#define GPIO_PM399
+#define GPIO_PM4100
+#define GPIO_PM5101
+#define GPIO_PM6102
+#define GPIO_PM7103
+#define GPIO_PN0104
+#define GPIO_PN1105
+#define GPIO_PN2106
+#define GPIO_PN3107
+#define GPIO_PN4108
+#define GPIO_PN5109
+#define GPIO_PN6110
+#define GPIO_PN7111
+#define GPIO_PO0112
+#define GPIO_PO1113
+#define GPIO_PO2114
+#define GPIO_PO3115
+#define GPIO_PO4116
+#define GPIO_PO5117
+#define GPIO_PO6118
+#define GPIO_PO7119
+#define GPIO_PP0120
+#define GPIO_PP1121
+#define GPIO_PP2122
+#define GPIO_PP3123
+#define GPIO_PP4124
+#define GPIO_PP5125
+#define GPIO_PP6126
+#define GPIO_PP7127
+#define GPIO_PQ0128
+#define GPIO_PQ1129
+#define GPIO_PQ2130
+#define GPIO_PQ3131
+#define GPIO_PQ4132
+#define GPIO_PQ5133
+#define GPIO_PQ6134
+#define GPIO_PQ7135
+#define GPIO_PR0136
+#define GPIO_PR1137
+#define GPIO_PR2138
+#define GPIO_PR3139
+#define GPIO_PR4140
+#define GPIO_PR5141
+#define GPIO_PR6142
+#define GPIO_PR7143
+#define GPIO_PS0144
+#define GPIO_PS1145
+#define GPIO_PS2146
+#define GPIO_PS3147
+#define GPIO_PS4148
+#define GPIO_PS5149
+#define GPIO_PS6150
+#define GPIO_PS7151
+#define GPIO_PT0152
+#define GPIO_PT1153
+#define GPIO_PT2154
+#define GPIO_PT3155
+#define GPIO_PT4156
+#define GPIO_PT5157
+#define GPIO_PT6158
+#define GPIO_PT7159
+#define GPIO_PU0160
+#define GPIO_PU1161
+#define GPIO_PU2162
+#define GPIO_PU3163
+#define GPIO_PU4164
+#define GPIO_PU5165
+#define GPIO_PU6166
+#define GPIO_PU7167
+#define GPIO_PV0168
+#def
Re: [U-Boot] [PATCH] BeagleBoard: Added LED driver
> > Added LED driver using status_led. USR0 is set to monitor the boot > status. USR1 is set to be the green LED. > > Included adding configuration and command to the default configuration. > > Signed-off-by: Jason Kridner Pushed to u-boot-ti ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3] omap3_beagle: enable the use of a plain text file named uEnv.txt instead of boot.scr
> From: Alexander Holler > > Using the new env import command it is possible to use plain text files > instead > of script-images. Plain text files are much easier to handle. > > E.g. If your boot.scr contains the following: > --- > setenv dvimode 1024x768-16@60 > run loaduimage > run mmcboot > --- > you could create a file named uEnv.txt and use that instead of boot.scr: > --- > dvimode=1024x768-16@60 > uenvcmd=run loaduimage; run mmcboot > --- > The variable uenvcmd (if existent) will be executed (using run) after > uEnv.txt > was loaded. If uenvcmd doesn't exist the default boot sequence will be > started, > therefore you could just use > --- > dvimode=1024x768-16@60 > --- > as uEnv.txt because loaduimage and mmcboot is part of the default boot > sequence. > > For backwards compatibility the use of boot.scr is still supported. > --- > Changes for v2: > - Eliminated else redundant clause that would be ignored if boot > succeeds. > > Changes for v3: > - Removed boot.scr per discussion with Alexander. > > Signed-off-by: Jason Kridner > --- Pushed to u-boot-ti after making changes to the patch header ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3] OMAP3: BeagleBoard: Enable pullups on i2c2.
> > From: Steve Kipisz > > This allows the reading of EEPROMS on the expansion bus without adding > external pull-ups. > --- > v2 updates > * Updated per http://patchwork.ozlabs.org/patch/71997/ > * Added description > * Used OMAP34XX_CTRL_BASE > * Used structure and writel to perform write > > v3 updates > * Included v3 in the subject line > * Fixed structure name typo that got messed up in generating patch > * Removed some extraneous blank lines > > Signed-off-by: Jason Kridner Pushed after making changes to the patch header ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2] OMAP3: BeagleBoard: add xM rev B to ID table
> > From: Koen Kooi > > Patch was updated by Jason Kridner : > * Use tabs to match style of other board revisions > * Only include board revisions that exist > * Default to the same configuration as the latest revision, but > without setting 'beaglerev' > --- > v2 Changes > * Updated with feedback from http://patchwork.ozlabs.org/patch/71995/ > * Removed setting of mpurate based on board revision > * Set mpurate to auto in default environment variables > > Cc: Koen Kooi > Signed-off-by: Jason Kridner > --- Pushed to u-boot-ti ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2] OMAP3: BeagleBoard: add more expansionboard IDs
> From: Koen Kooi > > Information on configurations pulled from > http://www.elinux.org/BeagleBoardPinMux#Vendor_and_Device_IDs > > Boards added: > * Added BeagleBoardToys WiFi, VGA and LCD boards > * Added KBADC Beagle FPGA board > * Added Brainmux LCDog and LCDog Touch > * Added Liquidware BeagleTouch > --- > v2 updates > * Feedback from http://www.mail-archive.com/u- > b...@lists.denx.de/msg41851.html > - Removed unused definitions > - The detection mechanism *is* consistent, simple read from an EEPROM > * Added BeagleBoardToys board configurations > * Made definition names consistent as VENDOR_BOARD > > Signed-off-by: Jason Kridner Pushed to u-boot-ti ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] BeagleBoard: add xM rev C to ID table
> > A simple addition to the revision IDs. > > This patch depends upon http://patchwork.ozlabs.org/patch/85303/. > > Signed-off-by: Jason Kridner Did not apply clean. Can you please rebase with u-boot-ti ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [Patch v1] ARMV7: AM3517/05: Add support for CraneBoard.
> -Original Message- > From: srin...@mistralsolutions.com [mailto:srin...@mistralsolutions.com] > Sent: Friday, April 01, 2011 6:13 PM > To: u-boot@lists.denx.de > Cc: w...@denx.de; nagen...@mistralsolutions.com; > ume...@mistralsolutions.com; > Srinath > Subject: [U-Boot][Patch v1] ARMV7: AM3517/05: Add support for CraneBoard. > > From: Srinath > > It is a low cost reference design based on Sitara AM3517 SoC from Texas > Instruments > Please refer to for more details. > > Signed-off-by: Srinath Pushed to u-boot-ti http://git.denx.de/?p=u-boot/u-boot-ti.git;a=commitdiff;h=fd0962f6ab1ce4430327651d033f1fc07c46cf66 Thanks, Sandeep ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 0/9] Update support for CM-T35
> > > >> This patch serie s based on the latest U-Boot release (v2011.03) and > >> updates support for Compulab CM-T35 board: > >> 1) Some clean up > >> 2) MMC/SD Card fix > >> 3) Add Green Status LED > >> 4) Add support for CM-T3730 which is basically the same board, but > >>has TI's DM3730 SoC and therefore some changes are required > >> > >> Igor Grinberg (9): > >> OMAP3: CM-T35: Move DECLARE_GLOBAL_DATA_PTR to file scope > >> OMAP3: CM-T35: update config > >> OMAP3: CM-T35: update board files header information > >> OMAP3: CM-T35: update MAINTAINERS file > >> OMAP3: CM-T35: add MMC1 pinmux > >> OMAP3: CM-T35: fix mmc > >> OMAP3: CM-T35: remove redundand i2c initialization > >> OMAP3: CM-T35: enable the green LED > >> OMAP3: CM-T35: Add support for CM-T3730 > >> > >> MAINTAINERS |8 ++-- > >> board/cm_t35/Makefile|2 +- > >> board/cm_t35/cm_t35.c| 116 -- > Thanks Pushed the series --Sandeep ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3] omap3_beagle: enable the use of a plain text file named uEnv.txt instead of boot.scr
Dear "Paulraj, Sandeep", In message <0554bef07d437848af01b9c9b5f0bc5dc365d...@dlee01.ent.ti.com> you wrote: > > > From: Alexander Holler > > > > Using the new env import command it is possible to use plain text files > > instead > > of script-images. Plain text files are much easier to handle. > > > > E.g. If your boot.scr contains the following: > > --- > > setenv dvimode 1024x768-16@60 > > run loaduimage > > run mmcboot > > --- > > you could create a file named uEnv.txt and use that instead of boot.scr: > > --- > > dvimode=1024x768-16@60 > > uenvcmd=run loaduimage; run mmcboot > > --- > > The variable uenvcmd (if existent) will be executed (using run) after > > uEnv.txt > > was loaded. If uenvcmd doesn't exist the default boot sequence will be > > started, > > therefore you could just use > > --- > > dvimode=1024x768-16@60 > > --- > > as uEnv.txt because loaduimage and mmcboot is part of the default boot > > sequence. > > > > For backwards compatibility the use of boot.scr is still supported. > > --- > > Changes for v2: > > - Eliminated else redundant clause that would be ignored if boot > > succeeds. > > > > Changes for v3: > > - Removed boot.scr per discussion with Alexander. > > > > Signed-off-by: Jason Kridner > > --- > > Pushed to u-boot-ti after making changes to the patch header I think you might have missed Jason Kridner's Signed-off-by ? 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 Documentation is like sex: when it is good, it is very, very good; and when it is bad, it is better than nothing. - Dick Brandon ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Please pull u-boot-ti/master
The following changes since commit 73e5476e1edf1b860dbd9b5fc21ef32ac1b551ba: Fabio Estevam (1): MAINTAINERS: fix email address case are available in the git repository at: git://git.denx.de/u-boot-ti.git master Alexander Holler (1): omap3_beagle: enable the use of a plain text file Igor Grinberg (9): OMAP3: CM-T35: Move DECLARE_GLOBAL_DATA_PTR to file scope OMAP3: CM-T35: update config OMAP3: CM-T35: update board files header information OMAP3: CM-T35: update MAINTAINERS file OMAP3: CM-T35: add MMC1 pinmux OMAP3: CM-T35: fix mmc OMAP3: CM-T35: remove redundand i2c initialization OMAP3: CM-T35: enable the green LED OMAP3: CM-T35: Add support for CM-T3730 Jason Kridner (2): Add 'led' command BeagleBoard: Added LED driver Koen Kooi (2): OMAP3: BeagleBoard: add xM rev B to ID table OMAP3: BeagleBoard: add more expansionboard IDs Srinath (1): ARMV7: AM3517/05: Add support for CraneBoard. Steve Kipisz (1): OMAP3: BeagleBoard: Enable pullups on i2c2. MAINTAINERS | 12 +- MAKEALL |1 + arch/arm/include/asm/arch-omap3/omap3.h | 14 + board/cm_t35/Makefile |2 +- board/cm_t35/cm_t35.c | 116 +++--- board/cm_t35/leds.c | 45 board/ti/am3517crane/Makefile | 46 board/ti/am3517crane/am3517crane.c | 75 ++ board/ti/am3517crane/am3517crane.h | 395 +++ board/ti/am3517crane/config.mk | 29 +++ board/ti/beagle/Makefile|4 +- board/ti/beagle/beagle.c| 63 +- board/ti/beagle/beagle.h| 15 +- board/ti/beagle/led.c | 91 +++ boards.cfg |1 + common/cmd_led.c| 153 include/configs/am3517_crane.h | 340 ++ include/configs/cm_t35.h| 41 +++- include/configs/omap3_beagle.h | 43 +++- 19 files changed, 1413 insertions(+), 73 deletions(-) create mode 100644 board/cm_t35/leds.c create mode 100644 board/ti/am3517crane/Makefile create mode 100644 board/ti/am3517crane/am3517crane.c create mode 100644 board/ti/am3517crane/am3517crane.h create mode 100644 board/ti/am3517crane/config.mk create mode 100644 board/ti/beagle/led.c create mode 100644 common/cmd_led.c create mode 100644 include/configs/am3517_crane.h ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3] omap3_beagle: enable the use of a plain text file named uEnv.txt instead of boot.scr
> > Dear "Paulraj, Sandeep", > > In message <0554bef07d437848af01b9c9b5f0bc5dc365d...@dlee01.ent.ti.com> > you wrote: > > > > > From: Alexander Holler > > > > > > Using the new env import command it is possible to use plain text > files > > > instead > > > of script-images. Plain text files are much easier to handle. > > > > > > E.g. If your boot.scr contains the following: > > > --- > > > setenv dvimode 1024x768-16@60 > > > run loaduimage > > > run mmcboot > > > --- > > > you could create a file named uEnv.txt and use that instead of > boot.scr: > > > --- > > > dvimode=1024x768-16@60 > > > uenvcmd=run loaduimage; run mmcboot > > > --- > > > The variable uenvcmd (if existent) will be executed (using run) after > > > uEnv.txt > > > was loaded. If uenvcmd doesn't exist the default boot sequence will be > > > started, > > > therefore you could just use > > > --- > > > dvimode=1024x768-16@60 > > > --- > > > as uEnv.txt because loaduimage and mmcboot is part of the default boot > > > sequence. > > > > > > For backwards compatibility the use of boot.scr is still supported. > > > --- > > > Changes for v2: > > > - Eliminated else redundant clause that would be ignored if boot > > > succeeds. > > > > > > Changes for v3: > > > - Removed boot.scr per discussion with Alexander. > > > > > > Signed-off-by: Jason Kridner > > > --- > > > > Pushed to u-boot-ti after making changes to the patch header > > I think you might have missed Jason Kridner's Signed-off-by ? > > Best regards, > > Wolfgang Denk Thanks, I have fixed this. I had to edit the patch headers of quite a few patches and missed this one. Regards, Sandeep ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Please pull u-boot-ti/master
The following changes since commit 73e5476e1edf1b860dbd9b5fc21ef32ac1b551ba: Fabio Estevam (1): MAINTAINERS: fix email address case are available in the git repository at: git://git.denx.de/u-boot-ti.git master Alexander Holler (1): omap3_beagle: enable the use of a plain text file Igor Grinberg (9): OMAP3: CM-T35: Move DECLARE_GLOBAL_DATA_PTR to file scope OMAP3: CM-T35: update config OMAP3: CM-T35: update board files header information OMAP3: CM-T35: update MAINTAINERS file OMAP3: CM-T35: add MMC1 pinmux OMAP3: CM-T35: fix mmc OMAP3: CM-T35: remove redundand i2c initialization OMAP3: CM-T35: enable the green LED OMAP3: CM-T35: Add support for CM-T3730 Jason Kridner (2): Add 'led' command BeagleBoard: Added LED driver Koen Kooi (2): OMAP3: BeagleBoard: add xM rev B to ID table OMAP3: BeagleBoard: add more expansionboard IDs Srinath (1): ARMV7: AM3517/05: Add support for CraneBoard. Steve Kipisz (1): OMAP3: BeagleBoard: Enable pullups on i2c2. MAINTAINERS | 12 +- MAKEALL |1 + arch/arm/include/asm/arch-omap3/omap3.h | 14 + board/cm_t35/Makefile |2 +- board/cm_t35/cm_t35.c | 116 +++--- board/cm_t35/leds.c | 45 board/ti/am3517crane/Makefile | 46 board/ti/am3517crane/am3517crane.c | 75 ++ board/ti/am3517crane/am3517crane.h | 395 +++ board/ti/am3517crane/config.mk | 29 +++ board/ti/beagle/Makefile|4 +- board/ti/beagle/beagle.c| 63 +- board/ti/beagle/beagle.h| 15 +- board/ti/beagle/led.c | 91 +++ boards.cfg |1 + common/cmd_led.c| 153 include/configs/am3517_crane.h | 340 ++ include/configs/cm_t35.h| 41 +++- include/configs/omap3_beagle.h | 43 +++- 19 files changed, 1413 insertions(+), 73 deletions(-) create mode 100644 board/cm_t35/leds.c create mode 100644 board/ti/am3517crane/Makefile create mode 100644 board/ti/am3517crane/am3517crane.c create mode 100644 board/ti/am3517crane/am3517crane.h create mode 100644 board/ti/am3517crane/config.mk create mode 100644 board/ti/beagle/led.c create mode 100644 common/cmd_led.c create mode 100644 include/configs/am3517_crane.h ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Fix for overlapping sections?
Designation: Non-SSA/Finmeccanica A while back there was a fix for the overlapping section link problem (see below) involving changing some sort of global. Does anyone have a pointer to the change. I'm using a fairly old uboot for AMCC Canyonlands/460Ex and can't easily upgrade to a newer uboot build. Thanks Larry eldk/usr/bin/../lib/gcc/powerpc-linux/4.2.2/pic -lgcc -Map u-boot.map -o u-boot /opt/eldk/usr/bin/ppc_4xx-ld: section .bootpg [f000 -> f303] overlaps section .data.rel.local [e1d8 -> febb] /opt/eldk/usr/bin/ppc_4xx-ld: u-boot: section .bootpg lma 0xf000 overlaps previous sections /opt/eldk/usr/bin/ppc_4xx-ld: u-boot: section .u_boot_cmd lma 0xfebc overlaps previous sections make: *** [u-boot] Error 1 3.1.0805 3.1.0805 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [V1 0/3] OpenRD-Client and OpenRD-Ultimate support
On Wed, Apr 13, 2011 at 09:57:19PM +0200, Albert ARIBAUD wrote: > If you can rework according to Detlev's suggestion before the end of > the merge window, that would be perfect. If not, and unless Prafulla > or Wolfgang objects, I will pull this in u-boot-arm, because it > works and at last provides support for all of the Open-RD variants. > PHY code convergence can come in later. Hi Albert, It is now looking exceedingly unlikely that I will have enough free time this month to figure the PHY business out, so I am sending v2 of the patchset and hoping that convergence does indeed come later. Thanks ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 0/4] support for OpenRD-Client and OpenRD-Ultimate
v2: define CONFIG_SYS_MVFS
Clint Adams (4):
Rename openrd_base files to openrd
Add definitions for OpenRD-Client and OpenRD-Ultimate
Initialize second PHY on OpenRD-Client and OpenRD-Ultimate
Enable multiple fs options for Marvell SoC family on OpenRD boards
MAKEALL|2 +
board/Marvell/{openrd_base => openrd}/Makefile |2 +-
board/Marvell/{openrd_base => openrd}/kwbimage.cfg |0
.../{openrd_base/openrd_base.c => openrd/openrd.c} | 33 +---
.../{openrd_base/openrd_base.h => openrd/openrd.h} |0
boards.cfg |4 ++-
include/configs/{openrd_base.h => openrd.h}| 33 +---
7 files changed, 62 insertions(+), 12 deletions(-)
rename board/Marvell/{openrd_base => openrd}/Makefile (98%)
rename board/Marvell/{openrd_base => openrd}/kwbimage.cfg (100%)
rename board/Marvell/{openrd_base/openrd_base.c => openrd/openrd.c} (79%)
rename board/Marvell/{openrd_base/openrd_base.h => openrd/openrd.h} (100%)
rename include/configs/{openrd_base.h => openrd.h} (81%)
--
1.7.4.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 2/4] Add definitions for OpenRD-Client and OpenRD-Ultimate
--- MAKEALL |2 ++ board/Marvell/openrd/openrd.c |6 ++ boards.cfg|2 ++ include/configs/openrd.h | 14 +- 4 files changed, 23 insertions(+), 1 deletions(-) diff --git a/MAKEALL b/MAKEALL index 6acece7..9e7fd02 100755 --- a/MAKEALL +++ b/MAKEALL @@ -361,6 +361,8 @@ LIST_ARM9=" \ omap5912osk \ omap730p2 \ openrd_base \ + openrd_client \ + openrd_ultimate \ rd6281a \ sbc2410x\ scb9328 \ diff --git a/board/Marvell/openrd/openrd.c b/board/Marvell/openrd/openrd.c index e53fa16..14ca88e 100644 --- a/board/Marvell/openrd/openrd.c +++ b/board/Marvell/openrd/openrd.c @@ -110,7 +110,13 @@ int board_init(void) /* * arch number of board */ +#if defined(CONFIG_BOARD_IS_OPENRD_BASE) gd->bd->bi_arch_number = MACH_TYPE_OPENRD_BASE; +#elif defined(CONFIG_BOARD_IS_OPENRD_CLIENT) + gd->bd->bi_arch_number = MACH_TYPE_OPENRD_CLIENT; +#elif defined(CONFIG_BOARD_IS_OPENRD_ULTIMATE) + gd->bd->bi_arch_number = MACH_TYPE_OPENRD_ULTIMATE; +#endif /* adress of boot parameters */ gd->bd->bi_boot_params = kw_sdram_bar(0) + 0x100; diff --git a/boards.cfg b/boards.cfg index 40a4476..ef38006 100644 --- a/boards.cfg +++ b/boards.cfg @@ -97,6 +97,8 @@ suen3arm arm926ejs km_arm keymile guruplug arm arm926ejs - Marvellkirkwood mv88f6281gtw_ge arm arm926ejs - Marvellkirkwood openrd_base arm arm926ejs openrd Marvellkirkwoodopenrd:BOARD_IS_OPENRD_BASE +openrd_clientarm arm926ejs openrd Marvellkirkwoodopenrd:BOARD_IS_OPENRD_CLIENT +openrd_ultimate arm arm926ejs openrd Marvellkirkwoodopenrd:BOARD_IS_OPENRD_ULTIMATE rd6281a arm arm926ejs - Marvellkirkwood sheevaplug arm arm926ejs - Marvellkirkwood dockstar arm arm926ejs - Seagatekirkwood diff --git a/include/configs/openrd.h b/include/configs/openrd.h index 13dc34c..7299749 100644 --- a/include/configs/openrd.h +++ b/include/configs/openrd.h @@ -33,7 +33,19 @@ /* * Version number information */ -#define CONFIG_IDENT_STRING"\nOpenRD_base" +#ifdef CONFIG_BOARD_IS_OPENRD_ULTIMATE +# define CONFIG_IDENT_STRING "\nOpenRD-Ultimate" +#else +# ifdef CONFIG_BOARD_IS_OPENRD_CLIENT +# define CONFIG_IDENT_STRING "\nOpenRD-Client" +# else +# ifdef CONFIG_BOARD_IS_OPENRD_BASE +# define CONFIG_IDENT_STRING "\nOpenRD-Base" +# else +# error Unknown OpenRD board specified +# endif +# endif +#endif /* * High Level Configuration Options (easy to change) -- 1.7.4.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 3/4] Initialize second PHY on OpenRD-Client and OpenRD-Ultimate
(rework of Julian Pidancet's patch)
---
board/Marvell/openrd/openrd.c | 25 +
include/configs/openrd.h | 14 --
2 files changed, 33 insertions(+), 6 deletions(-)
diff --git a/board/Marvell/openrd/openrd.c b/board/Marvell/openrd/openrd.c
index 14ca88e..b2f7adb 100644
--- a/board/Marvell/openrd/openrd.c
+++ b/board/Marvell/openrd/openrd.c
@@ -124,12 +124,11 @@ int board_init(void)
}
#ifdef CONFIG_RESET_PHY_R
-/* Configure and enable MV88E1116 PHY */
-void reset_phy(void)
+/* Configure and enable MV88E1116/88E1121 PHY */
+void mv_phy_init(char *name)
{
u16 reg;
u16 devadr;
- char *name = "egiga0";
if (miiphy_set_current_dev(name))
return;
@@ -154,6 +153,24 @@ void reset_phy(void)
/* reset the phy */
miiphy_reset(name, devadr);
- printf("88E1116 Initialized on %s\n", name);
+ printf(PHY_NO" Initialized on %s\n", name);
+}
+
+void reset_phy(void)
+{
+ mv_phy_init("egiga0");
+
+#ifdef CONFIG_BOARD_IS_OPENRD_CLIENT
+ /* Kirkwood ethernet driver is written with the assumption that in case
+* of multiple PHYs, their addresses are consecutive. But unfortunately
+* in case of OpenRD-Client, PHY addresses are not consecutive.*/
+ miiphy_write("egiga1", 0xEE, 0xEE, 24);
+#endif
+
+#if defined(CONFIG_BOARD_IS_OPENRD_CLIENT) || \
+defined(CONFIG_BOARD_IS_OPENRD_ULTIMATE)
+ /* configure and initialize both PHY's */
+ mv_phy_init("egiga1");
+#endif
}
#endif /* CONFIG_RESET_PHY_R */
diff --git a/include/configs/openrd.h b/include/configs/openrd.h
index 7299749..8d86067 100644
--- a/include/configs/openrd.h
+++ b/include/configs/openrd.h
@@ -117,8 +117,18 @@
* Ethernet Driver configuration
*/
#ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */
-#define CONFIG_PHY_BASE_ADR0x8
+# ifdef CONFIG_BOARD_IS_OPENRD_BASE
+# define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */
+# else
+# define CONFIG_MVGBE_PORTS {1, 1} /* enable both ports */
+# endif
+# ifdef CONFIG_BOARD_IS_OPENRD_ULTIMATE
+# define CONFIG_PHY_BASE_ADR 0x0
+# define PHY_NO "88E1121"
+# else
+# define CONFIG_PHY_BASE_ADR 0x8
+# define PHY_NO "88E1116"
+# endif
#endif /* CONFIG_CMD_NET */
/*
--
1.7.4.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 1/4] Rename openrd_base files to openrd
---
board/Marvell/{openrd_base => openrd}/Makefile |2 +-
board/Marvell/{openrd_base => openrd}/kwbimage.cfg |0
.../{openrd_base/openrd_base.c => openrd/openrd.c} |2 +-
.../{openrd_base/openrd_base.h => openrd/openrd.h} |0
boards.cfg |2 +-
include/configs/{openrd_base.h => openrd.h}|4 ++--
6 files changed, 5 insertions(+), 5 deletions(-)
rename board/Marvell/{openrd_base => openrd}/Makefile (98%)
rename board/Marvell/{openrd_base => openrd}/kwbimage.cfg (100%)
rename board/Marvell/{openrd_base/openrd_base.c => openrd/openrd.c} (99%)
rename board/Marvell/{openrd_base/openrd_base.h => openrd/openrd.h} (100%)
rename include/configs/{openrd_base.h => openrd.h} (98%)
diff --git a/board/Marvell/openrd_base/Makefile b/board/Marvell/openrd/Makefile
similarity index 98%
rename from board/Marvell/openrd_base/Makefile
rename to board/Marvell/openrd/Makefile
index d6d0ed3..19020e4 100644
--- a/board/Marvell/openrd_base/Makefile
+++ b/board/Marvell/openrd/Makefile
@@ -31,7 +31,7 @@ include $(TOPDIR)/config.mk
LIB= $(obj)lib$(BOARD).o
-COBJS := openrd_base.o
+COBJS := openrd.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS))
diff --git a/board/Marvell/openrd_base/kwbimage.cfg
b/board/Marvell/openrd/kwbimage.cfg
similarity index 100%
rename from board/Marvell/openrd_base/kwbimage.cfg
rename to board/Marvell/openrd/kwbimage.cfg
diff --git a/board/Marvell/openrd_base/openrd_base.c
b/board/Marvell/openrd/openrd.c
similarity index 99%
rename from board/Marvell/openrd_base/openrd_base.c
rename to board/Marvell/openrd/openrd.c
index 10109c1..e53fa16 100644
--- a/board/Marvell/openrd_base/openrd_base.c
+++ b/board/Marvell/openrd/openrd.c
@@ -31,7 +31,7 @@
#include
#include
#include
-#include "openrd_base.h"
+#include "openrd.h"
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/Marvell/openrd_base/openrd_base.h
b/board/Marvell/openrd/openrd.h
similarity index 100%
rename from board/Marvell/openrd_base/openrd_base.h
rename to board/Marvell/openrd/openrd.h
diff --git a/boards.cfg b/boards.cfg
index 554e06c..40a4476 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -96,7 +96,7 @@ davinci_sonata arm arm926ejs sonata
davinci
suen3arm arm926ejs km_arm
keymilekirkwood
guruplug arm arm926ejs -
Marvellkirkwood
mv88f6281gtw_ge arm arm926ejs -
Marvellkirkwood
-openrd_base arm arm926ejs -
Marvellkirkwood
+openrd_base arm arm926ejs openrd
Marvellkirkwoodopenrd:BOARD_IS_OPENRD_BASE
rd6281a arm arm926ejs -
Marvellkirkwood
sheevaplug arm arm926ejs -
Marvellkirkwood
dockstar arm arm926ejs -
Seagatekirkwood
diff --git a/include/configs/openrd_base.h b/include/configs/openrd.h
similarity index 98%
rename from include/configs/openrd_base.h
rename to include/configs/openrd.h
index cfdd09c..13dc34c 100644
--- a/include/configs/openrd_base.h
+++ b/include/configs/openrd.h
@@ -27,8 +27,8 @@
* MA 02110-1301 USA
*/
-#ifndef _CONFIG_OPENRD_BASE_H
-#define _CONFIG_OPENRD_BASE_H
+#ifndef _CONFIG_OPENRD_H
+#define _CONFIG_OPENRD_H
/*
* Version number information
--
1.7.4.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 4/4] Enable multiple fs options for Marvell SoC family on OpenRD boards
--- include/configs/openrd.h |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/configs/openrd.h b/include/configs/openrd.h index 8d86067..3256cb3 100644 --- a/include/configs/openrd.h +++ b/include/configs/openrd.h @@ -60,6 +60,7 @@ * Commands configuration */ #define CONFIG_SYS_NO_FLASH/* Declare no flash (NOR/SPI) */ +#define CONFIG_SYS_MVFS #include #define CONFIG_CMD_AUTOSCRIPT #define CONFIG_CMD_DHCP -- 1.7.4.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] ehci-pci: Fix PCI EHCI driver for 36-bit
Convert the PCI base address into a virtual address.
Signed-off-by: Zhao Chenhui
Signed-off-by: Li Yang
---
drivers/usb/host/ehci-pci.c |5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index a038b6c..e400aee 100644
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -43,7 +43,6 @@ static struct pci_device_id ehci_pci_ids[] = {
int ehci_hcd_init(void)
{
pci_dev_t pdev;
- uint32_t addr;
pdev = pci_find_devices(ehci_pci_ids, CONFIG_PCI_EHCI_DEVICE);
if (pdev == -1) {
@@ -51,8 +50,8 @@ int ehci_hcd_init(void)
return -1;
}
- pci_read_config_dword(pdev, PCI_BASE_ADDRESS_0, &addr);
- hccr = (struct ehci_hccr *)addr;
+ hccr = (struct ehci_hccr *)pci_map_bar(pdev,
+ PCI_BASE_ADDRESS_0, PCI_REGION_MEM);
hcor = (struct ehci_hcor *)((uint32_t) hccr +
HC_LENGTH(ehci_readl(&hccr->cr_capbase)));
--
1.6.4.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2 3/4] Initialize second PHY on OpenRD-Client and OpenRD-Ultimate
> -Original Message-
> From: Clint Adams [mailto:cl...@debian.org]
> Sent: Tuesday, April 19, 2011 5:17 AM
> To: u-boot@lists.denx.de
> Cc: Albert ARIBAUD; Prafulla Wadaskar; julian.pidan...@citrix.com;
> Wolfgang Denk; Clint Adams
> Subject: [PATCH v2 3/4] Initialize second PHY on OpenRD-Client and
> OpenRD-Ultimate
>
> (rework of Julian Pidancet's patch)
Hi Clint
Some meaning full description about this patch is useful to understand
objective of this patch. It is very difficult to know which patch you are
referring here. At least pointers are expected.
> ---
You must have captured change log history here.
That is equally important too.
Please refer "Sending updated patch versions" @
http://denx.de/wiki/U-Boot/Patches
Regards..
Prafulla . .
> board/Marvell/openrd/openrd.c | 25 +
> include/configs/openrd.h | 14 --
> 2 files changed, 33 insertions(+), 6 deletions(-)
>
> diff --git a/board/Marvell/openrd/openrd.c
> b/board/Marvell/openrd/openrd.c
> index 14ca88e..b2f7adb 100644
> --- a/board/Marvell/openrd/openrd.c
> +++ b/board/Marvell/openrd/openrd.c
> @@ -124,12 +124,11 @@ int board_init(void)
> }
>
> #ifdef CONFIG_RESET_PHY_R
> -/* Configure and enable MV88E1116 PHY */
> -void reset_phy(void)
> +/* Configure and enable MV88E1116/88E1121 PHY */
> +void mv_phy_init(char *name)
> {
> u16 reg;
> u16 devadr;
> - char *name = "egiga0";
>
> if (miiphy_set_current_dev(name))
> return;
> @@ -154,6 +153,24 @@ void reset_phy(void)
> /* reset the phy */
> miiphy_reset(name, devadr);
>
> - printf("88E1116 Initialized on %s\n", name);
> + printf(PHY_NO" Initialized on %s\n", name);
> +}
> +
> +void reset_phy(void)
> +{
> + mv_phy_init("egiga0");
> +
> +#ifdef CONFIG_BOARD_IS_OPENRD_CLIENT
> + /* Kirkwood ethernet driver is written with the assumption that
> in case
> +* of multiple PHYs, their addresses are consecutive. But
> unfortunately
> +* in case of OpenRD-Client, PHY addresses are not
> consecutive.*/
> + miiphy_write("egiga1", 0xEE, 0xEE, 24);
> +#endif
> +
> +#if defined(CONFIG_BOARD_IS_OPENRD_CLIENT) || \
> +defined(CONFIG_BOARD_IS_OPENRD_ULTIMATE)
> + /* configure and initialize both PHY's */
> + mv_phy_init("egiga1");
> +#endif
> }
> #endif /* CONFIG_RESET_PHY_R */
> diff --git a/include/configs/openrd.h b/include/configs/openrd.h
> index 7299749..8d86067 100644
> --- a/include/configs/openrd.h
> +++ b/include/configs/openrd.h
> @@ -117,8 +117,18 @@
> * Ethernet Driver configuration
> */
> #ifdef CONFIG_CMD_NET
> -#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */
> -#define CONFIG_PHY_BASE_ADR 0x8
> +# ifdef CONFIG_BOARD_IS_OPENRD_BASE
> +# define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */
> +# else
> +# define CONFIG_MVGBE_PORTS {1, 1} /* enable both ports */
> +# endif
> +# ifdef CONFIG_BOARD_IS_OPENRD_ULTIMATE
> +# define CONFIG_PHY_BASE_ADR0x0
> +# define PHY_NO "88E1121"
> +# else
> +# define CONFIG_PHY_BASE_ADR0x8
> +# define PHY_NO "88E1116"
> +# endif
> #endif /* CONFIG_CMD_NET */
>
> /*
> --
> 1.7.4.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Issue with ehci-pci on MPC8548
HI all, We are trying to bring up a board based on Freescale's MPC8548 SoC and we are facing issues with USB controller present on PCI. (PCI_1 <=> USB2.0 PCI host controller <=> USB flah driver controller <=> NAND flash). The issue that we are facing is with ehci_reset() returning failure condition (TIMEOUT). Below is the corresponding section: USB: EHCI fail to reset Error, couldn't init Lowlevel part We have defined CONFIG_PCI_EHCI_DEVICE, CONFIG_USB_EHCI_PCI in our case and populated the static struct pci_device_id ehci_pci_ids[] structure with the supported ids in drivers/usb/host/ehci-pci.c. "usb info" command under u-boot shows only the USB HUB, ideally it should have detected even the storage device. => usb info 1: Hub, USB Revision 2.0 - u-boot EHCI Host Controller - Class: Hub - PacketSize: 64 Configurations: 1 - Vendor: 0x Product 0x Version 1.0 Configuration: 1 - Interfaces: 1 Self Powered 0mA Interface: 0 - Alternate Setting 0, Endpoints: 1 - Class Hub - Endpoint 1 In Interrupt MaxPacket 2048 Interval 255ms => Can anyone provide any pointers on how resolve the issue ? -- Thanks Sandeep ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Please pull u-boot-ti/master
Hi Sandeep, Le 19/04/2011 01:33, s-paul...@ti.com a écrit : > The following changes since commit 73e5476e1edf1b860dbd9b5fc21ef32ac1b551ba: >Fabio Estevam (1): > MAINTAINERS: fix email address case > > are available in the git repository at: > >git://git.denx.de/u-boot-ti.git master > > Alexander Holler (1): >omap3_beagle: enable the use of a plain text file > > Igor Grinberg (9): >OMAP3: CM-T35: Move DECLARE_GLOBAL_DATA_PTR to file scope >OMAP3: CM-T35: update config >OMAP3: CM-T35: update board files header information >OMAP3: CM-T35: update MAINTAINERS file >OMAP3: CM-T35: add MMC1 pinmux >OMAP3: CM-T35: fix mmc >OMAP3: CM-T35: remove redundand i2c initialization >OMAP3: CM-T35: enable the green LED >OMAP3: CM-T35: Add support for CM-T3730 > > Jason Kridner (2): >Add 'led' command >BeagleBoard: Added LED driver > > Koen Kooi (2): >OMAP3: BeagleBoard: add xM rev B to ID table >OMAP3: BeagleBoard: add more expansionboard IDs > > Srinath (1): >ARMV7: AM3517/05: Add support for CraneBoard. > > Steve Kipisz (1): >OMAP3: BeagleBoard: Enable pullups on i2c2. > > MAINTAINERS | 12 +- > MAKEALL |1 + > arch/arm/include/asm/arch-omap3/omap3.h | 14 + > board/cm_t35/Makefile |2 +- > board/cm_t35/cm_t35.c | 116 +++--- > board/cm_t35/leds.c | 45 > board/ti/am3517crane/Makefile | 46 > board/ti/am3517crane/am3517crane.c | 75 ++ > board/ti/am3517crane/am3517crane.h | 395 > +++ > board/ti/am3517crane/config.mk | 29 +++ > board/ti/beagle/Makefile|4 +- > board/ti/beagle/beagle.c| 63 +- > board/ti/beagle/beagle.h| 15 +- > board/ti/beagle/led.c | 91 +++ > boards.cfg |1 + > common/cmd_led.c| 153 > include/configs/am3517_crane.h | 340 ++ > include/configs/cm_t35.h| 41 +++- > include/configs/omap3_beagle.h | 43 +++- > 19 files changed, 1413 insertions(+), 73 deletions(-) > create mode 100644 board/cm_t35/leds.c > create mode 100644 board/ti/am3517crane/Makefile > create mode 100644 board/ti/am3517crane/am3517crane.c > create mode 100644 board/ti/am3517crane/am3517crane.h > create mode 100644 board/ti/am3517crane/config.mk > create mode 100644 board/ti/beagle/led.c > create mode 100644 common/cmd_led.c > create mode 100644 include/configs/am3517_crane.h Applied, thanks! Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] help for porting u-boot
Dear All, I am new to u-boot porting,even though I am using it for quite sometime. I want to use UBI based file system for our embedded system and our present u-boot doesn't support it. can any one show me for porting on s3c2416 board. Regards, Ratheendran ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 0/9] Patch set for some Freescale ColdFire boards
The following patches update some ColdFire boards to work with latest u-boot. Those update were tested on following Freescale boards: M54455EVB, M54451EVB, M5475EVB(M5475CFE_config), M5485EVB(M5485HFE_conifg), M5208EVB, M5253DEMO, M52277EVB, M53017EVB, M5373EVB, M5329EVB(M5329BFEE_config). [PATCH 1/9] Fix the configuration broken for ColdFire boards. [PATCH V2 2/9] ColdFire: Change the way to set platform CPP flags [PATCH V2 3/9] Env and lds file clean up for ColdFire M5445x and M547x/8x boards. [PATCH 4/9] Clean up lds files for some ColdFire nommu chips [PATCH V2 5/9] Enable the dm9000 on ColdFire 5253DEMO board. [PATCH 6/9] Disable the NFS define for 52277 board. [PATCH 7/9] ColdFire:Add mb for 5253 dram initialization [PATCH 8/9] Change the env settings for u-boot update [PATCH 9/9] sync the buffer descriptor IO for coldfire FEC ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/9] Fix the configuration broken for ColdFire boards.
Some typoes in Makefile and boards.cfg make the M54455 board
and M53017 board configuration broken.
Signed-off-by: Jason Jin
---
Makefile |1 +
boards.cfg |2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index 713dba1..20e15eb 100644
--- a/Makefile
+++ b/Makefile
@@ -678,6 +678,7 @@ M54455EVB_stm33_config :unconfig
cp $(obj)board/freescale/m54455evb/u-boot.stm
$(obj)board/freescale/m54455evb/u-boot.lds ; \
fi; \
echo "#define CONFIG_SYS_INPUT_CLKSRC $${FREQ}" >>
$(obj)include/config.h ; \
+ $(XECHO) "... with $${FREQ}Hz input clock"
@$(MKCONFIG) -n $@ -a M54455EVB m68k mcf5445x m54455evb freescale
M5475AFE_config \
diff --git a/boards.cfg b/boards.cfg
index 554e06c..438c603 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -217,7 +217,7 @@ M5271EVB m68kmcf52x2
m5271evbfreesca
M5272C3 m68kmcf52x2 m5272c3
freescale
M5275EVB m68kmcf52x2 m5275evb
freescale
M5282EVB m68kmcf52x2 m5282evb
freescale
-M53017EVBm68kmcf52x2 m53017evb
freescale
+M53017EVBm68kmcf532x m53017evb
freescale
EP2500 m68kmcf52x2 ep2500
Mercury
microblaze-generic microblaze microblaze microblaze-generic xilinx
dbau1000 mipsmips32 dbau1x00-
au1x00 dbau1x00:DBAU1000
--
1.6.4
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH V2 2/9] ColdFire: Change the way to set platform CPP flags
The CPP flags for the ColdFire platform depend on the version of the toolchain. Setting the CPP flags based on the gcc --version is not good and not reliable. This patch try to set the flags by testing if the flag works. Signed-off-by: Jason Jin --- arch/m68k/cpu/mcf5227x/config.mk |6 +- arch/m68k/cpu/mcf523x/config.mk|6 +- arch/m68k/cpu/mcf52x2/config.mk| 21 +++-- arch/m68k/cpu/mcf532x/config.mk| 11 +++ arch/m68k/cpu/mcf5445x/config.mk |6 +- arch/m68k/cpu/mcf547x_8x/config.mk |6 +- 6 files changed, 14 insertions(+), 42 deletions(-) diff --git a/arch/m68k/cpu/mcf5227x/config.mk b/arch/m68k/cpu/mcf5227x/config.mk index 8eab49d..3a17bcb 100644 --- a/arch/m68k/cpu/mcf5227x/config.mk +++ b/arch/m68k/cpu/mcf5227x/config.mk @@ -24,8 +24,4 @@ # PLATFORM_RELFLAGS += -ffixed-d7 -msep-data -ifneq ($(findstring 4.1,$(shell $(CC) --version)),4.1) -PLATFORM_CPPFLAGS += -mcpu=52277 -fPIC -else -PLATFORM_CPPFLAGS += -m5307 -fPIC -endif +PLATFORM_CPPFLAGS += $(call cc-option,-mcpu=52277 -fPIC, -m5307 -fPIC) diff --git a/arch/m68k/cpu/mcf523x/config.mk b/arch/m68k/cpu/mcf523x/config.mk index fc79454..78ae8c1 100644 --- a/arch/m68k/cpu/mcf523x/config.mk +++ b/arch/m68k/cpu/mcf523x/config.mk @@ -24,8 +24,4 @@ # PLATFORM_RELFLAGS += -ffixed-d7 -msep-data -ifneq ($(findstring 4.1,$(shell $(CC) --version)),4.1) -PLATFORM_CPPFLAGS += -mcpu=5235 -fPIC -else -PLATFORM_CPPFLAGS += -m5307 -fPIC -endif +PLATFORM_CPPFLAGS += $(call cc-option, -mcpu=5235 -fPIC, -m5307 -fPIC) diff --git a/arch/m68k/cpu/mcf52x2/config.mk b/arch/m68k/cpu/mcf52x2/config.mk index 52751be..45c47e5 100644 --- a/arch/m68k/cpu/mcf52x2/config.mk +++ b/arch/m68k/cpu/mcf52x2/config.mk @@ -34,31 +34,24 @@ is5272:=$(shell grep CONFIG_M5272 $(TOPDIR)/include/$(cfg)) is5275:=$(shell grep CONFIG_M5275 $(TOPDIR)/include/$(cfg)) is5282:=$(shell grep CONFIG_M5282 $(TOPDIR)/include/$(cfg)) - -ifneq ($(findstring 4.1,$(shell $(CC) --version)),4.1) - ifneq (,$(findstring CONFIG_M5208,$(is5208))) -PLATFORM_CPPFLAGS += -mcpu=5208 +PLATFORM_CPPFLAGS += $(call cc-option,-mcpu=5208,-m5307) endif ifneq (,$(findstring CONFIG_M5249,$(is5249))) -PLATFORM_CPPFLAGS += -mcpu=5249 +PLATFORM_CPPFLAGS += $(call cc-option,-mcpu=5249,-m5307) endif ifneq (,$(findstring CONFIG_M5253,$(is5253))) -PLATFORM_CPPFLAGS += -mcpu=5253 +PLATFORM_CPPFLAGS += $(call cc-option,-mcpu=5253,-m5307) endif ifneq (,$(findstring CONFIG_M5271,$(is5271))) -PLATFORM_CPPFLAGS += -mcpu=5271 +PLATFORM_CPPFLAGS += $(call cc-option,-mcpu=5271,-m5307) endif ifneq (,$(findstring CONFIG_M5272,$(is5272))) -PLATFORM_CPPFLAGS += -mcpu=5272 +PLATFORM_CPPFLAGS += $(call cc-option,-mcpu=5272,-m5307) endif ifneq (,$(findstring CONFIG_M5275,$(is5275))) -PLATFORM_CPPFLAGS += -mcpu=5275 +PLATFORM_CPPFLAGS += $(call cc-option,-mcpu=5275,-m5307) endif ifneq (,$(findstring CONFIG_M5282,$(is5282))) -PLATFORM_CPPFLAGS += -mcpu=5282 -endif - -else -PLATFORM_CPPFLAGS += -m5307 +PLATFORM_CPPFLAGS += $(call cc-option,-mcpu=5282,-m5307) endif diff --git a/arch/m68k/cpu/mcf532x/config.mk b/arch/m68k/cpu/mcf532x/config.mk index b783444..b050206 100644 --- a/arch/m68k/cpu/mcf532x/config.mk +++ b/arch/m68k/cpu/mcf532x/config.mk @@ -29,15 +29,10 @@ cfg=$(shell grep configs $(OBJTREE)/include/config.h | sed 's/.*<\(configs.*\)>/ is5301x:=$(shell grep CONFIG_MCF5301x $(TOPDIR)/include/$(cfg)) is532x:=$(shell grep CONFIG_MCF532x $(TOPDIR)/include/$(cfg)) -ifneq ($(findstring 4.1,$(shell $(CC) --version)),4.1) - ifneq (,$(findstring CONFIG_MCF5301x,$(is5301x))) -PLATFORM_CPPFLAGS += -mcpu=53015 -fPIC -endif -ifneq (,$(findstring CONFIG_MCF532x,$(is532x))) -PLATFORM_CPPFLAGS += -mcpu=5329 -fPIC +PLATFORM_CPPFLAGS += $(call cc-option, -mcpu=53015 -fPIC, -m5307 -fPIC) endif -else -PLATFORM_CPPFLAGS += -m5307 -fPIC +ifneq (,$(findstring CONFIG_MCF532x,$(is532x))) +PLATFORM_CPPFLAGS += $(call cc-option, -mcpu=5329 -fPIC, -m5307 -fPIC) endif diff --git a/arch/m68k/cpu/mcf5445x/config.mk b/arch/m68k/cpu/mcf5445x/config.mk index b0b49f7..47ff6ec 100644 --- a/arch/m68k/cpu/mcf5445x/config.mk +++ b/arch/m68k/cpu/mcf5445x/config.mk @@ -24,11 +24,7 @@ # PLATFORM_RELFLAGS += -ffixed-d7 -msep-data -ifneq ($(findstring 4.1,$(shell $(CC) --version)),4.1) -PLATFORM_CPPFLAGS += -mcpu=54455 -fPIC -else -PLATFORM_CPPFLAGS += -m5407 -fPIC -endif +PLATFORM_CPPFLAGS += $(call cc-option,-mcpu=54455 -fPIC,-m5407 -fPIC) ifneq (,$(findstring -linux-,$(shell $(CC) --version))) ifneq (,$(findstring GOT,$(shell $(LD) --help))) diff --git a/arch/m68k/cpu/mcf547x_8x/config.mk b/arch/m68k/cpu/mcf547x_8x/config.mk index 83102ab..87cc0a5 100644 --- a/arch/m68k/cpu/mcf547x_8x/config.mk +++ b/arch/m68k/cpu/mcf547x_8x/config.mk @@ -24,11 +24,7 @@ # PLATFORM_RELFLAGS += -ffixed-d7 -msep-data -ifneq ($(findstring 4.1,$(shell $(CC) --version)),4.1) -PLATFORM_CPPFLAGS += -mcpu=5485 -fPIC -else -PLATFORM_CPPFLAGS += -m5407 -fPIC -endif +PLATFORM_CPPFLAGS += $(c
