mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH] compile (and warning) fixes for -next
@ 2011-12-07 12:52 Sascha Hauer
  2011-12-07 12:52 ` [PATCH 01/11] mci s3c: remove unused code Sascha Hauer
                   ` (10 more replies)
  0 siblings, 11 replies; 17+ messages in thread
From: Sascha Hauer @ 2011-12-07 12:52 UTC (permalink / raw)
  To: barebox


Sascha Hauer (11):
      mci s3c: remove unused code
      memory: do not try to reserve iomem on sandbox
      remove unused Kconfig variable HAS_CFI
      fix underscore count in bss_start/bss_stop
      console_simple: fix compiler warning
      net macb: remove unused variable
      pxa: add type to Kconfig choice
      ft_build: temporarily disable bootm oftree support
      arm eukrea boards: fix breakage after mach-types update
      arm at91sam9260: Add missing AT91SAM_ETX2_ETX3_ALTERNATIVE define
      x86: Fix linker script for magic vars

 arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c |    2 +-
 arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c |    2 +-
 arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c |    2 +-
 arch/arm/mach-at91/include/mach/board.h           |    1 +
 arch/arm/mach-imx/Kconfig                         |    8 ------
 arch/arm/mach-pxa/Kconfig                         |    1 +
 arch/blackfin/boards/ipe337/barebox.lds.S         |    4 +-
 arch/blackfin/cpu-bf561/start.S                   |    8 +++---
 arch/x86/lib/barebox.lds.S                        |    2 +-
 common/console_simple.c                           |    1 +
 common/ft_build.c                                 |    3 +-
 common/memory.c                                   |    3 +-
 drivers/mci/s3c.c                                 |   26 ---------------------
 drivers/net/macb.c                                |    1 -
 drivers/nor/Kconfig                               |    3 --
 15 files changed, 17 insertions(+), 50 deletions(-)

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH 01/11] mci s3c: remove unused code
  2011-12-07 12:52 [PATCH] compile (and warning) fixes for -next Sascha Hauer
@ 2011-12-07 12:52 ` Sascha Hauer
  2011-12-07 12:52 ` [PATCH 02/11] memory: do not try to reserve iomem on sandbox Sascha Hauer
                   ` (9 subsequent siblings)
  10 siblings, 0 replies; 17+ messages in thread
From: Sascha Hauer @ 2011-12-07 12:52 UTC (permalink / raw)
  To: barebox

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/mci/s3c.c |   26 --------------------------
 1 files changed, 0 insertions(+), 26 deletions(-)

diff --git a/drivers/mci/s3c.c b/drivers/mci/s3c.c
index f97e13a..89c8168 100644
--- a/drivers/mci/s3c.c
+++ b/drivers/mci/s3c.c
@@ -176,32 +176,6 @@ static void s3c_finish_request(struct device_d *hw_dev)
 	/* TODO ensure the engines are stopped */
 }
 
-/* TODO GPIO feature is required for this architecture */
-static unsigned gpio_get_value(unsigned val)
-{
-	return 0;
-}
-
-/**
- * Detect if a card is plugged in
- * @param hw_dev Host interface instance
- * @return 0 if a card is plugged in
- *
- * Note: If there is no GPIO registered to detect if a card is present, we
- * assume a card _is_ present.
- */
-static int s3c_mci_card_present(struct device_d *hw_dev)
-{
-	struct s3c_mci_platform_data *pd = GET_HOST_PDATA(hw_dev);
-	int ret;
-
-	if (pd->gpio_detect == 0)
-		return 0;	/* assume the card is present */
-
-	ret = gpio_get_value(pd->gpio_detect) ? 0 : 1;
-	return ret ^ pd->detect_invert;
-}
-
 /**
  * Setup a new clock frequency on this MCI bus
  * @param hw_dev Host interface instance
-- 
1.7.7.3


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH 02/11] memory: do not try to reserve iomem on sandbox
  2011-12-07 12:52 [PATCH] compile (and warning) fixes for -next Sascha Hauer
  2011-12-07 12:52 ` [PATCH 01/11] mci s3c: remove unused code Sascha Hauer
