Merge from bittboy/buildroot@db180c0

board/solidrun/clearfog/extlinux.conf

@@ -0,0 +1,4 @@
+label Clearfog Linux
+  kernel /boot/zImage
+  devicetree /boot/armada-388-clearfog-base.dtb
+  append console=ttyS0,115200n8 root=/dev/mmcblk0p1 rootwait

board/solidrun/clearfog/genimage.cfg

@@ -0,0 +1,16 @@
+image sdcard.img {
+	hdimage {
+	}
+
+	partition u-boot {
+		in-partition-table = "no"
+		image = "u-boot-spl.kwb"
+		offset = 512
+	}
+
+	partition rootfs {
+		partition-type = 0x83
+		image = "rootfs.ext4"
+		offset = 1M
+	}
+}

board/solidrun/clearfog/linux.fragment

@@ -0,0 +1 @@
+CONFIG_SENSORS_MCP3021=y

board/solidrun/clearfog/post-build.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+BOARD_DIR="$(dirname $0)"
+
+install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf

board/solidrun/clearfog/readme.txt

@@ -0,0 +1,61 @@
+**********************
+SolidRun Clearfog Base
+**********************
+
+This file documents Buildroot's support for the Clearfog Base by Solid Run.
+
+Vendor's documentation:
+https://wiki.solid-run.com/doku.php?id=products:a38x:documents
+
+Warning for eMMC variant of the MicroSoM
+========================================
+
+If you bought a MicroSoM version that includes an on-board eMMC flash, the
+built-in microSD card slot *WILL NOT WORK*. The Internet says that you have to
+upload the first bootloader via UART. This manual does not cover these steps;
+only MicroSoMs without the eMMC are supported.
+
+Build
+=====
+
+Start with the default Buildroot's configuration for Clearfog:
+
+  make solidrun_clearfog_defconfig
+
+Build all components:
+
+  make
+
+The results of the build are available in ./output/images.
+
+Create a bootable SD card
+=========================
+
+To determine the device associated to the SD card have a look in the
+/proc/partitions file:
+
+  cat /proc/partitions
+
+Buildroot prepares a bootable "sdcard.img" image in the output/images/
+directory, ready to be dumped on a microSD card. Launch the following
+command as root:
+
+  dd if=output/images/sdcard.img of=/dev/<your-microsd-device> conv=fdatasync
+
+*** WARNING! The dd command will destroy all the card content. Use with care! ***
+
+For details about the medium image layout, see the definition in
+board/solidrun/clearfog/genimage.cfg.
+
+Boot the Clearfog board
+=======================
+
+Here's how to boot the board:
+
+- Set up the DIP switches for microSD boot. The correct values are:
+  1: off, 2: off, 3: ON, 4: ON, 5: ON. In this scheme, switch #1" is closer to
+  the ethernet ports and #5 is closer to the microSD card, "ON" means towards
+  the SOM, and "off" means towards the SFP cage.
+- Connect to the board's console over the microUSB port.
+- Insert the SD card into the slot on the board (pins up).
+- Power up the board.

board/solidrun/clearfog_gt_8k/extlinux.conf

@@ -0,0 +1,4 @@
+label Clearfog GT-8K Linux
+  kernel /boot/Image
+  devicetree /boot/armada-8040-clearfog-gt-8k.dtb
+  append console=ttyS0,115200n8 root=/dev/mmcblk1p1 rootwait

board/solidrun/clearfog_gt_8k/genimage.cfg

@@ -0,0 +1 @@
+../macchiatobin/genimage.cfg

board/solidrun/clearfog_gt_8k/linux-extras.config

@@ -0,0 +1,4 @@
+CONFIG_MARVELL_PHY=y
+CONFIG_SFP=y
+CONFIG_NET_DSA=y
+CONFIG_NET_DSA_MV88E6XXX=y

board/solidrun/clearfog_gt_8k/post-build-mainline.sh

@@ -0,0 +1 @@
+../macchiatobin/post-build-mainline.sh

board/solidrun/clearfog_gt_8k/readme.txt

