From e842bbd2c12920fc94c8892901f8a04ff2759bdf Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 9 Aug 2019 23:25:03 +0200 Subject: [PATCH] diskimg: fixes for rpi target --- platforms/diskimg/pre.inc.sh | 6 +++--- platforms/rootfs-light/Makefile | 2 +- platforms/rootfs/Makefile | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/platforms/diskimg/pre.inc.sh b/platforms/diskimg/pre.inc.sh index 68cbe9f..097e994 100644 --- a/platforms/diskimg/pre.inc.sh +++ b/platforms/diskimg/pre.inc.sh @@ -1,8 +1,8 @@ case $VARIANT in baytrail) MODE=rootfsinstall; ROOTFSINSTALL_ADD="-baytrail"; DEVICEARCH=x86_64; MEDIA_SIZE=5120 ;; - bananapi) MODE=rootfsinstall; ROOTFSINSTALL_ADD="-bpi"; DEVICEARCH=arm; MEDIA_SIZE=3584 ;; - raspberrypi) MODE=rootfsinstall; ROOTFSINSTALL_ADD="-rpi"; DEVICEARCH=arm; MEDIA_SIZE=3584 ;; - cubox) MODE=rootfsinstall; ROOTFSINSTALL_ADD="-cubox" DEVICEARCH=arm; MEDIA_SIZE=3584 ;; + bananapi) MODE=rootfsinstall; ROOTFSINSTALL_ADD="-bpi"; DEVICEARCH=arm; MEDIA_SIZE=4192 ;; + raspberrypi) MODE=rootfsinstall; ROOTFSINSTALL_ADD="-rpi"; DEVICEARCH=arm; MEDIA_SIZE=4192 ;; + cubox) MODE=rootfsinstall; ROOTFSINSTALL_ADD="-cubox" DEVICEARCH=arm; MEDIA_SIZE=4192 ;; livecd) MODE=usbinstall; ROOTFSINSTALL_ADD= ;; *) MODE=rootfsinstall; ROOTFSINSTALL_ADD= ; DEVICEARCH=$ARCH ;; esac diff --git a/platforms/rootfs-light/Makefile b/platforms/rootfs-light/Makefile index 83e550e..edc0ac4 100644 --- a/platforms/rootfs-light/Makefile +++ b/platforms/rootfs-light/Makefile @@ -1,5 +1,5 @@ $(MAKEDIST_TARGET)-$(PLATFORM)-arm: \ - brcm_patchram midori u-boot-tools + midori u-boot-tools $(MAKEDIST_TARGET)-$(PLATFORM)-i586: \ kernel-mamba kernel-mamba-64GB chromium diff --git a/platforms/rootfs/Makefile b/platforms/rootfs/Makefile index 858910d..45e2756 100644 --- a/platforms/rootfs/Makefile +++ b/platforms/rootfs/Makefile @@ -1,7 +1,7 @@ $(MAKEDIST_TARGET)-$(PLATFORM)-kde: desktop-base-kde bluedevil5 kwalletmanager spectacle $(MAKEDIST_TARGET)-$(PLATFORM)-arm: \ - kernel-mamba-arm linux-firmware brcm_patchram u-boot-tools + kernel-mamba-arm linux-firmware midori $(MAKEDIST_TARGET)-$(PLATFORM)-i586: \ kernel-mamba kernel-mamba-64GB \