@ 2011-12-07 12:52 ` Sascha Hauer
  2011-12-07 12:52 ` [PATCH 03/11] remove unused Kconfig variable HAS_CFI Sascha Hauer
                   ` (8 subsequent siblings)
  10 siblings, 0 replies; 17+ messages in thread
From: Sascha Hauer @ 2011-12-07 12:52 UTC (permalink / raw)
  To: barebox

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 common/memory.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/common/memory.c b/common/memory.c
index 7d0f4ca..1d72888 100644
--- a/common/memory.c
+++ b/common/memory.c
@@ -53,6 +53,7 @@ void mem_malloc_init(void *start, void *end)
 	malloc_brk = malloc_start;
 }
 
+#ifndef __SANDBOX__
 static int mem_malloc_resource(void)
 {
 	/*
@@ -75,10 +76,10 @@ static int mem_malloc_resource(void)
 #ifdef STACK_BASE
 	request_sdram_region("stack", STACK_BASE, STACK_SIZE);
 #endif
-
 	return 0;
 }
 coredevice_initcall(mem_malloc_resource);
+#endif
 
 static void *sbrk_no_zero(ptrdiff_t increment)
 {
-- 
1.7.7.3


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH 03/11] remove unused Kconfig variable HAS_CFI
  2011-12-07 12:52 [PATCH] compile (and warning) fixes for -next Sascha Hauer
  2011-12-07 12:52 ` [PATCH 01/11] mci s3c: remove unused code Sascha Hauer
  2011-12-07 12:52 ` [PATCH 02/11] memory: do not try to reserve iomem on sandbox Sascha Hauer
@ 2011-12-07 12:52 ` Sascha Hauer
  2011-12-07 12:53 ` [PATCH 04/11] fix underscore count in bss_start/bss_stop Sascha Hauer
                   ` (7 subsequent siblings)
  10 siblings, 0 replies; 17+ messages in thread
From: Sascha Hauer @ 2011-12-07 12:52 UTC (permalink / raw)
  To: barebox

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/mach-imx/Kconfig |    8 --------
 drivers/nor/Kconfig       |    3 ---
 2 files changed, 0 insertions(+), 11 deletions(-)

diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 726920f..27bf386 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -182,7 +182,6 @@ config MACH_MX1ADS
 config MACH_SCB9328
 	bool "Synertronixx scb9328"
 	select HAS_DM9000
-	select HAS_CFI
 	select MACH_HAS_LOWLEVEL_INIT
 	help
 	  Say Y here if you are using the Synertronixx scb9328 board
@@ -201,7 +200,6 @@ choice
 
 config MACH_IMX21ADS
 	bool "Freescale i.MX21ADS"
-	select HAS_CFI
 	select MACH_HAS_LOWLEVEL_INIT
 	select HAS_CS8900
 	help
@@ -229,7 +227,6 @@ config MACH_EUKREA_CPUIMX25
 
 config MACH_FREESCALE_MX25_3STACK
 	bool "Freescale MX25 3stack"
-	select HAS_CFI
 	select MACH_HAS_LOWLEVEL_INIT
 	select I2C
 	select I2C_MC34704
@@ -257,7 +254,6 @@ choice
 
 config MACH_EUKREA_CPUIMX27
 	bool "EUKREA CPUIMX27"
-	select HAS_CFI
 	select MACH_HAS_LOWLEVEL_INIT
 	help
 	  Say Y here if you are using Eukrea's CPUIMX27 equipped
@@ -265,7 +261,6 @@ config MACH_EUKREA_CPUIMX27
 
 config MACH_IMX27ADS
 	bool "Freescale i.MX27ADS"
-	select HAS_CFI
 	select MACH_HAS_LOWLEVEL_INIT
 	help
 	  Say Y here if you are using the Freescale i.MX27ads board equipped
@@ -280,7 +275,6 @@ config MACH_PCA100
 
 config MACH_PCM038
 	bool "phyCORE-i.MX27"
-	select HAS_CFI
 	select MACH_HAS_LOWLEVEL_INIT
 	select SPI
 	select DRIVER_SPI_IMX
