* [U-Boot] [PATCH v2 14/18] at91: mtd: nand: Add dev_warn() to correct build error in driver
@ 2016-05-05 13:34 Simon Glass
2016-05-28 18:12 ` Scott Wood
0 siblings, 1 reply; 4+ messages in thread
From: Simon Glass @ 2016-05-05 13:34 UTC (permalink / raw)
To: u-boot
The code does not compile if ECC is enabled.
Signed-off-by: Andre Renaud <andre@designa-electronics.com>
Signed-off-by: Simon Glass <sjg@chromium.org>
---
Changes in v2: None
drivers/mtd/nand/atmel_nand.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c
index 8fac824..15958cb 100644
--- a/drivers/mtd/nand/atmel_nand.c
+++ b/drivers/mtd/nand/atmel_nand.c
@@ -20,6 +20,8 @@
#include <watchdog.h>
#include <linux/mtd/nand_ecc.h>
+#define dev_warn(dev, msg...)
+
#ifdef CONFIG_ATMEL_NAND_HWECC
/* Register access macros */
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH v2 14/18] at91: mtd: nand: Add dev_warn() to correct build error in driver
2016-05-05 13:34 [U-Boot] [PATCH v2 14/18] at91: mtd: nand: Add dev_warn() to correct build error in driver Simon Glass
@ 2016-05-28 18:12 ` Scott Wood
0 siblings, 0 replies; 4+ messages in thread
From: Scott Wood @ 2016-05-28 18:12 UTC (permalink / raw)
To: u-boot
On Thu, 2016-05-05 at 07:34 -0600, Simon Glass wrote:
> The code does not compile if ECC is enabled.
>
> Signed-off-by: Andre Renaud <andre@designa-electronics.com>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
> Changes in v2: None
>
> drivers/mtd/nand/atmel_nand.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c
> index 8fac824..15958cb 100644
> --- a/drivers/mtd/nand/atmel_nand.c
> +++ b/drivers/mtd/nand/atmel_nand.c
> @@ -20,6 +20,8 @@
> #include <watchdog.h>
> #include <linux/mtd/nand_ecc.h>
>
> +#define dev_warn(dev, msg...)
> +
> #ifdef CONFIG_ATMEL_NAND_HWECC
>
> /* Register access macros */
This should go in include/linux/compat.h with the others.
-Scott
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH v2 00/18] at91: Convert Ethernet and LCD to driver model
@ 2016-05-05 13:28 Simon Glass
2016-05-05 13:28 ` [U-Boot] [PATCH v2 14/18] at91: mtd: nand: Add dev_warn() to correct build error in driver Simon Glass
0 siblings, 1 reply; 4+ messages in thread
From: Simon Glass @ 2016-05-05 13:28 UTC (permalink / raw)
To: u-boot
This series is mainly designed to move the macb Ethernet to driver model,
along with the LCD controller. It also includes a few fixes:
- NAND with ECC doesn't build properly
- The instruction cache is off by default
- Ethernet macb doesn't send packets when the cache is enabled
A Snapper 9G45-based board is used for this work. It includes an AT91SAM9G45
CPU so is a good test of driver model on this chip.
Changes in v2:
- Correct commit author in several cases
- Rebase to master
Andre Renaud (7):
at91: Add support for the AT91 slow clock controller
net: Handle an empty bootp extension section
arm: at91: Add a header file for the real-time clock
at91: Correct NAND ECC register access
at91: nand: Set up the ECC strength correctly
mtd: nand: Drop a blank line in nand_wait()
arm: at91: Add support for gurnard
Simon Glass (11):
arm: Allow skipping of low-level init with I-cache on
bootm: Align cache flush end address correctly
net: macb: Prepare for driver-model conversion
net: macb: Flush correct cache portion when sending
net: macb: Convert to driver model
arm: at91: dts: Bring in device tree file for AT91SAM9G45
at91: Add driver-model GPIO devices for AT91SAM9G45
at91: mtd: nand: Add dev_warn() to correct build error in driver
at91: video: Prepare for driver-model conversion
at91: video: Support driver-model for the LCD driver
fdt: Correct return value in fdtdec_decode_display_timing()
README | 5 +
arch/arm/cpu/arm1136/start.S | 2 +
arch/arm/cpu/arm920t/start.S | 3 +-
arch/arm/cpu/arm926ejs/start.S | 2 +
arch/arm/cpu/arm946es/start.S | 2 +
arch/arm/cpu/armv7/start.S | 5 +-
arch/arm/cpu/sa1100/start.S | 2 +
arch/arm/dts/Makefile | 1 +
arch/arm/dts/at91sam9g45-gurnard.dts | 157 ++
arch/arm/dts/at91sam9g45.dtsi | 1335 ++++++++++
arch/arm/mach-at91/Kconfig | 9 +
.../mach-at91/arm926ejs/at91sam9m10g45_devices.c | 18 +
arch/arm/mach-at91/include/mach/at91_rtc.h | 71 +
arch/arm/mach-at91/include/mach/at91_sck.h | 21 +
arch/arm/mach-at91/include/mach/at91sam9g45.h | 1 +
board/bluewater/gurnard/Kconfig | 12 +
board/bluewater/gurnard/MAINTAINERS | 6 +
board/bluewater/gurnard/Makefile | 11 +
board/bluewater/gurnard/gurnard.c | 449 ++++
board/bluewater/gurnard/splash_logo.h | 2619 ++++++++++++++++++++
common/bootm.c | 2 +-
configs/gurnard_defconfig | 19 +
drivers/mtd/nand/atmel_nand.c | 7 +-
drivers/mtd/nand/nand_base.c | 1 -
drivers/net/macb.c | 320 ++-
drivers/video/atmel_lcdfb.c | 197 +-
include/atmel_lcd.h | 9 +
include/configs/snapper9g45.h | 156 ++
include/dt-bindings/clock/at91.h | 23 +
include/dt-bindings/dma/at91.h | 52 +
include/dt-bindings/pinctrl/at91.h | 40 +
lib/fdtdec.c | 2 +-
net/bootp.c | 9 +
33 files changed, 5449 insertions(+), 119 deletions(-)
create mode 100644 arch/arm/dts/at91sam9g45-gurnard.dts
create mode 100644 arch/arm/dts/at91sam9g45.dtsi
create mode 100644 arch/arm/mach-at91/include/mach/at91_rtc.h
create mode 100644 arch/arm/mach-at91/include/mach/at91_sck.h
create mode 100644 board/bluewater/gurnard/Kconfig
create mode 100644 board/bluewater/gurnard/MAINTAINERS
create mode 100644 board/bluewater/gurnard/Makefile
create mode 100644 board/bluewater/gurnard/gurnard.c
create mode 100644 board/bluewater/gurnard/splash_logo.h
create mode 100644 configs/gurnard_defconfig
create mode 100644 include/configs/snapper9g45.h
create mode 100644 include/dt-bindings/clock/at91.h
create mode 100644 include/dt-bindings/dma/at91.h
create mode 100644 include/dt-bindings/pinctrl/at91.h
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH v2 14/18] at91: mtd: nand: Add dev_warn() to correct build error in driver
2016-05-05 13:28 [U-Boot] [PATCH v2 00/18] at91: Convert Ethernet and LCD to driver model Simon Glass
@ 2016-05-05 13:28 ` Simon Glass
2016-05-28 23:04 ` Andreas Bießmann
0 siblings, 1 reply; 4+ messages in thread
From: Simon Glass @ 2016-05-05 13:28 UTC (permalink / raw)
To: u-boot
The code does not compile if ECC is enabled.
Signed-off-by: Andre Renaud <arenaud@bluewatersys.com>
Signed-off-by: Simon Glass <sjg@chromium.org>
---
Changes in v2: None
drivers/mtd/nand/atmel_nand.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c
index 8fac824..15958cb 100644
--- a/drivers/mtd/nand/atmel_nand.c
+++ b/drivers/mtd/nand/atmel_nand.c
@@ -20,6 +20,8 @@
#include <watchdog.h>
#include <linux/mtd/nand_ecc.h>
+#define dev_warn(dev, msg...)
+
#ifdef CONFIG_ATMEL_NAND_HWECC
/* Register access macros */
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH v2 14/18] at91: mtd: nand: Add dev_warn() to correct build error in driver
2016-05-05 13:28 ` [U-Boot] [PATCH v2 14/18] at91: mtd: nand: Add dev_warn() to correct build error in driver Simon Glass
@ 2016-05-28 23:04 ` Andreas Bießmann
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Bießmann @ 2016-05-28 23:04 UTC (permalink / raw)
To: u-boot
Hi Simon,
On 05.05.16 15:28, Simon Glass wrote:
> The code does not compile if ECC is enabled.
>
> Signed-off-by: Andre Renaud <arenaud@bluewatersys.com>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
> Changes in v2: None
>
> drivers/mtd/nand/atmel_nand.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c
> index 8fac824..15958cb 100644
> --- a/drivers/mtd/nand/atmel_nand.c
> +++ b/drivers/mtd/nand/atmel_nand.c
> @@ -20,6 +20,8 @@
> #include <watchdog.h>
> #include <linux/mtd/nand_ecc.h>
>
> +#define dev_warn(dev, msg...)
> +
This change is good in general, but I think the better fix is to use
dev_err() for the uncorrectable error and dev_dbg() for the rest.
Andreas
> #ifdef CONFIG_ATMEL_NAND_HWECC
>
> /* Register access macros */
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-05-28 23:04 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-05 13:34 [U-Boot] [PATCH v2 14/18] at91: mtd: nand: Add dev_warn() to correct build error in driver Simon Glass
2016-05-28 18:12 ` Scott Wood
-- strict thread matches above, loose matches on Subject: below --
2016-05-05 13:28 [U-Boot] [PATCH v2 00/18] at91: Convert Ethernet and LCD to driver model Simon Glass
2016-05-05 13:28 ` [U-Boot] [PATCH v2 14/18] at91: mtd: nand: Add dev_warn() to correct build error in driver Simon Glass
2016-05-28 23:04 ` Andreas Bießmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox