mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH 01/14] ARM: friendlyarm-mini2440: fix compilation for some displays
@ 2014-11-28 14:28 Sascha Hauer
  2014-11-28 14:28 ` [PATCH 02/14] ARM: ep93xx: Fix typo Sascha Hauer
                   ` (12 more replies)
  0 siblings, 13 replies; 18+ messages in thread
From: Sascha Hauer @ 2014-11-28 14:28 UTC (permalink / raw)
  To: barebox

struct fb_videomode does not have a flag member, so do not initialize
it.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/boards/friendlyarm-mini2440/mini2440.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/arch/arm/boards/friendlyarm-mini2440/mini2440.c b/arch/arm/boards/friendlyarm-mini2440/mini2440.c
index 4034de5..2dcb7db 100644
--- a/arch/arm/boards/friendlyarm-mini2440/mini2440.c
+++ b/arch/arm/boards/friendlyarm-mini2440/mini2440.c
@@ -96,7 +96,6 @@ static struct fb_videomode s3c24x0_fb_modes[] = {
 		.pixclock	= 41848,
 		.sync		= FB_SYNC_USE_PWREN | FB_SYNC_DE_HIGH_ACT,
 		.vmode		= FB_VMODE_NONINTERLACED,
-		.flag		= 0,
 	},
 #endif
 #ifdef CONFIG_MINI2440_VIDEO_SVGA
@@ -115,7 +114,6 @@ static struct fb_videomode s3c24x0_fb_modes[] = {
 		.sync		= FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT | FB_SYNC_DE_HIGH_ACT
                                   /* | FB_SYNC_SWAP_HW */ /* FIXME maybe */ ,
 		.vmode		= FB_VMODE_NONINTERLACED,
-		.flag		= 0,
 	},
 #endif
 };
-- 
2.1.3


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

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

* [PATCH 02/14] ARM: ep93xx: Fix typo
  2014-11-28 14:28 [PATCH 01/14] ARM: friendlyarm-mini2440: fix compilation for some displays Sascha Hauer
@ 2014-11-28 14:28 ` Sascha Hauer
  2014-11-28 14:28 ` [PATCH 03/14] ARM: ep93xx: let broken SoCs depend on BROKEN Sascha Hauer
                   ` (11 subsequent siblings)
  12 siblings, 0 replies; 18+ messages in thread
From: Sascha Hauer @ 2014-11-28 14:28 UTC (permalink / raw)
  To: barebox

Initialize 4th RAM bank with CONFIG_EP93XX_SDRAM_BANK3_SIZE,
not CONFIG_EP93XX_SDRAM_BANK2_SIZE.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/boards/edb93xx/edb93xx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boards/edb93xx/edb93xx.c b/arch/arm/boards/edb93xx/edb93xx.c
index d83980d..c314320 100644
--- a/arch/arm/boards/edb93xx/edb93xx.c
+++ b/arch/arm/boards/edb93xx/edb93xx.c
@@ -45,7 +45,7 @@ static int ep93xx_mem_init(void)
 #endif
 #if (CONFIG_EP93XX_SDRAM_NUM_BANKS == 4)
 	arm_add_mem_device("ram3", CONFIG_EP93XX_SDRAM_BANK3_BASE,
-				   CONFIG_EP93XX_SDRAM_BANK2_SIZE);
+				   CONFIG_EP93XX_SDRAM_BANK3_SIZE);
 #endif
 
 	return 0;
-- 
2.1.3


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

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

* [PATCH 03/14] ARM: ep93xx: let broken SoCs depend on BROKEN
  2014-11-28 14:28 [PATCH 01/14] ARM: friendlyarm-mini2440: fix compilation for some displays Sascha Hauer
  2014-11-28 14:28 ` [PATCH 02/14] ARM: ep93xx: Fix typo Sascha Hauer
@ 2014-11-28 14:28 ` Sascha Hauer
  2014-11-28 14:28 ` [PATCH 04/14] ARM: Let MMU depend on !CPU_ARM946E Sascha Hauer
                   ` (10 subsequent siblings)
  12 siblings, 0 replies; 18+ messages in thread
From: Sascha Hauer @ 2014-11-28 14:28 UTC (permalink / raw)
  To: barebox

Compilation with these SoCs fails with CONFIG_EP93XX_SDRAM_BANK3_SIZE
undefined.

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

diff --git a/arch/arm/mach-ep93xx/Kconfig b/arch/arm/mach-ep93xx/Kconfig
index 91f6c8e..f805a8f 100644
--- a/arch/arm/mach-ep93xx/Kconfig
+++ b/arch/arm/mach-ep93xx/Kconfig
@@ -18,12 +18,15 @@ config ARCH_EP9302
 	bool "EP9302"
 
 config ARCH_EP9307
+	depends on BROKEN
 	bool "EP9307"
 
 config ARCH_EP9312
+	depends on BROKEN
 	bool "EP9312"
 
 config ARCH_EP9315
+	depends on BROKEN
 	bool "EP9315"
 
 endchoice
-- 
2.1.3


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

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

* [PATCH 04/14] ARM: Let MMU depend on !CPU_ARM946E
  2014-11-28 14:28 [PATCH 01/14] ARM: friendlyarm-mini2440: fix compilation for some displays Sascha Hauer
  2014-11-28 14:28 ` [PATCH 02/14] ARM: ep93xx: Fix typo Sascha Hauer
  2014-11-28 14:28 ` [PATCH 03/14] ARM: ep93xx: let broken SoCs depend on BROKEN Sascha Hauer
@ 2014-11-28 14:28 ` Sascha Hauer
  2014-11-28 14:28 ` [PATCH 05/14] ARM: AT91: Always provide clk_set_rate stub Sascha Hauer
                   ` (9 subsequent siblings)
  12 siblings, 0 replies; 18+ messages in thread
