This bump fix the build failure with gcc5 for barebox. Some changes were made to the first patch to align to the latest barebox api. Also done the following changes: - Use "BR2_TARGET_BAREBOX_CONFIG_FRAGMENT_FILES" instead of patching the barebox sources. - Use "BR2_GLOBAL_PATCH_DIR" instead of "BR2_TARGET_BAREBOX_CUSTOM_PATCH_DIR". Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
27 lines
937 B
Diff
27 lines
937 B
Diff
From d8231b1726a020733d87c2685ec1631403e050cf Mon Sep 17 00:00:00 2001
|
|
From: Fabio Porcedda <fabio.porcedda@gmail.com>
|
|
Date: Thu, 17 Jan 2013 11:32:35 +0100
|
|
Subject: [PATCH 4/4] at91sam9260/9g20: fix wathdog support
|
|
|
|
Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
|
|
---
|
|
arch/arm/mach-at91/at91sam9260_devices.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c
|
|
index 51852a9a8..20c8cac9d 100644
|
|
--- a/arch/arm/mach-at91/at91sam9260_devices.c
|
|
+++ b/arch/arm/mach-at91/at91sam9260_devices.c
|
|
@@ -404,7 +404,7 @@ void at91_add_device_mci(short mmc_id, struct atmel_mci_platform_data *data) {}
|
|
static int at91_add_device_watchdog(void)
|
|
{
|
|
add_generic_device("at91sam9_wdt", DEVICE_ID_SINGLE, NULL,
|
|
- AT91_WDT + AT91_BASE_SYS, 16, IORESOURCE_MEM, NULL);
|
|
+ AT91_BASE_WDT, 16, IORESOURCE_MEM, NULL);
|
|
|
|
return 0;
|
|
}
|
|
--
|
|
2.12.0
|
|
|