aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/base-files
diff options
context:
space:
mode:
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-02-08 21:58:55 +0100
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-02-14 14:10:51 +0100
commit7d7aa2fd924c27829ec25f825481554dd81bce97 (patch)
tree658b87b89331670266163e522ea5fb52535633cb /target/linux/brcm2708/base-files
parente7bfda2c243e66a75ff966ba04c28b1590b5d24c (diff)
downloadupstream-7d7aa2fd924c27829ec25f825481554dd81bce97.tar.gz
upstream-7d7aa2fd924c27829ec25f825481554dd81bce97.tar.bz2
upstream-7d7aa2fd924c27829ec25f825481554dd81bce97.zip
brcm2708: rename target to bcm27xx
This change makes the names of Broadcom targets consistent by using the common notation based on SoC/CPU ID (which is used internally anyway), bcmXXXX instead of brcmXXXX. This is even used for target TITLE in make menuconfig already, only the short target name used brcm so far. Despite, since subtargets range from bcm2708 to bcm2711, it seems appropriate to use bcm27xx instead of bcm2708 (again, as already done for BOARDNAME). This also renames the packages brcm2708-userland and brcm2708-gpu-fw. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> Acked-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/brcm2708/base-files')
-rwxr-xr-xtarget/linux/brcm2708/base-files/etc/board.d/02_network32
-rw-r--r--target/linux/brcm2708/base-files/etc/diag.sh35
-rw-r--r--target/linux/brcm2708/base-files/etc/inittab4
-rw-r--r--target/linux/brcm2708/base-files/lib/preinit/05_set_preinit_iface_brcm270822
-rw-r--r--target/linux/brcm2708/base-files/lib/preinit/79_move_config20
-rw-r--r--target/linux/brcm2708/base-files/lib/upgrade/keep.d/platform1
-rw-r--r--target/linux/brcm2708/base-files/lib/upgrade/platform.sh99
7 files changed, 0 insertions, 213 deletions
diff --git a/target/linux/brcm2708/base-files/etc/board.d/02_network b/target/linux/brcm2708/base-files/etc/board.d/02_network
deleted file mode 100755
index 36c8c5df1a..0000000000
--- a/target/linux/brcm2708/base-files/etc/board.d/02_network
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2014-2016 OpenWrt.org
-# Copyright (C) 2017 LEDE project
-
-. /lib/functions/uci-defaults.sh
-. /lib/functions.sh
-. /lib/functions/system.sh
-
-board_config_update
-
-board=$(board_name)
-
-case "$board" in
-raspberrypi,model-b |\
-raspberrypi,model-b-plus |\
-raspberrypi,model-b-rev2 |\
-raspberrypi,2-model-b |\
-raspberrypi,2-model-b-rev2 |\
-raspberrypi,3-model-b |\
-raspberrypi,3-model-b-plus |\
-raspberrypi,4-model-b)
- ucidef_set_interface_lan "eth0"
- ;;
-
-raspberrypi,model-zero-w)
- ucidef_set_interface_lan "wlan0"
- ;;
-esac
-
-board_config_flush
-
-exit 0
diff --git a/target/linux/brcm2708/base-files/etc/diag.sh b/target/linux/brcm2708/base-files/etc/diag.sh
deleted file mode 100644
index ce0f591517..0000000000
--- a/target/linux/brcm2708/base-files/etc/diag.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2015-2016 OpenWrt.org
-# Copyright (C) 2017 LEDE project
-
-. /lib/functions.sh
-. /lib/functions/leds.sh
-
-set_state() {
- case "$(board_name)" in
- raspberrypi,2-model-b |\
- raspberrypi,model-b-plus)
- status_led="led1"
- ;;
- raspberrypi,model-b |\
- raspberrypi,model-zero |\
- raspberrypi,model-zero-w)
- status_led="led0"
- ;;
- esac
-
- case "$1" in
- preinit)
- status_led_blink_preinit
- ;;
- failsafe)
- status_led_blink_failsafe
- ;;
- preinit_regular)
- status_led_blink_preinit_regular
- ;;
- done)
- status_led_on
- ;;
- esac
-}
diff --git a/target/linux/brcm2708/base-files/etc/inittab b/target/linux/brcm2708/base-files/etc/inittab
deleted file mode 100644
index b944a93ada..0000000000
--- a/target/linux/brcm2708/base-files/etc/inittab
+++ /dev/null
@@ -1,4 +0,0 @@
-::sysinit:/etc/init.d/rcS S boot
-::shutdown:/etc/init.d/rcS K shutdown
-::askconsole:/usr/libexec/login.sh
-tty1::askfirst:/usr/libexec/login.sh
diff --git a/target/linux/brcm2708/base-files/lib/preinit/05_set_preinit_iface_brcm2708 b/target/linux/brcm2708/base-files/lib/preinit/05_set_preinit_iface_brcm2708
deleted file mode 100644
index de221ae7ad..0000000000
--- a/target/linux/brcm2708/base-files/lib/preinit/05_set_preinit_iface_brcm2708
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2015-2016 OpenWrt.org
-# Copyright (C) 2017 LEDE project
-
-set_preinit_iface() {
- . /lib/functions.sh
-
- case "$(board_name)" in
- raspberrypi,2-model-b |\
- raspberrypi,2-model-b-rev2 |\
- raspberrypi,3-model-b |\
- raspberrypi,3-model-b-plus |\
- raspberrypi,4-model-b |\
- raspberrypi,model-b |\
- raspberrypi,model-b-plus |\
- raspberrypi,model-b-rev2)
- ifname=eth0
- ;;
- esac
-}
-
-boot_hook_add preinit_main set_preinit_iface
diff --git a/target/linux/brcm2708/base-files/lib/preinit/79_move_config b/target/linux/brcm2708/base-files/lib/preinit/79_move_config
deleted file mode 100644
index b8738b645e..0000000000
--- a/target/linux/brcm2708/base-files/lib/preinit/79_move_config
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2015 OpenWrt.org
-
-. /lib/upgrade/common.sh
-
-BOOTPART=/dev/mmcblk0p1
-
-move_config() {
- if [ -b $BOOTPART ]; then
- insmod nls_cp437
- insmod nls_iso8859-1
- insmod fat
- insmod vfat
- mkdir -p /boot
- mount -t vfat -o rw,noatime $BOOTPART /boot
- [ -f "/boot/$BACKUP_FILE" ] && mv -f "/boot/$BACKUP_FILE" /
- fi
-}
-
-boot_hook_add preinit_mount_root move_config
diff --git a/target/linux/brcm2708/base-files/lib/upgrade/keep.d/platform b/target/linux/brcm2708/base-files/lib/upgrade/keep.d/platform
deleted file mode 100644
index 786796577d..0000000000
--- a/target/linux/brcm2708/base-files/lib/upgrade/keep.d/platform
+++ /dev/null
@@ -1 +0,0 @@
-/boot/config.txt
diff --git a/target/linux/brcm2708/base-files/lib/upgrade/platform.sh b/target/linux/brcm2708/base-files/lib/upgrade/platform.sh
deleted file mode 100644
index 811355b8f7..0000000000
--- a/target/linux/brcm2708/base-files/lib/upgrade/platform.sh
+++ /dev/null
@@ -1,99 +0,0 @@
-. /lib/functions.sh
-
-REQUIRE_IMAGE_METADATA=1
-
-# copied from x86's platform.sh
-
-platform_check_image() {
- local diskdev partdev diff
-
- [ "$#" -gt 1 ] && return 1
-
- export_bootdevice && export_partdevice diskdev 0 || {
- echo "Unable to determine upgrade device"
- return 1
- }
-
- get_partitions "/dev/$diskdev" bootdisk
-
- #extract the boot sector from the image
- get_image "$@" | dd of=/tmp/image.bs count=1 bs=512b 2>/dev/null
-
- get_partitions /tmp/image.bs image
-
- #compare tables
- diff="$(grep -F -x -v -f /tmp/partmap.bootdisk /tmp/partmap.image)"
-
- rm -f /tmp/image.bs /tmp/partmap.bootdisk /tmp/partmap.image
-
- if [ -n "$diff" ]; then
- echo "Partition layout has changed. Full image will be written."
- ask_bool 0 "Abort" && exit 1
- return 0
- fi
-
- return 0;
-}
-
-platform_do_upgrade() {
- local diskdev partdev diff
-
- export_bootdevice && export_partdevice diskdev 0 || {
- echo "Unable to determine upgrade device"
- return 1
- }
-
- sync
-
- if [ "$UPGRADE_OPT_SAVE_PARTITIONS" = "1" ]; then
- get_partitions "/dev/$diskdev" bootdisk
-
- #extract the boot sector from the image
- get_image "$@" | dd of=/tmp/image.bs count=1 bs=512b
-
- get_partitions /tmp/image.bs image
-
- #compare tables
- diff="$(grep -F -x -v -f /tmp/partmap.bootdisk /tmp/partmap.image)"
- else
- diff=1
- fi
-
- if [ -n "$diff" ]; then
- get_image "$@" | dd of="/dev/$diskdev" bs=2M conv=fsync
-
- # Separate removal and addtion is necessary; otherwise, partition 1
- # will be missing if it overlaps with the old partition 2
- partx -d - "/dev/$diskdev"
- partx -a - "/dev/$diskdev"
-
- return 0
- fi
-
- #iterate over each partition from the image and write it to the boot disk
- while read part start size; do
- if export_partdevice partdev $part; then
- echo "Writing image to /dev/$partdev..."
- get_image "$@" | dd of="/dev/$partdev" ibs="512" obs=1M skip="$start" count="$size" conv=fsync
- else
- echo "Unable to find partition $part device, skipped."
- fi
- done < /tmp/partmap.image
-
- #copy partition uuid
- echo "Writing new UUID to /dev/$diskdev..."
- get_image "$@" | dd of="/dev/$diskdev" bs=1 skip=440 count=4 seek=440 conv=fsync
-}
-
-platform_copy_config() {
- local partdev
-
- if export_partdevice partdev 1; then
- mkdir -p /boot
- [ -f /boot/kernel.img ] || mount -t vfat -o rw,noatime "/dev/$partdev" /boot
- cp -af "$UPGRADE_BACKUP" "/boot/$BACKUP_FILE"
- tar -C / -zxvf "$UPGRADE_BACKUP" boot/config.txt
- sync
- unmount /boot
- fi
-}