From: Sascha Hauer @ 2014-11-28 14:28 UTC (permalink / raw)
  To: barebox

CPU_ARM946E is selected by boards, so letting it depend on !MMU
leads to broken dependencies. Let MMU depend on !CPU_ARM946E instead.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/cpu/Kconfig | 1 -
 common/Kconfig       | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/cpu/Kconfig b/arch/arm/cpu/Kconfig
index fb1a999..8934df0 100644
--- a/arch/arm/cpu/Kconfig
+++ b/arch/arm/cpu/Kconfig
@@ -42,7 +42,6 @@ config CPU_ARM926T
 # ARM946E-S
 config CPU_ARM946E
 	bool
-	depends on !MMU
 	select CPU_32v4T
 	help
 	  ARM946E-S is a member of the ARM9E-S family of high-
diff --git a/common/Kconfig b/common/Kconfig
index 5627980..21298c2 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -145,6 +145,7 @@ source "pbl/Kconfig"
 
 config MMU
 	bool "Enable MMU"
+	depends on !CPU_ARM946E
 	help
 	  Saying yes here enables the MMU. This is useful on some architectures
 	  to enable the data cache which depends on the MMU. See Documentation/mmu.txt
-- 
2.1.3


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

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

* [PATCH 05/14] ARM: AT91: Always provide clk_set_rate stub
  2014-11-28 14:28 [PATCH 01/14] ARM: friendlyarm-mini2440: fix compilation for some displays Sascha Hauer
                   ` (2 preceding siblings ...)
  2014-11-28 14:28 ` [PATCH 04/14] ARM: Let MMU depend on !CPU_ARM946E Sascha Hauer
@ 2014-11-28 14:28 ` Sascha Hauer
  2014-11-28 15:23   ` Lucas Stach
  2014-11-28 14:28 ` [PATCH 06/14] mci: mxs-mci: add f_min/f_max fields unconditionally Sascha Hauer
                   ` (8 subsequent siblings)
  12 siblings, 1 reply; 18+ messages in thread
From: Sascha Hauer @ 2014-11-28 14:28 UTC (permalink / raw)
  To: barebox

Some drivers need clk_set_rate. To be able to link with these
drivers enabled provide a clk_set_rate stub.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/mach-at91/clock.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/arch/arm/mach-at91/clock.c b/arch/arm/mach-at91/clock.c
index a7051c3..125d169 100644
--- a/arch/arm/mach-at91/clock.c
+++ b/arch/arm/mach-at91/clock.c
@@ -336,8 +336,6 @@ EXPORT_SYMBOL(clk_get_rate);
 
 /*------------------------------------------------------------------------*/
 
-#ifdef CONFIG_AT91_PROGRAMMABLE_CLOCKS
-
 /*
  * For now, only the programmable clocks support reparenting (MCK could
  * do this too, with care) or rate changing (the PLLs could do this too,
@@ -379,6 +377,9 @@ int clk_set_rate(struct clk *clk, unsigned long rate)
 	unsigned long	prescale_offset, css_mask;
 	unsigned long	actual;
 
+	if (!IS_ENABLED(CONFIG_PROGRAMMABLE_CLOCKS))
+		return 0;
+
 	if (!clk_is_programmable(clk))
 		return -EINVAL;
 	if (clk->users)
@@ -419,6 +420,9 @@ EXPORT_SYMBOL(clk_get_parent);
 
 int clk_set_parent(struct clk *clk, struct clk *parent)
 {
+	if (!IS_ENABLED(CONFIG_PROGRAMMABLE_CLOCKS))
+		return -ENOSYS;
+
 	if (clk->users)
 		return -EBUSY;
 	if (!clk_is_primary(parent) || !clk_is_programmable(clk))
@@ -453,8 +457,6 @@ static void init_programmable_clock(struct clk *clk)
 	clk->rate_hz = parent->rate_hz / pmc_prescaler_divider(pckr);
 }
 
-#endif	/* CONFIG_AT91_PROGRAMMABLE_CLOCKS */
-
 /*------------------------------------------------------------------------*/
 
 /* Register a new clock */
