diff --git a/builds/any/rootfs/jessie/common/common-packages.yml b/builds/any/rootfs/jessie/common/common-packages.yml index ef765ea3..d41477b4 100644 --- a/builds/any/rootfs/jessie/common/common-packages.yml +++ b/builds/any/rootfs/jessie/common/common-packages.yml @@ -66,7 +66,6 @@ - realpath - iptables - onl-faultd -- onl-loader-initscripts - onlp-snmpd - oom-shim - python-parted diff --git a/builds/any/rootfs/wheezy/common/common-packages.yml b/builds/any/rootfs/wheezy/common/common-packages.yml index 40a6bf5d..eb365075 100644 --- a/builds/any/rootfs/wheezy/common/common-packages.yml +++ b/builds/any/rootfs/wheezy/common/common-packages.yml @@ -65,7 +65,6 @@ - realpath - iptables - onl-faultd -- onl-loader-initscripts - onlp-snmpd - oom-shim - python-parted diff --git a/packages/base/all/initrds/loader-initrd-files/PKG.yml b/packages/base/all/initrds/loader-initrd-files/PKG.yml index 3ae21ef7..79489347 100644 --- a/packages/base/all/initrds/loader-initrd-files/PKG.yml +++ b/packages/base/all/initrds/loader-initrd-files/PKG.yml @@ -6,6 +6,7 @@ common: packages: - name: onl-loader-initrd-files + depends: [ onl-vendor-config-onl ] version: 1.0.0 summary: Open Network Linux System Loader Source Files @@ -22,15 +23,4 @@ packages: changelog: Change changes changes., - - name: onl-loader-initscripts - version: 1.0.0 - summary: Open Network Linux System Loader Common Initscripts - - files: - src/bin/initnetdev : /sbin/ - - changelog: Change changes changes., - - - diff --git a/packages/base/all/initrds/loader-initrd-files/src/bin/initmounts b/packages/base/all/initrds/loader-initrd-files/src/bin/initmounts deleted file mode 100755 index 6f4f0ff0..00000000 --- a/packages/base/all/initrds/loader-initrd-files/src/bin/initmounts +++ /dev/null @@ -1,275 +0,0 @@ -#!/bin/sh -############################################################ -# -# -# Copyright 2013, 2014 BigSwitch Networks, Inc. -# -# -# -# -############################################################ -# -# initmounts -# -# Mount all mount points listed in /etc/onl/mounts -# -# Each line in /etc/onl/mounts is in the following syntax: -# -# /dev/sda sda mount-point -# - wait for /dev/sda to appear, -# then mount /dev/sda as /mnt/mount-point -# -# /dev/sda * mount-point -# - wait for block device /dev/sda to appear, -# then mount /dev/sda as /mnt/mount-point -# (infer /dev/sda from the left-hand path specification) -# -# block/sda sda mount-point -# block/sda * mount-point -# SYSDEV=block/sda sda mount-point -# SYSDEV=block/sda * mount-point -# - wait for /sys/block/sda to appear, -# then mount /mnt/sda as /mnt/mnt-point -# -# LABEL=MYDEV * mount-point -# LABEL="MYDEV" * mount-point -# - wait for a partition with the given label to appear -# (via polling 'blkid') -# then mount as /mnt/mnt-point -# -# UUID=some-uuid * mount-point -# UUID="some-uuid" * mount-point -# - wait for a partition with the given UUID to appear -# (via polling 'blkid') -# then mount as /mnt/mnt-point -# -# - multiple lines mapping to the same mount point can -# be listed in /etc/onl/mounts, the first one that -# is valid wins -# -# - initmounts exits with code zero (success) -# if each mount point is mounted once -# -# - initmounts exits with non-zero (failure) -# if un-mounted mount points are still remaining after 10s -# -############################################################ -exec 9<$0 -flock -x 9 - -CR=" -" -PATH=$PATH:/sbin:/usr/sbin - -recover="fsck" - -try_mount_block() -{ - local dev devpart mount - dev=$1; shift - devpart=$1; shift - mount=$1; shift - - if test -b "$dev"; then - - if test "$devpart" = "*"; then - devpart=`echo "$dev" | sed -e 's/^.*[/]//' ` - fi - - test -d /mnt/$mount || mkdir -p /mnt/$mount - if test "$recover" = "fsck"; then - if dosfsck -a /dev/$devpart; then - : - else - dosfsck -n /dev/$devpart || return - fi - else - dosfsck -n /dev/$devpart || return - fi - mount -o noatime /dev/$devpart /mnt/$mount || return - echo "mounted /dev/$devpart --> /mnt/$mount" - - fi -} - -try_mount_sysdev() -{ - local syspath devpart mount - syspath=$1; shift - devpart=$1; shift - mount=$1; shift - - if test -e /sys/$syspath; then - - if test "$devpart" = "*"; then - devpart=`echo "$syspath" | sed -e 's/^.*[/]//' ` - fi - - test -d /mnt/$mount || mkdir -p /mnt/$mount - if test "$recover" = "fsck"; then - if dosfsck -a /dev/$devpart; then - : - else - dosfsck -n /dev/$devpart || return - fi - else - dosfsck -n /dev/$devpart || return - fi - mount -o noatime /dev/$devpart /mnt/$mount || return - echo "mounted /dev/$devpart --> /mnt/$mount" - - fi -} - -try_mount_label() -{ - local label devpart mount - label=$1; shift - devpart=$1; shift - mount=$1; shift - - local ifs dummy line dev - ifs=$IFS; IFS=$CR - for line in `blkid`; do - IFS=$ifs - case " $line " in - *" LABEL=${label} "*) - dev=`echo "$line" | sed -e 's/:.*//'` - break - ;; - *" LABEL=\"${label}\" "*) - dev=`echo "$line" | sed -e 's/:.*//'` - break - ;; - esac - done - IFS=$ifs - - if test "$dev"; then - try_mount_block "$dev" "$devpart" "$mount" - fi -} - -try_mount_uuid() -{ - local uuid devpart mount - uuid=$1; shift - devpart=$1; shift - mount=$1; shift - - local ifs dummy line dev - ifs=$IFS; IFS=$CR - for line in `blkid`; do - IFS=$ifs - case " $line " in - *" UUID=${uuid} "*) - dev=`echo "$line" | sed -e 's/:.*//'` - break - ;; - *" UUID=\"${label}\" "*) - dev=`echo "$uuid" | sed -e 's/:.*//'` - break - ;; - esac - done - IFS=$ifs - - if test "$dev"; then - try_mount_block "$dev" "$devpart" "$mount" - fi -} - -try_mount() -{ - local devspec devpart mount - devspec=$1; shift - devpart=$1; shift - mount=$1; shift - - if grep " /mnt/$mount " /proc/mounts 1>/dev/null; then - return - fi - - local sysdev label uuid - - case "$devspec" in - /dev/*) - try_mount_block "$devspec" "$devpart" "$mount" - ;; - block/*) - try_mount_sysdev "$devspec" "$devpart" "$mount" - ;; - SYSDEV=\"*\") - sysdev=`echo "$devspec" | sed -e 's/SYSDEV=\"\(.*\)\"/\1/'` - try_mount_sysdev "$sysdev" "$devpart" "$mount" - ;; - SYSDEV=*) - sysdev=`echo "$devspec" | sed -e 's/SYSDEV=\(.*\)/\1/'` - try_mount_sysdev "$sysdev" "$devpart" "$mount" - ;; - LABEL=\"*\") - label=`echo "$devspec" | sed -e 's/LABEL=\"\(.*\)\"/\1/'` - try_mount_label "$label" "$devpart" "$mount" - ;; - LABEL=*) - label=`echo "$devspec" | sed -e 's/LABEL=\(.*\)/\1/'` - try_mount_label "$label" "$devpart" "$mount" - ;; - UUID=\"*\") - uuid=`echo "$devspec" | sed -e 's/UUID=\"\(.*\)\"/\1/'` - try_mount_uuid "$uuid" "$devpart" "$mount" - ;; - UUID=*) - uuid=`echo "$devspec" | sed -e 's/UUID=\(.*\)/\1/'` - try_mount_uuid "$uuid" "$devpart" "$mount" - ;; - *) - echo "*** invalid block specifier: $devspec" 1>&2 - ;; - esac -} - -visit_onl_mounts() -{ - local fn rest - fn=$1; shift - rest="$@" - - local ifs dummy line remain - remain=0 - ifs=$IFS; IFS=$CR - for line in $(cat /etc/onl/mounts); do - IFS=$ifs - - set -f - set dummy $line; shift - devspec=$1; shift - devpart=$1; shift - mount=$1; shift - - grep " /mnt/$mount " /proc/mounts 1>/dev/null && continue - remain=1 - eval $fn "$devspec" "$devpart" "$mount" $rest - - set +f - done - IFS=$ifs - - return $remain -} - -if test -f /etc/onl/mounts; then - timeout=10 - while test $timeout -gt 0; do - if visit_onl_mounts try_mount; then - echo "Found all mounts." - exit 0 - fi - sleep 1 - timeout=$(( $timeout - 1 )) - done - if test "$timeout" -eq 0; then - echo "Timed out waiting for block devices" - exit 1 - fi -fi diff --git a/packages/base/all/initrds/loader-initrd-files/src/bin/initnetdev b/packages/base/all/initrds/loader-initrd-files/src/bin/initnetdev deleted file mode 100755 index 95744fcc..00000000 --- a/packages/base/all/initrds/loader-initrd-files/src/bin/initnetdev +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh -############################################################ -# -# -# Copyright 2013, 2014 BigSwitch Networks, Inc. -# -# Licensed under the Eclipse Public License, Version 1.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.eclipse.org/legal/epl-v10.html -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, -# either express or implied. See the License for the specific -# language governing permissions and limitations under the -# License. -# -# -############################################################ -# -# initnetdev -# -# Initialize management interfaces specified in /etc/onl/net -# -# This maps the platform's management interface to well-known -# interface names (such as ma1) -# -############################################################ -set -e -exec 9<$0 -flock -x 9 -case $2 in - add) - dev=$1 - devid= - if [ -e /sys/class/net/${dev}/device ]; then - eval $(realpath /sys/class/net/${dev}/device | sed 's#/sys/devices/\(.*\)#devid=\1#') - fi - while read i n; do - expr match "$i" "#" >/dev/null && continue || : - [ -n "${devid}" ] && expr match "${devid}" "$i" >/dev/null && name=$n && break || : - expr match "@${dev}" "$i" >/dev/null && name=$n && break || : - done &1 > /dev/null; then - ip link set dev ${dev} name ${name} - fi - ;; -esac diff --git a/packages/base/all/initrds/loader-initrd-files/src/bin/sysinit b/packages/base/all/initrds/loader-initrd-files/src/bin/sysinit index 07b1f2e3..59c00ae0 100755 --- a/packages/base/all/initrds/loader-initrd-files/src/bin/sysinit +++ b/packages/base/all/initrds/loader-initrd-files/src/bin/sysinit @@ -72,6 +72,11 @@ if [ ! -f /etc/onl/abort ]; then # Initialize platform mounts initmounts -q + # Initialize U-Boot environment + if [ -s /proc/device-tree/model ]; then + initubootenv + fi + if [ -f /etc/issue ]; then cat /etc/issue fi diff --git a/packages/base/all/initrds/loader-initrd-files/src/lib/platform-detect b/packages/base/all/initrds/loader-initrd-files/src/lib/platform-detect index 446b3c5c..3c1d43d8 100644 --- a/packages/base/all/initrds/loader-initrd-files/src/lib/platform-detect +++ b/packages/base/all/initrds/loader-initrd-files/src/lib/platform-detect @@ -69,17 +69,15 @@ if [ ! -f /etc/onl/platform ]; then echo "unknown" > /etc/onl/platform fi -touch /etc/onl/net /etc/onl/block /etc/onl/mounts +touch /etc/onl/block platform="$(cat /etc/onl/platform)" if [ -d /lib/platform-config/${platform} ]; then - # Grab and source the platform boot configuration file + # Optionally source a platform boot configuration file x=/lib/platform-config/${platform}/onl/boot/${platform} if [ -f $x ]; then . $x - else - echo "The platform boot configuration for the current platform is broken, invalid, or missing." > /etc/onl/abort fi else echo "The current platform (${platform}) is not supported in this version." > /etc/onl/abort diff --git a/packages/base/all/vendor-config-onl/PKG.yml b/packages/base/all/vendor-config-onl/PKG.yml index d2544bab..32109df3 100644 --- a/packages/base/all/vendor-config-onl/PKG.yml +++ b/packages/base/all/vendor-config-onl/PKG.yml @@ -24,8 +24,10 @@ packages: summary: ONL Base Configuration Package (Loader) files: - src/python/onl : /usr/lib/python2.7/dist-packages/onl + src/python/onl : $PY_INSTALL/onl src/bin/initmounts : /bin/initmounts + src/bin/initubootenv : /bin/initubootenv + src/bin/initnetdev : /bin/initnetdev src/bin/pki : /sbin/pki changelog: Changes diff --git a/packages/base/all/vendor-config-onl/src/bin/initnetdev b/packages/base/all/vendor-config-onl/src/bin/initnetdev new file mode 100755 index 00000000..5f04f395 --- /dev/null +++ b/packages/base/all/vendor-config-onl/src/bin/initnetdev @@ -0,0 +1,3 @@ +#!/usr/bin/python +from onl.network import MdevApp +MdevApp.main() diff --git a/packages/base/all/vendor-config-onl/src/bin/initubootenv b/packages/base/all/vendor-config-onl/src/bin/initubootenv new file mode 100755 index 00000000..e3b47ea1 --- /dev/null +++ b/packages/base/all/vendor-config-onl/src/bin/initubootenv @@ -0,0 +1,3 @@ +#!/usr/bin/python +from onl.uboot import InitUbootApp +InitUbootApp.main() diff --git a/packages/base/all/vendor-config-onl/src/lib/platform-config-defaults-uboot.yml b/packages/base/all/vendor-config-onl/src/lib/platform-config-defaults-uboot.yml index 4343389e..e2c03f68 100644 --- a/packages/base/all/vendor-config-onl/src/lib/platform-config-defaults-uboot.yml +++ b/packages/base/all/vendor-config-onl/src/lib/platform-config-defaults-uboot.yml @@ -113,6 +113,15 @@ default: nos_bootcmds: *ide_bootcmds + # Configure the fw_env.config file, + # based on board settings (no defaults here) + # XXX NOTE that you will need to define this for each platform! + ##environment: + ##- device: /dev/mtd3 + ## env_offset: 0x00000000 + ## env_size: 0x00002000 + ## sector_size: 0x00020000 + # Default partitioning scheme # boot, config --> 128MiB (ext2) # images --> 1GiB @@ -134,3 +143,19 @@ default: - ONL-DATA: =: 100% format: ext4 + + network: + + # remap interface names on boot (loader only) + # make sure you have a valid 'ma1' entry in your platform config... + + interfaces: + + # this should work for most systems + ma1: + name: eth0 + + # for other wierd corner cases + ##ma1: + ## name: ~ + ## syspath: SOME-PATH diff --git a/packages/base/all/vendor-config-onl/src/lib/platform-config-defaults-x86-64.yml b/packages/base/all/vendor-config-onl/src/lib/platform-config-defaults-x86-64.yml index 2b188f5c..c3f416bf 100644 --- a/packages/base/all/vendor-config-onl/src/lib/platform-config-defaults-x86-64.yml +++ b/packages/base/all/vendor-config-onl/src/lib/platform-config-defaults-x86-64.yml @@ -104,3 +104,18 @@ default: ##- ONL-IMAGES: 384MiB ##- ONL-DATA: 100% + network: + + # remap interface names on boot (loader only) + # make sure you have a valid 'ma1' entry in your platform config... + + interfaces: + + # this should work for most systems + ma1: + name: eth0 + + # for other wierd corner cases + ##ma1: + ## name: ~ + ## syspath: SOME-PATH diff --git a/packages/base/all/vendor-config-onl/src/python/onl/network/MdevApp.py b/packages/base/all/vendor-config-onl/src/python/onl/network/MdevApp.py new file mode 100644 index 00000000..48eb1da3 --- /dev/null +++ b/packages/base/all/vendor-config-onl/src/python/onl/network/MdevApp.py @@ -0,0 +1,68 @@ +"""MdevApp.py + +busybox mdev handler for network devices + +""" + +import os, sys +import onl.platform.current +import subprocess + +import logging +logger = None + +def do_add(device): + + platform = onl.platform.current.OnlPlatform() + d = platform.platform_config + d = d.get('network', {}) + d = d.get('interfaces', {}) + + syspath = None + src = "/sys/class/net/%s/device" % device + dst = os.path.realpath(src) + if dst.startswith("/sys/devices/"): + syspath = dst[13:] + + tgtname = None + for intf, idata in d.items(): + + n = idata.get('name', None) + if n is not None and n == device: + sys.stdout.write("found interface name alias %s --> %s\n" + % (device, intf,)) + tgtname = intf + break + + p = idata.get('syspath', None) + if p is not None and p == syspath: + sys.stdout.write("found interface sysfs alias %s --> %s\n" + % (syspath, intf,)) + tgtname = intf + break + + if tgtname is not None: + src = "/sys/class/net/%s/device" % tgtname + if not os.path.exists(src): + sys.stdout.write("remapping interface %s --> %s\n" + % (device, tgtname,)) + cmd = ('ip', 'link', 'set', device, 'name', tgtname,) + subprocess.check_call(cmd) + + return 0 + +def main(): + + args = list(sys.argv) + args.pop(0) + device = args.pop(0) + action = args.pop(0) + + if action == 'add': + sys.exit(do_add(device)) + + sys.stderr.write("*** invalid action %s\n" % action) + sys.exit(1) + +if __name__ == "__main__": + main() diff --git a/packages/base/all/vendor-config-onl/src/python/onl/network/__init__.py b/packages/base/all/vendor-config-onl/src/python/onl/network/__init__.py new file mode 100644 index 00000000..9a2cd3e0 --- /dev/null +++ b/packages/base/all/vendor-config-onl/src/python/onl/network/__init__.py @@ -0,0 +1,3 @@ +"""__init__.py + +""" diff --git a/packages/base/all/vendor-config-onl/src/python/onl/uboot/InitUbootApp.py b/packages/base/all/vendor-config-onl/src/python/onl/uboot/InitUbootApp.py new file mode 100644 index 00000000..1311d6bb --- /dev/null +++ b/packages/base/all/vendor-config-onl/src/python/onl/uboot/InitUbootApp.py @@ -0,0 +1,53 @@ +"""InitUbootApp.py + +Initialize the fw_env.config file + +See +https://developer.ridgerun.com/wiki/index.php/Setting_up_fw_printenv_to_modify_u-boot_environment_variables + +""" + +PATH = "/etc/fw_env.config" + +import sys +import onl.platform.current + +platform = onl.platform.current.OnlPlatform() + +d = platform.platform_config +if 'flat_image_tree' not in d: + raise ValueError("missing flat_image_tree section, probably not U-Boot") +d = d.get('loader', {}) +d = d.get('environment', []) +if not d: + raise ValueError("missing or empty loader.environment config") + +with open(PATH, "w") as fd: + fd.write("# device env_offset env_size sector_size sector_count\n") + for m in d: + + dev = m.get('device', None) + if not dev: + raise ValueError("missing device key in environment settings") + + off = m.get('env_offset', None) + if off is None: + raise ValueError("missing env_offset key in environment settings") + + sz = m.get('env_size', None) + if not sz: + raise ValueError("missing env_size key in environment settings") + + ssz = m.get('sector_size', None) + if not ssz: + raise ValueError("missing sector_size key in environment settings") + + ns = m.get('sector_count', None) + if ns is None: + ns = sz / ssz + if ns == 0: ns = 1 + + fd.write("%s 0x%x 0x%x 0x%x %d\n" + % (dev, off, sz, ssz, ns,)) + +sys.exit(0) diff --git a/packages/base/all/vendor-config-onl/src/python/onl/uboot/__init__.py b/packages/base/all/vendor-config-onl/src/python/onl/uboot/__init__.py new file mode 100644 index 00000000..9a2cd3e0 --- /dev/null +++ b/packages/base/all/vendor-config-onl/src/python/onl/uboot/__init__.py @@ -0,0 +1,3 @@ +"""__init__.py + +""" diff --git a/packages/platforms/accton/armel/arm-accton-as4610-54/platform-config/r0/src/lib/arm-accton-as4610-54-r0.yml b/packages/platforms/accton/armel/arm-accton-as4610-54/platform-config/r0/src/lib/arm-accton-as4610-54-r0.yml index 010c3b7d..b4f66c4d 100644 --- a/packages/platforms/accton/armel/arm-accton-as4610-54/platform-config/r0/src/lib/arm-accton-as4610-54-r0.yml +++ b/packages/platforms/accton/armel/arm-accton-as4610-54/platform-config/r0/src/lib/arm-accton-as4610-54-r0.yml @@ -21,3 +21,10 @@ arm-accton-as4610-54-r0: ##partition: /dev/sda1 loadaddr: 0x70000000 nos_bootcmds: *usb2_bootcmds + + environment: + - device: /dev/mtd2 + env_offset: 0x00000000 + env_size: 0x00002000 + sector_size: 0x00010000 + \ No newline at end of file diff --git a/packages/platforms/accton/armel/arm-accton-as4610-54/platform-config/r0/src/lib/boot/arm-accton-as4610-54-r0 b/packages/platforms/accton/armel/arm-accton-as4610-54/platform-config/r0/src/lib/boot/arm-accton-as4610-54-r0 deleted file mode 100644 index 1edfdf27..00000000 --- a/packages/platforms/accton/armel/arm-accton-as4610-54/platform-config/r0/src/lib/boot/arm-accton-as4610-54-r0 +++ /dev/null @@ -1,6 +0,0 @@ -ip link set dev eth0 name ma1 -echo "block/sda sda2 flash" > /etc/onl/mounts -echo "block/sda sda3 flash2" >> /etc/onl/mounts - -echo "# MTD device name Device offset Env. size Flash sector size" > /etc/fw_env.config -echo "/dev/mtd2 0x00000000 0x00002000 0x00010000" >> /etc/fw_env.config diff --git a/packages/platforms/accton/armel/arm-accton-as4610-54/platform-config/r0/src/lib/install/arm-accton-as4610-54-r0.sh b/packages/platforms/accton/armel/arm-accton-as4610-54/platform-config/r0/src/lib/install/arm-accton-as4610-54-r0.sh deleted file mode 100644 index 753d8c9e..00000000 --- a/packages/platforms/accton/armel/arm-accton-as4610-54/platform-config/r0/src/lib/install/arm-accton-as4610-54-r0.sh +++ /dev/null @@ -1,7 +0,0 @@ -# The loader is installed in the fat partition of the first USB storage device -platform_bootcmd="usb start; usbiddev; ext2load usb 0:1 70000000 $ONL_PLATFORM.itb; setenv bootargs console=\$consoledev,\$baudrate onl_platform=$ONL_PLATFORM; bootm 70000000#$ONL_PLATFORM" - -platform_installer() { - # Standard installation to usb storage - installer_standard_blockdev_install sda 128M 128M 1024M "" -} diff --git a/packages/platforms/accton/powerpc/powerpc-accton-as4600-54t/platform-config/r0/src/lib/boot/powerpc-accton-as4600-54t-r0 b/packages/platforms/accton/powerpc/powerpc-accton-as4600-54t/platform-config/r0/src/lib/boot/powerpc-accton-as4600-54t-r0 deleted file mode 100644 index 395fe8e9..00000000 --- a/packages/platforms/accton/powerpc/powerpc-accton-as4600-54t/platform-config/r0/src/lib/boot/powerpc-accton-as4600-54t-r0 +++ /dev/null @@ -1,11 +0,0 @@ -############################################################ -# powerpc-accton-as4600-54t-r0 -############################################################ - -echo "soc.0/ff725000.ethernet ma1" > /etc/onl/net -echo "block/sda sda2 flash" > /etc/onl/mounts -echo "block/sda sda3 flash2" >> /etc/onl/mounts - -echo "# MTD device name Device offset Env. size Flash sector size" >> /etc/fw_env.config -echo "/dev/mtd2 0x00000000 0x00010000 0x00010000" >> /etc/fw_env.config - diff --git a/packages/platforms/accton/powerpc/powerpc-accton-as4600-54t/platform-config/r0/src/lib/install/powerpc-accton-as4600-54t-r0.sh b/packages/platforms/accton/powerpc/powerpc-accton-as4600-54t/platform-config/r0/src/lib/install/powerpc-accton-as4600-54t-r0.sh deleted file mode 100644 index e9bef0b1..00000000 --- a/packages/platforms/accton/powerpc/powerpc-accton-as4600-54t/platform-config/r0/src/lib/install/powerpc-accton-as4600-54t-r0.sh +++ /dev/null @@ -1,28 +0,0 @@ -############################################################ -# -# -# Copyright 2013, 2014 Big Switch Networks, Inc. -# -# Licensed under the Eclipse Public License, Version 1.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.eclipse.org/legal/epl-v10.html -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, -# either express or implied. See the License for the specific -# language governing permissions and limitations under the -# License. -# -# -############################################################ - -# The loader is installed in the fat partition of the first USB storage device -platform_bootcmd="usb start; ext2load usb 0:1 0x10000000 $ONL_PLATFORM.itb; setenv bootargs console=\$consoledev,\$baudrate onl_platform=$ONL_PLATFORM; bootm 0x10000000#$ONL_PLATFORM" - -platform_installer() { - # Standard installation to usb storage - installer_standard_blockdev_install sda 32M 32M 448M "" -} diff --git a/packages/platforms/accton/powerpc/powerpc-accton-as4600-54t/platform-config/r0/src/lib/powerpc-accton-as4600-54t-r0.yml b/packages/platforms/accton/powerpc/powerpc-accton-as4600-54t/platform-config/r0/src/lib/powerpc-accton-as4600-54t-r0.yml index b147cb47..eb3bdf19 100644 --- a/packages/platforms/accton/powerpc/powerpc-accton-as4600-54t/platform-config/r0/src/lib/powerpc-accton-as4600-54t-r0.yml +++ b/packages/platforms/accton/powerpc/powerpc-accton-as4600-54t/platform-config/r0/src/lib/powerpc-accton-as4600-54t-r0.yml @@ -19,6 +19,12 @@ powerpc-accton-as4600-54t-r0: ##partition: /dev/sda1 nos_bootcmds: *usb_bootcmds + environment: + - device: /dev/mtd2 + env_offset: 0x00000000 + env_size: 0x00010000 + sector_size: 0x00010000 + installer: - ONL-BOOT: =: 32MiB @@ -32,3 +38,9 @@ powerpc-accton-as4600-54t-r0: - ONL-DATA: =: 100% format: ext4 + + ##network: + ## interfaces: + ## ma1: + ## name: ~ + ## syspath: soc.0/ff725000.ethernet diff --git a/packages/platforms/accton/powerpc/powerpc-accton-as5610-52x/platform-config/r0/src/lib/boot/powerpc-accton-as5610-52x-r0 b/packages/platforms/accton/powerpc/powerpc-accton-as5610-52x/platform-config/r0/src/lib/boot/powerpc-accton-as5610-52x-r0 deleted file mode 100644 index a17562d0..00000000 --- a/packages/platforms/accton/powerpc/powerpc-accton-as5610-52x/platform-config/r0/src/lib/boot/powerpc-accton-as5610-52x-r0 +++ /dev/null @@ -1,10 +0,0 @@ -############################################################ -# powerpc-accton-as5610-52x-r0 -############################################################ - -echo "soc.0/ff724000.ethernet ma1" >/etc/onl/net -echo "block/sda sda2 flash" > /etc/onl/mounts -echo "block/sda sda3 flash2" >> /etc/onl/mounts - -echo "# MTD device name Device offset Env. size Flash sector size" > /etc/fw_env.config -echo "/dev/mtd1 0x00000000 0x00010000 0x00010000" >> /etc/fw_env.config \ No newline at end of file diff --git a/packages/platforms/accton/powerpc/powerpc-accton-as5610-52x/platform-config/r0/src/lib/install/powerpc-accton-as5610-52x-r0.sh b/packages/platforms/accton/powerpc/powerpc-accton-as5610-52x/platform-config/r0/src/lib/install/powerpc-accton-as5610-52x-r0.sh deleted file mode 100644 index bb545142..00000000 --- a/packages/platforms/accton/powerpc/powerpc-accton-as5610-52x/platform-config/r0/src/lib/install/powerpc-accton-as5610-52x-r0.sh +++ /dev/null @@ -1,28 +0,0 @@ -############################################################ -# -# -# Copyright 2013, 2014 Big Switch Networks, Inc. -# -# Licensed under the Eclipse Public License, Version 1.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.eclipse.org/legal/epl-v10.html -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, -# either express or implied. See the License for the specific -# language governing permissions and limitations under the -# License. -# -# -############################################################ - -# The loader is installed in the fat partition of the first USB storage device -platform_bootcmd="usb start; ext2load usb 0:1 0x10000000 $ONL_PLATFORM.itb; setenv bootargs console=\$consoledev,\$baudrate onl_platform=$ONL_PLATFORM; bootm 0x10000000#$ONL_PLATFORM" - -platform_installer() { - # Standard installation to usb storage - installer_standard_blockdev_install sda 128M 128M 768M "" -} diff --git a/packages/platforms/accton/powerpc/powerpc-accton-as5610-52x/platform-config/r0/src/lib/powerpc-accton-as5610-52x-r0.yml b/packages/platforms/accton/powerpc/powerpc-accton-as5610-52x/platform-config/r0/src/lib/powerpc-accton-as5610-52x-r0.yml index a02ae482..ca4037b2 100644 --- a/packages/platforms/accton/powerpc/powerpc-accton-as5610-52x/platform-config/r0/src/lib/powerpc-accton-as5610-52x-r0.yml +++ b/packages/platforms/accton/powerpc/powerpc-accton-as5610-52x/platform-config/r0/src/lib/powerpc-accton-as5610-52x-r0.yml @@ -20,6 +20,12 @@ powerpc-accton-as5610-52x-r0: ##partition: /dev/sda1 nos_bootcmds: *usb_bootcmds + environment: + - device: /dev/mtd1 + env_offset: 0x00000000 + env_size: 0x00010000 + sector_size: 0x00010000 + installer: - ONL-BOOT: =: 128MiB @@ -33,3 +39,9 @@ powerpc-accton-as5610-52x-r0: - ONL-DATA: =: 100% format: ext4 + + ##network: + ## interfaces: + ## ma1: + ## name: ~ + ## syspath: soc.0/ff724000.ethernet diff --git a/packages/platforms/accton/powerpc/powerpc-accton-as5710-54x/platform-config/r0/src/lib/boot/powerpc-accton-as5710-54x-r0 b/packages/platforms/accton/powerpc/powerpc-accton-as5710-54x/platform-config/r0/src/lib/boot/powerpc-accton-as5710-54x-r0 deleted file mode 100644 index 47478956..00000000 --- a/packages/platforms/accton/powerpc/powerpc-accton-as5710-54x/platform-config/r0/src/lib/boot/powerpc-accton-as5710-54x-r0 +++ /dev/null @@ -1,13 +0,0 @@ -############################################################ -# powerpc-accton-as5710-54x-r0 -############################################################ - -echo "fsl,dpaa.16/ethernet.17 ma1" > /etc/onl/net -echo "block/sda sda2 flash" > /etc/onl/mounts -echo "block/sda sda3 flash2" >> /etc/onl/mounts - -echo "# MTD device name Device offset Env. size Flash sector size" > /etc/fw_env.config -echo "/dev/mtd6 0x00000000 0x00002000 0x00020000" >> /etc/fw_env.config - - - diff --git a/packages/platforms/accton/powerpc/powerpc-accton-as5710-54x/platform-config/r0/src/lib/install/powerpc-accton-as5710-54x-r0.sh b/packages/platforms/accton/powerpc/powerpc-accton-as5710-54x/platform-config/r0/src/lib/install/powerpc-accton-as5710-54x-r0.sh deleted file mode 100644 index 029244c5..00000000 --- a/packages/platforms/accton/powerpc/powerpc-accton-as5710-54x/platform-config/r0/src/lib/install/powerpc-accton-as5710-54x-r0.sh +++ /dev/null @@ -1,27 +0,0 @@ -############################################################ -# -# -# Copyright 2013, 2014 Big Switch Networks, Inc. -# -# Licensed under the Eclipse Public License, Version 1.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.eclipse.org/legal/epl-v10.html -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, -# either express or implied. See the License for the specific -# language governing permissions and limitations under the -# License. -# -# -############################################################ - -platform_bootcmd="usb start; ext2load usb 0:1 0x10000000 $ONL_PLATFORM.itb; setenv bootargs console=\$consoledev,\$baudrate onl_platform=$ONL_PLATFORM; bootm 0x10000000#$ONL_PLATFORM" - -platform_installer() { - # Standard installation to usb storage - installer_standard_blockdev_install sda 128M 128M 1024M "" -} diff --git a/packages/platforms/accton/powerpc/powerpc-accton-as5710-54x/platform-config/r0/src/lib/powerpc-accton-as5710-54x-r0.yml b/packages/platforms/accton/powerpc/powerpc-accton-as5710-54x/platform-config/r0/src/lib/powerpc-accton-as5710-54x-r0.yml index 91c166c8..f30782be 100644 --- a/packages/platforms/accton/powerpc/powerpc-accton-as5710-54x/platform-config/r0/src/lib/powerpc-accton-as5710-54x-r0.yml +++ b/packages/platforms/accton/powerpc/powerpc-accton-as5710-54x/platform-config/r0/src/lib/powerpc-accton-as5710-54x-r0.yml @@ -19,6 +19,12 @@ powerpc-accton-as5710-54x-r0: device: /dev/sda nos_bootcmds: *usb_bootcmds + environment: + - device: /dev/mtd6 + env_offset: 0x00000000 + env_size: 0x00002000 + sector_size: 0x00020000 + installer: - ONL-BOOT: =: 128MiB @@ -33,3 +39,9 @@ powerpc-accton-as5710-54x-r0: - ONL-DATA: =: 100% format: ext4 + + ##network: + ## interfaces: + ## ma1: + ## name: ~ + ## syspath: fsl,dpaa.16/ethernet.17 diff --git a/packages/platforms/accton/powerpc/powerpc-accton-as5710-54x/platform-config/r0b/src/lib/boot/powerpc-accton-as5710-54x-r0b b/packages/platforms/accton/powerpc/powerpc-accton-as5710-54x/platform-config/r0b/src/lib/boot/powerpc-accton-as5710-54x-r0b deleted file mode 100644 index 011e60f6..00000000 --- a/packages/platforms/accton/powerpc/powerpc-accton-as5710-54x/platform-config/r0b/src/lib/boot/powerpc-accton-as5710-54x-r0b +++ /dev/null @@ -1,13 +0,0 @@ -############################################################ -# powerpc-accton-as5710-54x-r0b -############################################################ - -echo "fsl,dpaa.16/ethernet.17 ma1" > /etc/onl/net -echo "block/sda sda2 flash" > /etc/onl/mounts -echo "block/sda sda3 flash2" >> /etc/onl/mounts - -echo "# MTD device name Device offset Env. size Flash sector size" > /etc/fw_env.config -echo "/dev/mtd6 0x00000000 0x00002000 0x00020000" >> /etc/fw_env.config - - - diff --git a/packages/platforms/accton/powerpc/powerpc-accton-as5710-54x/platform-config/r0b/src/lib/install/powerpc-accton-as5710-54x-r0b.sh b/packages/platforms/accton/powerpc/powerpc-accton-as5710-54x/platform-config/r0b/src/lib/install/powerpc-accton-as5710-54x-r0b.sh deleted file mode 100644 index 029244c5..00000000 --- a/packages/platforms/accton/powerpc/powerpc-accton-as5710-54x/platform-config/r0b/src/lib/install/powerpc-accton-as5710-54x-r0b.sh +++ /dev/null @@ -1,27 +0,0 @@ -############################################################ -# -# -# Copyright 2013, 2014 Big Switch Networks, Inc. -# -# Licensed under the Eclipse Public License, Version 1.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.eclipse.org/legal/epl-v10.html -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, -# either express or implied. See the License for the specific -# language governing permissions and limitations under the -# License. -# -# -############################################################ - -platform_bootcmd="usb start; ext2load usb 0:1 0x10000000 $ONL_PLATFORM.itb; setenv bootargs console=\$consoledev,\$baudrate onl_platform=$ONL_PLATFORM; bootm 0x10000000#$ONL_PLATFORM" - -platform_installer() { - # Standard installation to usb storage - installer_standard_blockdev_install sda 128M 128M 1024M "" -} diff --git a/packages/platforms/accton/powerpc/powerpc-accton-as5710-54x/platform-config/r0b/src/lib/powerpc-accton-as5710-54x-r0b.yml b/packages/platforms/accton/powerpc/powerpc-accton-as5710-54x/platform-config/r0b/src/lib/powerpc-accton-as5710-54x-r0b.yml index 72b71b5d..f940bd38 100644 --- a/packages/platforms/accton/powerpc/powerpc-accton-as5710-54x/platform-config/r0b/src/lib/powerpc-accton-as5710-54x-r0b.yml +++ b/packages/platforms/accton/powerpc/powerpc-accton-as5710-54x/platform-config/r0b/src/lib/powerpc-accton-as5710-54x-r0b.yml @@ -15,7 +15,18 @@ powerpc-accton-as5710-54x-r0b: =: powerpc-accton-as5710-54x-r0b.dtb <<: *e500mc-kernel-package + environment: + - device: /dev/mtd6 + env_offset: 0x00000000 + env_size: 0x00002000 + sector_size: 0x00020000 + loader: device: /dev/sda nos_bootcmds: *usb_bootcmds + ##network: + ## interfaces: + ## ma1: + ## name: ~ + ## syspath: fsl,dpaa.16/ethernet.17 diff --git a/packages/platforms/accton/powerpc/powerpc-accton-as6700-32x/platform-config/r0/src/lib/boot/powerpc-accton-as6700-32x-r0 b/packages/platforms/accton/powerpc/powerpc-accton-as6700-32x/platform-config/r0/src/lib/boot/powerpc-accton-as6700-32x-r0 deleted file mode 100644 index 942441bf..00000000 --- a/packages/platforms/accton/powerpc/powerpc-accton-as6700-32x/platform-config/r0/src/lib/boot/powerpc-accton-as6700-32x-r0 +++ /dev/null @@ -1,22 +0,0 @@ -############################################################ -# powerpc-accton-as6700-32x-r0 -############################################################ - -echo "fsl,dpaa.16/ethernet.18 ma1" > /etc/onl/net -echo "# MTD device name Device offset Env. size Flash sector size" > /etc/fw_env.config -echo "/dev/mtd1 0x00000000 0x00002000 0x00010000" >> /etc/fw_env.config - -echo "block/sda sda2 flash" > /etc/onl/mounts -echo "block/sda sda3 flash2" >> /etc/onl/mounts - -# echo "block/mmcblk0 mmcblk0p2 flash" > /etc/onl/mounts -# echo "block/mmcblk0 mmcblk0p3 flash2" >> /etc/onl/mounts - - - - - - - - - diff --git a/packages/platforms/accton/powerpc/powerpc-accton-as6700-32x/platform-config/r0/src/lib/install/powerpc-accton-as6700-32x-r0.sh b/packages/platforms/accton/powerpc/powerpc-accton-as6700-32x/platform-config/r0/src/lib/install/powerpc-accton-as6700-32x-r0.sh deleted file mode 100644 index bb545142..00000000 --- a/packages/platforms/accton/powerpc/powerpc-accton-as6700-32x/platform-config/r0/src/lib/install/powerpc-accton-as6700-32x-r0.sh +++ /dev/null @@ -1,28 +0,0 @@ -############################################################ -# -# -# Copyright 2013, 2014 Big Switch Networks, Inc. -# -# Licensed under the Eclipse Public License, Version 1.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.eclipse.org/legal/epl-v10.html -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, -# either express or implied. See the License for the specific -# language governing permissions and limitations under the -# License. -# -# -############################################################ - -# The loader is installed in the fat partition of the first USB storage device -platform_bootcmd="usb start; ext2load usb 0:1 0x10000000 $ONL_PLATFORM.itb; setenv bootargs console=\$consoledev,\$baudrate onl_platform=$ONL_PLATFORM; bootm 0x10000000#$ONL_PLATFORM" - -platform_installer() { - # Standard installation to usb storage - installer_standard_blockdev_install sda 128M 128M 768M "" -} diff --git a/packages/platforms/accton/powerpc/powerpc-accton-as6700-32x/platform-config/r0/src/lib/powerpc-accton-as6700-32x-r0.yml b/packages/platforms/accton/powerpc/powerpc-accton-as6700-32x/platform-config/r0/src/lib/powerpc-accton-as6700-32x-r0.yml index 58f15076..b7ee33b1 100644 --- a/packages/platforms/accton/powerpc/powerpc-accton-as6700-32x/platform-config/r0/src/lib/powerpc-accton-as6700-32x-r0.yml +++ b/packages/platforms/accton/powerpc/powerpc-accton-as6700-32x/platform-config/r0/src/lib/powerpc-accton-as6700-32x-r0.yml @@ -20,6 +20,12 @@ powerpc-accton-as6700-32x-r0: ##partition: /dev/sda1 nos_bootcmds: *usb_bootcmds + environment: + - device: /dev/mtd1 + env_offset: 0x00000000 + env_size: 0x00002000 + sector_size: 0x00010000 + installer: - ONL-BOOT: =: 128MiB @@ -34,3 +40,8 @@ powerpc-accton-as6700-32x-r0: =: 100% format: ext4 + ##network: + ## interfaces: + ## ma1: + ## name: ~ + ## syspath: fsl,dpaa.16/ethernet.18 diff --git a/packages/platforms/accton/powerpc/powerpc-accton-as6700-32x/platform-config/r1/src/lib/boot/powerpc-accton-as6700-32x-r1 b/packages/platforms/accton/powerpc/powerpc-accton-as6700-32x/platform-config/r1/src/lib/boot/powerpc-accton-as6700-32x-r1 deleted file mode 100644 index 1ded5bc5..00000000 --- a/packages/platforms/accton/powerpc/powerpc-accton-as6700-32x/platform-config/r1/src/lib/boot/powerpc-accton-as6700-32x-r1 +++ /dev/null @@ -1,16 +0,0 @@ -############################################################ -# powerpc-accton-as6700-32x-r1 -############################################################ - -echo "fsl,dpaa.16/ethernet.18 ma1" > /etc/onl/net -echo "block/sda sda2 flash" > /etc/onl/mounts -echo "block/sda sda3 flash2" >> /etc/onl/mounts - -echo "# MTD device name Device offset Env. size Flash sector size" > /etc/fw_env.config -echo "/dev/mtd1 0x00000000 0x00002000 0x00040000" >> /etc/fw_env.config - - - - - - diff --git a/packages/platforms/accton/powerpc/powerpc-accton-as6700-32x/platform-config/r1/src/lib/install/powerpc-accton-as6700-32x-r1.sh b/packages/platforms/accton/powerpc/powerpc-accton-as6700-32x/platform-config/r1/src/lib/install/powerpc-accton-as6700-32x-r1.sh deleted file mode 100644 index bb545142..00000000 --- a/packages/platforms/accton/powerpc/powerpc-accton-as6700-32x/platform-config/r1/src/lib/install/powerpc-accton-as6700-32x-r1.sh +++ /dev/null @@ -1,28 +0,0 @@ -############################################################ -# -# -# Copyright 2013, 2014 Big Switch Networks, Inc. -# -# Licensed under the Eclipse Public License, Version 1.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.eclipse.org/legal/epl-v10.html -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, -# either express or implied. See the License for the specific -# language governing permissions and limitations under the -# License. -# -# -############################################################ - -# The loader is installed in the fat partition of the first USB storage device -platform_bootcmd="usb start; ext2load usb 0:1 0x10000000 $ONL_PLATFORM.itb; setenv bootargs console=\$consoledev,\$baudrate onl_platform=$ONL_PLATFORM; bootm 0x10000000#$ONL_PLATFORM" - -platform_installer() { - # Standard installation to usb storage - installer_standard_blockdev_install sda 128M 128M 768M "" -} diff --git a/packages/platforms/accton/powerpc/powerpc-accton-as6700-32x/platform-config/r1/src/lib/powerpc-accton-as6700-32x-r1.yml b/packages/platforms/accton/powerpc/powerpc-accton-as6700-32x/platform-config/r1/src/lib/powerpc-accton-as6700-32x-r1.yml index f35a9391..249fa0f5 100644 --- a/packages/platforms/accton/powerpc/powerpc-accton-as6700-32x/platform-config/r1/src/lib/powerpc-accton-as6700-32x-r1.yml +++ b/packages/platforms/accton/powerpc/powerpc-accton-as6700-32x/platform-config/r1/src/lib/powerpc-accton-as6700-32x-r1.yml @@ -20,6 +20,12 @@ powerpc-accton-as6700-32x-r1: ##partition: /dev/sda1 nos_bootcmds: *usb_bootcmds + environment: + - device: /dev/mtd1 + env_offset: 0x00000000 + env_size: 0x00002000 + sector_size: 0x00040000 + installer: - ONL-BOOT: =: 128MiB @@ -34,3 +40,8 @@ powerpc-accton-as6700-32x-r1: =: 100% format: ext4 + ##network: + ## interfaces: + ## ma1: + ## name: ~ + ## syspath: fsl,dpaa.16/ethernet.18 diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as5512-54x/platform-config/r0/src/lib/boot/grub.cfg b/packages/platforms/accton/x86-64/x86-64-accton-as5512-54x/platform-config/r0/src/lib/boot/grub.cfg deleted file mode 100644 index 40105eaf..00000000 --- a/packages/platforms/accton/x86-64/x86-64-accton-as5512-54x/platform-config/r0/src/lib/boot/grub.cfg +++ /dev/null @@ -1,21 +0,0 @@ -serial --port=0x2f8 --speed=115200 --word=8 --parity=no --stop=1 -terminal_input serial -terminal_output serial -set timeout=5 - -# boot switch light -menuentry OpenNetworkLinux { - search --no-floppy --label --set=root ONL-BOOT - echo 'Loading Open Network Linux ...' - insmod gzio - insmod part_msdos - linux /kernel-3.2-deb7-x86_64-all nopat console=ttyS1,115200n8 onl_platform=x86-64-accton-as5512-54x-r0 - initrd /initrd-amd64 -} - -# Menu entry to chainload ONIE -menuentry ONIE { - search --no-floppy --label --set=root ONIE-BOOT - echo 'Loading ONIE ...' - chainloader +1 -} diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as5512-54x/platform-config/r0/src/lib/boot/x86-64-accton-as5512-54x-r0 b/packages/platforms/accton/x86-64/x86-64-accton-as5512-54x/platform-config/r0/src/lib/boot/x86-64-accton-as5512-54x-r0 deleted file mode 100644 index 1d035c23..00000000 --- a/packages/platforms/accton/x86-64/x86-64-accton-as5512-54x/platform-config/r0/src/lib/boot/x86-64-accton-as5512-54x-r0 +++ /dev/null @@ -1,7 +0,0 @@ -echo "pci0000:00/0000:00:14.0 ma1" >/etc/onl/net - -echo "LABEL=FLASH * flash" > /etc/onl/mounts -echo "LABEL=FLASH2 * flash2" >> /etc/onl/mounts - - - diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as5512-54x/platform-config/r0/src/lib/install/x86-64-accton-as5512-54x-r0.sh b/packages/platforms/accton/x86-64/x86-64-accton-as5512-54x/platform-config/r0/src/lib/install/x86-64-accton-as5512-54x-r0.sh deleted file mode 100644 index e62ede0a..00000000 --- a/packages/platforms/accton/x86-64/x86-64-accton-as5512-54x/platform-config/r0/src/lib/install/x86-64-accton-as5512-54x-r0.sh +++ /dev/null @@ -1,15 +0,0 @@ -############################################################ -# -# -# Copyright 2013, 2014 BigSwitch Networks, Inc. -# -# -# -# -############################################################ -# Platform data goes here. - -platform_installer() { - # Standard isntallation to an available GPT partition - installer_standard_gpt_install /dev/sda -} diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as5512-54x/platform-config/r0/src/lib/x86-64-accton-as5512-54x-r0.yml b/packages/platforms/accton/x86-64/x86-64-accton-as5512-54x/platform-config/r0/src/lib/x86-64-accton-as5512-54x-r0.yml new file mode 100644 index 00000000..2c31c65a --- /dev/null +++ b/packages/platforms/accton/x86-64/x86-64-accton-as5512-54x/platform-config/r0/src/lib/x86-64-accton-as5512-54x-r0.yml @@ -0,0 +1,31 @@ +--- + +###################################################################### +# +# platform-config for AS5512 +# +###################################################################### + +x86-64-accton-as5512-54x-r0: + + grub: + + serial: >- + --port=0x2f8 + --speed=115200 + --word=8 + --parity=no + --stop=1 + + kernel: + <<: *kernel-3-2 + + args: >- + nopat + console=ttyS1,115200n8 + + ##network + ## interfaces: + ## ma1: + ## name: ~ + ## syspath: pci0000:00/0000:00:14.0 diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as5712-54x/platform-config/r0/src/lib/boot/grub.cfg b/packages/platforms/accton/x86-64/x86-64-accton-as5712-54x/platform-config/r0/src/lib/boot/grub.cfg deleted file mode 100644 index a39bae8c..00000000 --- a/packages/platforms/accton/x86-64/x86-64-accton-as5712-54x/platform-config/r0/src/lib/boot/grub.cfg +++ /dev/null @@ -1,21 +0,0 @@ -serial --port=0x2f8 --speed=115200 --word=8 --parity=no --stop=1 -terminal_input serial -terminal_output serial -set timeout=5 - -# boot switch light -menuentry OpenNetworkLinux { - search --no-floppy --label --set=root ONL-BOOT - echo 'Loading Open Network Linux ...' - insmod gzio - insmod part_msdos - linux /kernel-3.2-deb7-x86_64-all nopat console=ttyS1,115200n8 onl_platform=x86-64-accton-as5712-54x-r0 - initrd /initrd-amd64 -} - -# Menu entry to chainload ONIE -menuentry ONIE { - search --no-floppy --label --set=root ONIE-BOOT - echo 'Loading ONIE ...' - chainloader +1 -} diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as5712-54x/platform-config/r0/src/lib/boot/x86-64-accton-as5712-54x-r0 b/packages/platforms/accton/x86-64/x86-64-accton-as5712-54x/platform-config/r0/src/lib/boot/x86-64-accton-as5712-54x-r0 deleted file mode 100644 index 1d035c23..00000000 --- a/packages/platforms/accton/x86-64/x86-64-accton-as5712-54x/platform-config/r0/src/lib/boot/x86-64-accton-as5712-54x-r0 +++ /dev/null @@ -1,7 +0,0 @@ -echo "pci0000:00/0000:00:14.0 ma1" >/etc/onl/net - -echo "LABEL=FLASH * flash" > /etc/onl/mounts -echo "LABEL=FLASH2 * flash2" >> /etc/onl/mounts - - - diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as5712-54x/platform-config/r0/src/lib/install/x86-64-accton-as5712-54x-r0.sh b/packages/platforms/accton/x86-64/x86-64-accton-as5712-54x/platform-config/r0/src/lib/install/x86-64-accton-as5712-54x-r0.sh deleted file mode 100644 index e62ede0a..00000000 --- a/packages/platforms/accton/x86-64/x86-64-accton-as5712-54x/platform-config/r0/src/lib/install/x86-64-accton-as5712-54x-r0.sh +++ /dev/null @@ -1,15 +0,0 @@ -############################################################ -# -# -# Copyright 2013, 2014 BigSwitch Networks, Inc. -# -# -# -# -############################################################ -# Platform data goes here. - -platform_installer() { - # Standard isntallation to an available GPT partition - installer_standard_gpt_install /dev/sda -} diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as5712-54x/platform-config/r0/src/lib/x86-64-accton-as5712-54x-r0.yml b/packages/platforms/accton/x86-64/x86-64-accton-as5712-54x/platform-config/r0/src/lib/x86-64-accton-as5712-54x-r0.yml index 7820c773..fa4eea34 100644 --- a/packages/platforms/accton/x86-64/x86-64-accton-as5712-54x/platform-config/r0/src/lib/x86-64-accton-as5712-54x-r0.yml +++ b/packages/platforms/accton/x86-64/x86-64-accton-as5712-54x/platform-config/r0/src/lib/x86-64-accton-as5712-54x-r0.yml @@ -24,4 +24,8 @@ x86-64-accton-as5712-54x-r0: nopat console=ttyS1,115200n8 - \ No newline at end of file + ##network + ## interfaces: + ## ma1: + ## name: ~ + ## syspath: pci0000:00/0000:00:14.0 diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as5812-54t/platform-config/r0/src/lib/boot/grub.cfg b/packages/platforms/accton/x86-64/x86-64-accton-as5812-54t/platform-config/r0/src/lib/boot/grub.cfg deleted file mode 100644 index f0446db5..00000000 --- a/packages/platforms/accton/x86-64/x86-64-accton-as5812-54t/platform-config/r0/src/lib/boot/grub.cfg +++ /dev/null @@ -1,21 +0,0 @@ -serial --port=0x2f8 --speed=115200 --word=8 --parity=no --stop=1 -terminal_input serial -terminal_output serial -set timeout=5 - -# boot switch light -menuentry OpenNetworkLinux { - search --no-floppy --label --set=root ONL-BOOT - echo 'Loading Open Network Linux ...' - insmod gzio - insmod part_msdos - linux /kernel-3.2-deb7-x86_64-all nopat console=ttyS1,115200n8 onl_platform=x86-64-accton-as5812-54t-r0 - initrd /initrd-amd64 -} - -# Menu entry to chainload ONIE -menuentry ONIE { - search --no-floppy --label --set=root ONIE-BOOT - echo 'Loading ONIE ...' - chainloader +1 -} diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as5812-54t/platform-config/r0/src/lib/boot/x86-64-accton-as5812-54t-r0 b/packages/platforms/accton/x86-64/x86-64-accton-as5812-54t/platform-config/r0/src/lib/boot/x86-64-accton-as5812-54t-r0 deleted file mode 100644 index 1d035c23..00000000 --- a/packages/platforms/accton/x86-64/x86-64-accton-as5812-54t/platform-config/r0/src/lib/boot/x86-64-accton-as5812-54t-r0 +++ /dev/null @@ -1,7 +0,0 @@ -echo "pci0000:00/0000:00:14.0 ma1" >/etc/onl/net - -echo "LABEL=FLASH * flash" > /etc/onl/mounts -echo "LABEL=FLASH2 * flash2" >> /etc/onl/mounts - - - diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as5812-54t/platform-config/r0/src/lib/install/x86-64-accton-as5812-54t-r0.sh b/packages/platforms/accton/x86-64/x86-64-accton-as5812-54t/platform-config/r0/src/lib/install/x86-64-accton-as5812-54t-r0.sh deleted file mode 100644 index e62ede0a..00000000 --- a/packages/platforms/accton/x86-64/x86-64-accton-as5812-54t/platform-config/r0/src/lib/install/x86-64-accton-as5812-54t-r0.sh +++ /dev/null @@ -1,15 +0,0 @@ -############################################################ -# -# -# Copyright 2013, 2014 BigSwitch Networks, Inc. -# -# -# -# -############################################################ -# Platform data goes here. - -platform_installer() { - # Standard isntallation to an available GPT partition - installer_standard_gpt_install /dev/sda -} diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as5812-54t/platform-config/r0/src/lib/x86-64-accton-as5812-54t-r0.yml b/packages/platforms/accton/x86-64/x86-64-accton-as5812-54t/platform-config/r0/src/lib/x86-64-accton-as5812-54t-r0.yml index 35fdeeda..a88f81cf 100644 --- a/packages/platforms/accton/x86-64/x86-64-accton-as5812-54t/platform-config/r0/src/lib/x86-64-accton-as5812-54t-r0.yml +++ b/packages/platforms/accton/x86-64/x86-64-accton-as5812-54t/platform-config/r0/src/lib/x86-64-accton-as5812-54t-r0.yml @@ -23,3 +23,9 @@ x86-64-accton-as5812-54t-r0: args: >- nopat console=ttyS1,115200n8 + + ##network + ## interfaces: + ## ma1: + ## name: ~ + ## syspath: pci0000:00/0000:00:14.0 diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as5812-54x/platform-config/r0/src/lib/boot/grub.cfg b/packages/platforms/accton/x86-64/x86-64-accton-as5812-54x/platform-config/r0/src/lib/boot/grub.cfg deleted file mode 100644 index 37ee3ba1..00000000 --- a/packages/platforms/accton/x86-64/x86-64-accton-as5812-54x/platform-config/r0/src/lib/boot/grub.cfg +++ /dev/null @@ -1,21 +0,0 @@ -serial --port=0x2f8 --speed=115200 --word=8 --parity=no --stop=1 -terminal_input serial -terminal_output serial -set timeout=5 - -# boot switch light -menuentry OpenNetworkLinux { - search --no-floppy --label --set=root ONL-BOOT - echo 'Loading Open Network Linux ...' - insmod gzio - insmod part_msdos - linux /kernel-3.2-deb7-x86_64-all nopat console=ttyS1,115200n8 onl_platform=x86-64-accton-as5812-54x-r0 - initrd /initrd-amd64 -} - -# Menu entry to chainload ONIE -menuentry ONIE { - search --no-floppy --label --set=root ONIE-BOOT - echo 'Loading ONIE ...' - chainloader +1 -} diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as5812-54x/platform-config/r0/src/lib/boot/x86-64-accton-as5812-54x-r0 b/packages/platforms/accton/x86-64/x86-64-accton-as5812-54x/platform-config/r0/src/lib/boot/x86-64-accton-as5812-54x-r0 deleted file mode 100644 index 1d035c23..00000000 --- a/packages/platforms/accton/x86-64/x86-64-accton-as5812-54x/platform-config/r0/src/lib/boot/x86-64-accton-as5812-54x-r0 +++ /dev/null @@ -1,7 +0,0 @@ -echo "pci0000:00/0000:00:14.0 ma1" >/etc/onl/net - -echo "LABEL=FLASH * flash" > /etc/onl/mounts -echo "LABEL=FLASH2 * flash2" >> /etc/onl/mounts - - - diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as5812-54x/platform-config/r0/src/lib/install/x86-64-accton-as5812-54x-r0.sh b/packages/platforms/accton/x86-64/x86-64-accton-as5812-54x/platform-config/r0/src/lib/install/x86-64-accton-as5812-54x-r0.sh deleted file mode 100644 index e62ede0a..00000000 --- a/packages/platforms/accton/x86-64/x86-64-accton-as5812-54x/platform-config/r0/src/lib/install/x86-64-accton-as5812-54x-r0.sh +++ /dev/null @@ -1,15 +0,0 @@ -############################################################ -# -# -# Copyright 2013, 2014 BigSwitch Networks, Inc. -# -# -# -# -############################################################ -# Platform data goes here. - -platform_installer() { - # Standard isntallation to an available GPT partition - installer_standard_gpt_install /dev/sda -} diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as5812-54x/platform-config/r0/src/lib/x86-64-accton-as5812-54x-r0.yml b/packages/platforms/accton/x86-64/x86-64-accton-as5812-54x/platform-config/r0/src/lib/x86-64-accton-as5812-54x-r0.yml index b9f49b96..95817d8a 100644 --- a/packages/platforms/accton/x86-64/x86-64-accton-as5812-54x/platform-config/r0/src/lib/x86-64-accton-as5812-54x-r0.yml +++ b/packages/platforms/accton/x86-64/x86-64-accton-as5812-54x/platform-config/r0/src/lib/x86-64-accton-as5812-54x-r0.yml @@ -8,6 +8,8 @@ x86-64-accton-as5812-54x-r0: + grub: + serial: >- --port=0x2f8 --speed=115200 @@ -21,3 +23,9 @@ x86-64-accton-as5812-54x-r0: args: >- nopat console=ttyS1,115200n8 + + ##network + ## interfaces: + ## ma1: + ## name: ~ + ## syspath: pci0000:00/0000:00:14.0 diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as6712-32x/platform-config/r0/src/lib/boot/grub.cfg b/packages/platforms/accton/x86-64/x86-64-accton-as6712-32x/platform-config/r0/src/lib/boot/grub.cfg deleted file mode 100644 index c0b3d9c0..00000000 --- a/packages/platforms/accton/x86-64/x86-64-accton-as6712-32x/platform-config/r0/src/lib/boot/grub.cfg +++ /dev/null @@ -1,22 +0,0 @@ -serial --port=0x2f8 --speed=115200 --word=8 --parity=no --stop=1 -terminal_input serial -terminal_output serial -set timeout=5 - -# boot switch light -menuentry OpenNetworkLinux { - search --no-floppy --label --set=root ONL-BOOT - echo 'Loading Open Network Linux ...' - insmod gzio - insmod part_msdos - linux /kernel-3.2-deb7-x86_64-all nopat console=ttyS1,115200n8 onl_platform=x86-64-accton-as6712-32x-r0 - initrd /initrd-amd64 -} - -# Menu entry to chainload ONIE -menuentry ONIE { - search --no-floppy --label --set=root ONIE-BOOT - echo 'Loading ONIE ...' - chainloader +1 -} - diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as6712-32x/platform-config/r0/src/lib/boot/x86-64-accton-as6712-32x-r0 b/packages/platforms/accton/x86-64/x86-64-accton-as6712-32x/platform-config/r0/src/lib/boot/x86-64-accton-as6712-32x-r0 deleted file mode 100644 index a096ce1d..00000000 --- a/packages/platforms/accton/x86-64/x86-64-accton-as6712-32x/platform-config/r0/src/lib/boot/x86-64-accton-as6712-32x-r0 +++ /dev/null @@ -1,11 +0,0 @@ -############################################################ -# -# x86-64-accton-as6712-32x-r0 -# -############################################################ -echo "pci0000:00/0000:00:14.0 ma1" >/etc/onl/net -echo "LABEL=FLASH * flash" > /etc/onl/mounts -echo "LABEL=FLASH2 * flash2" >> /etc/onl/mounts - - - diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as6712-32x/platform-config/r0/src/lib/install/x86-64-accton-as6712-32x-r0.sh b/packages/platforms/accton/x86-64/x86-64-accton-as6712-32x/platform-config/r0/src/lib/install/x86-64-accton-as6712-32x-r0.sh deleted file mode 100644 index e62ede0a..00000000 --- a/packages/platforms/accton/x86-64/x86-64-accton-as6712-32x/platform-config/r0/src/lib/install/x86-64-accton-as6712-32x-r0.sh +++ /dev/null @@ -1,15 +0,0 @@ -############################################################ -# -# -# Copyright 2013, 2014 BigSwitch Networks, Inc. -# -# -# -# -############################################################ -# Platform data goes here. - -platform_installer() { - # Standard isntallation to an available GPT partition - installer_standard_gpt_install /dev/sda -} diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as6712-32x/platform-config/r0/src/lib/x86-64-accton-as6712-32x-r0.yml b/packages/platforms/accton/x86-64/x86-64-accton-as6712-32x/platform-config/r0/src/lib/x86-64-accton-as6712-32x-r0.yml index e6274083..b3310b8d 100644 --- a/packages/platforms/accton/x86-64/x86-64-accton-as6712-32x/platform-config/r0/src/lib/x86-64-accton-as6712-32x-r0.yml +++ b/packages/platforms/accton/x86-64/x86-64-accton-as6712-32x/platform-config/r0/src/lib/x86-64-accton-as6712-32x-r0.yml @@ -23,3 +23,9 @@ x86-64-accton-as6712-32x-r0: args: >- nopat console=ttyS1,115200n8 + + ##network + ## interfaces: + ## ma1: + ## name: ~ + ## syspath: pci0000:00/0000:00:14.0 diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as6812-32x/platform-config/r0/src/lib/boot/grub.cfg b/packages/platforms/accton/x86-64/x86-64-accton-as6812-32x/platform-config/r0/src/lib/boot/grub.cfg deleted file mode 100644 index d45f87bf..00000000 --- a/packages/platforms/accton/x86-64/x86-64-accton-as6812-32x/platform-config/r0/src/lib/boot/grub.cfg +++ /dev/null @@ -1,21 +0,0 @@ -serial --port=0x2f8 --speed=115200 --word=8 --parity=no --stop=1 -terminal_input serial -terminal_output serial -set timeout=5 - -# boot onl -menuentry OpenNetworkLinux { - search --no-floppy --label --set=root ONL-BOOT - echo 'Loading Open Network Linux ...' - insmod gzio - insmod part_msdos - linux /kernel-3.2-deb7-x86_64-all nopat console=ttyS1,115200n8 onl_platform=x86-64-accton-as6812-32x-r0 - initrd /initrd-amd64 -} - -# Menu entry to chainload ONIE -menuentry ONIE { - search --no-floppy --label --set=root ONIE-BOOT - echo 'Loading ONIE ...' - chainloader +1 -} diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as6812-32x/platform-config/r0/src/lib/boot/x86-64-accton-as6812-32x-r0 b/packages/platforms/accton/x86-64/x86-64-accton-as6812-32x/platform-config/r0/src/lib/boot/x86-64-accton-as6812-32x-r0 deleted file mode 100644 index b5f75d44..00000000 --- a/packages/platforms/accton/x86-64/x86-64-accton-as6812-32x/platform-config/r0/src/lib/boot/x86-64-accton-as6812-32x-r0 +++ /dev/null @@ -1,6 +0,0 @@ -echo "pci0000:00/0000:00:14.0 ma1" >/etc/onl/net - -echo "LABEL=FLASH * flash" >> /etc/onl/mounts -echo "LABEL=FLASH2 * flash2" >> /etc/onl/mounts - - diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as6812-32x/platform-config/r0/src/lib/install/x86-64-accton-as6812-32x-r0.sh b/packages/platforms/accton/x86-64/x86-64-accton-as6812-32x/platform-config/r0/src/lib/install/x86-64-accton-as6812-32x-r0.sh deleted file mode 100644 index 1c7108fa..00000000 --- a/packages/platforms/accton/x86-64/x86-64-accton-as6812-32x/platform-config/r0/src/lib/install/x86-64-accton-as6812-32x-r0.sh +++ /dev/null @@ -1,15 +0,0 @@ -############################################################ -# -# -# Copyright 2013, 2014 BigSwitch Networks, Inc. -# -# -# -# -############################################################ -# Platform data goes here. - -platform_installer() { - # Standard isntallation to an available GPT partition - installer_standard_gpt_install /dev/sda -} diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as6812-32x/platform-config/r0/src/lib/x86-64-accton-as6812-32x-r0.yml b/packages/platforms/accton/x86-64/x86-64-accton-as6812-32x/platform-config/r0/src/lib/x86-64-accton-as6812-32x-r0.yml index 6a6c75d0..a7b75803 100644 --- a/packages/platforms/accton/x86-64/x86-64-accton-as6812-32x/platform-config/r0/src/lib/x86-64-accton-as6812-32x-r0.yml +++ b/packages/platforms/accton/x86-64/x86-64-accton-as6812-32x/platform-config/r0/src/lib/x86-64-accton-as6812-32x-r0.yml @@ -24,3 +24,8 @@ x86-64-accton-as6812-32x-r0: nopat console=ttyS1,115200n8 + ##network + ## interfaces: + ## ma1: + ## name: ~ + ## syspath: pci0000:00/0000:00:14.0 diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as7512-32x/platform-config/r0/src/lib/boot/grub.cfg b/packages/platforms/accton/x86-64/x86-64-accton-as7512-32x/platform-config/r0/src/lib/boot/grub.cfg deleted file mode 100644 index f3152ac3..00000000 --- a/packages/platforms/accton/x86-64/x86-64-accton-as7512-32x/platform-config/r0/src/lib/boot/grub.cfg +++ /dev/null @@ -1,21 +0,0 @@ -serial --port=0x2f8 --speed=115200 --word=8 --parity=no --stop=1 -terminal_input serial -terminal_output serial -set timeout=5 - -# boot onl -menuentry OpenNetworkLinux { - search --no-floppy --label --set=root ONL-BOOT - echo 'Loading Open Network Linux ...' - insmod gzio - insmod part_msdos - linux /kernel-3.2-deb7-x86_64-all nopat console=ttyS1,115200n8 onl_platform=x86-64-accton-as7512-32x-r0 - initrd /initrd-amd64 -} - -# Menu entry to chainload ONIE -menuentry ONIE { - search --no-floppy --label --set=root ONIE-BOOT - echo 'Loading ONIE ...' - chainloader +1 -} diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as7512-32x/platform-config/r0/src/lib/boot/x86-64-accton-as7512-32x-r0 b/packages/platforms/accton/x86-64/x86-64-accton-as7512-32x/platform-config/r0/src/lib/boot/x86-64-accton-as7512-32x-r0 deleted file mode 100644 index f01ffc67..00000000 --- a/packages/platforms/accton/x86-64/x86-64-accton-as7512-32x/platform-config/r0/src/lib/boot/x86-64-accton-as7512-32x-r0 +++ /dev/null @@ -1,5 +0,0 @@ -echo "pci0000:00/0000:00:14.0 ma1" >/etc/onl/net - -cp /dev/null /etc/onl/mounts -echo "LABEL=FLASH * flash" >> /etc/onl/mounts -echo "LABEL=FLASH2 * flash2" >> /etc/onl/mounts diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as7512-32x/platform-config/r0/src/lib/install/x86-64-accton-as7512-32x-r0.sh b/packages/platforms/accton/x86-64/x86-64-accton-as7512-32x/platform-config/r0/src/lib/install/x86-64-accton-as7512-32x-r0.sh deleted file mode 100644 index 1c7108fa..00000000 --- a/packages/platforms/accton/x86-64/x86-64-accton-as7512-32x/platform-config/r0/src/lib/install/x86-64-accton-as7512-32x-r0.sh +++ /dev/null @@ -1,15 +0,0 @@ -############################################################ -# -# -# Copyright 2013, 2014 BigSwitch Networks, Inc. -# -# -# -# -############################################################ -# Platform data goes here. - -platform_installer() { - # Standard isntallation to an available GPT partition - installer_standard_gpt_install /dev/sda -} diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as7512-32x/platform-config/r0/src/lib/x86-64-accton-as7512-32x-r0.yml b/packages/platforms/accton/x86-64/x86-64-accton-as7512-32x/platform-config/r0/src/lib/x86-64-accton-as7512-32x-r0.yml index 2c83eb0d..4f4c51ce 100644 --- a/packages/platforms/accton/x86-64/x86-64-accton-as7512-32x/platform-config/r0/src/lib/x86-64-accton-as7512-32x-r0.yml +++ b/packages/platforms/accton/x86-64/x86-64-accton-as7512-32x/platform-config/r0/src/lib/x86-64-accton-as7512-32x-r0.yml @@ -23,3 +23,9 @@ x86-64-accton-as5712-32x-r0: args: >- nopat console=ttyS1,115200n8 + + ##network + ## interfaces: + ## ma1: + ## name: ~ + ## syspath: pci0000:00/0000:00:14.0 diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as7712-32x/platform-config/r0/src/lib/boot/grub.cfg b/packages/platforms/accton/x86-64/x86-64-accton-as7712-32x/platform-config/r0/src/lib/boot/grub.cfg deleted file mode 100644 index cd5cc7a6..00000000 --- a/packages/platforms/accton/x86-64/x86-64-accton-as7712-32x/platform-config/r0/src/lib/boot/grub.cfg +++ /dev/null @@ -1,21 +0,0 @@ -serial --port=0x2f8 --speed=115200 --word=8 --parity=no --stop=1 -terminal_input serial -terminal_output serial -set timeout=5 - -# boot onl -menuentry OpenNetworkLinux { - search --no-floppy --label --set=root ONL-BOOT - echo 'Loading Open Network Linux ...' - insmod gzio - insmod part_msdos - linux /kernel-3.2-deb7-x86_64-all nopat console=ttyS1,115200n8 onl_platform=x86-64-accton-as7712-32x-r0 - initrd /initrd-amd64 -} - -# Menu entry to chainload ONIE -menuentry ONIE { - search --no-floppy --label --set=root ONIE-BOOT - echo 'Loading ONIE ...' - chainloader +1 -} diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as7712-32x/platform-config/r0/src/lib/boot/x86-64-accton-as7712-32x-r0 b/packages/platforms/accton/x86-64/x86-64-accton-as7712-32x/platform-config/r0/src/lib/boot/x86-64-accton-as7712-32x-r0 deleted file mode 100644 index f01ffc67..00000000 --- a/packages/platforms/accton/x86-64/x86-64-accton-as7712-32x/platform-config/r0/src/lib/boot/x86-64-accton-as7712-32x-r0 +++ /dev/null @@ -1,5 +0,0 @@ -echo "pci0000:00/0000:00:14.0 ma1" >/etc/onl/net - -cp /dev/null /etc/onl/mounts -echo "LABEL=FLASH * flash" >> /etc/onl/mounts -echo "LABEL=FLASH2 * flash2" >> /etc/onl/mounts diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as7712-32x/platform-config/r0/src/lib/install/x86-64-accton-as7712-32x-r0.sh b/packages/platforms/accton/x86-64/x86-64-accton-as7712-32x/platform-config/r0/src/lib/install/x86-64-accton-as7712-32x-r0.sh deleted file mode 100644 index f30823a2..00000000 --- a/packages/platforms/accton/x86-64/x86-64-accton-as7712-32x/platform-config/r0/src/lib/install/x86-64-accton-as7712-32x-r0.sh +++ /dev/null @@ -1,15 +0,0 @@ -############################################################ -# -# -# Copyright 2013, 2014 BigSwitch Networks, Inc. -# -# -# -# -############################################################ -# Platform data goes here. - -platform_installer() { - # Standard isntallation to an available GPT partition - installer_standard_gpt_install -} diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as7712-32x/platform-config/r0/src/lib/x86-64-accton-as7712-32x-r0.yml b/packages/platforms/accton/x86-64/x86-64-accton-as7712-32x/platform-config/r0/src/lib/x86-64-accton-as7712-32x-r0.yml index 9630c73f..1220adf4 100644 --- a/packages/platforms/accton/x86-64/x86-64-accton-as7712-32x/platform-config/r0/src/lib/x86-64-accton-as7712-32x-r0.yml +++ b/packages/platforms/accton/x86-64/x86-64-accton-as7712-32x/platform-config/r0/src/lib/x86-64-accton-as7712-32x-r0.yml @@ -23,3 +23,9 @@ x86-64-accton-as7712-32x-r0: args: >- nopat console=ttyS1,115200n8 + + ##network + ## interfaces: + ## ma1: + ## name: ~ + ## syspath: pci0000:00/0000:00:14.0 diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as7716-32x/platform-config/r0/src/lib/boot/grub.cfg b/packages/platforms/accton/x86-64/x86-64-accton-as7716-32x/platform-config/r0/src/lib/boot/grub.cfg deleted file mode 100644 index ef2b5f5c..00000000 --- a/packages/platforms/accton/x86-64/x86-64-accton-as7716-32x/platform-config/r0/src/lib/boot/grub.cfg +++ /dev/null @@ -1,21 +0,0 @@ -serial --port=0x3f8 --speed=115200 --word=8 --parity=no --stop=1 -terminal_input serial -terminal_output serial -set timeout=5 - -# boot onl -menuentry OpenNetworkLinux { - search --no-floppy --label --set=root ONL-BOOT - echo 'Loading Open Network Linux ...' - insmod gzio - insmod part_msdos - linux /kernel-3.2-deb7-x86_64-all nopat console=ttyS0,115200n8 onl_platform=x86-64-accton-as7716-32x-r0 - initrd /initrd-amd64 -} - -# Menu entry to chainload ONIE -menuentry ONIE { - search --no-floppy --label --set=root ONIE-BOOT - echo 'Loading ONIE ...' - chainloader +1 -} diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as7716-32x/platform-config/r0/src/lib/boot/x86-64-accton-as7716-32x-r0 b/packages/platforms/accton/x86-64/x86-64-accton-as7716-32x/platform-config/r0/src/lib/boot/x86-64-accton-as7716-32x-r0 deleted file mode 100644 index cd87988e..00000000 --- a/packages/platforms/accton/x86-64/x86-64-accton-as7716-32x/platform-config/r0/src/lib/boot/x86-64-accton-as7716-32x-r0 +++ /dev/null @@ -1,6 +0,0 @@ -#echo "pci0000:00/0000:00:1c.0/0000:0a:00.0" > /etc/onl/net -ip link set dev eth0 name ma1 - -cp /dev/null /etc/onl/mounts -echo "LABEL=FLASH * flash" >> /etc/onl/mounts -echo "LABEL=FLASH2 * flash2" >> /etc/onl/mounts diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as7716-32x/platform-config/r0/src/lib/install/x86-64-accton-as7716-32x-r0.sh b/packages/platforms/accton/x86-64/x86-64-accton-as7716-32x/platform-config/r0/src/lib/install/x86-64-accton-as7716-32x-r0.sh deleted file mode 100644 index f30823a2..00000000 --- a/packages/platforms/accton/x86-64/x86-64-accton-as7716-32x/platform-config/r0/src/lib/install/x86-64-accton-as7716-32x-r0.sh +++ /dev/null @@ -1,15 +0,0 @@ -############################################################ -# -# -# Copyright 2013, 2014 BigSwitch Networks, Inc. -# -# -# -# -############################################################ -# Platform data goes here. - -platform_installer() { - # Standard isntallation to an available GPT partition - installer_standard_gpt_install -} diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as7716-32x/platform-config/r0/src/lib/x86-64-accton-as7716-32x-r0.yml b/packages/platforms/accton/x86-64/x86-64-accton-as7716-32x/platform-config/r0/src/lib/x86-64-accton-as7716-32x-r0.yml index c528084b..f88f0e06 100644 --- a/packages/platforms/accton/x86-64/x86-64-accton-as7716-32x/platform-config/r0/src/lib/x86-64-accton-as7716-32x-r0.yml +++ b/packages/platforms/accton/x86-64/x86-64-accton-as7716-32x/platform-config/r0/src/lib/x86-64-accton-as7716-32x-r0.yml @@ -23,3 +23,9 @@ x86-64-accton-as7716-32x-r0: args: >- nopat console=ttyS0,115200n8 + + ##network: + ## interfaces: + ## ma1: + ## name: ~ + ## syspath: pci0000:00/0000:00:1c.0/0000:0a:00.0 diff --git a/packages/platforms/accton/x86-64/x86-64-accton-wedge-16x/platform-config/r0/src/lib/boot/grub.cfg b/packages/platforms/accton/x86-64/x86-64-accton-wedge-16x/platform-config/r0/src/lib/boot/grub.cfg deleted file mode 100644 index 44a99ece..00000000 --- a/packages/platforms/accton/x86-64/x86-64-accton-wedge-16x/platform-config/r0/src/lib/boot/grub.cfg +++ /dev/null @@ -1,22 +0,0 @@ -serial --unit=0 --speed=57600 --word=8 --parity=0 --stop=1 -terminal_input serial -terminal_output serial -set timeout=5 - -# boot onl -menuentry OpenNetworkLinux { - search --no-floppy --label --set=root ONL-BOOT - echo 'Loading Open Network Linux ...' - insmod gzio - insmod part_msdos - # grub options copied from Wedge's grub.conf; did not verify which were necessary - linux /kernel-3.2-deb7-x86_64-all nopat console=ttyS1,57600n8 onl_platform=x86-64-accton-wedge-16x-r0 rd_NO_MD rd_NO_LUKS intel_iommu=off - initrd /initrd-amd64 -} - -# Menu entry to chainload ONIE -menuentry ONIE { - search --no-floppy --label --set=root ONIE-BOOT - echo 'Loading ONIE ...' - chainloader +1 -} diff --git a/packages/platforms/accton/x86-64/x86-64-accton-wedge-16x/platform-config/r0/src/lib/boot/x86-64-accton-wedge-16x-r0 b/packages/platforms/accton/x86-64/x86-64-accton-wedge-16x/platform-config/r0/src/lib/boot/x86-64-accton-wedge-16x-r0 deleted file mode 100644 index 92132f72..00000000 --- a/packages/platforms/accton/x86-64/x86-64-accton-wedge-16x/platform-config/r0/src/lib/boot/x86-64-accton-wedge-16x-r0 +++ /dev/null @@ -1,7 +0,0 @@ -echo "pci0000:00/0000:00:14.0 ma1" >/etc/onl/net - -cp /dev/null /etc/onl/mounts -echo "LABEL=FLASH * flash" >> /etc/onl/mounts -echo "LABEL=FLASH2 * flash2" >> /etc/onl/mounts - - diff --git a/packages/platforms/accton/x86-64/x86-64-accton-wedge-16x/platform-config/r0/src/lib/install/x86-64-accton-wedge-16x-r0.sh b/packages/platforms/accton/x86-64/x86-64-accton-wedge-16x/platform-config/r0/src/lib/install/x86-64-accton-wedge-16x-r0.sh deleted file mode 100644 index 1c7108fa..00000000 --- a/packages/platforms/accton/x86-64/x86-64-accton-wedge-16x/platform-config/r0/src/lib/install/x86-64-accton-wedge-16x-r0.sh +++ /dev/null @@ -1,15 +0,0 @@ -############################################################ -# -# -# Copyright 2013, 2014 BigSwitch Networks, Inc. -# -# -# -# -############################################################ -# Platform data goes here. - -platform_installer() { - # Standard isntallation to an available GPT partition - installer_standard_gpt_install /dev/sda -} diff --git a/packages/platforms/accton/x86-64/x86-64-accton-wedge-16x/platform-config/r0/src/lib/x86-64-accton-wedge-16x-r0.yml b/packages/platforms/accton/x86-64/x86-64-accton-wedge-16x/platform-config/r0/src/lib/x86-64-accton-wedge-16x-r0.yml index bc55cd86..1c42ce71 100644 --- a/packages/platforms/accton/x86-64/x86-64-accton-wedge-16x/platform-config/r0/src/lib/x86-64-accton-wedge-16x-r0.yml +++ b/packages/platforms/accton/x86-64/x86-64-accton-wedge-16x/platform-config/r0/src/lib/x86-64-accton-wedge-16x-r0.yml @@ -26,3 +26,9 @@ x86-64-accton-wedge-16x-r0: rd_NO_MD rd_NO_LUKS intel_iommu=off + + ##network + ## interfaces: + ## ma1: + ## name: ~ + ## syspath: pci0000:00/0000:00:14.0 diff --git a/packages/platforms/celestica/x86-64/x86-64-cel-redstone-xp/platform-config/r0/src/lib/boot/grub.cfg b/packages/platforms/celestica/x86-64/x86-64-cel-redstone-xp/platform-config/r0/src/lib/boot/grub.cfg deleted file mode 100644 index f1dfa037..00000000 --- a/packages/platforms/celestica/x86-64/x86-64-cel-redstone-xp/platform-config/r0/src/lib/boot/grub.cfg +++ /dev/null @@ -1,21 +0,0 @@ -serial --port=0x3f8 --speed=115200 --word=8 --parity=no --stop=1 -terminal_input serial -terminal_output serial -set timeout=5 - -menuentry OpenNetworkLinux { - search --no-floppy --label --set=root ONL-BOOT - echo 'Loading Open Network Linux ...' - insmod gzio - insmod part_msdos - linux /kernel-3.2-deb7-x86_64-all nopat console=ttyS0,115200n8 onl_platform=x86-64-cel-redstone-xp-r0 - initrd /initrd-amd64 -} - -# Menu entry to chainload ONIE -menuentry ONIE { - search --no-floppy --label --set=root ONIE-BOOT - echo 'Loading ONIE ...' - chainloader +1 -} - diff --git a/packages/platforms/celestica/x86-64/x86-64-cel-redstone-xp/platform-config/r0/src/lib/boot/x86-64-cel-redstone-xp-r0 b/packages/platforms/celestica/x86-64/x86-64-cel-redstone-xp/platform-config/r0/src/lib/boot/x86-64-cel-redstone-xp-r0 deleted file mode 100644 index 72689103..00000000 --- a/packages/platforms/celestica/x86-64/x86-64-cel-redstone-xp/platform-config/r0/src/lib/boot/x86-64-cel-redstone-xp-r0 +++ /dev/null @@ -1,6 +0,0 @@ -echo "pci0000:00/0000:00:14.0 ma1" > /etc/onl/net - -echo "LABEL=FLASH * flash" > /etc/onl/mounts -echo "LABEL=FLASH2 * flash2" >> /etc/onl/mounts - - diff --git a/packages/platforms/celestica/x86-64/x86-64-cel-redstone-xp/platform-config/r0/src/lib/install/x86-64-cel-redstone-xp-r0.sh b/packages/platforms/celestica/x86-64/x86-64-cel-redstone-xp/platform-config/r0/src/lib/install/x86-64-cel-redstone-xp-r0.sh deleted file mode 100644 index e62ede0a..00000000 --- a/packages/platforms/celestica/x86-64/x86-64-cel-redstone-xp/platform-config/r0/src/lib/install/x86-64-cel-redstone-xp-r0.sh +++ /dev/null @@ -1,15 +0,0 @@ -############################################################ -# -# -# Copyright 2013, 2014 BigSwitch Networks, Inc. -# -# -# -# -############################################################ -# Platform data goes here. - -platform_installer() { - # Standard isntallation to an available GPT partition - installer_standard_gpt_install /dev/sda -} diff --git a/packages/platforms/celestica/x86-64/x86-64-cel-redstone-xp/platform-config/r0/src/lib/x86-64-cel-redstone-xp-r0.yml b/packages/platforms/celestica/x86-64/x86-64-cel-redstone-xp/platform-config/r0/src/lib/x86-64-cel-redstone-xp-r0.yml index 69652363..76c1455d 100644 --- a/packages/platforms/celestica/x86-64/x86-64-cel-redstone-xp/platform-config/r0/src/lib/x86-64-cel-redstone-xp-r0.yml +++ b/packages/platforms/celestica/x86-64/x86-64-cel-redstone-xp/platform-config/r0/src/lib/x86-64-cel-redstone-xp-r0.yml @@ -23,3 +23,9 @@ x86-64-cel-redstone-xp-r0: args: >- nopat console=ttyS0,115200n8 + + ##network: + ## interfaces: + ## ma1: + ## name: ~ + ## syspath: pci0000:00/0000:00:14.0 diff --git a/packages/platforms/kvm/x86-64/x86-64-kvm-x86-64/platform-config/r0/src/lib/boot/grub.cfg b/packages/platforms/kvm/x86-64/x86-64-kvm-x86-64/platform-config/r0/src/lib/boot/grub.cfg deleted file mode 100644 index e0526b6d..00000000 --- a/packages/platforms/kvm/x86-64/x86-64-kvm-x86-64/platform-config/r0/src/lib/boot/grub.cfg +++ /dev/null @@ -1,21 +0,0 @@ -serial --port=0x3f8 --speed=115200 --word=8 --parity=no --stop=1 -terminal_input serial -terminal_output serial -set timeout=5 - -menuentry OpenNetworkLinux { - search --no-floppy --label --set=root ONL-BOOT - echo 'Loading Open Network Linux ...' - insmod gzio - insmod part_msdos - linux /kernel-3.9.6-x86-64-all nopat console=ttyS0,115200n8 onl_platform=x86-64-kvm-x86-64-r0 - initrd /initrd-amd64 -} - -# Menu entry to chainload ONIE -menuentry ONIE { - search --no-floppy --label --set=root ONIE-BOOT - echo 'Loading ONIE ...' - chainloader +1 -} - diff --git a/packages/platforms/kvm/x86-64/x86-64-kvm-x86-64/platform-config/r0/src/lib/boot/x86-64-kvm-x86-64-r0 b/packages/platforms/kvm/x86-64/x86-64-kvm-x86-64/platform-config/r0/src/lib/boot/x86-64-kvm-x86-64-r0 deleted file mode 100644 index ae44e205..00000000 --- a/packages/platforms/kvm/x86-64/x86-64-kvm-x86-64/platform-config/r0/src/lib/boot/x86-64-kvm-x86-64-r0 +++ /dev/null @@ -1,11 +0,0 @@ -echo "pci0000:00/0000:00:03.0 ma1" >/etc/onl/net - -cp /dev/null /etc/onl/mounts -echo "block/sda sda flash" >> /etc/onl/mounts -echo "block/vda vda flash" >> /etc/onl/mounts -echo "LABEL=FLASH * flash" >> /etc/onl/mounts - -echo "block/sdb sdb flash2" >> /etc/onl/mounts -echo "block/vdb vdb flash2" >> /etc/onl/mounts -echo "LABEL=FLASH2 * flash2" >> /etc/onl/mounts - diff --git a/packages/platforms/kvm/x86-64/x86-64-kvm-x86-64/platform-config/r0/src/lib/install/x86-64-kvm-x86-64-r0.sh b/packages/platforms/kvm/x86-64/x86-64-kvm-x86-64/platform-config/r0/src/lib/install/x86-64-kvm-x86-64-r0.sh deleted file mode 100644 index 1fe58183..00000000 --- a/packages/platforms/kvm/x86-64/x86-64-kvm-x86-64/platform-config/r0/src/lib/install/x86-64-kvm-x86-64-r0.sh +++ /dev/null @@ -1,15 +0,0 @@ -############################################################ -# -# -# Copyright 2013, 2014 BigSwitch Networks, Inc. -# -# -# -# -############################################################ -# Platform data goes here. - -platform_installer() { - # Standard isntallation to an available GPT partition - installer_standard_gpt_install /dev/vda -} diff --git a/packages/platforms/kvm/x86-64/x86-64-kvm-x86-64/platform-config/r0/src/lib/x86-64-kvm-x86-64-r0.yml b/packages/platforms/kvm/x86-64/x86-64-kvm-x86-64/platform-config/r0/src/lib/x86-64-kvm-x86-64-r0.yml index 83133bce..e20a30ab 100644 --- a/packages/platforms/kvm/x86-64/x86-64-kvm-x86-64/platform-config/r0/src/lib/x86-64-kvm-x86-64-r0.yml +++ b/packages/platforms/kvm/x86-64/x86-64-kvm-x86-64/platform-config/r0/src/lib/x86-64-kvm-x86-64-r0.yml @@ -23,4 +23,9 @@ x86-64-kvm-x86-64-r0: args: >- nopat console=ttyS0,115200n8 - \ No newline at end of file + + ##network + ## interfaces: + ## ma1: + ## name: ~ + ## syspath: pci0000:00/0000:00:03.0 diff --git a/packages/platforms/qemu/arm/arm-qemu-armv7a/platform-config/r0/src/lib/arm-qemu-armv7a-r0.yml b/packages/platforms/qemu/arm/arm-qemu-armv7a/platform-config/r0/src/lib/arm-qemu-armv7a-r0.yml index dd31aaad..0620cb71 100644 --- a/packages/platforms/qemu/arm/arm-qemu-armv7a/platform-config/r0/src/lib/arm-qemu-armv7a-r0.yml +++ b/packages/platforms/qemu/arm/arm-qemu-armv7a/platform-config/r0/src/lib/arm-qemu-armv7a-r0.yml @@ -16,3 +16,11 @@ arm-qemu-armv7a-r0: <<: *arm-iproc-kernel-package itb: <<: *arm-itb + + loader: + + environment: + - device: /dev/mtd1 + env_offset: 0x00000000 + env_size: 0x00002000 + sector_size: 0x00040000 diff --git a/packages/platforms/qemu/arm/arm-qemu-armv7a/platform-config/r0/src/lib/boot/arm-qemu-armv7a-r0 b/packages/platforms/qemu/arm/arm-qemu-armv7a/platform-config/r0/src/lib/boot/arm-qemu-armv7a-r0 deleted file mode 100644 index a0ef10f3..00000000 --- a/packages/platforms/qemu/arm/arm-qemu-armv7a/platform-config/r0/src/lib/boot/arm-qemu-armv7a-r0 +++ /dev/null @@ -1,8 +0,0 @@ -ip link set dev eth0 name ma1 - -cp /dev/null /etc/onl/mounts -echo "block/mmcblk0 mmcblk0p2 flash" > /etc/onl/mounts -echo "block/mmcblk0 mmcblk0p3 flash2" >> /etc/onl/mounts - -echo "# MTD device name Device offset Env. size Flash sector size" > /etc/fw_env.config -echo "/dev/mtd1 0x00000000 0x00002000 0x00040000" >> /etc/fw_env.config diff --git a/packages/platforms/qemu/arm/arm-qemu-armv7a/platform-config/r0/src/lib/install/arm-qemu-armv7a-r0.sh b/packages/platforms/qemu/arm/arm-qemu-armv7a/platform-config/r0/src/lib/install/arm-qemu-armv7a-r0.sh deleted file mode 100644 index e62ede0a..00000000 --- a/packages/platforms/qemu/arm/arm-qemu-armv7a/platform-config/r0/src/lib/install/arm-qemu-armv7a-r0.sh +++ /dev/null @@ -1,15 +0,0 @@ -############################################################ -# -# -# Copyright 2013, 2014 BigSwitch Networks, Inc. -# -# -# -# -############################################################ -# Platform data goes here. - -platform_installer() { - # Standard isntallation to an available GPT partition - installer_standard_gpt_install /dev/sda -} diff --git a/packages/platforms/quanta/powerpc/powerpc-quanta-lb9/platform-config/r0/src/lib/boot/powerpc-quanta-lb9-r0 b/packages/platforms/quanta/powerpc/powerpc-quanta-lb9/platform-config/r0/src/lib/boot/powerpc-quanta-lb9-r0 deleted file mode 100644 index f8611386..00000000 --- a/packages/platforms/quanta/powerpc/powerpc-quanta-lb9/platform-config/r0/src/lib/boot/powerpc-quanta-lb9-r0 +++ /dev/null @@ -1,12 +0,0 @@ -############################################################ -# -# powerpc-quanta-lb9-r0 -# -############################################################ - -echo "e0000000.soc8541/e0024000.ethernet ma1" >/etc/onl/net -echo "block/sda sda2 flash" > /etc/onl/mounts -echo "block/sda sda3 flash2" >> /etc/onl/mounts - -echo "# MTD device name Device offset Env. size Flash sector size" > /etc/fw_env.config -echo "/dev/mtd3 0x00000000 0x00002000 0x00020000" >> /etc/fw_env.config diff --git a/packages/platforms/quanta/powerpc/powerpc-quanta-lb9/platform-config/r0/src/lib/install/powerpc-quanta-lb9-r0.sh b/packages/platforms/quanta/powerpc/powerpc-quanta-lb9/platform-config/r0/src/lib/install/powerpc-quanta-lb9-r0.sh deleted file mode 100644 index 0b7ebb4f..00000000 --- a/packages/platforms/quanta/powerpc/powerpc-quanta-lb9/platform-config/r0/src/lib/install/powerpc-quanta-lb9-r0.sh +++ /dev/null @@ -1,28 +0,0 @@ -############################################################ -# -# -# Copyright 2013, 2014 Big Switch Networks, Inc. -# -# Licensed under the Eclipse Public License, Version 1.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.eclipse.org/legal/epl-v10.html -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, -# either express or implied. See the License for the specific -# language governing permissions and limitations under the -# License. -# -# -############################################################ - -# The bootcommand is to read the loader directly from the first partition and execute it. -platform_bootcmd="ext2load ide 0:1 0x10000000 powerpc-quanta-lb9-r0.itb; setenv bootargs console=\$consoledev,\$baudrate onl_platform=$ONL_PLATFORM; bootm 0x10000000#$ONL_PLATFORM" - -platform_installer() { - # Standard installation on the CF card. - installer_standard_blockdev_install sda 128M 128M 1024M "" -} diff --git a/packages/platforms/quanta/powerpc/powerpc-quanta-lb9/platform-config/r0/src/lib/powerpc-quanta-lb9-r0.yml b/packages/platforms/quanta/powerpc/powerpc-quanta-lb9/platform-config/r0/src/lib/powerpc-quanta-lb9-r0.yml index e21363f2..5e6528cd 100644 --- a/packages/platforms/quanta/powerpc/powerpc-quanta-lb9/platform-config/r0/src/lib/powerpc-quanta-lb9-r0.yml +++ b/packages/platforms/quanta/powerpc/powerpc-quanta-lb9/platform-config/r0/src/lib/powerpc-quanta-lb9-r0.yml @@ -19,3 +19,15 @@ powerpc-quanta-lb9-r0: loader: device: /dev/sda nos_bootcmds: *ide_bootcmds + + environment: + - device: /dev/mtd3 + env_offset: 0x00000000 + env_size: 0x00002000 + sector_size: 0x00020000 + + ##network: + ## interfaces: + ## ma1: + ## name: ~ + ## syspath: e0000000.soc8541/e0024000.ethernet diff --git a/packages/platforms/quanta/powerpc/powerpc-quanta-ly2/platform-config/r0/src/lib/boot/powerpc-quanta-ly2-r0 b/packages/platforms/quanta/powerpc/powerpc-quanta-ly2/platform-config/r0/src/lib/boot/powerpc-quanta-ly2-r0 deleted file mode 100644 index 4f0f57e7..00000000 --- a/packages/platforms/quanta/powerpc/powerpc-quanta-ly2/platform-config/r0/src/lib/boot/powerpc-quanta-ly2-r0 +++ /dev/null @@ -1,32 +0,0 @@ -# -*- sh -*- -############################################################ -# -# -# Copyright 2013, 2014 Big Switch Networks, Inc. -# -# Licensed under the Eclipse Public License, Version 1.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.eclipse.org/legal/epl-v10.html -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, -# either express or implied. See the License for the specific -# language governing permissions and limitations under the -# License. -# -# -############################################################ -# -# powerpc-quanta-ly2-r0 -# -############################################################ - -echo "soc.0/ffe24000.ethernet ma1" >/etc/onl/net -echo "block/mmcblk0 mmcblk0p2 flash" > /etc/onl/mounts -echo "block/mmcblk0 mmcblk0p3 flash2" >> /etc/onl/mounts - -echo "# MTD device name Device offset Env. size Flash sector size" > /etc/fw_env.config -echo "/dev/mtd2 0x00000000 0x00002000 0x00020000" >> /etc/fw_env.config diff --git a/packages/platforms/quanta/powerpc/powerpc-quanta-ly2/platform-config/r0/src/lib/install/powerpc-quanta-ly2-r0.sh b/packages/platforms/quanta/powerpc/powerpc-quanta-ly2/platform-config/r0/src/lib/install/powerpc-quanta-ly2-r0.sh deleted file mode 100644 index 72f4a223..00000000 --- a/packages/platforms/quanta/powerpc/powerpc-quanta-ly2/platform-config/r0/src/lib/install/powerpc-quanta-ly2-r0.sh +++ /dev/null @@ -1,28 +0,0 @@ -############################################################ -# -# -# Copyright 2013, 2014 Big Switch Networks, Inc. -# -# Licensed under the Eclipse Public License, Version 1.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.eclipse.org/legal/epl-v10.html -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, -# either express or implied. See the License for the specific -# language governing permissions and limitations under the -# License. -# -# -############################################################ - -# The bootcommand is to read the loader directly from the first partition and execute it. -platform_bootcmd="mmc part 0; ext2load mmc 0:1 0x10000000 $ONL_PLATFORM.itb; setenv bootargs console=\$consoledev,\$baudrate onl_platform=$ONL_PLATFORM; bootm 0x10000000#$ONL_PLATFORM" - -platform_installer() { - # Standard installation on the CF card. - installer_standard_blockdev_install mmcblk0 128M 128M 1024M "" -} diff --git a/packages/platforms/quanta/powerpc/powerpc-quanta-ly2/platform-config/r0/src/lib/powerpc-quanta-ly2-r0.yml b/packages/platforms/quanta/powerpc/powerpc-quanta-ly2/platform-config/r0/src/lib/powerpc-quanta-ly2-r0.yml index 80af8e38..47231061 100644 --- a/packages/platforms/quanta/powerpc/powerpc-quanta-ly2/platform-config/r0/src/lib/powerpc-quanta-ly2-r0.yml +++ b/packages/platforms/quanta/powerpc/powerpc-quanta-ly2/platform-config/r0/src/lib/powerpc-quanta-ly2-r0.yml @@ -19,3 +19,15 @@ powerpc-quanta-ly2-r0: device: /dev/mmcblk0 ##partition: /dev/mmcblk0p1 nos_bootcmds: *mmc_bootcmds + + environment: + - device: /dev/mtd2 + env_offset: 0x00000000 + env_size: 0x00002000 + sector_size: 0x00020000 + + ##network + ## interfaces: + ## ma1: + ## name: ~ + ## syspath: soc.0/ffe24000.ethernet diff --git a/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/platform-config/r0/src/lib/boot/grub.cfg b/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/platform-config/r0/src/lib/boot/grub.cfg deleted file mode 100644 index 55ad9311..00000000 --- a/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/platform-config/r0/src/lib/boot/grub.cfg +++ /dev/null @@ -1,21 +0,0 @@ -serial --port=0x2f8 --speed=115200 --word=8 --parity=no --stop=1 -terminal_input serial -terminal_output serial -set timeout=5 - -# boot onl -menuentry OpenNetworkLinux { - search --no-floppy --label --set=root ONL-BOOT - echo 'Loading Open Network Linux ...' - insmod gzio - insmod part_msdos - linux /kernel-3.9.6-x86-64-all console=ttyS1,115200n8 onl_platform=x86-64-quanta-ly6-rangeley-r0 - initrd /initrd-amd64 -} - -# Menu entry to chainload ONIE -menuentry ONIE { - search --no-floppy --label --set=root ONIE-BOOT - echo 'Loading ONIE ...' - chainloader +1 -} diff --git a/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/platform-config/r0/src/lib/boot/x86-64-quanta-ly6-rangeley-r0 b/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/platform-config/r0/src/lib/boot/x86-64-quanta-ly6-rangeley-r0 deleted file mode 100644 index 7c120d46..00000000 --- a/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/platform-config/r0/src/lib/boot/x86-64-quanta-ly6-rangeley-r0 +++ /dev/null @@ -1,3 +0,0 @@ -echo "pci0000:00/0000:00:14.0 ma1" >/etc/onl/net -echo "LABEL=FLASH * flash" > /etc/onl/mounts -echo "LABEL=FLASH2 * flash2" >> /etc/onl/mounts diff --git a/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/platform-config/r0/src/lib/install/x86-64-quanta-ly6-rangeley-r0.sh b/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/platform-config/r0/src/lib/install/x86-64-quanta-ly6-rangeley-r0.sh deleted file mode 100644 index 1a40e94b..00000000 --- a/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/platform-config/r0/src/lib/install/x86-64-quanta-ly6-rangeley-r0.sh +++ /dev/null @@ -1,16 +0,0 @@ -############################################################ -# -# -# Copyright 2013, 2014 BigSwitch Networks, Inc. -# Copyright 2015 Quanta Computer Inc. -# -# -# -# -############################################################ -# Platform data goes here. - -platform_installer() { - # Standard isntallation to an available GPT partition - installer_standard_gpt_install /dev/sda -} diff --git a/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/platform-config/r0/src/lib/x86-64-quanta-ly6-rangeley-r0.yml b/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/platform-config/r0/src/lib/x86-64-quanta-ly6-rangeley-r0.yml index cf0815d2..0d6cc8f9 100644 --- a/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/platform-config/r0/src/lib/x86-64-quanta-ly6-rangeley-r0.yml +++ b/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/platform-config/r0/src/lib/x86-64-quanta-ly6-rangeley-r0.yml @@ -22,4 +22,9 @@ x86-64-quanta-ly6-rangeley-r0: args: >- console=ttyS1,115200n8 - \ No newline at end of file + + ##network: + ## interfaces: + ## ma1: + ## name: ~ + ## syspath: pci0000:00/0000:00:14.0 diff --git a/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangeley/platform-config/r0/src/lib/boot/grub.cfg b/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangeley/platform-config/r0/src/lib/boot/grub.cfg deleted file mode 100644 index 63c09023..00000000 --- a/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangeley/platform-config/r0/src/lib/boot/grub.cfg +++ /dev/null @@ -1,21 +0,0 @@ -serial --port=0x2f8 --speed=115200 --word=8 --parity=no --stop=1 -terminal_input serial -terminal_output serial -set timeout=5 - -# boot onl -menuentry OpenNetworkLinux { - search --no-floppy --label --set=root ONL-BOOT - echo 'Loading Open Network Linux ...' - insmod gzio - insmod part_msdos - linux /kernel-3.9.6-x86-64-all console=ttyS1,115200n8 onl_platform=x86-64-quanta-ly8-rangeley-r0 - initrd /initrd-amd64 -} - -# Menu entry to chainload ONIE -menuentry ONIE { - search --no-floppy --label --set=root ONIE-BOOT - echo 'Loading ONIE ...' - chainloader +1 -} diff --git a/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangeley/platform-config/r0/src/lib/boot/x86-64-quanta-ly8-rangeley-r0 b/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangeley/platform-config/r0/src/lib/boot/x86-64-quanta-ly8-rangeley-r0 deleted file mode 100644 index 39db2b55..00000000 --- a/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangeley/platform-config/r0/src/lib/boot/x86-64-quanta-ly8-rangeley-r0 +++ /dev/null @@ -1,4 +0,0 @@ -echo "pci0000:00/0000:00:14.0 ma1" >/etc/onl/net -echo "LABEL=FLASH * flash" > /etc/onl/mounts -echo "LABEL=FLASH2 * flash2" >> /etc/onl/mounts - diff --git a/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangeley/platform-config/r0/src/lib/install/x86-64-quanta-ly8-rangeley-r0.sh b/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangeley/platform-config/r0/src/lib/install/x86-64-quanta-ly8-rangeley-r0.sh deleted file mode 100644 index 1a40e94b..00000000 --- a/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangeley/platform-config/r0/src/lib/install/x86-64-quanta-ly8-rangeley-r0.sh +++ /dev/null @@ -1,16 +0,0 @@ -############################################################ -# -# -# Copyright 2013, 2014 BigSwitch Networks, Inc. -# Copyright 2015 Quanta Computer Inc. -# -# -# -# -############################################################ -# Platform data goes here. - -platform_installer() { - # Standard isntallation to an available GPT partition - installer_standard_gpt_install /dev/sda -} diff --git a/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangeley/platform-config/r0/src/lib/x86-64-quanta-ly8-rangeley-r0.yml b/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangeley/platform-config/r0/src/lib/x86-64-quanta-ly8-rangeley-r0.yml index 2fa1247a..d6d78f2a 100644 --- a/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangeley/platform-config/r0/src/lib/x86-64-quanta-ly8-rangeley-r0.yml +++ b/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangeley/platform-config/r0/src/lib/x86-64-quanta-ly8-rangeley-r0.yml @@ -22,4 +22,9 @@ x86-64-quanta-ly8-rangeley-r0: args: >- console=ttyS1,115200n8 - \ No newline at end of file + + ##network: + ## interfaces: + ## ma1: + ## name: ~ + ## syspath: pci0000:00/0000:00:14.0