[bootlin/training-materials updates] master: lab-data: bbb-recovery: Create a folder for sdcard binaries (5b8d8b86)

Miquel Raynal miquel.raynal at bootlin.com
Mon Jul 17 23:09:29 CEST 2023 

Repository : https://github.com/bootlin/training-materials
On branch  : master
Link       : https://github.com/bootlin/training-materials/commit/5b8d8b86cd874c44dd814b0d7ae4910030ab3f4a

>---------------------------------------------------------------

commit 5b8d8b86cd874c44dd814b0d7ae4910030ab3f4a
Author: Miquel Raynal <miquel.raynal at bootlin.com>
Date:   Mon Jul 17 22:52:06 2023 +0200

    lab-data: bbb-recovery: Create a folder for sdcard binaries
    
    Signed-off-by: Miquel Raynal <miquel.raynal at bootlin.com>


>---------------------------------------------------------------

5b8d8b86cd874c44dd814b0d7ae4910030ab3f4a
 lab-data/common/bootloader/beaglebone-black/MBR    | Bin 512 -> 0 bytes
 lab-data/common/bootloader/beaglebone-black/MLO    | Bin 71840 -> 0 bytes
 .../common/bootloader/beaglebone-black/MLO.final   | Bin 75680 -> 0 bytes
 .../common/bootloader/beaglebone-black/README.txt  |  17 +++++++-------
 lab-data/common/bootloader/beaglebone-black/dtb    | Bin 35947 -> 0 bytes
 lab-data/common/bootloader/beaglebone-black/gen.sh |  10 ---------
 .../bootloader/beaglebone-black/genimage.cfg       |  25 ---------------------
 .../common/bootloader/beaglebone-black/sdcard.img  | Bin 6291968 -> 0 bytes
 .../common/bootloader/beaglebone-black/sdcard/MBR  | Bin 0 -> 512 bytes
 .../common/bootloader/beaglebone-black/sdcard/MLO  | Bin 0 -> 71840 bytes
 .../bootloader/beaglebone-black/sdcard/MLO.final   | Bin 0 -> 75680 bytes
 .../common/bootloader/beaglebone-black/sdcard/dtb  | Bin 0 -> 35947 bytes
 .../bootloader/beaglebone-black/sdcard/gen.sh      |  10 +++++++++
 .../beaglebone-black/sdcard/genimage.cfg           |  25 +++++++++++++++++++++
 .../bootloader/beaglebone-black/sdcard/u-boot.img  | Bin 0 -> 396912 bytes
 .../beaglebone-black/sdcard/u-boot.img.final       | Bin 0 -> 391064 bytes
 .../bootloader/beaglebone-black/sdcard/zImage      | Bin 0 -> 3359648 bytes
 .../common/bootloader/beaglebone-black/u-boot.img  | Bin 396912 -> 0 bytes
 .../bootloader/beaglebone-black/u-boot.img.final   | Bin 391064 -> 0 bytes
 lab-data/common/bootloader/beaglebone-black/zImage | Bin 3359648 -> 0 bytes
 20 files changed, 44 insertions(+), 43 deletions(-)

diff --git a/lab-data/common/bootloader/beaglebone-black/MBR b/lab-data/common/bootloader/beaglebone-black/MBR
deleted file mode 100644
index 9077d648..00000000
Binary files a/lab-data/common/bootloader/beaglebone-black/MBR and /dev/null differ
diff --git a/lab-data/common/bootloader/beaglebone-black/MLO b/lab-data/common/bootloader/beaglebone-black/MLO
deleted file mode 100644
index ad64b9f3..00000000
Binary files a/lab-data/common/bootloader/beaglebone-black/MLO and /dev/null differ
diff --git a/lab-data/common/bootloader/beaglebone-black/MLO.final b/lab-data/common/bootloader/beaglebone-black/MLO.final
deleted file mode 100644
index b1dece58..00000000
Binary files a/lab-data/common/bootloader/beaglebone-black/MLO.final and /dev/null differ
diff --git a/lab-data/common/bootloader/beaglebone-black/README.txt b/lab-data/common/bootloader/beaglebone-black/README.txt
index be5b660a..4f3f06b2 100644
--- a/lab-data/common/bootloader/beaglebone-black/README.txt
+++ b/lab-data/common/bootloader/beaglebone-black/README.txt
@@ -18,7 +18,8 @@ Make a bootable micro-SD card
 -----------------------------
 
 We are going to prepare a bootable micro-SD card that will automatically
