Skip to content

Commit 69d599e

Browse files
committed
board/aarch64: add missing mmc partconf command to BPi-R64 U-Boot
Also, simplify board README a bit now that we know that you don't need to flip the boot switch to program eMMC. [skip ci] Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
1 parent 6c879d8 commit 69d599e

3 files changed

Lines changed: 18 additions & 23 deletions

File tree

board/aarch64/bananapi-bpi-r64/README.md

Lines changed: 15 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,15 @@ Infix comes preconfigured with:
3030

3131
<img align="right" src="bpi-r64-sw1.png" alt="SW1 Boot Switch" width=90 padding=10>
3232

33-
The BPI-R64 uses a 2-position DIP switch (SW1) to select the boot device
34-
order. The MT7622 Boot ROM tries devices in the order listed and falls
35-
back to the next if no valid BL2 is found at the expected location.
33+
The BPI-R64 has a 2-position DIP switch (SW1) for selecting the boot device.
34+
The MT7622 Boot ROM always tries SD first if a card is present, so you can
35+
leave SW1 in the OFF (eMMC) position and simply insert or remove an SD card
36+
to control boot device selection.
3637

37-
| SW1 | Boot device | Use case |
38-
|-----|-------------|----------------------------|
39-
| OFF | eMMC | Production eMMC boot |
40-
| ON | SD card | SD card boot / development |
41-
42-
> [!NOTE]
43-
> SinoVoip has exposed only one bit of the MT7622's two-bit `BOOT_SEL[1:0]`
44-
> strapping field via SW1, with `BOOT_SEL[1]` hardwired high. This limits the
45-
> board to eMMC (`10b`) and SD (`11b`) boot; the SPI-NOR and SPI-NAND modes
46-
> available on the MT7622 reference board (`00b`, `01b`) are not selectable.
38+
| SW1 | Boot device |
39+
|-----|-------------|
40+
| OFF | eMMC |
41+
| ON | SD card |
4742

4843
## Getting Started
4944

@@ -58,11 +53,10 @@ back to the next if no valid BL2 is found at the expected location.
5853
dd if=infix-*-bpi-r64-sdcard.img of=/dev/sdX bs=4M status=progress
5954
```
6055

61-
2. **Set boot switch:** SW1 ON (SD card boot)
62-
3. **Insert SD card and power on**
63-
4. **Connect console:** 115200 8N1 — use the dedicated Debug UART header
56+
2. **Insert SD card and power on**
57+
3. **Connect console:** 115200 8N1 — use the dedicated Debug UART header
6458
just below the 40-pin GPIO header; pins are labeled GND, RX, TX on the board
65-
5. **Default login:** `admin` / `admin`
59+
4. **Default login:** `admin` / `admin`
6660

6761
## Installing to eMMC
6862

@@ -84,9 +78,8 @@ drive.
8478

8579
#### Step 1: Boot from SD card
8680

87-
1. Set SW1 to ON (SD boot)
88-
2. Insert SD card with Infix
89-
3. Power on and break into U-Boot (press Ctrl-C during boot)
81+
1. Insert SD card with Infix
82+
2. Power on and break into U-Boot (press Ctrl-C during boot)
9083

9184
#### Step 2: Write the eMMC image from U-Boot
9285

@@ -115,9 +108,8 @@ mmc partconf 0 1 1 0
115108
#### Step 4: Boot from eMMC
116109

117110
1. Power off the board
118-
2. Set SW1 to OFF (eMMC boot)
119-
3. Remove SD card and USB drive
120-
4. Power on
111+
2. Remove SD card and USB drive
112+
3. Power on
121113

122114
## Platform Notes
123115

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
CONFIG_DEVICE_TREE_INCLUDES="infix-env.dtsi infix-key.dtsi mt7622-emmc-env.dtsi"
22
CONFIG_SUPPORT_EMMC_BOOT=y
3+
CONFIG_CMD_MMC_PARTCONF=y
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
CONFIG_DEVICE_TREE_INCLUDES="infix-env.dtsi infix-key.dtsi mt7622-sd-env.dtsi"
2+
CONFIG_SUPPORT_EMMC_BOOT=y
3+
CONFIG_CMD_MMC_PARTCONF=y

0 commit comments

Comments
 (0)