[gnome-build-meta/tpollard/raspi4] Try and remove the need for overlap whitelists

[Tom Pollard <tpollard src gnome org>]

commit 23fb7cb5eba8763c4915b6051adaed234c922154
Author: Tom Pollard <tom pollard codethink co uk>
Date:   Wed May 20 13:43:06 2020 +0100

    Try and remove the need for overlap whitelists

 elements/boards/raspberrypi-4/bsp.bst              |  1 -
 elements/boards/raspberrypi-4/bsp/boot.bst         | 92 ++--------------------
 .../boards/raspberrypi-4/bsp/kernel-modules.bst    | 12 +--
 files/raspberrypi-4/cmdline.txt                    |  1 +
 files/raspberrypi-4/config.txt                     | 64 +++++++++++++++
 5 files changed, 74 insertions(+), 96 deletions(-)
---
diff --git a/elements/boards/raspberrypi-4/bsp.bst b/elements/boards/raspberrypi-4/bsp.bst
index 9590b275..1f1c77e2 100644
--- a/elements/boards/raspberrypi-4/bsp.bst
+++ b/elements/boards/raspberrypi-4/bsp.bst
@@ -7,4 +7,3 @@ depends:
   - filename: boards/raspberrypi-4/bsp/firmware.bst
   - filename: boards/raspberrypi-4/bsp/userland-firmware.bst
   - filename: boards/raspberrypi-4/bsp/boot.bst
-  - filename: boards/raspberrypi-4/bsp/kernel-modules.bst
diff --git a/elements/boards/raspberrypi-4/bsp/boot.bst b/elements/boards/raspberrypi-4/bsp/boot.bst
index 31b251b7..17399c96 100644
--- a/elements/boards/raspberrypi-4/bsp/boot.bst
+++ b/elements/boards/raspberrypi-4/bsp/boot.bst
@@ -1,89 +1,9 @@
-kind: manual
+kind: import
 
-
-build-depends:
-- boards/raspberrypi-4/bsp/linux.bst
-- boards/raspberrypi-4/bsp/firmware.bst
-- freedesktop-sdk.bst:bootstrap-import.bst
-
-
-public:
-  bst:
-    overlap-whitelist:
-    # FIX
-    - '**'
+sources:
+- kind: local
+  path: files/raspberrypi-4
 
 config:
-  install-commands:
-  - mkdir -p %{install-root}/boot/
-  - cp  -r /boot/* %{install-root}/boot/
-  - echo "dwc_otg.lpm_enable=0 console=ttyAMA0,115200 console=tty1 root=/dev/mmcblk0p2 rootfstype=ext4 
elevator=deadline rootwait kernel=kernel8.img splash plymouth.ignore-serial-consoles" > 
%{install-root}/boot/cmdline.txt
-  - |
-    cat > %{install-root}/boot/config.txt << EOF
-    # For more options and information see
-    # http://rpf.io/configtxt
-    # Some settings may impact device functionality. See link above for details
-
-    enable_uart=1
-    arm_64bit=1
-    start_x=1
-    gpu_mem=16
-
-    # Use VideoCore 4 Firmware KMS shim for RPi4, open-source KMS is WIP
-    dtoverlay=vc4-fkms-v3d
-
-    # uncomment if you get no picture on HDMI for a default "safe" mode
-    #hdmi_safe=1
-
-    # uncomment this if your display has a black border of unused pixels visible
-    # and your display can output without overscan
-    #disable_overscan=1
-
-    # uncomment the following to adjust overscan. Use positive numbers if console
-    # goes off screen, and negative if there is too much border
-    #overscan_left=16
-    #overscan_right=16
-    #overscan_top=16
-    #overscan_bottom=16
-
-    # uncomment to force a console size. By default it will be display's size minus
-    # overscan.
-    #framebuffer_width=1280
-    #framebuffer_height=720
-
-    # uncomment if hdmi display is not detected and composite is being output
-    #hdmi_force_hotplug=1
-
-    # uncomment to force a specific HDMI mode (this will force VGA)
-    #hdmi_group=1
-    #hdmi_mode=1
-
-    # uncomment to force a HDMI mode rather than DVI. This can make audio work in
-    # DMT (computer monitor) modes
-    #hdmi_drive=2
-
-    # uncomment to increase signal to HDMI, if you have interference, blanking, or
-    # no display
-    #config_hdmi_boost=4
-
-    # uncomment for composite PAL
-    #sdtv_mode=2
-
-    #uncomment to overclock the arm. 700 MHz is the default.
-    #arm_freq=800
-
-    # Uncomment some or all of these to enable the optional hardware interfaces
-    #dtparam=i2c_arm=on
-    #dtparam=i2s=on
-    #dtparam=spi=on
-
-    # Uncomment this to enable the lirc-rpi module
-    #dtoverlay=lirc-rpi
-
-    # Additional overlays and parameters are documented /boot/overlays/README
-
-    # Enable audio (loads snd_bcm2835)
-    dtparam=audio=on
-    EOF
-
-
+  source: /
+  target: /boot
\ No newline at end of file
diff --git a/elements/boards/raspberrypi-4/bsp/kernel-modules.bst 
b/elements/boards/raspberrypi-4/bsp/kernel-modules.bst
index c5b7b3a2..7023ee36 100644
--- a/elements/boards/raspberrypi-4/bsp/kernel-modules.bst
+++ b/elements/boards/raspberrypi-4/bsp/kernel-modules.bst
@@ -1,15 +1,9 @@
 kind: filter
-depends:
-- filename: boards/raspberrypi-4/bsp/linux.bst
-  type: build
+
+build-depends:
+- boards/raspberrypi-4/bsp/linux.bst
 
 config:
   exclude:
   - boot
   include-orphans: True
-
-public:
-  bst:
-    overlap-whitelist:
-    # FIX
-    - '**'
diff --git a/files/raspberrypi-4/cmdline.txt b/files/raspberrypi-4/cmdline.txt
new file mode 100644
index 00000000..6929801a
--- /dev/null
+++ b/files/raspberrypi-4/cmdline.txt
@@ -0,0 +1 @@
+dwc_otg.lpm_enable=0 console=ttyAMA0,115200 console=tty1 root=/dev/mmcblk0p2 rootfstype=ext4 
elevator=deadline rootwait kernel=kernel8.img splash plymouth.ignore-serial-consoles
\ No newline at end of file
diff --git a/files/raspberrypi-4/config.txt b/files/raspberrypi-4/config.txt
new file mode 100644
index 00000000..3265d073
--- /dev/null
+++ b/files/raspberrypi-4/config.txt
@@ -0,0 +1,64 @@
+# For more options and information see
+# http://rpf.io/configtxt
+# Some settings may impact device functionality. See link above for details
+
+enable_uart=1
+arm_64bit=1
+start_x=1
+gpu_mem=16
+
+# Use VideoCore 4 Firmware KMS shim for RPi4, open-source KMS is WIP
+dtoverlay=vc4-fkms-v3d
+
+# uncomment if you get no picture on HDMI for a default "safe" mode
+#hdmi_safe=1
+
+# uncomment this if your display has a black border of unused pixels visible
+# and your display can output without overscan
+#disable_overscan=1
+
+# uncomment the following to adjust overscan. Use positive numbers if console
+# goes off screen, and negative if there is too much border
+#overscan_left=16
+#overscan_right=16
+#overscan_top=16
+#overscan_bottom=16
+
+# uncomment to force a console size. By default it will be display's size minus
+# overscan.
+#framebuffer_width=1280
+#framebuffer_height=720
+
+# uncomment if hdmi display is not detected and composite is being output
+#hdmi_force_hotplug=1
+
+# uncomment to force a specific HDMI mode (this will force VGA)
+#hdmi_group=1
+#hdmi_mode=1
+
+# uncomment to force a HDMI mode rather than DVI. This can make audio work in
+# DMT (computer monitor) modes
+#hdmi_drive=2
+
+# uncomment to increase signal to HDMI, if you have interference, blanking, or
+# no display
+#config_hdmi_boost=4
+
+# uncomment for composite PAL
+#sdtv_mode=2
+
+#uncomment to overclock the arm. 700 MHz is the default.
+#arm_freq=800
+
+# Uncomment some or all of these to enable the optional hardware interfaces
+#dtparam=i2c_arm=on
+#dtparam=i2s=on
+#dtparam=spi=on
+
+# Uncomment this to enable the lirc-rpi module
+#dtoverlay=lirc-rpi
+
+# Additional overlays and parameters are documented /boot/overlays/README
+
+# Enable audio (loads snd_bcm2835)
+dtparam=audio=on
\ No newline at end of file