leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-arm

Browse Source
This commit is contained in:
Tom Rini
2015-10-19 11:30:38 -04:00
parent ef1e5710b3 79ad5cef15
commit 7003e4cf76
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-bcm283x/include/mach/mbox.h
View File

@@ -150,6 +150,7 @@ struct bcm2835_mbox_tag_hdr {
#define BCM2835_BOARD_REV_A_PLUS 0x12 #define BCM2835_BOARD_REV_A_PLUS 0x12
#define BCM2835_BOARD_REV_B_PLUS_13 0x13 #define BCM2835_BOARD_REV_B_PLUS_13 0x13
#define BCM2835_BOARD_REV_CM_14 0x14 #define BCM2835_BOARD_REV_CM_14 0x14
#define BCM2835_BOARD_REV_A_PLUS_15 0x15
#endif #endif
struct bcm2835_mbox_tag_get_board_rev { struct bcm2835_mbox_tag_get_board_rev {

5
board/raspberrypi/rpi/rpi.c
View File

@@ -176,6 +176,11 @@ static const struct {
"bcm2835-rpi-cm.dtb", "bcm2835-rpi-cm.dtb",
false, false,
}, },
[BCM2835_BOARD_REV_A_PLUS_15] = {
"Model A+",
"bcm2835-rpi-a-plus.dtb",
false,
},
#endif #endif
}; };

4
include/configs/dockstar.h
View File

@@ -57,8 +57,8 @@
* it has to be rounded to sector size * it has to be rounded to sector size
*/ */
#define CONFIG_ENV_SIZE 0x20000 /* 128k */ #define CONFIG_ENV_SIZE 0x20000 /* 128k */
#define CONFIG_ENV_ADDR 0x60000 #define CONFIG_ENV_ADDR 0x80000
#define CONFIG_ENV_OFFSET 0x60000 /* env starts here */ #define CONFIG_ENV_OFFSET 0x80000 /* env starts here */
/* /*
* Default environment variables * Default environment variables