@@ -339,7 +333,6 @@ config MACH_EUKREA_CPUIMX35
 
 config MACH_FREESCALE_MX35_3STACK
 	bool "Freescale MX35 3stack"
-	select HAS_CFI
 	select MACH_HAS_LOWLEVEL_INIT
 	select I2C
 	select I2C_IMX
@@ -351,7 +344,6 @@ config MACH_FREESCALE_MX35_3STACK
 
 config MACH_PCM043
 	bool "phyCORE-i.MX35"
-	select HAS_CFI
 	select MACH_HAS_LOWLEVEL_INIT
 	select ARCH_HAS_L2X0
 	help
diff --git a/drivers/nor/Kconfig b/drivers/nor/Kconfig
index 84ce0d0..8652d27 100644
--- a/drivers/nor/Kconfig
+++ b/drivers/nor/Kconfig
@@ -8,9 +8,6 @@ menuconfig DRIVER_CFI
 
 if DRIVER_CFI
 
-config HAS_CFI
-	bool
-
 config DRIVER_CFI_INTEL
 	default y
 	depends on DRIVER_CFI
-- 
1.7.7.3


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH 04/11] fix underscore count in bss_start/bss_stop
  2011-12-07 12:52 [PATCH] compile (and warning) fixes for -next Sascha Hauer
                   ` (2 preceding siblings ...)
  2011-12-07 12:52 ` [PATCH 03/11] remove unused Kconfig variable HAS_CFI Sascha Hauer
@ 2011-12-07 12:53 ` Sascha Hauer
  2011-12-07 12:53 ` [PATCH 05/11] console_simple: fix compiler warning Sascha Hauer
                   ` (6 subsequent siblings)
  10 siblings, 0 replies; 17+ messages in thread
From: Sascha Hauer @ 2011-12-07 12:53 UTC (permalink / raw)
  To: barebox

As done in the Linux Kernel

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/blackfin/boards/ipe337/barebox.lds.S |    4 ++--
 arch/blackfin/cpu-bf561/start.S           |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/blackfin/boards/ipe337/barebox.lds.S b/arch/blackfin/boards/ipe337/barebox.lds.S
index 25ca988..9e2b034 100644
--- a/arch/blackfin/boards/ipe337/barebox.lds.S
+++ b/arch/blackfin/boards/ipe337/barebox.lds.S
@@ -84,9 +84,9 @@ SECTIONS
 	___usymtab_end = .;
 
 	. = ALIGN(4);
-	__bss_start = .;
+	___bss_start = .;
 	.bss : { *(.bss) }
-	__bss_stop = .;
+	___bss_stop = .;
 	_end = .;
 }
 
diff --git a/arch/blackfin/cpu-bf561/start.S b/arch/blackfin/cpu-bf561/start.S
index 4345362..8a6c563 100644
--- a/arch/blackfin/cpu-bf561/start.S
+++ b/arch/blackfin/cpu-bf561/start.S
@@ -163,8 +163,8 @@ offset:
 	p2.h = hi(TEXT_BASE);
 
 	p3 = 0x04;
-	p4.l = __bss_start;
-	p4.h = __bss_start;
+	p4.l = ___bss_start;
+	p4.h = ___bss_start;
 loop1:
 	r1 = [p1 ++ p3];
 	[p2 ++ p3] = r1;
@@ -308,8 +308,8 @@ WAIT_DMA_DONE:
 	W[P1+OFFSET_(MDMA_D0_IRQ_STATUS)] = R0;	/* Write 1 to clear DMA interrupt */
 
 	/* Initialize BSS Section with 0 s */
-	p1.l = __bss_start;
-	p1.h = __bss_start;
+	p1.l = ___bss_start;
+	p1.h = ___bss_start;
 	p2.l = _end;
 	p2.h = _end;
 	r1 = p1;
-- 
1.7.7.3


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH 05/11] console_simple: fix compiler warning
  2011-12-07 12:52 [PATCH] compile (and warning) fixes for -next Sascha Hauer
                   ` (3 preceding siblings ...)
  2011-12-07 12:53 ` [PATCH 04/11] fix underscore count in bss_start/bss_stop Sascha Hauer
@ 2011-12-07 12:53 ` Sascha Hauer
  2011-12-07 12:53 ` [PATCH 06/11] net macb: remove unused variable Sascha Hauer
                   ` (5 subsequent siblings)
  10 siblings, 0 replies; 17+ messages in thread