@@ -0,0 +1,61 @@
+Intro
+=====
+
+The default configuration described below will allow you to start
+experimenting with the buildroot environment for the SolidRun Clearfog GT-8K
+based on the Marvell Armada 8040 SoC.
+
+This default configuration will bring up the board and allow shell command
+line access through the serial console.
+
+How to build
+============
+
+  $ make solidrun_clearfog_gt_8k_defconfig
+  $ make
+
+How to write the SD card
+========================
+
+Once the build process is finished you will have an image file named
+"sdcard.img" in the output/images/ directory.
+
+Copy the bootable "sdcard.img" onto an SD card with "dd":
+
+  $ sudo dd if=output/images/sdcard.img of=/dev/sdX bs=1M conv=fsync
+
+How to boot the board
+=====================
+
+The Clearfog GT-8K can be setup to load the bootloader from different sources
+including eMMC, SPI flash, and SD-card.
+
+To select boot from SD-card the DIP switches in SW6 (at the bottom of the
+board) should be configured as follows:
+
+  SW6: 11010
+
+Insert the micro SDcard in the Cleargfog GT-8K and power it up.
+
+Serial console
+==============
+
+The serial console is accessible at the J27 pins header (TTL UART) with the
+following pinout (pin #1 is marked with triangle on the PCB):
+
+  pin #1: Ground
+  pin #2: Armada 8040 Rx
+  pin #3: Armada 8040 Tx
+
+Enable the switch (yellow) Ethernet ports
+=========================================
+
+To enable the Clearfog GT-8K internal switch port make sure to load the
+'mv88e6xxx' kernel module, and up the switch up-link port (eth2 by default):
+
+  modprobe mv88e6xxx
+  ifconfig eth2 up
+
+Then you can configure each switch port separately. These port are named
+'lan1' to 'lan4' by default. 'lan1' is closest to the USB port, while 'lan4'
+is closest to the blue Ethernet port.

board/solidrun/clearfog_gt_8k/uboot-fragment.config

@@ -0,0 +1 @@
+../macchiatobin/uboot-fragment.config

board/solidrun/macchiatobin/extlinux.conf

@@ -0,0 +1,4 @@
+label Macchiatobin Linux
+  kernel /boot/Image
+  devicetree /boot/armada-8040-mcbin.dtb
+  append console=ttyS0,115200n8 root=/dev/mmcblk1p1 rootwait

board/solidrun/macchiatobin/genimage.cfg

@@ -0,0 +1,16 @@
+image sdcard.img {
+	hdimage {
+	}
+
+	partition uboot {
+		in-partition-table = "no"
+		image = "flash-image.bin"
+		offset = 0x200000
+	}
+
+	partition rootfs {
+		partition-type = 0x83
+		offset = 0x2200000
+		image = "rootfs.ext4"
+	}
+}

board/solidrun/macchiatobin/linux-extras.config

@@ -0,0 +1,3 @@
+CONFIG_MARVELL_PHY=y
+CONFIG_MARVELL_10G_PHY=y
+CONFIG_SFP=y

board/solidrun/macchiatobin/post-build-mainline.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+BOARD_DIR="$(dirname $0)"
+
+install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf

board/solidrun/macchiatobin/post-build.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+BOARD_DIR="$(dirname $0)"
+
+install -m 0644 -D ${BOARD_DIR}/uEnv-example.txt ${TARGET_DIR}/boot/uEnv-example.txt

board/solidrun/macchiatobin/readme.txt

@@ -0,0 +1,95 @@
+Intro
+=====
+
+This default configuration will allow you to start experimenting with
+the buildroot environment for the MacchiatoBin board based on the
+Marvell Armada 8040 SoC. Documentation for the board hardware and
+software is available on the wiki at: http://wiki.macchiatobin.net
+
+This default configuration will bring up the board and allow access
+through the serial console.
+
+How to build
+============
+
+There are two build options: mainline support and vendor support.
+
+For the mainline BSP, we use:
+ - Linux v4.19.2
+ - U-Boot v2018.11
+
+For the vendor BSP, we use the sources available from Marvell Github
+page at https://github.com/MarvellEmbeddedProcessors, which uses:
+ - Linux v4.4.120
+ - U-Boot v2018.03
+
+At the moment mainline support for the board is a work in
+progress. Mainline kernel 4.19 enables eth2 in 1Gb (RJ45 connector J5),
+copper 10Gb interfaces, and automatic configuration of select SFP
+modules on the SFP cages. The vendor BSP enables more hardware features
+out of the box, but lacks support for SFP detection and automatic
+configuration.
+
+To use the mainline BSP run the following commands:
+
+    $ make solidrun_macchiatobin_mainline_defconfig
+    $ make
+
+To use the vendor BSP run the following commands:
+
+    $ make solidrun_macchiatobin_marvell_defconfig
+    $ make
+
+How to write the SD card
+========================
+
+Once the build process is finished you will have an image
+called "sdcard.img" in the output/images/ directory.
+
+Copy the bootable "sdcard.img" onto an SD card with "dd":
+
+  $ sudo dd if=output/images/sdcard.img of=/dev/sdX bs=1M conv=fsync
+  $ sudo sync
+
+How to boot the board
+=====================
+
+The MacchiatoBin board can be setup to load the bootloader from
+different sources including eMMC, SPI flash, and SD-card.
+
+On Rev 1.2 board to select boot from SD-card the DIP switches
+SW1 and SW2 should be configured as follows:
+
+SW2: 01110
+SW1: 1xxxx
+
+The upcoming Rev 1.3 board will have a single pins header J1 instead
+of the SW1/2 DIP switches. To boot from SD-card the setting of J1
+jumpers should match the DIP switches of Rev v1.2 board
+from left to right:
+
+J1: 011101xxxx
+
+Insert the micro SDcard in the MacchiatoBin board and power it up.
+The serial console is accessible at the micro-USB Type-B connector
+marked CON9. The serial line settings are 115200 8N1.
+
+Note: the following text only applies to the vendor BSP from
+solidrun_macchiatobin_marvell_defconfig.
+
+By default Marvell provided U-Boot will load its environment from the
+SPI flash. On the first boot SPI flash may be empty or it may contain a
+legacy environment that prevents proper boot. Then the following
+commands can be used to boot the board:
+
+=> ext4load mmc 1:1 0x01700000 /boot/uEnv-example.txt
+=> env import -t 0x01700000 $filesize
+=> boot
+
+The example environment from uEnv-example.txt can be written to
+SPI flash using the following commands:
+
+=> env default -f -a
+=> ext4load mmc 1:1 0x01700000 /boot/uEnv-example.txt
+=> env import -t 0x01700000 $filesize
+=> saveenv

board/solidrun/macchiatobin/uEnv-example.txt

@@ -0,0 +1,7 @@
+bootargs=console=ttyS0,115200 root=/dev/mmcblk1p1 rw rootwait
+fdt_addr=0x1000000
+fdt_high=0xffffffffffffffff
+fdt_name=boot/armada-8040-mcbin.dtb
+kernel_addr=0x2000000
+image_name=boot/Image
+bootcmd=mmc dev 1; ext4load mmc 1:1 $kernel_addr $image_name; ext4load mmc 1:1 $fdt_addr $fdt_name; booti $kernel_addr - $fdt_addr

board/solidrun/macchiatobin/uboot-fragment.config

@@ -0,0 +1,2 @@
+CONFIG_ENV_IS_IN_MMC=y
+# CONFIG_ENV_IS_IN_SPI_FLASH is not set

board/solidrun/mx6cubox/boot.scr.txt

@@ -0,0 +1,7 @@
+setenv finduuid "part uuid mmc 0:1 uuid"
+run finduuid
+run findfdt
+setenv bootargs "console=ttymxc0,115200 root=PARTUUID=${uuid} rootwait rootfstype=ext4"
+load mmc 0:1 ${fdt_addr} boot/${fdtfile}
+load mmc 0:1 ${loadaddr} boot/zImage
+bootz ${loadaddr} - ${fdt_addr}

board/solidrun/mx6cubox/genimage.cfg

@@ -0,0 +1,29 @@
+# Minimal SD card image for the MX6 Cubox/Hummingboard
+#
+# U-Boot SPL and u-boot.img are flashed in the first 1MB raw partition.
+# A single root filesystem partition is used (Ext4 in this case).
+#
+
+image sdcard.img {
+	hdimage {
+	}
+
+	partition spl {
+		in-partition-table = "no"
+		image = "SPL"
+		offset = 1K
+	}
+
+	partition u-boot {
+		in-partition-table = "no"
+		image = "u-boot.img"
+		offset = 69K
+	}
+
+	partition rootfs {
+		partition-type = 0x83
+		image = "rootfs.ext4"
+		offset = 1M
+		size = 512M
+	}
+}

board/solidrun/mx6cubox/post-build.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+BOARD_DIR="$(dirname $0)"
+
+$HOST_DIR/bin/mkimage -A arm -O linux -T script -C none  \
+-n "boot script" -d $BOARD_DIR/boot.scr.txt $BOARD_DIR/boot.scr
+
+install -m 0644 -D $BOARD_DIR/boot.scr $TARGET_DIR/boot/boot.scr

board/solidrun/mx6cubox/post-image.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+BOARD_DIR="$(dirname $0)"
+GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg"
+GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
+
+rm -rf "${GENIMAGE_TMP}"
+
+genimage \
+  --rootpath "${TARGET_DIR}" \
+  --tmppath "${GENIMAGE_TMP}" \
+  --inputpath "${BINARIES_DIR}" \
+  --outputpath "${BINARIES_DIR}" \
+  --config "${GENIMAGE_CFG}"

board/solidrun/mx6cubox/readme.txt

@@ -0,0 +1,18 @@
+Solidrun's MX6 Cubox/Hummingboard
+
+https://www.solid-run.com/freescale-imx6-family/hummingboard/
+
+https://www.solid-run.com/freescale-imx6-family/cubox-i/
+
+To build a minimal support for these boards:
+
+    $ make mx6cubox_defconfig
+    $ make
+
+Buildroot prepares a bootable "sdcard.img" image in the output/images/
+directory, ready to be dumped on an SD card:
+
+dd if=output/images/sdcard.img of=/dev/<your-microsd-device>
+
+For details about the medium image layout, see the definition in
+board/solidrun/mx6cubox/genimage.cfg.