diff options
| -rw-r--r-- | board/raspberrypi/rpi/rpi.c | 14 | ||||
| -rw-r--r-- | configs/rpi_0_w_defconfig | 1 | ||||
| -rw-r--r-- | configs/rpi_2_defconfig | 1 | ||||
| -rw-r--r-- | configs/rpi_3_32b_defconfig | 1 | ||||
| -rw-r--r-- | configs/rpi_3_defconfig | 1 | ||||
| -rw-r--r-- | configs/rpi_defconfig | 1 | ||||
| -rw-r--r-- | include/configs/rpi.h | 1 |
7 files changed, 12 insertions, 8 deletions
diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c index 649127c5bf..153a1fdcb7 100644 --- a/board/raspberrypi/rpi/rpi.c +++ b/board/raspberrypi/rpi/rpi.c @@ -68,14 +68,7 @@ struct msg_get_clock_rate { #endif /* - * http://raspberryalphaomega.org.uk/2013/02/06/automatic-raspberry-pi-board-revision-detection-model-a-b1-and-b2/ - * http://www.raspberrypi.org/forums/viewtopic.php?f=63&t=32733 - * http://git.drogon.net/?p=wiringPi;a=blob;f=wiringPi/wiringPi.c;h=503151f61014418b9c42f4476a6086f75cd4e64b;hb=refs/heads/master#l922 - * - * In http://lists.denx.de/pipermail/u-boot/2016-January/243752.html - * ("[U-Boot] [PATCH] rpi: fix up Model B entries") Dom Cobley at the RPi - * Foundation stated that the following source was accurate: - * https://github.com/AndrewFromMelbourne/raspberry_pi_revision + * https://www.raspberrypi.org/documentation/hardware/raspberrypi/revision-codes/README.md */ struct rpi_model { const char *name; @@ -145,6 +138,11 @@ static const struct rpi_model rpi_models_new_scheme[] = { DTB_DIR "bcm2837-rpi-3-b-plus.dtb", true, }, + [0xE] = { + "3 Model A+", + DTB_DIR "bcm2837-rpi-3-a-plus.dtb", + false, + }, }; static const struct rpi_model rpi_models_old_scheme[] = { diff --git a/configs/rpi_0_w_defconfig b/configs/rpi_0_w_defconfig index d5bf01b76e..66b0de31b6 100644 --- a/configs/rpi_0_w_defconfig +++ b/configs/rpi_0_w_defconfig @@ -13,6 +13,7 @@ CONFIG_SYS_PROMPT="U-Boot> " CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y +CONFIG_CMD_FS_UUID=y CONFIG_OF_EMBED=y CONFIG_DEFAULT_DEVICE_TREE="bcm2835-rpi-zero-w" CONFIG_ENV_FAT_INTERFACE="mmc" diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig index a50a815759..ba75e52dda 100644 --- a/configs/rpi_2_defconfig +++ b/configs/rpi_2_defconfig @@ -13,6 +13,7 @@ CONFIG_SYS_PROMPT="U-Boot> " CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y +CONFIG_CMD_FS_UUID=y CONFIG_OF_EMBED=y CONFIG_DEFAULT_DEVICE_TREE="bcm2836-rpi-2-b" CONFIG_ENV_FAT_INTERFACE="mmc" diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig index ec395d29ed..bbcdd91e90 100644 --- a/configs/rpi_3_32b_defconfig +++ b/configs/rpi_3_32b_defconfig @@ -14,6 +14,7 @@ CONFIG_SYS_PROMPT="U-Boot> " CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y +CONFIG_CMD_FS_UUID=y CONFIG_OF_EMBED=y CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b" CONFIG_ENV_FAT_INTERFACE="mmc" diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig index ac99f2000a..54b6303c2d 100644 --- a/configs/rpi_3_defconfig +++ b/configs/rpi_3_defconfig @@ -14,6 +14,7 @@ CONFIG_SYS_PROMPT="U-Boot> " CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y +CONFIG_CMD_FS_UUID=y CONFIG_OF_EMBED=y CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b" CONFIG_ENV_FAT_INTERFACE="mmc" diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig index db42ffd135..e7820cb147 100644 --- a/configs/rpi_defconfig +++ b/configs/rpi_defconfig @@ -13,6 +13,7 @@ CONFIG_SYS_PROMPT="U-Boot> " CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y +CONFIG_CMD_FS_UUID=y CONFIG_OF_EMBED=y CONFIG_DEFAULT_DEVICE_TREE="bcm2835-rpi-b" CONFIG_ENV_FAT_INTERFACE="mmc" diff --git a/include/configs/rpi.h b/include/configs/rpi.h index 37be6dbeeb..9ce41767a9 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -148,6 +148,7 @@ #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) \ + func(MMC, mmc, 1) \ func(USB, usb, 0) \ func(PXE, pxe, na) \ func(DHCP, dhcp, na) |