From: Sascha Hauer @ 2011-12-07 12:53 UTC (permalink / raw)
  To: barebox

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 common/console_simple.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/common/console_simple.c b/common/console_simple.c
index 73e4752..49c5b33 100644
--- a/common/console_simple.c
+++ b/common/console_simple.c
@@ -167,4 +167,5 @@ int console_register(struct console_device *newcdev)
 
 int console_unregister(struct console_device *cdev)
 {
+	return -EBUSY;
 }
-- 
1.7.7.3


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH 06/11] net macb: remove unused variable
  2011-12-07 12:52 [PATCH] compile (and warning) fixes for -next Sascha Hauer
                   ` (4 preceding siblings ...)
  2011-12-07 12:53 ` [PATCH 05/11] console_simple: fix compiler warning Sascha Hauer
@ 2011-12-07 12:53 ` Sascha Hauer
  2011-12-07 13:19   ` Jean-Christophe PLAGNIOL-VILLARD
  2011-12-07 12:53 ` [PATCH 07/11] pxa: add type to Kconfig choice Sascha Hauer
                   ` (4 subsequent siblings)
  10 siblings, 1 reply; 17+ messages in thread
From: Sascha Hauer @ 2011-12-07 12:53 UTC (permalink / raw)
  To: barebox

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/net/macb.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index e1cfd85..d79da72 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -344,7 +344,6 @@ static int macb_phy_write(struct mii_device *mdev, int addr, int reg, int value)
 	unsigned long netctl;
 	unsigned long netstat;
 	unsigned long frame;
-	int iflag;
 
 	debug("%s\n", __func__);
 
-- 
1.7.7.3


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH 07/11] pxa: add type to Kconfig choice
  2011-12-07 12:52 [PATCH] compile (and warning) fixes for -next Sascha Hauer
                   ` (5 preceding siblings ...)
  2011-12-07 12:53 ` [PATCH 06/11] net macb: remove unused variable Sascha Hauer
@ 2011-12-07 12:53 ` Sascha Hauer
  2011-12-07 12:53 ` [PATCH 08/11] ft_build: temporarily disable bootm oftree support Sascha Hauer
                   ` (3 subsequent siblings)
  10 siblings, 0 replies; 17+ messages in thread
From: Sascha Hauer @ 2011-12-07 12:53 UTC (permalink / raw)
  To: barebox

To avoid Kconfig warning as long we do not have any board
support for pxa.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/mach-pxa/Kconfig |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 9e3c53a..9ef11bb 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -27,6 +27,7 @@ if ARCH_PXA27X
 
 choice
 	prompt "PXA27x Board Type"
+	bool
 
 endchoice
 
-- 
1.7.7.3


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH 08/11] ft_build: temporarily disable bootm oftree support
  2011-12-07 12:52 [PATCH] compile (and warning) fixes for -next Sascha Hauer
                   ` (6 preceding siblings ...)
  2011-12-07 12:53 ` [PATCH 07/11] pxa: add type to Kconfig choice Sascha Hauer
@ 2011-12-07 12:53 ` Sascha Hauer
  2011-12-07 12:53 ` [PATCH 09/11] arm eukrea boards: fix breakage after mach-types update Sascha Hauer
                   ` (2 subsequent siblings)
  10 siblings, 0 replies; 17+ messages in thread
From: Sascha Hauer @ 2011-12-07 12:53 UTC (permalink / raw)
  To: barebox

We do not have any command line parser support for bootm anymore.
Disable it for now to at least be able to compile it.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 common/ft_build.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/common/ft_build.c b/common/ft_build.c
index 4c27cfa..9042f13 100644
--- a/common/ft_build.c
+++ b/common/ft_build.c
@@ -591,6 +591,7 @@ void ft_setup(void *blob, bd_t * bd, ulong initrd_start, ulong initrd_end)
 #endif
 }
 