@@ -483,13 +485,10 @@ int clk_register(struct clk *clk)
 	else if (clk_is_sys(clk)) {
 		clk->parent = &mck;
 		clk->mode = pmc_sys_mode;
-	}
-#ifdef CONFIG_AT91_PROGRAMMABLE_CLOCKS
-	else if (clk_is_programmable(clk)) {
+	} else if (IS_ENABLED(CONFIG_PROGRAMMABLE_CLOCKS) && clk_is_programmable(clk)) {
 		clk->mode = pmc_sys_mode;
 		init_programmable_clock(clk);
 	}
-#endif
 
 	at91_clk_add(clk);
 
-- 
2.1.3


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

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

* [PATCH 06/14] mci: mxs-mci: add f_min/f_max fields unconditionally
  2014-11-28 14:28 [PATCH 01/14] ARM: friendlyarm-mini2440: fix compilation for some displays Sascha Hauer
                   ` (3 preceding siblings ...)
  2014-11-28 14:28 ` [PATCH 05/14] ARM: AT91: Always provide clk_set_rate stub Sascha Hauer
@ 2014-11-28 14:28 ` Sascha Hauer
  2014-11-28 14:28 ` [PATCH 07/14] param: make string arguments to dev_add_param_fixed const Sascha Hauer
                   ` (7 subsequent siblings)
  12 siblings, 0 replies; 18+ messages in thread
From: Sascha Hauer @ 2014-11-28 14:28 UTC (permalink / raw)
  To: barebox

Parts of the driver need these regardless of whether CONFIG_MCI_INFO
is set, so add these fields unconditionally.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/mci/mxs.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/mci/mxs.c b/drivers/mci/mxs.c
index 738bde9..d6565ca 100644
--- a/drivers/mci/mxs.c
+++ b/drivers/mci/mxs.c
@@ -53,10 +53,8 @@ struct mxs_mci_host {
 	void __iomem	*regs;
 	struct clk	*clk;
 	unsigned	clock;	/* current clock speed in Hz ("0" if disabled) */
-#ifdef CONFIG_MCI_INFO
 	unsigned	f_min;
 	unsigned	f_max;
-#endif
 	unsigned	bus_width:2; /* 0 = 1 bit, 1 = 4 bit, 2 = 8 bit */
 };
 
-- 
2.1.3


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

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

* [PATCH 07/14] param: make string arguments to dev_add_param_fixed const
  2014-11-28 14:28 [PATCH 01/14] ARM: friendlyarm-mini2440: fix compilation for some displays Sascha Hauer
                   ` (4 preceding siblings ...)
  2014-11-28 14:28 ` [PATCH 06/14] mci: mxs-mci: add f_min/f_max fields unconditionally Sascha Hauer
@ 2014-11-28 14:28 ` Sascha Hauer
  2014-11-28 14:29 ` [PATCH 08/14] fs: bpkfs: select CRC32 Sascha Hauer
                   ` (6 subsequent siblings)
  12 siblings, 0 replies; 18+ messages in thread
From: Sascha Hauer @ 2014-11-28 14:28 UTC (permalink / raw)
  To: barebox

dev_add_param_fixed does not modify the strings, so make them
const.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 include/param.h | 4 ++--
 lib/parameter.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/param.h b/include/param.h
index b8dd9b1..53bee54 100644
--- a/include/param.h
+++ b/include/param.h
@@ -67,7 +67,7 @@ struct param_d *dev_add_param_mac(struct device_d *dev, const char *name,
 		int (*get)(struct param_d *p, void *priv),
 		u8 *mac, void *priv);
 
-int dev_add_param_fixed(struct device_d *dev, char *name, const char *value);
+int dev_add_param_fixed(struct device_d *dev, const char *name, const char *value);
 
 void dev_remove_param(struct param_d *p);
 
@@ -161,7 +161,7 @@ static inline struct param_d *dev_add_param_mac(struct device_d *dev, const char
 	return NULL;
 }
 
-static inline int dev_add_param_fixed(struct device_d *dev, char *name, char *value)
+static inline int dev_add_param_fixed(struct device_d *dev, const char *name, const char *value)
 {
 	return 0;
 }
