| @@ -25,13 +25,15 fi | |||
|
|
25 | 25 | #rm files/apt/sources.list |
|
|
26 | 26 | #netselect-apt does not know buster yet |
|
|
27 | 27 | if [ "$RELEASE" = "buster" ] ; then |
|
|
28 |
R |
|
|
|
28 | RLS=testing | |
|
|
29 | else | |
|
|
30 | RLS="$RELEASE" | |
|
|
29 | 31 | fi |
|
|
30 | 32 | |
|
|
31 | 33 | if [ "$ENABLE_NONFREE" = true ] ; then |
|
|
32 |
netselect-apt --arch "$RELEASE_ARCH" --tests 10 --sources --nonfree --outfile "${ETC_DIR}/apt/sources.list" -d "$R |
|
|
|
34 | netselect-apt --arch "$RELEASE_ARCH" --tests 10 --sources --nonfree --outfile "${ETC_DIR}/apt/sources.list" -d "$RLS" | |
|
|
33 | 35 | else |
|
|
34 |
netselect-apt --arch "$RELEASE_ARCH" --tests 10 --sources --outfile "${ETC_DIR}/apt/sources.list" -d "$R |
|
|
|
36 | netselect-apt --arch "$RELEASE_ARCH" --tests 10 --sources --outfile "${ETC_DIR}/apt/sources.list" -d "$RLS" | |
|
|
35 | 37 | fi |
|
|
36 | 38 | |
|
|
37 | 39 | #ipinfo=$(curl ipinfo.io | grep country ) |
| @@ -40,17 +40,13 if [ "$ENABLE_UBOOT" = true ] ; then | |||
|
|
40 | 40 | install_readonly "${R}/tmp/u-boot/u-boot.bin" "${BOOT_DIR}/u-boot.bin" |
|
|
41 | 41 | printf "\n# boot u-boot kernel\nkernel=u-boot.bin\n" >> "${BOOT_DIR}/config.txt" |
|
|
42 | 42 | |
|
|
43 | if [ "$SET_ARCH" = 64 ] ; then | |
|
|
44 | #add arm_64bit=1 | |
|
|
45 | #device_tree_address=0x100 | |
|
|
46 | #device_tree_end=0x8000 | |
|
|
47 | #to config.txt | |
|
|
48 | echo "Setting up config.txt to boot 64bit uboot" | |
|
|
49 | fi | |
|
|
50 | ||
|
|
51 | 43 | # Install and setup U-Boot command file |
|
|
52 | 44 | install_readonly files/boot/uboot.mkimage "${BOOT_DIR}/uboot.mkimage" |
|
|
53 | 45 | printf "# Set the kernel boot command line\nsetenv bootargs \"earlyprintk ${CMDLINE}\"\n\n$(cat "${BOOT_DIR}"/uboot.mkimage)" > "${BOOT_DIR}/uboot.mkimage" |
|
|
46 | #Set correkt KERNEL_IMAGE | |
|
|
47 | sed -i "s/kernel7.img/$KERNEL_BIN_IMAGE/g" files/boot/uboot.mkimage | |
|
|
48 | #Set correct DTB_FILE | |
|
|
49 | sed -i "s/bcm2709-rpi-2-b.dtb/$DTB_FILE/g" files/boot/uboot.mkimage | |
|
|
54 | 50 | |
|
|
55 | 51 | if [ "$ENABLE_INITRAMFS" = true ] ; then |
|
|
56 | 52 | # Convert generated initramfs for U-Boot using mkimage |
| @@ -75,8 +71,13 if [ "$ENABLE_UBOOT" = true ] ; then | |||
|
|
75 | 71 | fi |
|
|
76 | 72 | fi |
|
|
77 | 73 | |
|
|
78 | # Set mkfile to use the correct dtb file | |
|
|
79 | sed -i "s/^\(setenv dtbfile \).*/\1${DTB_FILE}/" "${BOOT_DIR}/uboot.mkimage" | |
|
|
74 | if [ "$SET_ARCH" = 64 ] ; then | |
|
|
75 | echo "Setting up config.txt to boot 64bit uboot" | |
|
|
76 | printf \n# Tell u-boot a 64bit kernel is used\narm_64bit=1\n" >> "${BOOT_DIR}/config.txt" | |
|
|
77 | printf \n# Device tree start addr\ndevice_tree_address=0x100\n" >> "${BOOT_DIR}/config.txt" | |
|
|
78 | printf \n# Device tree stop adrr\ndevice_tree_end=0x8000\n" >> "${BOOT_DIR}/config.txt" | |
|
|
79 | #to config.txt | |
|
|
80 | fi | |
|
|
80 | 81 | |
|
|
81 | 82 | # Set mkfile to use the correct mach id |
|
|
82 | 83 | if [ "$ENABLE_QEMU" = true ] ; then |
General Comments 0
Vous devez vous connecter pour laisser un commentaire.
Se connecter maintenant