+#if 0
 static int oftree_handler_cmdline_parse(struct image_data *data, int opt,
 		char *optarg)
 {
@@ -616,4 +617,4 @@ static int oftree_register_image_handler(void)
 }
 
 late_initcall(oftree_register_image_handler);
-
+#endif
-- 
1.7.7.3


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH 09/11] arm eukrea boards: fix breakage after mach-types update
  2011-12-07 12:52 [PATCH] compile (and warning) fixes for -next Sascha Hauer
                   ` (7 preceding siblings ...)
  2011-12-07 12:53 ` [PATCH 08/11] ft_build: temporarily disable bootm oftree support Sascha Hauer
@ 2011-12-07 12:53 ` Sascha Hauer
  2011-12-07 12:53 ` [PATCH 10/11] arm at91sam9260: Add missing AT91SAM_ETX2_ETX3_ALTERNATIVE define Sascha Hauer
  2011-12-07 12:53 ` [PATCH 11/11] x86: Fix linker script for magic vars Sascha Hauer
  10 siblings, 0 replies; 17+ messages in thread
From: Sascha Hauer @ 2011-12-07 12:53 UTC (permalink / raw)
  To: barebox

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c |    2 +-
 arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c |    2 +-
 arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c b/arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c
index 6355e3c..162c117 100644
--- a/arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c
+++ b/arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c
@@ -259,7 +259,7 @@ static int eukrea_cpuimx25_devices_init(void)
 			   IORESOURCE_MEM, &usb_pdata);
 
 	armlinux_set_bootparams((void *)0x80000100);
-	armlinux_set_architecture(MACH_TYPE_EUKREA_CPUIMX25);
+	armlinux_set_architecture(MACH_TYPE_EUKREA_CPUIMX25SD);
 
 	return 0;
 }
diff --git a/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c b/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c
index 994f456..c419c73 100644
--- a/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c
+++ b/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c
@@ -217,7 +217,7 @@ static int eukrea_cpuimx27_devices_init(void)
 #endif
 
 	armlinux_set_bootparams((void *)0xa0000100);
-	armlinux_set_architecture(MACH_TYPE_CPUIMX27);
+	armlinux_set_architecture(MACH_TYPE_EUKREA_CPUIMX27);
 
 	return 0;
 }
diff --git a/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c b/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c
index 5f654d4..20cfad4 100644
--- a/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c
+++ b/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c
@@ -169,7 +169,7 @@ static int eukrea_cpuimx35_devices_init(void)
 			   IORESOURCE_MEM, &usb_pdata);
 #endif
 	armlinux_set_bootparams((void *)0x80000100);
-	armlinux_set_architecture(MACH_TYPE_EUKREA_CPUIMX35);
+	armlinux_set_architecture(MACH_TYPE_EUKREA_CPUIMX35SD);
 
 	return 0;
 }
-- 
1.7.7.3


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH 10/11] arm at91sam9260: Add missing AT91SAM_ETX2_ETX3_ALTERNATIVE define
  2011-12-07 12:52 [PATCH] compile (and warning) fixes for -next Sascha Hauer
                   ` (8 preceding siblings ...)
  2011-12-07 12:53 ` [PATCH 09/11] arm eukrea boards: fix breakage after mach-types update Sascha Hauer
@ 2011-12-07 12:53 ` Sascha Hauer
  2011-12-08 14:20   ` Jean-Christophe PLAGNIOL-VILLARD
  2011-12-07 12:53 ` [PATCH 11/11] x86: Fix linker script for magic vars Sascha Hauer
  10 siblings, 1 reply; 17+ messages in thread
From: Sascha Hauer @ 2011-12-07 12:53 UTC (permalink / raw)
  To: barebox

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/mach-at91/include/mach/board.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-at91/include/mach/board.h b/arch/arm/mach-at91/include/mach/board.h
index 546fe90..5e23688 100644
--- a/arch/arm/mach-at91/include/mach/board.h
+++ b/arch/arm/mach-at91/include/mach/board.h
@@ -51,6 +51,7 @@ void at91_add_device_nand(struct atmel_nand_data *data);
 #define AT91SAM_ETHER_MII		(0 << 0)
 #define AT91SAM_ETHER_RMII		(1 << 0)
 #define AT91SAM_ETHER_FORCE_LINK	(1 << 1)