-reflash the eMMC with the U-Boot binaries provided in this directory.
+reflash the eMMC with the U-Boot binaries provided in the sdcard/
+directory.
 
 Take a micro-SD card and connect it to your PC:
 - Either using a direct SD slot if available.
@@ -121,17 +122,17 @@ git checkout v2018.05
 export CROSS_COMPILE=arm-linux-gnueabi-
 make am335x_boneblack_defconfig
 
-To compile u-boot.img and MLO:
+To compile sdcard/u-boot.img and sdcard/MLO:
 Copy the src/u-boot/u-boot-2018.05.config file to .config
 make
 
-To compile u-boot.img.final and MLO.final:
+To compile sdcard/u-boot.img.final and sdcard/MLO.final:
 Copy the src/u-boot-final/u-boot-2018.05.config file to .config
 and the src/u-boot-final/uEnv.txt file to the U-boot toplevel source directory
 (this contains default environment settings)
 make
 
-This produces the MLO and u-boot.img files.
+This produces the sdcard/MLO and sdcard/u-boot.img files.
 
 Root filesystem
 ---------------
@@ -176,13 +177,13 @@ This produces:
 arch/arm/boot/zImage
 arch/arm/boot/dts/am335x-boneblack-wireless.dtb
 
-Copy the arch/arm/boot/dts/am335x-boneblack-wireless.dtb to "dtb"
+Copy the arch/arm/boot/dts/am335x-boneblack-wireless.dtb to sdcard/dtb
 (this dtb will work fine for both BeagleBone Black
 and BeagleBoneBlack Wireless, at least for the purpose of
-reflashing U-Boot).
+reflashing U-Boot) and the zImage file as well.
 
 Assembling all files into sdcard.img
 ------------------------------------
 
