diff options
| author | Tom Rini <trini@konsulko.com> | 2015-10-19 11:30:38 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-10-19 11:30:38 -0400 |
| commit | 7003e4cf76138de2f6af2f251ec929f2ea4b4043 (patch) | |
| tree | 2ba13ad1163e5750d98c56ffafbf23cc4602cbf1 | |
| parent | ef1e5710b338916e71543244a6b4982a3918dd3c (diff) | |
| parent | 79ad5cef151fff32432a31ce7fe92e170d8a95ae (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
| -rw-r--r-- | arch/arm/mach-bcm283x/include/mach/mbox.h | 1 | ||||
| -rw-r--r-- | board/raspberrypi/rpi/rpi.c | 5 | ||||
| -rw-r--r-- | include/configs/dockstar.h | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/arch/arm/mach-bcm283x/include/mach/mbox.h b/arch/arm/mach-bcm283x/include/mach/mbox.h index ff959c8a97d..9260ee2df76 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 6d7be11518e..942badb0873 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 }; diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h index a62f4e3d3b3..6ebd703d32d 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 |