+#define AT91SAM_ETX2_ETX3_ALTERNATIVE	(2 << 0)
 
 struct at91_ether_platform_data {
 	unsigned int flags;
-- 
1.7.7.3


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH 11/11] x86: Fix linker script for magic vars
  2011-12-07 12:52 [PATCH] compile (and warning) fixes for -next Sascha Hauer
                   ` (9 preceding siblings ...)
  2011-12-07 12:53 ` [PATCH 10/11] arm at91sam9260: Add missing AT91SAM_ETX2_ETX3_ALTERNATIVE define Sascha Hauer
@ 2011-12-07 12:53 ` Sascha Hauer
  10 siblings, 0 replies; 17+ messages in thread
From: Sascha Hauer @ 2011-12-07 12:53 UTC (permalink / raw)
  To: barebox

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/x86/lib/barebox.lds.S |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/lib/barebox.lds.S b/arch/x86/lib/barebox.lds.S
index 716cea6..c7d5175 100644
--- a/arch/x86/lib/barebox.lds.S
+++ b/arch/x86/lib/barebox.lds.S
@@ -172,7 +172,7 @@ SECTIONS
 
 	.barebox_magicvars : AT ( LOADADDR(.barebox_cmd) + SIZEOF (.barebox_cmd) ) {
 		__barebox_magicvar_start = .;
-		.barebox_magicvar : { BAREBOX_MAGICVARS }
+		BAREBOX_MAGICVARS
 		__barebox_magicvar_end = .;
 		. = ALIGN(4);
 	} > barebox
-- 
1.7.7.3


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PATCH 06/11] net macb: remove unused variable
  2011-12-07 12:53 ` [PATCH 06/11] net macb: remove unused variable Sascha Hauer
@ 2011-12-07 13:19   ` Jean-Christophe PLAGNIOL-VILLARD
  0 siblings, 0 replies; 17+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2011-12-07 13:19 UTC (permalink / raw)
  To: Sascha Hauer; +Cc: barebox

HI,

	I send IIRC

Best Regards,
J.
On 13:53 Wed 07 Dec     , Sascha Hauer wrote:
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
>  drivers/net/macb.c |    1 -
>  1 files changed, 0 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/net/macb.c b/drivers/net/macb.c
> index e1cfd85..d79da72 100644
> --- a/drivers/net/macb.c
> +++ b/drivers/net/macb.c
> @@ -344,7 +344,6 @@ static int macb_phy_write(struct mii_device *mdev, int addr, int reg, int value)
>  	unsigned long netctl;
>  	unsigned long netstat;
>  	unsigned long frame;
> -	int iflag;
>  
>  	debug("%s\n", __func__);
>  
> -- 
> 1.7.7.3
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PATCH 10/11] arm at91sam9260: Add missing AT91SAM_ETX2_ETX3_ALTERNATIVE define
  2011-12-07 12:53 ` [PATCH 10/11] arm at91sam9260: Add missing AT91SAM_ETX2_ETX3_ALTERNATIVE define Sascha Hauer
@ 2011-12-08 14:20   ` Jean-Christophe PLAGNIOL-VILLARD
  2011-12-09  5:33     ` Jean-Christophe PLAGNIOL-VILLARD
  0 siblings, 1 reply; 17+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2011-12-08 14:20 UTC (permalink / raw)
  To: Sascha Hauer; +Cc: barebox

On 13:53 Wed 07 Dec     , Sascha Hauer wrote:
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
>  arch/arm/mach-at91/include/mach/board.h |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/mach-at91/include/mach/board.h b/arch/arm/mach-at91/include/mach/board.h
> index 546fe90..5e23688 100644
> --- a/arch/arm/mach-at91/include/mach/board.h
> +++ b/arch/arm/mach-at91/include/mach/board.h
> @@ -51,6 +51,7 @@ void at91_add_device_nand(struct atmel_nand_data *data);
>  #define AT91SAM_ETHER_MII		(0 << 0)
>  #define AT91SAM_ETHER_RMII		(1 << 0)
>  #define AT91SAM_ETHER_FORCE_LINK	(1 << 1)
> +#define AT91SAM_ETX2_ETX3_ALTERNATIVE	(2 << 0
this will not work too

