Patch queue for rpi - 2018-12-03

A few Raspberry Pi specific changes this time:
 
   - Allow 2nd MMC device
   - Support RPi 3 Model A+
   - Allow UUID to find filesystem
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABAgAGBQJcBYNQAAoJECszeR4D/txgpdAQAL+JkA5pJeX2bSJy10Y1jTQa
 uD9R5uvRFmduXLMYgZPzc9FCOTbsO5DJvvERV+JidHDeNYIFVAuPo494fUZL3JGa
 Q+zUEDkO8lf2ybJCX5lg6EEZ2O/xzCZJqHs+cV5iPWJ//y0Hx6RuhfS0DGbPQuwN
 e7tlOZg178ZzXSmsNdqKGhNUgSXUTHKaJ5H02VJZ61oUo9/4Zmpsoc3flCrYDjme
 DAeVqDMex+UyqxfBrxMdvVUtdovMV6coF/hbZiHHogvjwNZCmBri0wmFaCmzheSj
 DCz3ec0MxdT3lM2n4otAWiB1x/UY8cwCiWkSzRlFCUNzlvUxVddWgghoH0uQYvzh
 u35EMmNPM4wV6J3RjS+klQyD5tSLoUG5m4DRUDX1KKhE3MFTnx89tTf7n4++/5bk
 Hke3p1KLDnYCvEffFAu/PAeKMpLFTAxZTZm5Nog/EO5dFV2M3NeS2GpAbXXQep3r
 0WfflWrvjjG7CnnDDWMxMxYSqNv/tC9gqTeML1dOt4P275s1NyDkFj0OebjoVoiI
 fnh3DALF4AMP2mDLrFFvoYP7LptSb/TiidH3IT/AwfjFiHGicVDufBqfUObfPKNE
 oUqkKzdKnuZ9Nq5HN9OuAxM4SkSKuXVJpGXef7yJ+BUrQylPjTCpOtxtRVpIumvK
 +vIMVysbLz0EqpuV8i2P
 =W6tE
 -----END PGP SIGNATURE-----

Merge tag 'signed-rpi-next' of git://github.com/agraf/u-boot

Patch queue for rpi - 2018-12-03

A few Raspberry Pi specific changes this time:

  - Allow 2nd MMC device
  - Support RPi 3 Model A+
  - Allow UUID to find filesystem
This commit is contained in:
Tom Rini 2018-12-03 17:52:53 -05:00
commit 9981c60ef5
7 changed files with 12 additions and 8 deletions

View File

@ -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[] = {

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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)