-This is done using the ./gen.sh script, which itself uses the genimage
-tool.
+This is done using the sdcard/gen.sh script, which itself uses the
+genimage tool.
diff --git a/lab-data/common/bootloader/beaglebone-black/dtb b/lab-data/common/bootloader/beaglebone-black/dtb
deleted file mode 100644
index c802b149..00000000
Binary files a/lab-data/common/bootloader/beaglebone-black/dtb and /dev/null differ
diff --git a/lab-data/common/bootloader/beaglebone-black/gen.sh b/lab-data/common/bootloader/beaglebone-black/gen.sh
deleted file mode 100755
index b8409ed7..00000000
--- a/lab-data/common/bootloader/beaglebone-black/gen.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-trap 'rm -rf "${ROOTPATH_TMP}" "${GENIMAGE_TMP}"' EXIT
-ROOTPATH_TMP="$(mktemp -d)"
-GENIMAGE_TMP="$(mktemp -d)"
-genimage \
-        --rootpath "${ROOTPATH_TMP}"     \
-        --tmppath "${GENIMAGE_TMP}"    \
-        --inputpath .  \
-        --outputpath . \
-        --config genimage.cfg
diff --git a/lab-data/common/bootloader/beaglebone-black/genimage.cfg b/lab-data/common/bootloader/beaglebone-black/genimage.cfg
deleted file mode 100644
index f682b461..00000000
--- a/lab-data/common/bootloader/beaglebone-black/genimage.cfg
+++ /dev/null
@@ -1,25 +0,0 @@
-image boot.vfat {
-  vfat {
-    files = {
-        "zImage",
-	"dtb",
-	"MLO",
-	"MLO.final",
-	"u-boot.img",
-	"u-boot.img.final",
-	"MBR"
-    }
-  }
-  size = 6M
-}
-
-image sdcard.img {
-  hdimage {
-  }
-
-  partition boot {
-    partition-type = 0xC
-    bootable = "true"
-    image = "boot.vfat"
-  }
-}
diff --git a/lab-data/common/bootloader/beaglebone-black/sdcard.img b/lab-data/common/bootloader/beaglebone-black/sdcard.img
deleted file mode 100644
index d7e771f4..00000000
Binary files a/lab-data/common/bootloader/beaglebone-black/sdcard.img and /dev/null differ
diff --git a/lab-data/common/bootloader/beaglebone-black/sdcard/MBR b/lab-data/common/bootloader/beaglebone-black/sdcard/MBR
new file mode 100644
index 00000000..9077d648
Binary files /dev/null and b/lab-data/common/bootloader/beaglebone-black/sdcard/MBR differ
diff --git a/lab-data/common/bootloader/beaglebone-black/sdcard/MLO b/lab-data/common/bootloader/beaglebone-black/sdcard/MLO
new file mode 100644
index 00000000..ad64b9f3
Binary files /dev/null and b/lab-data/common/bootloader/beaglebone-black/sdcard/MLO differ
diff --git a/lab-data/common/bootloader/beaglebone-black/sdcard/MLO.final b/lab-data/common/bootloader/beaglebone-black/sdcard/MLO.final
new file mode 100644
index 00000000..b1dece58
Binary files /dev/null and b/lab-data/common/bootloader/beaglebone-black/sdcard/MLO.final differ
diff --git a/lab-data/common/bootloader/beaglebone-black/sdcard/dtb b/lab-data/common/bootloader/beaglebone-black/sdcard/dtb
new file mode 100644
index 00000000..c802b149
Binary files /dev/null and b/lab-data/common/bootloader/beaglebone-black/sdcard/dtb differ
diff --git a/lab-data/common/bootloader/beaglebone-black/sdcard/gen.sh b/lab-data/common/bootloader/beaglebone-black/sdcard/gen.sh
new file mode 100755
index 00000000..b8409ed7
--- /dev/null
+++ b/lab-data/common/bootloader/beaglebone-black/sdcard/gen.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+trap 'rm -rf "${ROOTPATH_TMP}" "${GENIMAGE_TMP}"' EXIT
+ROOTPATH_TMP="$(mktemp -d)"
+GENIMAGE_TMP="$(mktemp -d)"
+genimage \
+        --rootpath "${ROOTPATH_TMP}"     \
+        --tmppath "${GENIMAGE_TMP}"    \
+        --inputpath .  \
+        --outputpath . \
+        --config genimage.cfg
diff --git a/lab-data/common/bootloader/beaglebone-black/sdcard/genimage.cfg b/lab-data/common/bootloader/beaglebone-black/sdcard/genimage.cfg
new file mode 100644
index 00000000..f682b461
--- /dev/null
+++ b/lab-data/common/bootloader/beaglebone-black/sdcard/genimage.cfg
@@ -0,0 +1,25 @@
+image boot.vfat {
+  vfat {
+    files = {
+        "zImage",
+	"dtb",
+	"MLO",
+	"MLO.final",
+	"u-boot.img",
+	"u-boot.img.final",
+	"MBR"
+    }
+  }
+  size = 6M
+}
+
+image sdcard.img {
+  hdimage {
+  }
+
+  partition boot {
+    partition-type = 0xC
+    bootable = "true"
+    image = "boot.vfat"
+  }
+}
diff --git a/lab-data/common/bootloader/beaglebone-black/sdcard/u-boot.img b/lab-data/common/bootloader/beaglebone-black/sdcard/u-boot.img
new file mode 100644
index 00000000..4da306e4
Binary files /dev/null and b/lab-data/common/bootloader/beaglebone-black/sdcard/u-boot.img differ
diff --git a/lab-data/common/bootloader/beaglebone-black/sdcard/u-boot.img.final b/lab-data/common/bootloader/beaglebone-black/sdcard/u-boot.img.final
new file mode 100644
index 00000000..3259c5c6
Binary files /dev/null and b/lab-data/common/bootloader/beaglebone-black/sdcard/u-boot.img.final differ
diff --git a/lab-data/common/bootloader/beaglebone-black/sdcard/zImage b/lab-data/common/bootloader/beaglebone-black/sdcard/zImage
new file mode 100755
index 00000000..f976b9a7
Binary files /dev/null and b/lab-data/common/bootloader/beaglebone-black/sdcard/zImage differ
diff --git a/lab-data/common/bootloader/beaglebone-black/u-boot.img b/lab-data/common/bootloader/beaglebone-black/u-boot.img
deleted file mode 100644
index 4da306e4..00000000
Binary files a/lab-data/common/bootloader/beaglebone-black/u-boot.img and /dev/null differ
diff --git a/lab-data/common/bootloader/beaglebone-black/u-boot.img.final b/lab-data/common/bootloader/beaglebone-black/u-boot.img.final
deleted file mode 100644
index 3259c5c6..00000000
Binary files a/lab-data/common/bootloader/beaglebone-black/u-boot.img.final and /dev/null differ
diff --git a/lab-data/common/bootloader/beaglebone-black/zImage b/lab-data/common/bootloader/beaglebone-black/zImage
deleted file mode 100755
index f976b9a7..00000000
Binary files a/lab-data/common/bootloader/beaglebone-black/zImage and /dev/null differ

More information about the training-materials-updates mailing list