(1 << 1) = (1 << 0)


Best Regards,
J.

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PATCH 10/11] arm at91sam9260: Add missing AT91SAM_ETX2_ETX3_ALTERNATIVE define
  2011-12-08 14:20   ` Jean-Christophe PLAGNIOL-VILLARD
@ 2011-12-09  5:33     ` Jean-Christophe PLAGNIOL-VILLARD
  2011-12-09 10:15       ` Sascha Hauer
  0 siblings, 1 reply; 17+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2011-12-09  5:33 UTC (permalink / raw)
  To: Sascha Hauer; +Cc: barebox

On 15:20 Thu 08 Dec     , Jean-Christophe PLAGNIOL-VILLARD wrote:
> On 13:53 Wed 07 Dec     , Sascha Hauer wrote:
> > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> > ---
> >  arch/arm/mach-at91/include/mach/board.h |    1 +
> >  1 files changed, 1 insertions(+), 0 deletions(-)
> > 
> > diff --git a/arch/arm/mach-at91/include/mach/board.h b/arch/arm/mach-at91/include/mach/board.h
> > index 546fe90..5e23688 100644
> > --- a/arch/arm/mach-at91/include/mach/board.h
> > +++ b/arch/arm/mach-at91/include/mach/board.h
> > @@ -51,6 +51,7 @@ void at91_add_device_nand(struct atmel_nand_data *data);
> >  #define AT91SAM_ETHER_MII		(0 << 0)
> >  #define AT91SAM_ETHER_RMII		(1 << 0)
> >  #define AT91SAM_ETHER_FORCE_LINK	(1 << 1)
> > +#define AT91SAM_ETX2_ETX3_ALTERNATIVE	(2 << 0
> this will not work too
> 
> (1 << 1) = (1 << 0)
btw where does this come from

I see no patch about it on the ML at All

NACK

Best Regards,
J.

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PATCH 10/11] arm at91sam9260: Add missing AT91SAM_ETX2_ETX3_ALTERNATIVE define
  2011-12-09  5:33     ` Jean-Christophe PLAGNIOL-VILLARD
@ 2011-12-09 10:15       ` Sascha Hauer
  2011-12-09 10:45         ` Jean-Christophe PLAGNIOL-VILLARD
  0 siblings, 1 reply; 17+ messages in thread
From: Sascha Hauer @ 2011-12-09 10:15 UTC (permalink / raw)
  To: Jean-Christophe PLAGNIOL-VILLARD; +Cc: barebox

On Fri, Dec 09, 2011 at 06:33:08AM +0100, Jean-Christophe PLAGNIOL-VILLARD wrote:
> On 15:20 Thu 08 Dec     , Jean-Christophe PLAGNIOL-VILLARD wrote:
> > On 13:53 Wed 07 Dec     , Sascha Hauer wrote:
> > > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> > > ---
> > >  arch/arm/mach-at91/include/mach/board.h |    1 +
> > >  1 files changed, 1 insertions(+), 0 deletions(-)
> > > 
> > > diff --git a/arch/arm/mach-at91/include/mach/board.h b/arch/arm/mach-at91/include/mach/board.h
> > > index 546fe90..5e23688 100644
> > > --- a/arch/arm/mach-at91/include/mach/board.h
> > > +++ b/arch/arm/mach-at91/include/mach/board.h
> > > @@ -51,6 +51,7 @@ void at91_add_device_nand(struct atmel_nand_data *data);
> > >  #define AT91SAM_ETHER_MII		(0 << 0)
> > >  #define AT91SAM_ETHER_RMII		(1 << 0)
> > >  #define AT91SAM_ETHER_FORCE_LINK	(1 << 1)
> > > +#define AT91SAM_ETX2_ETX3_ALTERNATIVE	(2 << 0
> > this will not work too
> > 
> > (1 << 1) = (1 << 0)
> btw where does this come from
> 
> I see no patch about it on the ML at All

Sorry, I realized after the fact that Michael hasn't Cced the mailing
list. I owe you a beer.

Sascha