diff --git a/lib/parameter.c b/lib/parameter.c
index bcdb16b..d337ef3 100644
--- a/lib/parameter.c
+++ b/lib/parameter.c
@@ -185,7 +185,7 @@ struct param_d *dev_add_param(struct device_d *dev, const char *name,
  * @param name	The name of the parameter
  * @param value	The value of the parameter
  */
-int dev_add_param_fixed(struct device_d *dev, char *name, const char *value)
+int dev_add_param_fixed(struct device_d *dev, const char *name, const char *value)
 {
 	struct param_d *param;
 	int ret;
-- 
2.1.3


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

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

* [PATCH 08/14] fs: bpkfs: select CRC32
  2014-11-28 14:28 [PATCH 01/14] ARM: friendlyarm-mini2440: fix compilation for some displays Sascha Hauer
                   ` (5 preceding siblings ...)
  2014-11-28 14:28 ` [PATCH 07/14] param: make string arguments to dev_add_param_fixed const Sascha Hauer
@ 2014-11-28 14:29 ` Sascha Hauer
  2014-11-28 14:29 ` [PATCH 09/14] firmware: altera serial: depend on GENERIC_GPIO Sascha Hauer
                   ` (5 subsequent siblings)
  12 siblings, 0 replies; 18+ messages in thread
From: Sascha Hauer @ 2014-11-28 14:29 UTC (permalink / raw)
  To: barebox

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 fs/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fs/Kconfig b/fs/Kconfig
index 64fc117..cc3e334 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -61,6 +61,7 @@ source fs/ubifs/Kconfig
 
 config FS_BPKFS
 	bool
+	select CRC32
 	prompt "BPKFS support"
 	help
 	  Simple update file format developed for Somfy, tools and library are
-- 
2.1.3


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

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

* [PATCH 09/14] firmware: altera serial: depend on GENERIC_GPIO
  2014-11-28 14:28 [PATCH 01/14] ARM: friendlyarm-mini2440: fix compilation for some displays Sascha Hauer
                   ` (6 preceding siblings ...)
  2014-11-28 14:29 ` [PATCH 08/14] fs: bpkfs: select CRC32 Sascha Hauer
@ 2014-11-28 14:29 ` Sascha Hauer
  2014-11-28 14:29 ` [PATCH 10/14] spi: mxs-spi: Allow compilation on i.MX28 only Sascha Hauer
                   ` (4 subsequent siblings)
  12 siblings, 0 replies; 18+ messages in thread
From: Sascha Hauer @ 2014-11-28 14:29 UTC (permalink / raw)
  To: barebox

The driver needs gpio support, so depend on GENERIC_GPIO

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/firmware/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
index ac96bc0..15465fe 100644
--- a/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@ -3,6 +3,7 @@ menu "Firmware Drivers"
 config FIRMWARE_ALTERA_SERIAL
 	bool "Altera SPI programming"
 	depends on OFDEVICE
+	depends on GENERIC_GPIO
 	depends on SPI
 	select FIRMWARE
 	help
-- 
2.1.3


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

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

* [PATCH 10/14] spi: mxs-spi: Allow compilation on i.MX28 only
  2014-11-28 14:28 [PATCH 01/14] ARM: friendlyarm-mini2440: fix compilation for some displays Sascha Hauer
                   ` (7 preceding siblings ...)
  2014-11-28 14:29 ` [PATCH 09/14] firmware: altera serial: depend on GENERIC_GPIO Sascha Hauer
@ 2014-11-28 14:29 ` Sascha Hauer
  2014-11-28 14:29 ` [PATCH 11/14] gpio: move gpio_is_valid to include/gpio.h Sascha Hauer
                   ` (3 subsequent siblings)
  12 siblings, 0 replies; 18+ messages in thread
From: Sascha Hauer @ 2014-11-28 14:29 UTC (permalink / raw)
  To: barebox

The driver does not compile on i.MX23, so remove the i.MX23 from
the dependency list.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/spi/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 8a9bbd7..e4fa6a2 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -39,7 +39,7 @@ config DRIVER_SPI_IMX_2_3
 
 config DRIVER_SPI_MXS
 	bool "i.MX (23,28) SPI Master driver"
-	depends on ARCH_IMX23 || ARCH_IMX28
+	depends on ARCH_IMX28
 	depends on SPI
 
 config DRIVER_SPI_MVEBU
-- 
2.1.3


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

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

* [PATCH 11/14] gpio: move gpio_is_valid to include/gpio.h
  2014-11-28 14:28 [PATCH 01/14] ARM: friendlyarm-mini2440: fix compilation for some displays Sascha Hauer
                   ` (8 preceding siblings ...)
  2014-11-28 14:29 ` [PATCH 10/14] spi: mxs-spi: Allow compilation on i.MX28 only Sascha Hauer
@ 2014-11-28 14:29 ` Sascha Hauer
  2014-11-28 14:29 ` [PATCH 12/14] ARM: rockchip: select PINCTRL Sascha Hauer
                   ` (2 subsequent siblings)
  12 siblings, 0 replies; 18+ messages in thread
From: Sascha Hauer @ 2014-11-28 14:29 UTC (permalink / raw)
  To: barebox

No architectue implements its own gpio_is_valid() function, so move
the only existing implementation to include/gpio.h where it's available
for all users.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 include/asm-generic/gpio.h | 11 -----------
 include/gpio.h             | 11 +++++++++++
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h
index 95fdd05..7674970 100644
--- a/include/asm-generic/gpio.h
+++ b/include/asm-generic/gpio.h
@@ -1,17 +1,6 @@
 #ifndef __ASM_GENERIC_GPIO_H
 #define __ASM_GENERIC_GPIO_H
 
-#define ARCH_NR_GPIOS 256
-
-static inline int gpio_is_valid(int gpio)
-{
-	if (gpio < 0)
-		return 0;
-	if (gpio < ARCH_NR_GPIOS)
-		return 1;
-	return 0;
-}
-
 void gpio_set_value(unsigned gpio, int value);
 int gpio_get_value(unsigned gpio);
 int gpio_direction_output(unsigned gpio, int value);
diff --git a/include/gpio.h b/include/gpio.h
index 4a97521..f116ea6 100644
--- a/include/gpio.h
+++ b/include/gpio.h
@@ -3,6 +3,17 @@
 
 #include <asm/gpio.h>
 
+#define ARCH_NR_GPIOS 256
+
+static inline int gpio_is_valid(int gpio)
+{
+	if (gpio < 0)
+		return 0;
+	if (gpio < ARCH_NR_GPIOS)
+		return 1;
+	return 0;
+}
+
 #define GPIOF_DIR_OUT	(0 << 0)
 #define GPIOF_DIR_IN	(1 << 0)
 
-- 
2.1.3


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

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

* [PATCH 12/14] ARM: rockchip: select PINCTRL
  2014-11-28 14:28 [PATCH 01/14] ARM: friendlyarm-mini2440: fix compilation for some displays Sascha Hauer
                   ` (9 preceding siblings ...)
  2014-11-28 14:29 ` [PATCH 11/14] gpio: move gpio_is_valid to include/gpio.h Sascha Hauer
@ 2014-11-28 14:29 ` Sascha Hauer
  2014-11-28 14:29 ` [PATCH 13/14] ARM: AM335x: Select OFTREE Sascha Hauer
  2014-11-28 14:29 ` [PATCH 14/14] Kconfig: make BROKEN invisible Sascha Hauer
  12 siblings, 0 replies; 18+ messages in thread
From: Sascha Hauer @ 2014-11-28 14:29 UTC (permalink / raw)
  To: barebox

The Rockchip support needs pinctrl support, so select it in Kconfig.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 6e9e715..e1d21e4 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -154,6 +154,7 @@ config ARCH_ROCKCHIP
 	select CLKDEV_LOOKUP
 	select COMMON_CLK_OF_PROVIDER
 	select GPIOLIB
+	select PINCTRL
 	select PINCTRL_ROCKCHIP
 	select HAVE_PBL_MULTI_IMAGES
 
-- 
2.1.3


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

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

* [PATCH 13/14] ARM: AM335x: Select OFTREE
  2014-11-28 14:28 [PATCH 01/14] ARM: friendlyarm-mini2440: fix compilation for some displays Sascha Hauer
                   ` (10 preceding siblings ...)
  2014-11-28 14:29 ` [PATCH 12/14] ARM: rockchip: select PINCTRL Sascha Hauer
@ 2014-11-28 14:29 ` Sascha Hauer
  2014-11-28 14:29 ` [PATCH 14/14] Kconfig: make BROKEN invisible Sascha Hauer
  12 siblings, 0 replies; 18+ messages in thread
From: Sascha Hauer @ 2014-11-28 14:29 UTC (permalink / raw)
  To: barebox

All AM335x boards are devicetree only, so select support for it.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/mach-omap/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/mach-omap/Kconfig b/arch/arm/mach-omap/Kconfig
index f9b5ec3..82d9800 100644
--- a/arch/arm/mach-omap/Kconfig
+++ b/arch/arm/mach-omap/Kconfig
@@ -42,6 +42,7 @@ config ARCH_AM33XX
 	bool
 	select CPU_V7
 	select GENERIC_GPIO
+	select OFTREE
 	select OMAP_CLOCK_SOURCE_DMTIMER0
 	help
 	  Say Y here if you are using Texas Instrument's AM33xx based platform
-- 
2.1.3


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

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

* [PATCH 14/14] Kconfig: make BROKEN invisible
  2014-11-28 14:28 [PATCH 01/14] ARM: friendlyarm-mini2440: fix compilation for some displays Sascha Hauer
                   ` (11 preceding siblings ...)
  2014-11-28 14:29 ` [PATCH 13/14] ARM: AM335x: Select OFTREE Sascha Hauer
@ 2014-11-28 14:29 ` Sascha Hauer
  2014-12-01  9:00   ` Michael Olbrich
  12 siblings, 1 reply; 18+ messages in thread
From: Sascha Hauer @ 2014-11-28 14:29 UTC (permalink / raw)
  To: barebox

BROKEN is a developer option to keep things in the tree we know
are broken. Make this option invisible so that randconfig builds do
not enable it.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 common/Kconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/common/Kconfig b/common/Kconfig
index 21298c2..a5fa46b 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -248,7 +248,6 @@ endmenu
 
 config BROKEN
 	bool
-	prompt "Prompt for broken or incomplete code"
 
 config EXPERIMENTAL
 	bool
-- 
2.1.3


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

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

* Re: [PATCH 05/14] ARM: AT91: Always provide clk_set_rate stub
  2014-11-28 14:28 ` [PATCH 05/14] ARM: AT91: Always provide clk_set_rate stub Sascha Hauer
@ 2014-11-28 15:23   ` Lucas Stach
  2014-11-30 11:01     ` Sascha Hauer
  0 siblings, 1 reply; 18+ messages in thread
From: Lucas Stach @ 2014-11-28 15:23 UTC (permalink / raw)
  To: Sascha Hauer; +Cc: barebox

Am Freitag, den 28.11.2014, 15:28 +0100 schrieb Sascha Hauer:
> Some drivers need clk_set_rate. To be able to link with these
> drivers enabled provide a clk_set_rate stub.
> 
This commit seem to do something different than what the changelog says.

> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
>  arch/arm/mach-at91/clock.c | 15 +++++++--------
>  1 file changed, 7 insertions(+), 8 deletions(-)
> 
> diff --git a/arch/arm/mach-at91/clock.c b/arch/arm/mach-at91/clock.c
> index a7051c3..125d169 100644
> --- a/arch/arm/mach-at91/clock.c
> +++ b/arch/arm/mach-at91/clock.c
> @@ -336,8 +336,6 @@ EXPORT_SYMBOL(clk_get_rate);
>  
>  /*------------------------------------------------------------------------*/
>  
> -#ifdef CONFIG_AT91_PROGRAMMABLE_CLOCKS
> -
>  /*
>   * For now, only the programmable clocks support reparenting (MCK could
>   * do this too, with care) or rate changing (the PLLs could do this too,
> @@ -379,6 +377,9 @@ int clk_set_rate(struct clk *clk, unsigned long rate)
>  	unsigned long	prescale_offset, css_mask;
>  	unsigned long	actual;
>  
> +	if (!IS_ENABLED(CONFIG_PROGRAMMABLE_CLOCKS))
> +		return 0;
> +
>  	if (!clk_is_programmable(clk))
>  		return -EINVAL;
>  	if (clk->users)
> @@ -419,6 +420,9 @@ EXPORT_SYMBOL(clk_get_parent);
>  
>  int clk_set_parent(struct clk *clk, struct clk *parent)
>  {
> +	if (!IS_ENABLED(CONFIG_PROGRAMMABLE_CLOCKS))
> +		return -ENOSYS;
> +
>  	if (clk->users)
>  		return -EBUSY;
>  	if (!clk_is_primary(parent) || !clk_is_programmable(clk))
> @@ -453,8 +457,6 @@ static void init_programmable_clock(struct clk *clk)
>  	clk->rate_hz = parent->rate_hz / pmc_prescaler_divider(pckr);
>  }
>  
> -#endif	/* CONFIG_AT91_PROGRAMMABLE_CLOCKS */
> -
>  /*------------------------------------------------------------------------*/
>  
>  /* Register a new clock */
> @@ -483,13 +485,10 @@ int clk_register(struct clk *clk)
>  	else if (clk_is_sys(clk)) {
>  		clk->parent = &mck;
>  		clk->mode = pmc_sys_mode;
> -	}
> -#ifdef CONFIG_AT91_PROGRAMMABLE_CLOCKS
> -	else if (clk_is_programmable(clk)) {
> +	} else if (IS_ENABLED(CONFIG_PROGRAMMABLE_CLOCKS) && clk_is_programmable(clk)) {
>  		clk->mode = pmc_sys_mode;
>  		init_programmable_clock(clk);
>  	}
> -#endif
>  
>  	at91_clk_add(clk);
>  

-- 
Pengutronix e.K.             | Lucas Stach                 |
Industrial Linux Solutions   | http://www.pengutronix.de/  |


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

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

* Re: [PATCH 05/14] ARM: AT91: Always provide clk_set_rate stub
  2014-11-28 15:23   ` Lucas Stach
@ 2014-11-30 11:01     ` Sascha Hauer
  0 siblings, 0 replies; 18+ messages in thread
From: Sascha Hauer @ 2014-11-30 11:01 UTC (permalink / raw)
  To: Lucas Stach; +Cc: barebox

On Fri, Nov 28, 2014 at 04:23:26PM +0100, Lucas Stach wrote:
> Am Freitag, den 28.11.2014, 15:28 +0100 schrieb Sascha Hauer:
> > Some drivers need clk_set_rate. To be able to link with these
> > drivers enabled provide a clk_set_rate stub.
> > 
> This commit seem to do something different than what the changelog says.

No, look again. The clock_set_rate/clock_set_parent functions are
already there, but #ifdeffed out. This patch replaces the #ifdef
with IS_ENABLED() and thus provides the desired functions.

Sascha

> 
> > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> > ---
> >  arch/arm/mach-at91/clock.c | 15 +++++++--------
> >  1 file changed, 7 insertions(+), 8 deletions(-)
> > 
> > diff --git a/arch/arm/mach-at91/clock.c b/arch/arm/mach-at91/clock.c
> > index a7051c3..125d169 100644
> > --- a/arch/arm/mach-at91/clock.c
> > +++ b/arch/arm/mach-at91/clock.c
> > @@ -336,8 +336,6 @@ EXPORT_SYMBOL(clk_get_rate);
> >  
> >  /*------------------------------------------------------------------------*/
> >  
> > -#ifdef CONFIG_AT91_PROGRAMMABLE_CLOCKS
> > -
> >  /*
> >   * For now, only the programmable clocks support reparenting (MCK could
> >   * do this too, with care) or rate changing (the PLLs could do this too,
> > @@ -379,6 +377,9 @@ int clk_set_rate(struct clk *clk, unsigned long rate)
> >  	unsigned long	prescale_offset, css_mask;
> >  	unsigned long	actual;
> >  
> > +	if (!IS_ENABLED(CONFIG_PROGRAMMABLE_CLOCKS))
> > +		return 0;
> > +
> >  	if (!clk_is_programmable(clk))
> >  		return -EINVAL;
> >  	if (clk->users)
> > @@ -419,6 +420,9 @@ EXPORT_SYMBOL(clk_get_parent);
> >  
> >  int clk_set_parent(struct clk *clk, struct clk *parent)
> >  {
> > +	if (!IS_ENABLED(CONFIG_PROGRAMMABLE_CLOCKS))
> > +		return -ENOSYS;
> > +
> >  	if (clk->users)
> >  		return -EBUSY;
> >  	if (!clk_is_primary(parent) || !clk_is_programmable(clk))
> > @@ -453,8 +457,6 @@ static void init_programmable_clock(struct clk *clk)
> >  	clk->rate_hz = parent->rate_hz / pmc_prescaler_divider(pckr);
> >  }
> >  
> > -#endif	/* CONFIG_AT91_PROGRAMMABLE_CLOCKS */
> > -
> >  /*------------------------------------------------------------------------*/
> >  
> >  /* Register a new clock */
> > @@ -483,13 +485,10 @@ int clk_register(struct clk *clk)
> >  	else if (clk_is_sys(clk)) {
> >  		clk->parent = &mck;
> >  		clk->mode = pmc_sys_mode;
> > -	}
> > -#ifdef CONFIG_AT91_PROGRAMMABLE_CLOCKS
> > -	else if (clk_is_programmable(clk)) {
> > +	} else if (IS_ENABLED(CONFIG_PROGRAMMABLE_CLOCKS) && clk_is_programmable(clk)) {
> >  		clk->mode = pmc_sys_mode;
> >  		init_programmable_clock(clk);
> >  	}
> > -#endif
> >  
> >  	at91_clk_add(clk);
> >  
> 
> -- 
> Pengutronix e.K.             | Lucas Stach                 |
> Industrial Linux Solutions   | http://www.pengutronix.de/  |
> 
> 

-- 
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] 18+ messages in thread

* Re: [PATCH 14/14] Kconfig: make BROKEN invisible
  2014-11-28 14:29 ` [PATCH 14/14] Kconfig: make BROKEN invisible Sascha Hauer
@ 2014-12-01  9:00   ` Michael Olbrich
  2014-12-01 11:12     ` Sascha Hauer
  0 siblings, 1 reply; 18+ messages in thread
From: Michael Olbrich @ 2014-12-01  9:00 UTC (permalink / raw)
  To: barebox

On Fri, Nov 28, 2014 at 03:29:06PM +0100, Sascha Hauer wrote:
> BROKEN is a developer option to keep things in the tree we know
> are broken. Make this option invisible so that randconfig builds do
> not enable it.

I don't think this is needed. You can specify a partial config file when
running randconfig with KCONFIG_ALLCONFIG=some_config. Just disable BROKEN
there.

Michael

> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
>  common/Kconfig | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/common/Kconfig b/common/Kconfig
> index 21298c2..a5fa46b 100644
> --- a/common/Kconfig
> +++ b/common/Kconfig
> @@ -248,7 +248,6 @@ endmenu
>  
>  config BROKEN
>  	bool
> -	prompt "Prompt for broken or incomplete code"
>  
>  config EXPERIMENTAL
>  	bool
> -- 
> 2.1.3
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
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] 18+ messages in thread

* Re: [PATCH 14/14] Kconfig: make BROKEN invisible
  2014-12-01  9:00   ` Michael Olbrich
@ 2014-12-01 11:12     ` Sascha Hauer
  0 siblings, 0 replies; 18+ messages in thread
From: Sascha Hauer @ 2014-12-01 11:12 UTC (permalink / raw)
  To: barebox

On Mon, Dec 01, 2014 at 10:00:43AM +0100, Michael Olbrich wrote:
> On Fri, Nov 28, 2014 at 03:29:06PM +0100, Sascha Hauer wrote:
> > BROKEN is a developer option to keep things in the tree we know
> > are broken. Make this option invisible so that randconfig builds do
> > not enable it.
> 
> I don't think this is needed. You can specify a partial config file when
> running randconfig with KCONFIG_ALLCONFIG=some_config. Just disable BROKEN
> there.

Not since:

| commit 490f16171119a16e05d670306c105f3b45c38837
| Author: Yann E. MORIN <yann.morin.1998@free.fr>
| Date:   Tue Jun 25 23:37:44 2013 +0200
| 
|     Revert "kconfig: fix randomising choice entries in presence of KCONFIG_ALLCONFIG"
|     
|     This reverts commit 8357b48549e17b3e4e402c7f977b65708922e60f.
|     
|     It breaks more stuff than it fixes.

This renders KCONFIG_ALLCONFIG quite useless.

But regardless of this I think not showing broken options to users is the
right approach.

/me grepping for BROKEN in arch/*/configs/:

arch/arm/configs/friendlyarm_mini6410_defconfig:4:CONFIG_BROKEN=y
arch/arm/configs/freescale-mx28-evk_defconfig:9:CONFIG_BROKEN=y
arch/arm/configs/cfa10036_defconfig:9:CONFIG_BROKEN=y
arch/arm/configs/imx233-olinuxino_defconfig:5:CONFIG_BROKEN=y
arch/arm/configs/friendlyarm_mini2440_defconfig:8:CONFIG_BROKEN=y
arch/arm/configs/freescale-mx23-evk_defconfig:4:CONFIG_BROKEN=y
arch/arm/configs/netx_nxdb500_defconfig:3:CONFIG_BROKEN=y
arch/arm/configs/a9m2410_defconfig:4:CONFIG_BROKEN=y
arch/arm/configs/friendlyarm_tiny6410_defconfig:5:CONFIG_BROKEN=y
arch/arm/configs/chumbyone_defconfig:7:CONFIG_BROKEN=y
arch/arm/configs/a9m2440_defconfig:6:CONFIG_BROKEN=y
arch/arm/configs/tx28stk5_defconfig:8:CONFIG_BROKEN=y
arch/mips/configs/dlink-dir-320_defconfig:5:CONFIG_BROKEN=y
arch/mips/configs/qemu-malta_defconfig:5:CONFIG_BROKEN=y
arch/mips/configs/loongson-ls1b_defconfig:6:CONFIG_BROKEN=y
arch/x86/configs/generic_defconfig:3:CONFIG_BROKEN=y

So users starting from these defconfigs can just enable broken stuff
without even realizing. Let's not bother users with stuff we already
know it's broken.

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] 18+ messages in thread

end of thread, other threads:[~2014-12-01 11:12 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-11-28 14:28 [PATCH 01/14] ARM: friendlyarm-mini2440: fix compilation for some displays Sascha Hauer
2014-11-28 14:28 ` [PATCH 02/14] ARM: ep93xx: Fix typo Sascha Hauer
2014-11-28 14:28 ` [PATCH 03/14] ARM: ep93xx: let broken SoCs depend on BROKEN Sascha Hauer
2014-11-28 14:28 ` [PATCH 04/14] ARM: Let MMU depend on !CPU_ARM946E Sascha Hauer
2014-11-28 14:28 ` [PATCH 05/14] ARM: AT91: Always provide clk_set_rate stub Sascha Hauer
2014-11-28 15:23   ` Lucas Stach
2014-11-30 11:01     ` Sascha Hauer
2014-11-28 14:28 ` [PATCH 06/14] mci: mxs-mci: add f_min/f_max fields unconditionally Sascha Hauer
2014-11-28 14:28 ` [PATCH 07/14] param: make string arguments to dev_add_param_fixed const Sascha Hauer
2014-11-28 14:29 ` [PATCH 08/14] fs: bpkfs: select CRC32 Sascha Hauer
2014-11-28 14:29 ` [PATCH 09/14] firmware: altera serial: depend on GENERIC_GPIO Sascha Hauer
2014-11-28 14:29 ` [PATCH 10/14] spi: mxs-spi: Allow compilation on i.MX28 only Sascha Hauer
2014-11-28 14:29 ` [PATCH 11/14] gpio: move gpio_is_valid to include/gpio.h Sascha Hauer
2014-11-28 14:29 ` [PATCH 12/14] ARM: rockchip: select PINCTRL Sascha Hauer
2014-11-28 14:29 ` [PATCH 13/14] ARM: AM335x: Select OFTREE Sascha Hauer
2014-11-28 14:29 ` [PATCH 14/14] Kconfig: make BROKEN invisible Sascha Hauer
2014-12-01  9:00   ` Michael Olbrich
2014-12-01 11:12     ` Sascha Hauer

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