FIx for new boot system

AaronDewes · AaronDewes · commit 7fe60ca3a744 · 2020-08-23T10:01:49.000+02:00
diff --git a/BUILDME.sh b/BUILDME.sh
@@ -219,7 +219,7 @@ if [ $SKIP_KERNEL_REBUILD -ne 1 ]; then
         select_kernelconfig armv7l
         make linux-reconfigure
         # copy ARMv7L kernel
-        cp "$IMAGES_DIR/zImage" "$FINAL_OUTPUT_DIR/recovery7l.img"
+        cp "$IMAGES_DIR/zImage" "$FINAL_OUTPUT_DIR/kernel7l.img"
     else
         echo "Warning: kernel armv7l in '$NOOBS_OUTPUT_DIR' directory hasn't been updated"
     fi
@@ -229,7 +229,7 @@ if [ $SKIP_KERNEL_REBUILD -ne 1 ]; then
         select_kernelconfig armv7
         make linux-reconfigure
         # copy ARMv7 kernel
-        cp "$IMAGES_DIR/zImage" "$FINAL_OUTPUT_DIR/recovery7.img"
+        cp "$IMAGES_DIR/zImage" "$FINAL_OUTPUT_DIR/kernel7.img"
     else
         echo "Warning: kernel armv7 in '$NOOBS_OUTPUT_DIR' directory hasn't been updated"
     fi
@@ -239,7 +239,7 @@ if [ $SKIP_KERNEL_REBUILD -ne 1 ]; then
         select_kernelconfig armv6
         make linux-reconfigure
         # copy ARMv6 kernel
-        cp "$IMAGES_DIR/zImage" "$FINAL_OUTPUT_DIR/recovery.img"
+        cp "$IMAGES_DIR/zImage" "$FINAL_OUTPUT_DIR/kernel.img"
     else
         echo "Warning: kernel armv6 in '$NOOBS_OUTPUT_DIR' directory hasn't been updated"
     fi
@@ -257,20 +257,22 @@ cp "$IMAGES_DIR/rootfs.squashfs" "$FINAL_OUTPUT_DIR/recovery.rfs"
 #cp "$IMAGES_DIR/rootfs.cpio.lzo" "$FINAL_OUTPUT_DIR/recovery.rfs"
 
 # Ensure that final output dir contains files necessary to boot