-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PATCH 10/11] arm at91sam9260: Add missing AT91SAM_ETX2_ETX3_ALTERNATIVE define
  2011-12-09 10:15       ` Sascha Hauer
@ 2011-12-09 10:45         ` Jean-Christophe PLAGNIOL-VILLARD
  0 siblings, 0 replies; 17+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2011-12-09 10:45 UTC (permalink / raw)
  To: Sascha Hauer; +Cc: barebox

On 11:15 Fri 09 Dec     , Sascha Hauer wrote:
> On Fri, Dec 09, 2011 at 06:33:08AM +0100, Jean-Christophe PLAGNIOL-VILLARD wrote:
> > On 15:20 Thu 08 Dec     , Jean-Christophe PLAGNIOL-VILLARD wrote:
> > > On 13:53 Wed 07 Dec     , Sascha Hauer wrote:
> > > > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> > > > ---
> > > >  arch/arm/mach-at91/include/mach/board.h |    1 +
> > > >  1 files changed, 1 insertions(+), 0 deletions(-)
> > > > 
> > > > diff --git a/arch/arm/mach-at91/include/mach/board.h b/arch/arm/mach-at91/include/mach/board.h
> > > > index 546fe90..5e23688 100644
> > > > --- a/arch/arm/mach-at91/include/mach/board.h
> > > > +++ b/arch/arm/mach-at91/include/mach/board.h
> > > > @@ -51,6 +51,7 @@ void at91_add_device_nand(struct atmel_nand_data *data);
> > > >  #define AT91SAM_ETHER_MII		(0 << 0)
> > > >  #define AT91SAM_ETHER_RMII		(1 << 0)
> > > >  #define AT91SAM_ETHER_FORCE_LINK	(1 << 1)
> > > > +#define AT91SAM_ETX2_ETX3_ALTERNATIVE	(2 << 0
> > > this will not work too
> > > 
> > > (1 << 1) = (1 << 0)
> > btw where does this come from
> > 
> > I see no patch about it on the ML at All
> 
> Sorry, I realized after the fact that Michael hasn't Cced the mailing
> list. I owe you a beer.
good tks

can he post them for review at least

because I don't like too much this new flags
and expect all the soc will updated

Best Regards,
J.

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 17+ messages in thread

end of thread, other threads:[~2011-12-09 10:49 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-12-07 12:52 [PATCH] compile (and warning) fixes for -next Sascha Hauer
2011-12-07 12:52 ` [PATCH 01/11] mci s3c: remove unused code Sascha Hauer
2011-12-07 12:52 ` [PATCH 02/11] memory: do not try to reserve iomem on sandbox Sascha Hauer
2011-12-07 12:52 ` [PATCH 03/11] remove unused Kconfig variable HAS_CFI Sascha Hauer
2011-12-07 12:53 ` [PATCH 04/11] fix underscore count in bss_start/bss_stop Sascha Hauer
2011-12-07 12:53 ` [PATCH 05/11] console_simple: fix compiler warning Sascha Hauer
2011-12-07 12:53 ` [PATCH 06/11] net macb: remove unused variable Sascha Hauer
2011-12-07 13:19   ` Jean-Christophe PLAGNIOL-VILLARD
2011-12-07 12:53 ` [PATCH 07/11] pxa: add type to Kconfig choice Sascha Hauer
2011-12-07 12:53 ` [PATCH 08/11] ft_build: temporarily disable bootm oftree support Sascha Hauer
2011-12-07 12:53 ` [PATCH 09/11] arm eukrea boards: fix breakage after mach-types update Sascha Hauer
2011-12-07 12:53 ` [PATCH 10/11] arm at91sam9260: Add missing AT91SAM_ETX2_ETX3_ALTERNATIVE define Sascha Hauer
2011-12-08 14:20   ` Jean-Christophe PLAGNIOL-VILLARD
2011-12-09  5:33     ` Jean-Christophe PLAGNIOL-VILLARD
2011-12-09 10:15       ` Sascha Hauer
2011-12-09 10:45         ` Jean-Christophe PLAGNIOL-VILLARD
2011-12-07 12:53 ` [PATCH 11/11] x86: Fix linker script for magic vars Sascha Hauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox