Merge remote-tracking branch 'origin/core120' into kernel-4.14

[ipfire-2.x.git] / lfs / flash-images

diff --git a/lfs/flash-images b/lfs/flash-images
index 8ed7f63756f4d3924a83289f24deaf5b4629bc65..a553ad023564be2dff87c8b4d1ba1ef4fee7224b 100644 (file)
--- a/lfs/flash-images
+++ b/lfs/flash-images
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2017  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -34,9 +34,9 @@ PART_BOOT  = /dev/mapper/$(patsubst /dev/%,%,$(DEVICE))p1
 PART_ROOT  = /dev/mapper/$(patsubst /dev/%,%,$(DEVICE))p3
 
 ifeq "$(SCON)" "1"
-       IMAGE_FILE = /install/images/$(SNAME)-$(VERSION).1gb-ext4-scon.$(BUILD_ARCH)-full-core$(CORE).img.gz
+       IMAGE_FILE = /install/images/$(SNAME)-$(VERSION).2gb-ext4-scon.$(BUILD_ARCH)-full-core$(CORE).img.gz
 else
-       IMAGE_FILE = /install/images/$(SNAME)-$(VERSION).1gb-ext4.$(BUILD_ARCH)-full-core$(CORE).img.gz
+       IMAGE_FILE = /install/images/$(SNAME)-$(VERSION).2gb-ext4.$(BUILD_ARCH)-full-core$(CORE).img.gz
 endif
 
 FSTAB_FMT = UUID=%s %-8s %-4s %-10s %d %d\n
@@ -74,10 +74,10 @@ else
  PART_TYPE = L
 endif
 
-# /boot:  64MB - OFFSET
-# /    : 850MB
-S_BOOT := $(shell echo $$(( 131072 - $(S_OFFSET) )))
-S_ROOT := 1740800
+# /boot:  100MB - OFFSET
+# /    : 1200 MB
+S_BOOT := $(shell echo $$(( 204800 - $(S_OFFSET) )))
+S_ROOT := 2477600
 
 PADDING = 100 # MB
 
@@ -121,15 +121,6 @@ endif
 ifeq "$(BUILD_PLATFORM)" "arm"
        cp -v /boot/MLO $(MNThdd)/boot/
        cp -v /boot/u-boot.img $(MNThdd)/boot/
-       cp -v /boot/zImage-ipfire-multi $(MNThdd)/boot/
-       cp -v /boot/uInit-ipfire-multi $(MNThdd)/boot/
-       cp -v /boot/uImage-ipfire-kirkwood $(MNThdd)/boot/
-       cp -v /boot/uInit-ipfire-kirkwood $(MNThdd)/boot/
-       cp -v /boot/uEnv.txt $(MNThdd)/boot/
-       # work around a u-boot bug not find the folders sometimes
-       mkdir -pv $(MNThdd)/boot/dtb-$(KVER)-ipfire-multi
-       mkdir -pv $(MNThdd)/boot/dtb-$(KVER)-ipfire-kirkwood
-       
        sync
        umount $(MNThdd)/boot
        mount $(PART_BOOT) $(MNThdd)/boot
@@ -137,7 +128,7 @@ endif
 
        # Install IPFire
 ifneq "$(BUILD_PLATFORM)" "arm"
-       tar -x --lzma -C $(MNThdd)/ -f /install/cdrom/distro.img
+       tar -x --xz -C $(MNThdd)/ -f /install/cdrom/distro.img
 else
        tar -x -C $(MNThdd)/ -f /install/cdrom/distro.img
 endif
@@ -146,18 +137,20 @@ endif
        echo "THEME=ipfire" >> $(MNThdd)/var/ipfire/main/settings
 
 ifeq "$(SCON)" "1"
-       # Enable serial console
-       sed -i -e "s|1:2345:respawn:|#1:2345:respawn:|g" $(MNThdd)/etc/inittab
+       # Disable console on tty2-6
        sed -i -e "s|2:2345:respawn:|#2:2345:respawn:|g" $(MNThdd)/etc/inittab
        sed -i -e "s|3:2345:respawn:|#3:2345:respawn:|g" $(MNThdd)/etc/inittab
        sed -i -e "s|4:2345:respawn:|#4:2345:respawn:|g" $(MNThdd)/etc/inittab
        sed -i -e "s|5:2345:respawn:|#5:2345:respawn:|g" $(MNThdd)/etc/inittab
        sed -i -e "s|6:2345:respawn:|#6:2345:respawn:|g" $(MNThdd)/etc/inittab
-       sed -i -e "s|#7:2345:respawn:|7:2345:respawn:|g" $(MNThdd)/etc/inittab
 
 ifeq "$(BUILD_PLATFORM)" "arm"
-       sed -i -e "s| console=tty1 | console=ttyAMA0,115200n8 |g" $(MNThdd)/boot/cmdline.txt
-       sed -i -e "s| console=tty1 | console=ttyO2,115200n8 |g" $(MNThdd)/boot/uEnv.txt
+       sed -i -e "s|SERIAL-CONSOLE=OFF|SERIAL-CONSOLE=ON|g" $(MNThdd)/boot/uEnv.txt
+       sed -i -e "s|xxxDTBSUNXIxxx|sun8i-h2-plus-ipfire-nano.dtb|" $(MNThdd)/boot/uEnv.txt
+endif
+else
+ifeq "$(BUILD_PLATFORM)" "arm"
+       sed -i -e "s|xxxDTBSUNXIxxx|sun7i-a20-bananapi.dtb|" $(MNThdd)/boot/uEnv.txt
 endif
 endif
 
@@ -230,8 +223,13 @@ endif
        dd if=/dev/zero bs=1M count=$(PADDING) >> $(IMG)
 
 ifeq "$(BUILD_PLATFORM)" "arm"
+ifeq "$(SCON)" "1"
+       # Install u-boot for Orangepi Zero/Nanopi DUO into image 8KB
+       dd if=/usr/share/u-boot/orangepi_zero/u-boot-sunxi-with-spl.bin of=$(IMG) bs=1K seek=8 conv=notrunc
+else
        # Install u-boot for LeMaker Banana Pi into image 8KB
        dd if=/usr/share/u-boot/banana_pi/u-boot-sunxi-with-spl.bin of=$(IMG) bs=1K seek=8 conv=notrunc
+endif
 endif
 
        # Compress Image