-cp "$IMAGES_DIR/rpi-firmware/start.elf" "$FINAL_OUTPUT_DIR/recovery.elf"
-
-cp "$IMAGES_DIR/rpi-firmware/start4.elf" "$FINAL_OUTPUT_DIR/recover4.elf"
+cp "$IMAGES_DIR/rpi-firmware/fixup.dat" "$FINAL_OUTPUT_DIR/fixup.dat"
+cp "$IMAGES_DIR/rpi-firmware/fixup4.dat" "$FINAL_OUTPUT_DIR/fixup4.dat"
+cp "$IMAGES_DIR/rpi-firmware/start.elf" "$FINAL_OUTPUT_DIR/start.elf"
+cp "$IMAGES_DIR/rpi-firmware/start4.elf" "$FINAL_OUTPUT_DIR/start4.elf"
 
 cp "$IMAGES_DIR/rpi-firmware/bootcode.bin" "$FINAL_OUTPUT_DIR"
 cp -a $IMAGES_DIR/*.dtb "$IMAGES_DIR/overlays" "$FINAL_OUTPUT_DIR"
-cp "$IMAGES_DIR/cmdline.txt" "$FINAL_OUTPUT_DIR/recovery.cmdline"
-cp "$IMAGES_DIR/recovery.cmdline.new" "$FINAL_OUTPUT_DIR"
+cp "$IMAGES_DIR/rpi-firmware/config.txt" "$FINAL_OUTPUT_DIR/config.txt"
+cp "$IMAGES_DIR/cmdline.txt" "$FINAL_OUTPUT_DIR/cmdline.txt"
+cp "$IMAGES_DIR/cmdline.txt.new" "$FINAL_OUTPUT_DIR"
 touch "$FINAL_OUTPUT_DIR/RECOVERY_FILES_DO_NOT_EDIT"
 
 #Use the latest PINN firmware
 pushd "$FINAL_OUTPUT_DIR"
 bsdtar xvfz firmware.tar.gz
-cp bootcode.bin recovery.elf firmware.latest
+cp bootcode.bin start.elf fixup.dat firmware.latest
 bsdtar cvfz firmware.tar.gz firmware.*
 popd
 
diff --git a/buildroot/package/rpi-firmware/config.txt b/buildroot/package/rpi-firmware/config.txt
@@ -9,17 +9,18 @@
 start_file=start.elf
 fixup_file=fixup.dat
 
-kernel=zImage
-
 # To use an external initramfs file
-#initramfs rootfs.cpio.gz
+initramfs recovery.rfs
 
 # Disable overscan assuming the display supports displaying the full resolution
 # If the text shown on the screen disappears off the edge, comment this out
 disable_overscan=1
 
-# How much memory in MB to assign to the GPU on Pi models having
-# 256, 512 or 1024 MB total memory
-gpu_mem_256=100
-gpu_mem_512=100
-gpu_mem_1024=100
+# Enable audio (loads snd_bcm2835)
+dtparam=audio=on
+
+[pi4]
+# Enable DRM VC4 V3D driver on top of the dispmanx display stack
+dtoverlay=vc4-fkms-v3d
+max_framebuffers=2
+
diff --git a/recovery/confeditdialog.cpp b/recovery/confeditdialog.cpp
@@ -85,7 +85,7 @@ ConfEditDialog::ConfEditDialog(const QVariantMap &map, const QString &partition,
     {  //This is the PINN reference
         QProcess::execute("mount -o remount,rw /mnt");
         _tabs.append(new ConfEditDialogTab("config.txt", "/mnt/config.txt", false, ui->tabWidget));
-        _tabs.append(new ConfEditDialogTab("recovery.cmdline", "/mnt/recovery.cmdline", false, ui->tabWidget));
+        _tabs.append(new ConfEditDialogTab("cmdline.txt", "/mnt/cmdline.txt", false, ui->tabWidget));
         ui->pbEdit->show();
     }
     else
@@ -166,7 +166,7 @@ void ConfEditDialog::options_finished(int result)
 {
     ui->tabWidget->removeTab(_tabs.count()-1);
     _tabs.removeLast();
-    _tabs.append(new ConfEditDialogTab("recovery.cmdline", "/mnt/recovery.cmdline", false, ui->tabWidget));
+    _tabs.append(new ConfEditDialogTab("cmdline.txt", "/mnt/cmdline.txt", false, ui->tabWidget));
 }
 
 void ConfEditDialog::on_cbvk_toggled(bool checked)
diff --git a/recovery/fullfatthread.cpp b/recovery/fullfatthread.cpp
@@ -51,9 +51,7 @@ void FullFatThread::run()
         return;
     }
 
-    QString cmdlinefilename = "/mnt/recovery.cmdline";
-    if (!QFile::exists(cmdlinefilename))
-        cmdlinefilename = "/mnt/cmdline.txt";
+    QString cmdlinefilename = "/mnt/cmdline.txt";
 
     /* Add "runinstaller" to cmdline.txt */
     QFile f(cmdlinefilename);
diff --git a/recovery/initdrivethread.cpp b/recovery/initdrivethread.cpp
@@ -90,9 +90,7 @@ void InitDriveThread::run()
     dir.mkdir("/mnt/os");
     emit statusUpdate(tr("Editing cmdline.txt"));
 
-    QString cmdlinefilename = "/mnt/recovery.cmdline";
-    if (!QFile::exists(cmdlinefilename))
-        cmdlinefilename = "/mnt/cmdline.txt";
+    QString cmdlinefilename = "/mnt/cmdline.txt";
 
     /* Remove "runinstaller" from cmdline.txt */
     QFile f(cmdlinefilename);
diff --git a/recovery/mainwindow.cpp b/recovery/mainwindow.cpp
@@ -808,7 +808,7 @@ bool MainWindow::canInstallOs(const QString &name, const QVariantMap &values)
         }
     }
 
