From d1a2f32fca16ce0ec01b3447cc4755a17aca7f0f Mon Sep 17 00:00:00 2001 From: Eric Cooper Date: Mon, 12 Oct 2015 19:18:52 -0400 Subject: ARM: dockstar: move start of environment area The default dockstar configuration for U-Boot currently causes it to overrun the environment area, so that a "saveenv" command bricks the device. This patch moves the environment to a higher address to avoid that. Signed-off-by: Eric Cooper --- include/configs/dockstar.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h index a62f4e3d3b..6ebd703d32 100644 --- a/include/configs/dockstar.h +++ b/include/configs/dockstar.h @@ -57,8 +57,8 @@ * it has to be rounded to sector size */ #define CONFIG_ENV_SIZE 0x20000 /* 128k */ -#define CONFIG_ENV_ADDR 0x60000 -#define CONFIG_ENV_OFFSET 0x60000 /* env starts here */ +#define CONFIG_ENV_ADDR 0x80000 +#define CONFIG_ENV_OFFSET 0x80000 /* env starts here */ /* * Default environment variables -- cgit v1.2.3 From 79ad5cef151fff32432a31ce7fe92e170d8a95ae Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Wed, 14 Oct 2015 17:17:54 +0200 Subject: ARM: rpi: add another revision of Raspberry Pi A+ Seen this one in the wild. Is labelled "Raspberry Pi Model A+ V1.1, (C) Raspberry Pi 2014". A standard A+ board, much like the one with version 0x12, didn't notice any differencies. Signed-off-by: Lubomir Rintel --- arch/arm/mach-bcm283x/include/mach/mbox.h | 1 + board/raspberrypi/rpi/rpi.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/arch/arm/mach-bcm283x/include/mach/mbox.h b/arch/arm/mach-bcm283x/include/mach/mbox.h index ff959c8a97..9260ee2df7 100644 --- a/arch/arm/mach-bcm283x/include/mach/mbox.h +++ b/arch/arm/mach-bcm283x/include/mach/mbox.h @@ -150,6 +150,7 @@ struct bcm2835_mbox_tag_hdr { #define BCM2835_BOARD_REV_A_PLUS 0x12 #define BCM2835_BOARD_REV_B_PLUS_13 0x13 #define BCM2835_BOARD_REV_CM_14 0x14 +#define BCM2835_BOARD_REV_A_PLUS_15 0x15 #endif struct bcm2835_mbox_tag_get_board_rev { diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c index 6d7be11518..942badb087 100644 --- a/board/raspberrypi/rpi/rpi.c +++ b/board/raspberrypi/rpi/rpi.c @@ -176,6 +176,11 @@ static const struct { "bcm2835-rpi-cm.dtb", false, }, + [BCM2835_BOARD_REV_A_PLUS_15] = { + "Model A+", + "bcm2835-rpi-a-plus.dtb", + false, + }, #endif }; -- cgit v1.2.3