-    /* Display OS in list if it is supported or "showall" is specified in recovery.cmdline */
+    /* Display OS in list if it is supported or "showall" is specified in cmdline.txt */
     if (_showAll)
     {
         return true;
@@ -4346,7 +4346,7 @@ void MainWindow::downloadUpdateComplete()
     {
         qDebug() << "Time to update PINN!";
         QProcess::execute("mount -o remount,rw /mnt");
-        QProcess::execute("unzip /tmp/pinn-lite.zip -o -x recovery.cmdline -d /mnt");
+        QProcess::execute("unzip /tmp/pinn-lite.zip -o -x cmdline.txt -d /mnt");
         QProcess::execute("mount -o remount,ro /mnt");
         QProcess::execute(QString("rm ")+BUILD_IGNORE);
         QProcess::execute("sync");
diff --git a/recovery/optionsdialog.cpp b/recovery/optionsdialog.cpp
@@ -76,7 +76,7 @@ void OptionsDialog::read()
 {
     int sep;
     QString line;
-    QString file = getFileContents("/mnt/recovery.cmdline");
+    QString file = getFileContents("/mnt/cmdline.txt");
 
     sep = file.indexOf('\n');
     if (-1==sep)
@@ -273,7 +273,7 @@ void OptionsDialog::write()
 
     contents += remainderOptions.trimmed() + "\n" + remainderFile;
 
-    QFile f("/mnt/recovery.cmdline");
+    QFile f("/mnt/cmdline.txt");
     if (f.open(QIODevice::WriteOnly))
     {
         f.write(contents.toLatin1());

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ ConfEditDialog::ConfEditDialog(const QVariantMap &map, const QString &partition,`
`85`	`85`	`{ //This is the PINN reference`
`86`	`86`	`QProcess::execute("mount -o remount,rw /mnt");`
`87`	`87`	`_tabs.append(new ConfEditDialogTab("config.txt", "/mnt/config.txt", false, ui->tabWidget));`
`88`		`- _tabs.append(new ConfEditDialogTab("recovery.cmdline", "/mnt/recovery.cmdline", false, ui->tabWidget));`
	`88`	`+ _tabs.append(new ConfEditDialogTab("cmdline.txt", "/mnt/cmdline.txt", false, ui->tabWidget));`
`89`	`89`	`ui->pbEdit->show();`
`90`	`90`	`}`
`91`	`91`	`else`
`@@ -166,7 +166,7 @@ void ConfEditDialog::options_finished(int result)`
`166`	`166`	`{`
`167`	`167`	`ui->tabWidget->removeTab(_tabs.count()-1);`
`168`	`168`	`_tabs.removeLast();`
`169`		`- _tabs.append(new ConfEditDialogTab("recovery.cmdline", "/mnt/recovery.cmdline", false, ui->tabWidget));`
	`169`	`+ _tabs.append(new ConfEditDialogTab("cmdline.txt", "/mnt/cmdline.txt", false, ui->tabWidget));`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`void ConfEditDialog::on_cbvk_toggled(bool checked)`
Original file line number	Diff line number	Diff line change
`@@ -51,9 +51,7 @@ void FullFatThread::run()`
`51`	`51`	`return;`
`52`	`52`	`}`
`53`	`53`
`54`		`- QString cmdlinefilename = "/mnt/recovery.cmdline";`
`55`		`- if (!QFile::exists(cmdlinefilename))`
`56`		`- cmdlinefilename = "/mnt/cmdline.txt";`
	`54`	`+ QString cmdlinefilename = "/mnt/cmdline.txt";`
`57`	`55`
`58`	`56`	`/* Add "runinstaller" to cmdline.txt */`
`59`	`57`	`QFile f(cmdlinefilename);`
Original file line number	Diff line number	Diff line change
`@@ -808,7 +808,7 @@ bool MainWindow::canInstallOs(const QString &name, const QVariantMap &values)`
`808`	`808`	`}`
`809`	`809`	`}`
`810`	`810`
`811`		`- /* Display OS in list if it is supported or "showall" is specified in recovery.cmdline */`
	`811`	`+ /* Display OS in list if it is supported or "showall" is specified in cmdline.txt */`
`812`	`812`	`if (_showAll)`
`813`	`813`	`{`
`814`	`814`	`return true;`
`@@ -4346,7 +4346,7 @@ void MainWindow::downloadUpdateComplete()`
`4346`	`4346`	`{`
`4347`	`4347`	`qDebug() << "Time to update PINN!";`
`4348`	`4348`	`QProcess::execute("mount -o remount,rw /mnt");`
`4349`		`- QProcess::execute("unzip /tmp/pinn-lite.zip -o -x recovery.cmdline -d /mnt");`
	`4349`	`+ QProcess::execute("unzip /tmp/pinn-lite.zip -o -x cmdline.txt -d /mnt");`
`4350`	`4350`	`QProcess::execute("mount -o remount,ro /mnt");`
`4351`	`4351`	`QProcess::execute(QString("rm ")+BUILD_IGNORE);`
`4352`	`4352`	`QProcess::execute("sync");`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ void OptionsDialog::read()`
`76`	`76`	`{`
`77`	`77`	`int sep;`
`78`	`78`	`QString line;`
`79`		`- QString file = getFileContents("/mnt/recovery.cmdline");`
	`79`	`+ QString file = getFileContents("/mnt/cmdline.txt");`
`80`	`80`
`81`	`81`	`sep = file.indexOf('\n');`
`82`	`82`	`if (-1==sep)`
`@@ -273,7 +273,7 @@ void OptionsDialog::write()`
`273`	`273`
`274`	`274`	`contents += remainderOptions.trimmed() + "\n" + remainderFile;`
`275`	`275`
`276`		`- QFile f("/mnt/recovery.cmdline");`
	`276`	`+ QFile f("/mnt/cmdline.txt");`
`277`	`277`	`if (f.open(QIODevice::WriteOnly))`
`278`	`278`	`{`
`279`	`279`	`f.write(contents.toLatin1());`