diff --git a/SD-Image-Gen/build-all.sh b/SD-Image-Gen/build-all.sh index af63fba..af0f12d 100755 --- a/SD-Image-Gen/build-all.sh +++ b/SD-Image-Gen/build-all.sh @@ -22,7 +22,7 @@ #------------------------------------------------------------------------------------------------------ ## Valid boards: -BOARDS=("de0_nano_soc" "de10_nano" "de1_soc" "sockit" "ultra96") +BOARDS=("de0_nano_soc" "de10_nano" "de1_soc" "DExx" "ultra96") ## Valid distros: DISTROS=("stretch" "buster" "bionic" "petalinux") @@ -42,13 +42,14 @@ DEB_EXT_REPO_URL="http://deb.debian.org//debian/" #UB_EXT_REPO_URL=http://ftp.tu-chemnitz.de/pub/linux/ubuntu-ports UB_EXT_REPO_URL="http://ports.ubuntu.com/ubuntu-ports/" #final_repo="http://ftp.dk.debian.org/debian/" -final_deb_repo= +final_deb_repo=${DEB_EXT_REPO_URL} final_ub_repo=${UB_EXT_REPO_URL} #local_deb_repo=${HOME_DEB_MIRR_REPO_URL} local_deb_repo=${DEB_EXT_REPO_URL} local_ub_repo=${UB_EXT_REPO_URL} -local_ws=neon-ws +local_ws=kdeneon-ws local_kernel_repo="http://${local_ws}.holotronic.lan/debian/" +local_ub_kernel_repo="http://${local_ws}.holotronic.lan/ubuntu/" ## 3 part Expandable image with swap in p2 @@ -71,16 +72,18 @@ UBOOT_VERSION="v2018.01" XIL_UBOOT_VERSION="xilinx-v2018.2" #UBOOT_MAKE_CONFIG="u-boot-with-spl.sfp" UBOOT_MAKE_CONFIG="all" +UBOOT_IMG_FILENAME="u-boot-with-spl.sfp" XIL_UBOOT_IMG_FILENAME="u-boot" -XIL_BOOT_FILES_LOC="/home/mib/Development/Docker/petalinux-docker" - +#XIL_BOOT_FILES_LOC="/home/mib/Development/Docker/petalinux-docker" +XIL_BOOT_FILES_LOC='/home/mib/Development/Holosynth_arm64_image_build/bak/BOOT' RT_KERNEL_VERSION="4.9.68" RT_PATCH_REV="rt60" ALT_GIT_KERNEL_VERSION="4.9.76" ALT_GIT_KERNEL_REV="-ltsi-rt" XIL_GIT_KERNEL_VERSION="xilinx" -XIL_GIT_KERNEL_REV="-v2018.2" +#XIL_GIT_KERNEL_REV="-v2018.2" +XIL_GIT_KERNEL_REV="-v2018.3" #XIL_GIT_KERNEL_REV="-v2017.3" #ALT_GIT_KERNEL_VERSION="4.15" @@ -109,7 +112,8 @@ apt_cmd="apt-get" WORK_DIR=$(pwd) #HOME_REPO_DIR="/var/www/repos/apt/debian" -HOME_REPO_DIR="/var/www/debian" +#HOME_REPO_DIR="/var/www/debian" +HOME_REPO_DIR="/var/www/repos/apt" MAIN_SCRIPT_DIR="$(cd $(dirname $0) && pwd)" SUB_SCRIPT_DIR=${MAIN_SCRIPT_DIR}/subscripts @@ -157,10 +161,10 @@ RT_PATCH_FILE="patch-${RT_KERNEL_TAG}.patch.xz" RT_PATCH_URL="https://cdn.kernel.org/pub/linux/kernel/projects/rt/4.9/${RT_PATCH_FILE}" -ALT_GIT_KERNEL_PARENT_DIR="${CURRENT_DIR}/arm-linux-${ALT_GIT_KERNEL_TAG}-gnueabifh-kernel" -XIL_GIT_KERNEL_PARENT_DIR="${CURRENT_DIR}/arm-linux-${XIL_GIT_KERNEL_TAG}-gnueabifh-kernel" +ALT_GIT_KERNEL_PARENT_DIR="${CURRENT_DIR}/arm-linux-${ALT_GIT_KERNEL_TAG}-gnueabihf-kernel" +XIL_GIT_KERNEL_PARENT_DIR="${CURRENT_DIR}/arm-linux-${XIL_GIT_KERNEL_TAG}-aarch64-kernel" -RT_KERNEL_PARENT_DIR="${CURRENT_DIR}/arm-linux-${RT_KERNEL_VERSION}-gnueabifh-kernel" +RT_KERNEL_PARENT_DIR="${CURRENT_DIR}/arm-linux-${RT_KERNEL_VERSION}-gnueabihf-kernel" RT_KERNEL_BUILD_DIR="${RT_KERNEL_PARENT_DIR}/${RT_KERNEL_FOLDER}" ALT_GIT_KERNEL_BUILD_DIR="${ALT_GIT_KERNEL_PARENT_DIR}/linux" XIL_GIT_KERNEL_BUILD_DIR="${XIL_GIT_KERNEL_PARENT_DIR}/linux" @@ -229,6 +233,10 @@ usage() echo " --mk2repo Will add machinekit .debs to local repo Use =distroname=distarch" echo " --cadence2repo Will add cadence .debs to local repo Use =distroname=distarch" echo " --carla2repo Will add carla .debs to local repo Use =distroname=distarch" + echo " --lv22repo Will add lv2plugin .debs to local repo Use =distroname=distarch" + echo " --jackd22repo Will add Jackd2 .debs to local repo Use =distroname=distarch" + echo " --hikey2repo Will add Hikey kernel .debs to local repo Use =distroname=distarch" + echo " --dexed2repo Will add Dexed and plugin .debs to local repo Use =distroname=distarch" echo " --xf86-video-armsoc2repo Will add xf86-video-armsoc .debs to local repo Use =distroname=distarch" echo " --gen-base-qemu-rootfs Will create single root partition image and generate base qemu rootfs Use =distroname=distarch" echo " --gen-base-qemu-rootfs-desktop Will create single root partition image and generate base qemu rootfs Use =distroname=distarch" @@ -277,8 +285,8 @@ build_uboot() { echo "Valid boardname = ${1} given" if [ "${1}" == "ultra96" ]; then XIL_UBOOT_PATCH_FILE="u-boot-${XIL_UBOOT_VERSION}-ultra96-changeset.patch" -# git_fetch ${UBOOT_PARENT_DIR} ${UBOOT_GIT_URL} ${UBOOT_VERSION} ${UBOOT_VERSION} ${UBOOT_VERSION} ${UBOOT_PATCH_FILE} - git_fetch ${UBOOT_PARENT_DIR} ${XIL_UBOOT_GIT_URL} ${XIL_UBOOT_VERSION} ${XIL_UBOOT_VERSION} ${XIL_UBOOT_VERSION} ${XIL_UBOOT_PATCH_FILE} +# git_fetch ${UBOOT_PARENT_DIR} ${UBOOT_GIT_URL} ${UBOOT_VERSION} ${UBOOT_VERSION} ${UBOOT_VERSION} ${UBOOT_PATCH_FILE} + git_fetch ${UBOOT_PARENT_DIR} ${XIL_UBOOT_GIT_URL} ${XIL_UBOOT_VERSION} ${XIL_UBOOT_VERSION} ${XIL_UBOOT_VERSION} ${XIL_UBOOT_PATCH_FILE} UBOOT_BOARD_CONFIG="xilinx_zynqmp_zcu100_revC_defconfig" arm64_build "$UBOOT_PARENT_DIR/${XIL_UBOOT_VERSION}" "${UBOOT_BOARD_CONFIG}" "${UBOOT_MAKE_CONFIG}" "envtools" else @@ -301,7 +309,7 @@ build_uboot() { ## parameters: 1: board name, 2: distro name build_git_kernel() { - contains ${BOARDS[@]} ${1} +contains ${BOARDS[@]} ${1} if [ "$?" -eq 0 ]; then echo "Valid boardname = ${1} given" if [ "${1}" == "ultra96" ]; then @@ -310,14 +318,16 @@ build_git_kernel() { else KERNEL_PKG_VERSION="0.1" fi - git_fetch ${XIL_GIT_KERNEL_PARENT_DIR} ${XIL_GIT_KERNEL_URL} ${XIL_GIT_KERNEL_TAG} "${XIL_GIT_KERNEL_TAG}" ${GIT_KERNEL_DIR} ${XIL_GIT_KERNEL_PATCH_FILE} +ยค git_fetch ${XIL_GIT_KERNEL_PARENT_DIR} ${XIL_GIT_KERNEL_URL} ${XIL_GIT_KERNEL_TAG} "${XIL_GIT_KERNEL_TAG}" ${GIT_KERNEL_DIR} ${XIL_GIT_KERNEL_PATCH_FILE} +# git_fetch ${XIL_GIT_KERNEL_PARENT_DIR} ${XIL_GIT_KERNEL_URL} ${XIL_GIT_KERNEL_TAG} "${XIL_GIT_KERNEL_TAG}" ${GIT_KERNEL_DIR} + git_fetch ${XIL_GIT_KERNEL_PARENT_DIR} ${XIL_GIT_KERNEL_URL} ${XIL_GIT_KERNEL_TAG} "work2" ${GIT_KERNEL_DIR} arm64_build "${XIL_GIT_KERNEL_BUILD_DIR}" ${XIL_KERNEL_CONF} "deb-pkg" |& tee ${CURRENT_DIR}/Logs/xil_git_kernel_deb_rt-log.txt else KERNEL_PKG_VERSION="1.0" git_fetch ${ALT_GIT_KERNEL_PARENT_DIR} ${ALT_GIT_KERNEL_URL} ${ALT_GIT_KERNEL_TAG} "origin/${ALT_GIT_KERNEL_BRANCH}" ${GIT_KERNEL_DIR} ${ALT_GIT_KERNEL_PATCH_FILE} armhf_build "${ALT_GIT_KERNEL_BUILD_DIR}" ${ALT_KERNEL_CONF} "deb-pkg" |& tee ${CURRENT_DIR}/Logs/alt_git_kernel_deb_rt-log.txt fi - + else if [ "${1}" != "c" ]; then echo "--build_git_kernel bad argument --> ${1}" @@ -353,8 +363,13 @@ gen_rootfs_image() { run_desktop_qemu_debootstrap_bionic ${1} ${3} ${UB_EXT_REPO_URL} ${4} echo "Script_MSG: run_desktop_qemu_debootstrap_bionic (${3}) (${4}) function return value was --> ${output}" else - run_desktop_qemu_debootstrap ${1} ${3} ${DEB_EXT_REPO_URL} ${4} - echo "Script_MSG: run_desktop_qemu_debootstrap (${3}) (${4}) function return value was --> ${output}" + if [ "${3}" == "buster" ]; then + run_desktop_qemu_debootstrap_buster ${1} ${3} ${DEB_EXT_REPO_URL} ${4} + echo "Script_MSG: run_desktop_qemu_debootstrap_buster (${3}) (${4}) function return value was --> ${output}" + else + run_desktop_qemu_debootstrap ${1} ${3} ${DEB_EXT_REPO_URL} ${4} + echo "Script_MSG: run_desktop_qemu_debootstrap (${3}) (${4}) function return value was --> ${output}" + fi fi else run_qemu_debootstrap ${1} ${3} ${DEB_EXT_REPO_URL} ${4} @@ -430,7 +445,7 @@ finalize_rootfs_image() { else compress_rootfs ${CURRENT_DIR} ${1} "${4}_finalized-fully-configured" ${3} fi - set +e + # set +e sudo sync unmount_binded ${1} cp ${2} "${2}-fully-configured" @@ -440,7 +455,7 @@ finalize_rootfs_image() { echo "Use =distroname=username=distarch" echo "Valid distarchs are:" echo " ${DISTARCHS[@]}" - fi + fi else echo "--finalize_rootfs_image= bad argument --> ${4}" echo "missing username" @@ -464,7 +479,7 @@ finalize_rootfs_image() { fi } -## parameters: 1: mount dev name, 2: kernel image tag, 3: rootfs image path, 4: distroname, 5: distro arch, 5: user name +## parameters: 1: mount dev name, 2: kernel image tag, 3: rootfs image path, 4: distroname, 5: distro arch, 6: user name inst_repo_kernel() { contains ${DISTROS[@]} ${4} if [ "$?" -eq 0 ]; then @@ -489,7 +504,7 @@ inst_repo_kernel() { fi echo "Script_MSG: will now install kernel" if [ "${5}" == "arm64" ]; then - if [ "${4}" == "bionic" ]; then + if [ "${4}" == "bionic" ] || [ "${4}" == "buster" ]; then SD_KERNEL_TAG="*socfpga64-2.1" else SD_KERNEL_TAG="*socfpga64-0.1" @@ -552,7 +567,7 @@ assemble_full_sd_img() { if [ "${DESKTOP}" == "yes" ]; then SD_IMG_NAME="${SD_FILE_PRELUDE}_desktop_sd_${REL_DATE}.img" else - SD_IMG_NAME="${SD_FILE_PRELUDE}_sd_${REL_DATE}.img" + SD_IMG_NAME="${SD_FILE_PRELUDE}_console_sd_${REL_DATE}.img" fi SD_IMG_FILE="${CURRENT_DIR}/${SD_IMG_NAME}" @@ -578,8 +593,8 @@ assemble_full_sd_img() { create_img "2" "${SD_IMG_FILE}" "${1}" "p2" "2" mount_sd_imagefile ${SD_IMG_FILE} ${1} p1 echo "Copying files to boot partition" - sudo cp ${XIL_BOOT_FILES_LOC}/boot_files/BOOT.BIN ${1} -# sudo cp ${XIL_BOOT_FILES_LOC}/image.ub ${1} + sudo cp ${XIL_BOOT_FILES_LOC}/BOOT.BIN ${1} + sudo cp ${XIL_BOOT_FILES_LOC}/image.ub ${1} echo "Unmounting boot partition" unmount_binded ${1} unmount_loopdev @@ -587,34 +602,62 @@ assemble_full_sd_img() { mount_sd_imagefile ${SD_IMG_FILE} ${1} p2 echo "Extracting to rootfs partition" extract_rootfs ${CURRENT_DIR} ${1} "${5}_${2}" ${4} - if [ "${4}" == "bionic" ]; then + if [ "${4}" == "bionic" ] || [ "${4}" == "buster" ]; then + echo "" + echo "Script_MSG: Arm64 detected" + echo "" bind_mounted ${1} - sudo sync - sudo rm -f ${1}/etc/resolv.conf - sudo cp /etc/resolv.conf ${1}/etc/resolv.conf - sudo cp -f ${1}/etc/apt/sources.list-local ${1}/etc/apt/sources.list - sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y update' -# sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install xserver-xorg-video-armsoc xfonts-base xfonts-cyrillic xfonts-100dpi xfonts-75dpi libdirectfb-1.7-7 libdirectfb-bin libdirectfb-extra' + sudo sync + sudo rm -f ${1}/etc/resolv.conf + sudo cp /etc/resolv.conf ${1}/etc/resolv.conf + sudo cp -f ${1}/etc/apt/sources.list-local ${1}/etc/apt/sources.list + sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y update' + sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y upgrade' + set -x + sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y lxmenu-data lxqt-globalkeys lxqt-panel lxqt' # sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install xfonts-base xfonts-cyrillic xfonts-100dpi xfonts-75dpi libdirectfb-1.7-7 libdirectfb-bin libdirectfb-extra xserver-xorg-video-fbdev xserver-xorg-video-armsoc-exynos xserver-xorg-video-armsoc lua-inotify inotify-tools' # sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install libdirectfb-1.7-7 libdirectfb-bin libdirectfb-extra xserver-xorg-video-fbdev lua-inotify inotify-tools' - set -x - sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install xserver-xorg-video-fbdev' - sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install mesa-utils' - sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /bin/rm -f /etc/resolv.conf' - sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /bin/mv /etc/X11/xorg.conf /etc/X11/xorg.conf-armsoc' +# sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install xserver-xorg-video-fbdev xserver-xorg-video-armsoc' + sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install xserver-xorg-video-fbdev' +# sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install mesa-utils' +# sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y --no-install-recommends install --reinstall kwin-x11 kwin-addons' +# sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y --no-install-recommends install --reinstall kwin-style-breeze' +# sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install kde-style-breeze kde-style-breeze-qt4' +# sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install --reinstall breeze-icon-theme' + sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /bin/rm -f /etc/resolv.conf' + sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /bin/mv /etc/X11/xorg.conf /etc/X11/xorg.conf-armsoc-bak' + sudo sh -c 'cat < '${1}'/etc/X11/xorg.conf +Section "Files" + ModulePath "/usr/local/lib/xorg/modules,/usr/lib/xorg/modules" +EndSection + +Section "InputDevice" + Identifier "System Mouse" + Driver "mouse" + Option "Device" "/dev/input/mouse0" +EndSection + +Section "InputDevice" + Identifier "System Keyboard" + Driver "kbd" + Option "Device" "/dev/input/event0" +EndSection + Section "Device" - Identifier "Frame Buffer" - Driver "fbdev" - Option "Rotate" "off" + Identifier "ZynqMP" + Driver "armsoc" + Option "DRI2" "true" + Option "DRI2_PAGE_FLIP" "false" + Option "DRI2_WAIT_VSYNC" "true" + Option "SWcursorLCD" "false" + Option "DEBUG" "false" EndSection -Section "ServerLayout" - Identifier "ServerLayout0" - Option "BlankTime" "0" - Option "StandbyTime" "0" - Option "SuspendTime" "0" - Option "OffTime" "0" +Section "Screen" + Identifier "DefaultScreen" + Device "ZynqMP" + DefaultDepth 16 EndSection EOF' @@ -625,7 +668,7 @@ EOF' unmount_loopdev echo "No dd uboot install" set +x - fi + fi else create_img "3" "${SD_IMG_FILE}" "${1}" "${media_rootfs_partition}" echo "step 2 mount:" @@ -634,7 +677,7 @@ EOF' set_fw_uboot_env_mnt ${LOOP_DEV} ${1} unmount_binded ${1} unmount_loopdev - install_uboot ${UBOOT_BUILD_DIR} ${UBOOT_IMG_FILENAME} ${SD_IMG_FILE} + install_uboot "${UBOOT_BUILD_DIR}" "${UBOOT_IMG_FILENAME}" "${SD_IMG_FILE}" fi make_bmap_image ${CURRENT_DIR} ${SD_IMG_NAME} else @@ -726,17 +769,66 @@ while [ "$1" != "" ]; do ;; --cadence2repo) ## parameters: 1: distro name, 2: dir, 3: dist arch, 4: file filter - add2repo "${VALUE1}" "/home/mib/Development/deb_comp/Cadence" "${VALUE2}" "cadence|claudia|catia|catarina" + if [ "${VALUE1}" == "bionic" ]; then + add2repo "${VALUE1}" "/home/mib/Development/Deb-Pkg/Bionic/Cadence" "${VALUE2}" "cadence|claudia|catia|catarina" + else + add2repo "${VALUE1}" "/home/mib/Development/Deb-Pkg/Cadence" "${VALUE2}" "cadence|claudia|catia|catarina" + fi ;; --carla2repo) ## parameters: 1: distro name, 2: dir, 3: dist arch, 4: file filter - add2repo "${VALUE1}" "/home/mib/Development/Deb-Pkg/carla_debs" "${VALUE2}" "fttw3|libjpeg|liblo|libpng|mxml|zlib|pixman|ntk|libogg|libvorbis|flac|sndfile|fluidsynth|gig|linuxsampler|carla" - ;; - --xf86-video-armsoc2repo) + if [ "${VALUE1}" == "bionic" ]; then + add2repo "${VALUE1}" "/home/mib/Development/Deb-Pkg/Bionic/Carla" "${VALUE2}" "fttw3|libjpeg|liblo|libpng|mxml|zlib|pixman|ntk|libogg|libvorbis|flac|sndfile|fluidsynth|gig|linuxsampler-static|carla" + else + add2repo "${VALUE1}" "/home/mib/Development/Deb-Pkg/Buster/Carla" "${VALUE2}" "fttw3|libjpeg|liblo|libpng|mxml|zlib|pixman|ntk|libogg|libvorbis|flac|sndfile|fluidsynth|gig|linuxsampler-static|carla" + fi + ;; + --lv22repo) + ## parameters: 1: distro name, 2: dir, 3: dist arch, 4: file filter + if [ "${VALUE1}" == "bionic" ]; then + add2repo "${VALUE1}" "/home/mib/Development/Deb-Pkg/Bionic/Lv2-plugins" "${VALUE2}" "vs2sdk|sqlite3-static|linuxsampler-lv2|linuxsampler-dssi|linuxsampler-vst|hexter|premake" + else + add2repo "${VALUE1}" "/home/mib/Development/Deb-Pkg/Buster/Lv2-plugins" "${VALUE2}" "vs2sdk|sqlite3-static|linuxsampler-lv2|linuxsampler-dssi|linuxsampler-vst" + fi + ;; + --jackd22repo) + ## parameters: 1: distro name, 2: dir, 3: dist arch, 4: file filter + if [ "${VALUE1}" == "bionic" ]; then + add2repo "${VALUE1}" "/home/mib/Development/Deb-Pkg/Bionic/Jackd2" "${VALUE2}" "libopus-custom-static|jackd2|ardour" + else + add2repo "${VALUE1}" "/home/mib/Development/Deb-Pkg/Buster/Jackd2" "${VALUE2}" "" + fi + ;; + --hikey2repo) + ## parameters: 1: distro name, 2: dir, 3: dist arch, 4: file filter + if [ "${VALUE1}" == "stretch" ]; then + add2repo "${VALUE1}" "/home/mib/Development/Deb-Pkg/Stretch/Hikey" "${VALUE2}" "hikey" + else + add2repo "${VALUE1}" "/home/mib/Development/Deb-Pkg/Buster/Jackd2" "${VALUE2}" "" + fi + ;; + --dexed2repo) + ## parameters: 1: distro name, 2: dir, 3: dist arch, 4: file filter + if [ "${VALUE1}" == "bionic" ]; then + add2repo "${VALUE1}" "/home/mib/Development/Deb-Pkg/Bionic/Dexed" "${VALUE2}" "kxstudio3" + else + add2repo "${VALUE1}" "/home/mib/Development/Deb-Pkg/Buster/Dexed" "${VALUE2}" "" + fi + ;; + --xf86-video-armsoc2repo) ## parameters: 1: distro name, 2: dir, 3: dist arch, 4: file filter add2repo "${VALUE1}" "/home/mib/Development/Deb-Pkg/armsoc_debs" "${VALUE2}" "xserver-xorg-video-armsoc" ;; - --finalize-rootfs) + --gen-base-qemu-rootfs) + ## parameters: 1: mount dev name, 2: image name, 3: distro name, 4: distro arch + gen_rootfs_image ${ROOTFS_MNT} "${CURRENT_DIR}/base-qemu-${VALUE2}_${ROOTFS_IMG}" "${VALUE1}" "${VALUE2}" | tee ${CURRENT_DIR}/Logs/gen-qemu-base_rootfs-log.txt + ;; + --gen-base-qemu-rootfs-desktop) + DESKTOP="yes" + ## parameters: 1: mount dev name, 2: image name, 3: distro name, 4: distro arch + gen_rootfs_image ${ROOTFS_MNT} "${CURRENT_DIR}/base-qemu-${VALUE2}-desktop_${ROOTFS_IMG}" "${VALUE1}" "${VALUE2}" | tee ${CURRENT_DIR}/Logs/gen-qemu-base_rootfs-log.txt + ;; + --finalize-rootfs) finalize_rootfs_image ${ROOTFS_MNT} "${CURRENT_DIR}/qemu-${VALUE3}-${VALUE2}_${ROOTFS_IMG}" "${VALUE1}" "${VALUE2}" "${VALUE3}" | tee ${CURRENT_DIR}/Logs/finalize_rootfs-log.txt ## parameters: 1: mount dev name, 2: image name, 3: distro name, 4 user name, 5: distro arch ;; diff --git a/SD-Image-Gen/functions/file_build-func.sh b/SD-Image-Gen/functions/file_build-func.sh index 86116b6..ea5a199 100755 --- a/SD-Image-Gen/functions/file_build-func.sh +++ b/SD-Image-Gen/functions/file_build-func.sh @@ -556,8 +556,8 @@ xzcat ../${RT_PATCH_FILE} | patch -p1 echo "rt-Patch applied" ## Uio Patch: uiomod_kernel -#cp /home/mib/intelFPGA/QuartusProjects/DE1-Soc/DE1-SoC-Sound/socfpga_cyclone5_DE1-SoC-FB.dts /home/mib/Development/HolosynthV-Image-gen/arm-linux-4.9.33-gnueabifh-kernel/linux-4.9.33/arch/arm/boot/dts -#cp /home/mib/intelFPGA/QuartusProjects/DE1-Soc/DE1-SoC-Sound/Makefile-dtb /home/mib/Development/HolosynthV-Image-gen/arm-linux-4.9.33-gnueabifh-kernel/linux-4.9.33/arch/arm/boot/dts/Makefile +#cp /home/mib/intelFPGA/QuartusProjects/DE1-Soc/DE1-SoC-Sound/socfpga_cyclone5_DE1-SoC-FB.dts /home/mib/Development/HolosynthV-Image-gen/arm-linux-4.9.33-gnueabihf-kernel/linux-4.9.33/arch/arm/boot/dts +#cp /home/mib/intelFPGA/QuartusProjects/DE1-Soc/DE1-SoC-Sound/Makefile-dtb /home/mib/Development/HolosynthV-Image-gen/arm-linux-4.9.33-gnueabihf-kernel/linux-4.9.33/arch/arm/boot/dts/Makefile } ## parameters: 1: folder name, 2: patch file name @@ -673,6 +673,7 @@ arm64_build() { ## parameters: 1: distro name, 2: dir, 3: dist arch, 4: file filter add2repo(){ #sudo systemctl stop apache2 +set -x contains ${DISTROS[@]} ${1} if [ "$?" -eq 0 ]; then echo "Valid distroname = ${1} given" @@ -683,7 +684,12 @@ add2repo(){ echo "" echo "Script_MSG: Repo content before -->" echo "" - LIST1=`reprepro -b ${HOME_REPO_DIR} -C main -A ${3} --list-format='''${package}\n''' list ${1} | { grep -E "${4}" || true; }` + if [[ "${1}" == "bionic" ]]; then + dist_flavor=ubuntu + else + dist_flavor=debian + fi + LIST1=`reprepro -b "${HOME_REPO_DIR}/${dist_flavor}" -C main -A ${3} --list-format='''${package}\n''' list ${1} | { grep -E "${4}" || true; }` echo "Got list1" REPO_LIST1=$"${LIST1}" @@ -699,12 +705,12 @@ add2repo(){ echo "" echo "Script_MSG: Will remove former version from repo" echo "" - reprepro -b ${HOME_REPO_DIR} -C main -A ${3} remove ${1} ${REPO_LIST1} - reprepro -b ${HOME_REPO_DIR} export ${1} + reprepro -b "${HOME_REPO_DIR}/${dist_flavor}" -C main -A ${3} remove ${1} ${REPO_LIST1} + reprepro -b "${HOME_REPO_DIR}/${dist_flavor}" export ${1} echo "Script_MSG: Restarting web server" sudo systemctl restart apache2 - reprepro -b ${HOME_REPO_DIR} export ${1} + reprepro -b "${HOME_REPO_DIR}/${dist_flavor}" export ${1} else echo "" echo "Script_MSG: Former version not found" @@ -714,7 +720,7 @@ add2repo(){ # # if [[ "${CLEAN_KERNELREPO}" == "${OK}" ]]; then - # CLEAN_ALL_LIST=`reprepro -b ${HOME_REPO_DIR} -C main -A ${3} --list-format='''${package}\n''' list ${1}` + # CLEAN_ALL_LIST=`reprepro -b "${HOME_REPO_DIR}/${dist_flavor}" -C main -A ${3} --list-format='''${package}\n''' list ${1}` # # JESSIE_CLEAN_ALL_LIST=$"${CLEAN_ALL_LIST}" # @@ -722,8 +728,8 @@ add2repo(){ # echo "" # echo "Script_MSG: Will clean repo" # echo "" - # reprepro -b ${HOME_REPO_DIR} -C main -A ${3} remove ${1} ${JESSIE_CLEAN_ALL_LIST} - # reprepro -b ${HOME_REPO_DIR} export ${1} + # reprepro -b "${HOME_REPO_DIR}/${dist_flavor}" -C main -A ${3} remove ${1} ${JESSIE_CLEAN_ALL_LIST} + # reprepro -b "${HOME_REPO_DIR}/${dist_flavor}" export ${1} # echo "Script_MSG: Restarting web server" # sudo systemctl restart apache2 # else @@ -734,11 +740,11 @@ add2repo(){ # echo "" # fi # - reprepro -b ${HOME_REPO_DIR} -C main -A ${3} includedeb ${1} ${2}/*.deb - reprepro -b ${HOME_REPO_DIR} export ${1} - reprepro -b ${HOME_REPO_DIR} list ${1} + reprepro -b "${HOME_REPO_DIR}/${dist_flavor}" -C main -A ${3} includedeb ${1} ${2}/*.deb + reprepro -b "${HOME_REPO_DIR}/${dist_flavor}" export ${1} + reprepro -b "${HOME_REPO_DIR}/${dist_flavor}" list ${1} - LIST2=`reprepro -b ${HOME_REPO_DIR} -C main -A ${3} --list-format='''${package}\n''' list ${1}` + LIST2=`reprepro -b "${HOME_REPO_DIR}/${dist_flavor}" -C main -A ${3} --list-format='''${package}\n''' list ${1}` REPO_LIST2=$"${LIST2}" echo "${REPO_LIST2}" echo "" @@ -874,7 +880,7 @@ sudo dd if=/dev/zero of=${1} bs=4K count=1500K sudo sh -c "LC_ALL=C ${mkfs} ${mkfs_options} ${1} ${mkfs_label}" } -## parameters: 1: loop dev name, 2: boot partition +## parameters: 1: loop dev name, 2: boot partition fdisk_2part() { sudo fdisk ${1} << EOF n @@ -939,7 +945,8 @@ if [ "${1}" = "1" ]; then echo "# Script_MSG: 1 part rootfs image" create_rootfs_img ${2} elif [ "${1}" = "2" ] || [ "${1}" = "3" ]; then - sudo dd if=/dev/zero of=${2} bs=4K count=1700K + sudo dd if=/dev/zero of=${2} bs=4K count=1850K +# sudo dd if=/dev/zero of=${2} bs=4K count=3525K echo "Now mounting sd-image file" mount_sd_imagefile ${2} ${3} if [ "${1}" = "2" ]; then @@ -1118,10 +1125,10 @@ EOT' echo "" echo "NOTE: Generated ${2}/etc/fw_env.config" -cat < ${CURRENT_DIR}/fw_env.config +#cat < ${CURRENT_DIR}/fw_env.config # MMC device name Device offset Env. size Flash sector size Number of sectors -${1} 0x4000 0x2000 -EOT +#${1} 0x4000 0x2000 +#EOT } @@ -1144,6 +1151,7 @@ make_bmap_image() { cd ${1} bmaptool create -o ${2}.bmap ${2} tar -cSf ${2}.tar.bz2 ${2} --use-compress-program lbzip2 + md5sum ${2}.tar.bz2 > ${2}.tar.bz2.md5 echo "" echo "NOTE: Bmap image created" echo "" diff --git a/SD-Image-Gen/functions/rootfs-func.sh b/SD-Image-Gen/functions/rootfs-func.sh index 127e911..ebfdb43 100755 --- a/SD-Image-Gen/functions/rootfs-func.sh +++ b/SD-Image-Gen/functions/rootfs-func.sh @@ -16,10 +16,10 @@ output=${?} } # ## parameters: 1: mount dev name, 2: distro name, 3: repo url, 4: distro arch -#run_qemu_debootstrap_buster() { -#sudo qemu-debootstrap --foreign --arch=${4} --variant=buildd --keyring /usr/share/keyrings/debian-archive-keyring.gpg --include=sudo,locales,nano,apt-utils,rsyslog,libssh2-1,openssh-client,openssh-server,openssl,leafpad,kmod,dbus,dbus-x11,upower,udev,net-tools,lsof,less,accountsservice,iputils-ping,python,python3,ifupdown,iproute2,dhcpcd5,avahi-daemon,uuid-runtime,avahi-discover,libnss-mdns,traceroute,strace,u-boot-tools,initramfs-tools,gnupg2,dirmngr,wget,xorg,cgroupfs-mount,ntp,autofs,open-iscsi,xserver-xorg-video-dummy ${2} ${1} ${3} -#output=${?} -#} +run_desktop_qemu_debootstrap_buster() { +sudo qemu-debootstrap --foreign --arch=${4} --variant=buildd --keyring /usr/share/keyrings/debian-archive-keyring.gpg --include=sudo,locales,nano,vim,adduser,apt-utils,rsyslog,libssh2-1,openssh-client,openssh-server,openssl,leafpad,kmod,dbus,dbus-x11,upower,udev,net-tools,lsof,less,accountsservice,iputils-ping,python,python3,ifupdown,iproute2,avahi-daemon,uuid-runtime,avahi-discover,libnss-mdns,traceroute,strace,u-boot-tools,initramfs-tools,gnupg2,dirmngr,wget,xorg,cgroupfs-mount,ntp,autofs,libpam-systemd,systemd-sysv,fuse,cgmanager,policykit-1,gtk2-engines-pixbuf,fontconfig,fontconfig-config,console-setup,fbset,libdirectfb-1.7-7,x11-xserver-utils,acpid ${2} ${1} ${3} +output=${?} +} # # ## parameters: 1: mount dev name, 2: distro name, 3: repo url, 4: distro arch # run_qemu_debootstrap_buster_lxqt() { @@ -141,7 +141,7 @@ sudo sh -c 'cat < '${1}'/etc/apt/sources.list-local #------------------------------------------------------------------------------# ##### Local mirror -deb '${local_kernel_repo}' '${2}' main +deb '${local_ub_kernel_repo}' '${2}' main deb [arch=arm64] '${local_ub_repo}' '${2}' main restricted deb-src [arch=arm64] '${local_ub_repo}' '${2}' main restricted @@ -737,7 +737,7 @@ sudo sh -c 'cat < '${1}'/home/add_user.sh #set -x -export DEFGROUPS="sudo,kmem,adm,dialout,'${2}',video,plugdev,netdev,audio" +export DEFGROUPS="sudo,kmem,adm,dialout,'${2}',video,plugdev,netdev,audio,tty" export LANG=C '${apt_cmd}' -y update @@ -794,12 +794,12 @@ sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/sbin/locale-ge } -# parameters: 1: mount dev name +# parameters: 1: mount dev name, 2: distro arch gen_initial_sh() { echo "------------------------------------------" echo "generating initial.sh chroot config script" echo "------------------------------------------" - +if [[ "${2}" == "arm64" ]]; then sudo sh -c 'cat < '${1}'/home/initial.sh #!/bin/bash @@ -829,26 +829,58 @@ echo "ECHO: Will now run '${apt_cmd}' update, upgrade" rm -f /etc/resolv.conf # enable systemd-networkd -# if [ ! -L '/lib/systemd/system/systemd-networkd.service' ]; then -# echo "" -# echo "ECHO:--> Enabling Systemd Networkd" -# echo "" -# ln -s '${EnableSystemdNetworkedLink}' /lib/systemd/system/systemd-networkd.service -# fi -# + if [ ! -L '/lib/systemd/system/systemd-networkd.service' ]; then + echo "" + echo "ECHO:--> Enabling Systemd Networkd" + echo "" + ln -s '${EnableSystemdNetworkedLink}' /lib/systemd/system/systemd-networkd.service + fi + # enable systemd-resolved -# if [ ! -L '/lib/systemd/system/systemd-resolved.service' ]; then -# echo "" -# echo "ECHO:--> Enabling Systemd Resolved" -# echo "" -# ln -s '${EnableSystemdResolvedLink}' /lib/systemd/system/systemd-resolved.service -# rm -f /etc/resolv.conf -# ln -s /run/systemd/resolve/resolv.conf /etc/resolv.conf -# fi + if [ ! -L '/lib/systemd/system/systemd-resolved.service' ]; then + echo "" + echo "ECHO:--> Enabling Systemd Resolved" + echo "" + ln -s '${EnableSystemdResolvedLink}' /lib/systemd/system/systemd-resolved.service + rm -f /etc/resolv.conf + ln -s /run/systemd/resolve/resolv.conf /etc/resolv.conf + fi exit EOF' +else +sudo sh -c 'cat < '${1}'/home/initial.sh +#!/bin/bash + +#set -x + +ln -s /proc/mounts /etc/mtab + + + +cat << EOT >/etc/fstab +# /etc/fstab: static file system information. +# +# +/dev/root / ext4 noatime,errors=remount-ro 0 1 +tmpfs /tmp tmpfs defaults 0 0 +none /dev/shm tmpfs rw,nosuid,nodev,noexec 0 0 +/sys/kernel/config /config none bind 0 0 +/dev/mmcblk0p2 swap swap defaults 0 0 +debugfs /sys/kernel/debug debugfs defaults 0 0 +EOT + + +echo "ECHO: Will now run '${apt_cmd}' update, upgrade" +'${apt_cmd}' -y update +'${apt_cmd}' -y --assume-yes upgrade +'${apt_cmd}' -y install connman + +rm -f /etc/resolv.conf +exit +EOF' +fi sudo chmod +x ${1}/home/initial.sh } @@ -880,22 +912,28 @@ sudo cp ${1}/etc/apt/sources.list-final ${1}/etc/apt/sources.list if [ "${2}" == "machinekit" ]; then HOST_NAME="mksocfpga-nano-soc" elif [ "${2}" == "holosynth" ]; then - HOST_NAME="holosynthv" + if [ "${4}" == "arm64" ]; then + HOST_NAME="holosynthv-u96" + else + HOST_NAME="holosynthv" + fi +elif [ "${2}" == "ubuntu" ]; then + HOST_NAME="ultra96" fi gen_hosts ${1} ${HOST_NAME} sudo mkdir -p ${1}/etc/systemd/network -if [[ "${4}" == "arm64" ]]; then - gen_network_interface_setup "wlan0" -else + if [[ "${4}" == "arm64" ]]; then + gen_network_interface_setup "enx*" + else gen_network_interface_setup "eth0" -fi + fi sudo sh -c 'echo T0:2345:respawn:rootfs/sbin/getty -L ttyS0 115200 vt100 >> '${1}'/etc/inittab' -#conf_timezone_locale +conf_timezone_locale sudo sh -c 'cat < '${1}'/etc/locale.conf LANG=en_US.UTF-8 UTF-8 @@ -909,8 +947,8 @@ initial_rootfs_user_setup_sh() { echo "------------------------------------------------------------" echo "---- running initial_rootfs_user_setup_sh ------------" echo "------------------------------------------------------------" -set -e -set -x +# set -e +# set -x sudo rm -f ${1}/etc/resolv.conf sudo cp /etc/resolv.conf ${1}/etc/resolv.conf @@ -937,8 +975,12 @@ sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd} sudo sh -c 'DEBIAN_FRONTEND=noninteractive LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/sbin/dpkg-reconfigure --frontend noninteractive tzdata' sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install leafpad gnupg2 avahi-discover traceroute cgroupfs-mount ntp' #fi +if [ "${3}" == "bionic" ]; then + sudo chroot --userspec=root:root ${1} /usr/bin/wget http://${local_ws}.holotronic.lan/ubuntu/socfpgakernel.gpg.key +else + sudo chroot --userspec=root:root ${1} /usr/bin/wget http://${local_ws}.holotronic.lan/debian/socfpgakernel.gpg.key +fi -sudo chroot --userspec=root:root ${1} /usr/bin/wget http://${local_ws}.holotronic.lan/debian/socfpgakernel.gpg.key sudo chroot --userspec=root:root ${1} /usr/bin/apt-key add socfpgakernel.gpg.key sudo chroot --userspec=root:root ${1} /bin/rm socfpgakernel.gpg.key @@ -965,13 +1007,19 @@ fi if [ "${DESKTOP}" == "yes" ]; then echo "Scr_MSG: Installing lxqt" - if [ "${3}" == "bionic" ]; then + if [ "${3}" == "bionic" ] || [ "${3}" == "buster" ]; then sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install software-properties-common' - sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install tasksel' - sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install sddm-theme-breeze ark lxqt lxqt-panel' +# sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install tasksel' +# sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install lxqt openbox lxmenu-data lxqt-globalkeys lxqt-panel lxqt-policykit lxqt' +# sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install sddm-theme-breeze ark lxqt lxqt-panel' # sudo sh -c 'DEBIAN_FRONTEND=noninteractive LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/tasksel install lubuntu-qt-desktop' +# sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install lxqt openbox lxmenu-data pcmanfm-qt lxqt-admin lxqt-config lxqt-globalkeys lxqt-notificationd lxqt-panel lxqt-policykit lxqt-powermanagement lxqt-qtplugin lxqt-runner lxqt-session lxqt-sudo' + sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install lxqt-core openbox lxqt-sudo' + sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install lxqt' + sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install tasksel' + sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install task-lxqt-desktop' else - sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install openbox pcmanfm-qt lxqt-admin lxqt-common lxqt-config lxqt-globalkeys lxqt-notificationd lxqt-panel lxqt-policykit lxqt-powermanagement lxqt-qtplugin lxqt-runner lxqt-session lxqt-sudo' + sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install openbox lxmenu-data pcmanfm-qt lxqt-admin lxqt-config lxqt-globalkeys lxqt-notificationd lxqt-panel lxqt-policykit lxqt-powermanagement lxqt-qtplugin lxqt-runner lxqt-session lxqt-sudo' # sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y ' sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y --no-install-recommends install kwin-x11 kwin-addons' sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y --no-install-recommends install kwin-style-breeze' @@ -979,8 +1027,8 @@ if [ "${DESKTOP}" == "yes" ]; then sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install breeze' sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install breeze-icon-theme' fi - sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install mesa-utils' - sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y --no-install-recommends install kwin-x11 kwin-style-breeze kwin-addons systemsettings' + sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install mesa-utils mesa-utils-extra' +# sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y --no-install-recommends install kwin-x11 kwin-style-breeze kwin-addons systemsettings' # sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' --no-install-recommends -y install kde-window-manager kwin-x11 kwin-style-breeze kwin-addons systemsettings' # sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install kwin-x11 kwin-style-breeze kwin-addons systemsettings' sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install xfonts-base xfonts-cyrillic xfonts-100dpi xfonts-75dpi' @@ -998,7 +1046,7 @@ if [ "${DESKTOP}" == "yes" ]; then else sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y -t '${3}'-backports install firmware-ti-connectivity' fi - sudo cp ${WORK_DIR}/../bt/TIInit_11.8.32.bts ${1}/lib/firmware/ti-connectivity/ + sudo cp ${WORK_DIR}/../bt/TIInit_11.8.32.bts ${1}/lib/firmware/ti-connectivity/ fi if [[ "${2}" == "holosynth" ]]; then echo "Scr_MSG: Installing Cadence deps" @@ -1019,7 +1067,7 @@ if [ "${DESKTOP}" == "yes" ]; then fi fi -gen_initial_sh ${1} +gen_initial_sh ${1} ${4} echo "Script_MSG: gen_initial.sh finished ... will now run in chroot" sudo chroot ${1} ${shell_cmd} -c /home/initial.sh @@ -1045,6 +1093,33 @@ if [[ "${2}" == "holosynth" ]]; then # mmcboot=setenv bootargs console=ttyS0,115200 root=\${mmcroot} rootfstype=ext4 rw rootwait fbcon=rotate:2;bootz \${loadaddr} - \${fdt_addr} # EOF' +# if [[ "${3}" == "stretch" ]]; then +# sudo sh -c 'cat < '${1}'/home/holosynth/.xsessionrc +# xinput set-prop 'eGalax Inc. eGalaxTouch EXC7910-1026-13.00.00' 'Coordinate Transformation Matrix' -1 0 1 0 -1 1 0 0 1 +# EOF' + + mkdir -p ${1}/home/holosynth/Desktop + mkdir -p ${1}/home/holosynth/.local/share/applications + sudo sh -c 'cat < '${1}'/home/holosynth/.local/share/applications/holosynthed.desktop +[Desktop Entry] +Name=HolosynthVEd +GenericName=HolosynthVEd +Comment=Synth Editor for HolosynthV +Exec=/home/holosynth/prg/HolosynthVEd -nograb -platform xcb +Icon=catia +Terminal=false +Type=Application +Categories=AudioVideo;AudioEditing;Qt +EOF' + + sudo sh -c 'cat < '${1}'/home/holosynth/Desktop/HolosynthVEd.sh +/home/holosynth/prg/HolosynthVEd -nograb -platform xcb +EOF' + +# fi + sudo chmod +x ${1}/home/holosynth/Desktop/HolosynthVEd.sh + sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /bin/chown -R '${2}':'${2}' /home/'${2}'' +fi if [[ "${4}" == "arm64" ]]; then sudo sh -c 'cat < '${1}'/etc/X11/xorg.conf-armsoc Section "InputDevice" @@ -1079,6 +1154,7 @@ Section "Screen" EndSection EOF' +else sudo sh -c 'cat < '${1}'/etc/X11/xorg.conf Section "Device" @@ -1096,51 +1172,6 @@ Section "ServerLayout" EndSection EOF' - else - -sudo sh -c 'cat < '${1}'/etc/X11/xorg.conf -Section "Device" - Identifier "Frame Buffer" - Driver "fbdev" - Option "Rotate" "off" -EndSection - -Section "ServerLayout" - Identifier "ServerLayout0" - Option "BlankTime" "0" - Option "StandbyTime" "0" - Option "SuspendTime" "0" - Option "OffTime" "0" -EndSection - -EOF' - fi -# if [[ "${3}" == "stretch" ]]; then -# sudo sh -c 'cat < '${1}'/home/holosynth/.xsessionrc -# xinput set-prop 'eGalax Inc. eGalaxTouch EXC7910-1026-13.00.00' 'Coordinate Transformation Matrix' -1 0 1 0 -1 1 0 0 1 -# EOF' - - mkdir -p ${1}/home/holosynth/Desktop - mkdir -p ${1}/home/holosynth/.local/share/applications - sudo sh -c 'cat < '${1}'/home/holosynth/.local/share/applications/holosynthed.desktop -[Desktop Entry] -Name=HolosynthVEd -GenericName=HolosynthVEd -Comment=Synth Editor for HolosynthV -Exec=/home/holosynth/prg/HolosynthVEd -nograb -platform xcb -Icon=catia -Terminal=false -Type=Application -Categories=AudioVideo;AudioEditing;Qt -EOF' - - sudo sh -c 'cat < '${1}'/home/holosynth/Desktop/HolosynthVEd.sh -/home/holosynth/prg/HolosynthVEd -nograb -platform xcb -EOF' - -# fi - sudo chmod +x ${1}/home/holosynth/Desktop/HolosynthVEd.sh - sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /bin/chown -R '${2}':'${2}' /home/'${2}'' fi if [ "${2}" == "machinekit" ]; then diff --git a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0001-disable-debug-package-gen.patch b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0001-disable-debug-package-gen.patch index 36b5b89..9525415 100644 --- a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0001-disable-debug-package-gen.patch +++ b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0001-disable-debug-package-gen.patch @@ -1,7 +1,7 @@ -From a1ae4132a7cb4ed56c51febf801cf56960e61c18 Mon Sep 17 00:00:00 2001 +From 863f395485a705e13a7ba3c49b650f719d3be12a Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Wed, 7 Mar 2018 14:14:18 +0100 -Subject: [PATCH 01/31] disable debug package gen +Subject: [PATCH 01/33] disable debug package gen Signed-off-by: Michael Brown --- diff --git a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0002-Remove-gittag-from-kernel-file-name-s.patch b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0002-Remove-gittag-from-kernel-file-name-s.patch index aab3be3..1a9cdfc 100644 --- a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0002-Remove-gittag-from-kernel-file-name-s.patch +++ b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0002-Remove-gittag-from-kernel-file-name-s.patch @@ -1,7 +1,7 @@ -From 8ddb35bb8f54f809a7ba947a77a4c33f99c8da4d Mon Sep 17 00:00:00 2001 +From 9d651948c4bad162eac64a6ecf5b4691dfb989cc Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Tue, 1 May 2018 16:02:19 +0200 -Subject: [PATCH 02/31] Remove gittag from kernel (file) name(s) +Subject: [PATCH 02/33] Remove gittag from kernel (file) name(s) Signed-off-by: Michael Brown --- diff --git a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0003-add-ext4-root-fs-support-and-autofs4-module.patch b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0003-add-ext4-root-fs-support-and-autofs4-module.patch index 2bb503c..6ef2e81 100644 --- a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0003-add-ext4-root-fs-support-and-autofs4-module.patch +++ b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0003-add-ext4-root-fs-support-and-autofs4-module.patch @@ -1,7 +1,7 @@ -From 3cd6103d065a2bbc680cde90487fe8b490f1e4d2 Mon Sep 17 00:00:00 2001 +From 8b24dee1205097ffbd1443780a8fd8bc0fc12949 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Wed, 7 Mar 2018 14:21:56 +0100 -Subject: [PATCH 03/31] add ext4 root fs support and autofs4 module +Subject: [PATCH 03/33] add ext4 root fs support and autofs4 module Signed-off-by: Michael Brown --- diff --git a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0004-add-.dtd-files-to-kernel-image-.deb.patch b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0004-add-.dtd-files-to-kernel-image-.deb.patch index f3a425f..64c4a66 100644 --- a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0004-add-.dtd-files-to-kernel-image-.deb.patch +++ b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0004-add-.dtd-files-to-kernel-image-.deb.patch @@ -1,7 +1,7 @@ -From e442580d459d4a0dfd783d1815e3f64e8c696e07 Mon Sep 17 00:00:00 2001 +From b81286a31d17e30d8a6af70da23b8c7787bc6170 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Wed, 7 Mar 2018 14:26:50 +0100 -Subject: [PATCH 04/31] add .dtd files to kernel-image .deb +Subject: [PATCH 04/33] add .dtd files to kernel-image .deb Signed-off-by: Michael Brown --- diff --git a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0005-add-generate-boot-extlinux-extlinux.conf-and-boot-uE.patch b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0005-add-generate-boot-extlinux-extlinux.conf-and-boot-uE.patch index dddb823..e4951ad 100644 --- a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0005-add-generate-boot-extlinux-extlinux.conf-and-boot-uE.patch +++ b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0005-add-generate-boot-extlinux-extlinux.conf-and-boot-uE.patch @@ -1,7 +1,7 @@ -From 2566730d58e00cc8138d89548cc5b0d6decd616f Mon Sep 17 00:00:00 2001 +From f2eb467110902e85f4f8a7aa50946bdb38e463db Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Wed, 7 Mar 2018 14:33:44 +0100 -Subject: [PATCH 05/31] add generate /boot/extlinux/extlinux.conf and +Subject: [PATCH 05/33] add generate /boot/extlinux/extlinux.conf and /boot/uEnv.txt for uboot boot info Signed-off-by: Michael Brown diff --git a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0006-add-configfs-and-fpgacfg-dts-entities-and-dynamic-dt.patch b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0006-add-configfs-and-fpgacfg-dts-entities-and-dynamic-dt.patch index 033cccd..d1d42b8 100644 --- a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0006-add-configfs-and-fpgacfg-dts-entities-and-dynamic-dt.patch +++ b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0006-add-configfs-and-fpgacfg-dts-entities-and-dynamic-dt.patch @@ -1,7 +1,7 @@ -From 2ebe92b1919b662912fcd77f9a9b381cbc1923da Mon Sep 17 00:00:00 2001 +From 7cc8a9c6441367bbfe4d367b6d5a5d5c2a1e2b25 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Wed, 7 Mar 2018 15:43:11 +0100 -Subject: [PATCH 06/31] add configfs and fpgacfg dts entities, and dynamic dts +Subject: [PATCH 06/33] add configfs and fpgacfg dts entities, and dynamic dts overlay support Signed-off-by: Michael Brown diff --git a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0007-rename-kernel-package-names-to-socfpga-rt-ltsi.patch b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0007-rename-kernel-package-names-to-socfpga-rt-ltsi.patch index 49f185d..d05aa7c 100644 --- a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0007-rename-kernel-package-names-to-socfpga-rt-ltsi.patch +++ b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0007-rename-kernel-package-names-to-socfpga-rt-ltsi.patch @@ -1,7 +1,7 @@ -From d909cb2174d2d7de3521bc0e86c3fc55c895fea3 Mon Sep 17 00:00:00 2001 +From cb14e913b3af5a3f41fc5337c3d4ea8b44faf496 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Sat, 10 Mar 2018 12:55:03 +0100 -Subject: [PATCH 07/31] rename kernel package names to *-socfpga-rt-ltsi +Subject: [PATCH 07/33] rename kernel package names to *-socfpga-rt-ltsi Signed-off-by: Michael Brown --- diff --git a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0008-Enable-bridges-in-dtb-s.patch b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0008-Enable-bridges-in-dtb-s.patch index 40114ab..b25ee7e 100644 --- a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0008-Enable-bridges-in-dtb-s.patch +++ b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0008-Enable-bridges-in-dtb-s.patch @@ -1,7 +1,7 @@ -From 6ea990706300c1b550433968b905ce688cafcd37 Mon Sep 17 00:00:00 2001 +From c4d51ebaf0fd72b6ec4bad6d54bbf2d205702d22 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Mon, 21 May 2018 13:19:43 +0200 -Subject: [PATCH 08/31] Enable bridges in dtb's +Subject: [PATCH 08/33] Enable bridges in dtb's Signed-off-by: Michael Brown --- diff --git a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0009-add-spidev-in-dts-so-driver-is-loaded.patch b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0009-add-spidev-in-dts-so-driver-is-loaded.patch index cc5a711..d6c8af2 100644 --- a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0009-add-spidev-in-dts-so-driver-is-loaded.patch +++ b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0009-add-spidev-in-dts-so-driver-is-loaded.patch @@ -1,7 +1,7 @@ -From 0f2a38dc74eafd24ab8c8384ae2bc5048c80df3f Mon Sep 17 00:00:00 2001 +From ce25054a5cd29a0439ec7b0c36ed9c56d60a14d6 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Sat, 10 Mar 2018 13:13:12 +0100 -Subject: [PATCH 09/31] add spidev in dts so driver is loaded +Subject: [PATCH 09/33] add spidev in dts so driver is loaded Signed-off-by: Michael Brown --- diff --git a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0010-set-ACL-secutity.patch b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0010-set-ACL-secutity.patch index 0164e68..f18ab6b 100644 --- a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0010-set-ACL-secutity.patch +++ b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0010-set-ACL-secutity.patch @@ -1,7 +1,7 @@ -From 77814709193f81c3e27f563c3979189956d38011 Mon Sep 17 00:00:00 2001 +From f10355556e59c9f1b516e97135810d130aa87588 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Mon, 12 Mar 2018 23:41:23 +0100 -Subject: [PATCH 10/31] set ACL secutity +Subject: [PATCH 10/33] set ACL secutity Signed-off-by: Michael Brown --- diff --git a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0011-Enable-altvip-framebuffer.patch b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0011-Enable-altvip-framebuffer.patch index a620d62..6cfc2fb 100644 --- a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0011-Enable-altvip-framebuffer.patch +++ b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0011-Enable-altvip-framebuffer.patch @@ -1,7 +1,7 @@ -From 24b707412df5683a277f2ce50e0061eafac979a4 Mon Sep 17 00:00:00 2001 +From 8d2003f8a906701e0f569d93e65fdfa666f32a06 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Fri, 30 Mar 2018 20:41:53 +0200 -Subject: [PATCH 11/31] Enable altvip framebuffer +Subject: [PATCH 11/33] Enable altvip framebuffer Signed-off-by: Michael Brown --- diff --git a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0012-Added-DE-10-Nano-with-uio-with-without-framebuffer-1.patch b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0012-Added-DE-10-Nano-with-uio-with-without-framebuffer-1.patch index 4dcb7a9..15e6962 100644 --- a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0012-Added-DE-10-Nano-with-uio-with-without-framebuffer-1.patch +++ b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0012-Added-DE-10-Nano-with-uio-with-without-framebuffer-1.patch @@ -1,7 +1,7 @@ -From 9ebb634ed31bc383dea4cbcae1f1848dfeca30c1 Mon Sep 17 00:00:00 2001 +From c9317aa2f577862ee595cf4bdeb114e2f223863e Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Sun, 11 Mar 2018 22:21:04 +0100 -Subject: [PATCH 12/31] Added DE-10 Nano with uio, with/without framebuffer +Subject: [PATCH 12/33] Added DE-10 Nano with uio, with/without framebuffer 1024x768 and 1920x1080(hd) dts dtb Signed-off-by: Michael Brown diff --git a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0013-Add-framebuffer-ii-core-driver-based-on-Mister-and-e.patch b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0013-Add-framebuffer-ii-core-driver-based-on-Mister-and-e.patch index 49733e1..e2cf9f3 100644 --- a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0013-Add-framebuffer-ii-core-driver-based-on-Mister-and-e.patch +++ b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0013-Add-framebuffer-ii-core-driver-based-on-Mister-and-e.patch @@ -1,7 +1,7 @@ -From de453e438539160ba15487a85f495b2ccb832348 Mon Sep 17 00:00:00 2001 +From ea682e9a715ee7962c92f0a0dd83e333809e12f4 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Fri, 18 May 2018 20:35:35 +0200 -Subject: [PATCH 13/31] Add framebuffer-ii core driver based on Mister, and +Subject: [PATCH 13/33] Add framebuffer-ii core driver based on Mister, and enable it Signed-off-by: Michael Brown diff --git a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0014-Add-audio-and-midi-drivers-for-holosynth-and-builtin.patch b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0014-Add-audio-and-midi-drivers-for-holosynth-and-builtin.patch index 48016b7..7bd175c 100644 --- a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0014-Add-audio-and-midi-drivers-for-holosynth-and-builtin.patch +++ b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0014-Add-audio-and-midi-drivers-for-holosynth-and-builtin.patch @@ -1,7 +1,7 @@ -From ac16dda0451d6d73f56629afca4f90311cc2d5ab Mon Sep 17 00:00:00 2001 +From ca4835c1d3ff31515598b5d263ba60241aee7bea Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Sun, 8 Apr 2018 22:39:54 +0200 -Subject: [PATCH 14/31] Add audio and midi drivers for holosynth and builtin +Subject: [PATCH 14/33] Add audio and midi drivers for holosynth and builtin audio codec on de1 board Signed-off-by: Michael Brown diff --git a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0015-Add-Hsynth-audio-driver-with-Phat-pcm5102-audio-outp.patch b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0015-Add-Hsynth-audio-driver-with-Phat-pcm5102-audio-outp.patch index c878c15..8d89958 100644 --- a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0015-Add-Hsynth-audio-driver-with-Phat-pcm5102-audio-outp.patch +++ b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0015-Add-Hsynth-audio-driver-with-Phat-pcm5102-audio-outp.patch @@ -1,7 +1,7 @@ -From fb9d96a5fd90231db01520f8ca3a36f7c68bdd3b Mon Sep 17 00:00:00 2001 +From 409f0b04555861a5af789a6435a58bf03573a46e Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Thu, 17 May 2018 10:58:21 +0200 -Subject: [PATCH 15/31] Add Hsynth audio driver with Phat(pcm5102) audio output +Subject: [PATCH 15/33] Add Hsynth audio driver with Phat(pcm5102) audio output Add vipii fb,pidac/hsynth audio dtb for DE10 Nano HD HDMI Signed-off-by: Michael Brown diff --git a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0016-add-vipii-framebuffer-dtb-for-de1_soc.patch b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0016-add-vipii-framebuffer-dtb-for-de1_soc.patch index be7caab..594dc7f 100644 --- a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0016-add-vipii-framebuffer-dtb-for-de1_soc.patch +++ b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0016-add-vipii-framebuffer-dtb-for-de1_soc.patch @@ -1,7 +1,7 @@ -From fc207a7c2d740d8f7ac177c994fd42c1d77c850d Mon Sep 17 00:00:00 2001 +From b39f7a459d4782d0904487bf0d697c2e59c1aecd Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Fri, 4 May 2018 14:32:56 +0200 -Subject: [PATCH 16/31] add vipii framebuffer dtb for de1_soc +Subject: [PATCH 16/33] add vipii framebuffer dtb for de1_soc Signed-off-by: Michael Brown --- diff --git a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0017-div-codec-mods.patch b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0017-div-codec-mods.patch index 5496b10..92acc1b 100644 --- a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0017-div-codec-mods.patch +++ b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0017-div-codec-mods.patch @@ -1,7 +1,7 @@ -From 360d12f25adf8aaf5f4fd388f5bd830c7041a45e Mon Sep 17 00:00:00 2001 +From 35c8d2ff12a366f5979580810751004e93c13924 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Thu, 24 May 2018 12:18:18 +0200 -Subject: [PATCH 17/31] div codec mods +Subject: [PATCH 17/33] div codec mods Signed-off-by: Michael Brown --- diff --git a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0018-Change-uio-port-name-Fix-for-machinekit-use.patch b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0018-Change-uio-port-name-Fix-for-machinekit-use.patch index 73b692e..c05f706 100644 --- a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0018-Change-uio-port-name-Fix-for-machinekit-use.patch +++ b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0018-Change-uio-port-name-Fix-for-machinekit-use.patch @@ -1,7 +1,7 @@ -From b917c027996462f95af2bffff965f3fbd83f920f Mon Sep 17 00:00:00 2001 +From 7c25073265887c4d237e9b17352e332e614362c6 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Sat, 26 May 2018 21:36:55 +0200 -Subject: [PATCH 18/31] Change uio port name Fix: for machinekit use +Subject: [PATCH 18/33] Change uio port name Fix: for machinekit use Signed-off-by: Michael Brown --- diff --git a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0019-Terasic-dev-boards-Make-core-addresses-in-qsys-devic.patch b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0019-Terasic-dev-boards-Make-core-addresses-in-qsys-devic.patch index 5ff3776..4e636ff 100644 --- a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0019-Terasic-dev-boards-Make-core-addresses-in-qsys-devic.patch +++ b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0019-Terasic-dev-boards-Make-core-addresses-in-qsys-devic.patch @@ -1,7 +1,7 @@ -From 490d07f514c87a2bab18edbf72d6c0019e6f3f16 Mon Sep 17 00:00:00 2001 +From 74c3cd1db05238daa22597ee604f34b2a91cfbac Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Wed, 30 May 2018 12:33:08 +0200 -Subject: [PATCH 19/31] Terasic dev boards: Make core addresses in qsys +Subject: [PATCH 19/33] Terasic dev boards: Make core addresses in qsys devicetrees consistant Signed-off-by: Michael Brown diff --git a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0020-Test-Improve-dtb.patch b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0020-Test-Improve-dtb.patch index 1b75ea7..013acf1 100644 --- a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0020-Test-Improve-dtb.patch +++ b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0020-Test-Improve-dtb.patch @@ -1,7 +1,7 @@ -From 3bc67f6c0513c2478acbc053c7bb31c2b57b46f4 Mon Sep 17 00:00:00 2001 +From 9776ba79f2d0f4ee79aa07c32fcd4e7b076df6e0 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Thu, 31 May 2018 13:46:11 +0200 -Subject: [PATCH 20/31] Test Improve dtb +Subject: [PATCH 20/33] Test Improve dtb Signed-off-by: Michael Brown --- diff --git a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0021-Add-missing-.ops-to-synthpcm5102-codec.patch b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0021-Add-missing-.ops-to-synthpcm5102-codec.patch index 9423661..210733b 100644 --- a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0021-Add-missing-.ops-to-synthpcm5102-codec.patch +++ b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0021-Add-missing-.ops-to-synthpcm5102-codec.patch @@ -1,7 +1,7 @@ -From 94fcb85bd5bc94b3ce79807dadac33f9bb7aaa9d Mon Sep 17 00:00:00 2001 +From ee48f50922a05404fa95eba93abe0c8594311123 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Thu, 31 May 2018 18:08:43 +0200 -Subject: [PATCH 21/31] Add missing .ops to synthpcm5102 codec +Subject: [PATCH 21/33] Add missing .ops to synthpcm5102 codec Signed-off-by: Michael Brown --- diff --git a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0022-Make-DE1x-Devicetree-qsys-core-addresses-consistant.patch b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0022-Make-DE1x-Devicetree-qsys-core-addresses-consistant.patch index 8b5132b..be5dbe7 100644 --- a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0022-Make-DE1x-Devicetree-qsys-core-addresses-consistant.patch +++ b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0022-Make-DE1x-Devicetree-qsys-core-addresses-consistant.patch @@ -1,7 +1,7 @@ -From d9d30f5013eee12ab5f2b25620b6289192db4cc8 Mon Sep 17 00:00:00 2001 +From b7a59ad103030d02ce9970912e3a92a5ee73c682 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Fri, 1 Jun 2018 12:52:57 +0200 -Subject: [PATCH 22/31] Make DE1x Devicetree qsys core addresses consistant +Subject: [PATCH 22/33] Make DE1x Devicetree qsys core addresses consistant Signed-off-by: Michael Brown --- diff --git a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0023-Add-builtin-audio-codec-driver-for-DE1-DE10-SoC-wm87.patch b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0023-Add-builtin-audio-codec-driver-for-DE1-DE10-SoC-wm87.patch index 538686e..e3c9177 100644 --- a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0023-Add-builtin-audio-codec-driver-for-DE1-DE10-SoC-wm87.patch +++ b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0023-Add-builtin-audio-codec-driver-for-DE1-DE10-SoC-wm87.patch @@ -1,7 +1,7 @@ -From 4bfed542f6da6e441d1d94d96292fbf042fe317e Mon Sep 17 00:00:00 2001 +From 02badf3c0e1871d245637a1e17fe5f9fd61b0e90 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Sat, 2 Jun 2018 22:56:31 +0200 -Subject: [PATCH 23/31] Add builtin audio codec driver for DE1/DE10 SoC +Subject: [PATCH 23/33] Add builtin audio codec driver for DE1/DE10 SoC (wm8731) Add Audio and framebuffer Supporting device trees xga and hd versions diff --git a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0024-Rename-Hsynth-stream-names.patch b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0024-Rename-Hsynth-stream-names.patch index d7b7087..0d8d9a3 100644 --- a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0024-Rename-Hsynth-stream-names.patch +++ b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0024-Rename-Hsynth-stream-names.patch @@ -1,7 +1,7 @@ -From daa97a667e7005a8196eeb6d1f76111022a97440 Mon Sep 17 00:00:00 2001 +From 97226c1c1f665b00e88d98ea10c1becdc3fef3c3 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Fri, 8 Jun 2018 16:50:10 +0200 -Subject: [PATCH 24/31] Rename Hsynth stream names +Subject: [PATCH 24/33] Rename Hsynth stream names Signed-off-by: Michael Brown --- diff --git a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0025-Add-irq-to-De10-Nano-vipii-fb.patch b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0025-Add-irq-to-De10-Nano-vipii-fb.patch index 8358b33..8d532da 100644 --- a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0025-Add-irq-to-De10-Nano-vipii-fb.patch +++ b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0025-Add-irq-to-De10-Nano-vipii-fb.patch @@ -1,7 +1,7 @@ -From 5ce4b071d4d6df23e7e2aa3a63404a67a254b217 Mon Sep 17 00:00:00 2001 +From b0fffbf455ee8c67488074cc5f6b318bfed11314 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Sun, 10 Jun 2018 17:24:54 +0200 -Subject: [PATCH 25/31] Add irq to De10 Nano vipii fb +Subject: [PATCH 25/33] Add irq to De10 Nano vipii fb Signed-off-by: Michael Brown --- diff --git a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0026-Usb-core-fixes.patch b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0026-Usb-core-fixes.patch index 0e59222..e79d7a9 100644 --- a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0026-Usb-core-fixes.patch +++ b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0026-Usb-core-fixes.patch @@ -1,7 +1,7 @@ -From 96b779110bc7c462df4bd4a6f1843f24781be0dc Mon Sep 17 00:00:00 2001 +From 3f90dc965076274ea97a1af587e1fec1dc5be781 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Sun, 10 Jun 2018 18:13:46 +0200 -Subject: [PATCH 26/31] Usb core fixes +Subject: [PATCH 26/33] Usb core fixes Signed-off-by: Michael Brown --- diff --git a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0027-Add-kernel-debug-stuff.patch b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0027-Add-kernel-debug-stuff.patch index c8730cb..f34d90f 100644 --- a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0027-Add-kernel-debug-stuff.patch +++ b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0027-Add-kernel-debug-stuff.patch @@ -1,7 +1,7 @@ -From cdec557769a648f36cb23919fabbf630a6390c20 Mon Sep 17 00:00:00 2001 +From 6be9c2f317a20a112cd05a08d2fbcaa2ad66c900 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Sun, 10 Jun 2018 23:18:17 +0200 -Subject: [PATCH 27/31] Add kernel debug stuff +Subject: [PATCH 27/33] Add kernel debug stuff Signed-off-by: Michael Brown --- diff --git a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0028-Sounddriver-mods.patch b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0028-Sounddriver-mods.patch index e222265..5885c3f 100644 --- a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0028-Sounddriver-mods.patch +++ b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0028-Sounddriver-mods.patch @@ -1,7 +1,7 @@ -From 4b3ea3bacec6a101bbabad7238e229d62801bcc5 Mon Sep 17 00:00:00 2001 +From 2865d74a0981310f1ad2cda34b9943cdb0e60e8e Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Mon, 11 Jun 2018 16:18:22 +0200 -Subject: [PATCH 28/31] Sounddriver mods +Subject: [PATCH 28/33] Sounddriver mods Signed-off-by: Michael Brown --- diff --git a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0029-update-DE10-devicetrees.patch b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0029-update-DE10-devicetrees.patch index 8df8228..12814d3 100644 --- a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0029-update-DE10-devicetrees.patch +++ b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0029-update-DE10-devicetrees.patch @@ -1,7 +1,7 @@ -From 185470269b621f40afd55e274e00a71642e319e8 Mon Sep 17 00:00:00 2001 +From 14ffd12bd41f1042156c1c701870808ea14d4865 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Fri, 15 Jun 2018 02:48:57 +0200 -Subject: [PATCH 29/31] update DE10 devicetrees +Subject: [PATCH 29/33] update DE10 devicetrees Signed-off-by: Michael Brown --- diff --git a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0030-Add-devicetree-for-DE10-Nano-Touch-screen-Quartus-pr.patch b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0030-Add-devicetree-for-DE10-Nano-Touch-screen-Quartus-pr.patch index e024c21..6973bb7 100644 --- a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0030-Add-devicetree-for-DE10-Nano-Touch-screen-Quartus-pr.patch +++ b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0030-Add-devicetree-for-DE10-Nano-Touch-screen-Quartus-pr.patch @@ -1,7 +1,7 @@ -From 937fc4a8e4da91d092de97f20b69895e82843947 Mon Sep 17 00:00:00 2001 +From 358ace9b9f5cead2ceb5934d80e989fc85e71a4c Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Fri, 12 Oct 2018 20:51:17 +0200 -Subject: [PATCH 30/31] Add devicetree for DE10 Nano Touch screen Quartus +Subject: [PATCH 30/33] Add devicetree for DE10 Nano Touch screen Quartus project Signed-off-by: Michael Brown diff --git a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0031-Add-devicetree-for-DE1-Nano-Touch-screen-Quartus-pro.patch b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0031-Add-devicetree-for-DE1-Nano-Touch-screen-Quartus-pro.patch index 0d271b1..10d6d04 100644 --- a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0031-Add-devicetree-for-DE1-Nano-Touch-screen-Quartus-pro.patch +++ b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0031-Add-devicetree-for-DE1-Nano-Touch-screen-Quartus-pro.patch @@ -1,7 +1,7 @@ -From a49bb7fca4e619a8036aa1bd59025274e441b6ba Mon Sep 17 00:00:00 2001 +From 31e08fcf6ab6b9407b2ef98d57f5b426aa0ff85f Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Tue, 16 Oct 2018 12:46:21 +0200 -Subject: [PATCH 31/31] Add devicetree for DE1 Nano Touch screen Quartus +Subject: [PATCH 31/33] Add devicetree for DE1 Nano Touch screen Quartus project Signed-off-by: Michael Brown diff --git a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0032-DE0_Nano_soc-Added-devicetree-entry-for-SPI-Qsys-cor.patch b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0032-DE0_Nano_soc-Added-devicetree-entry-for-SPI-Qsys-cor.patch new file mode 100644 index 0000000..df3c0cf --- /dev/null +++ b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0032-DE0_Nano_soc-Added-devicetree-entry-for-SPI-Qsys-cor.patch @@ -0,0 +1,51 @@ +From 1c853e0937106e4c3bdfce33dc804f19fa2fdde4 Mon Sep 17 00:00:00 2001 +From: Michael Brown +Date: Sat, 12 Jan 2019 19:36:51 +0100 +Subject: [PATCH 32/33] DE0_Nano_soc: Added devicetree entry for SPI Qsys core + +Signed-off-by: Michael Brown +--- + .../boot/dts/socfpga_cyclone5_de0_sockit.dts | 27 +++++++++++++++++++ + 1 file changed, 27 insertions(+) + +diff --git a/arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts b/arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts +index b280e6494193..b245fa4ad585 100644 +--- a/arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts ++++ b/arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts +@@ -50,6 +50,33 @@ + linux,default-trigger = "heartbeat"; + }; + }; ++ ++ bridge@0xc0000000 { ++ compatible = "altr,bridge-15.1", "simple-bus"; ++ reg = <0xc0000000 0x20000000 0xff200000 0x200000>; ++ #address-cells = <0x2>; ++ #size-cells = <0x1>; ++ ranges = <0x00000001 0x00000000 0xff200000 0x00000020>; ++ ++ spi_3: spi@0x100000000 { ++ compatible = "altr,spi-17.1", "altr,spi-1.0"; ++ reg = <0x00000001 0x00000000 0x00000020>; ++ interrupt-parent = <&intc>; ++ interrupts = <0 44 4>; ++ clocks = <&osc1>; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ bus-num = <0>; ++ num-chipselect = <1>; ++ status = "okay"; ++ }; //end spi@0x100000000 (spi_3) ++ ++ spidev3_fpga: spidev@0 { ++ compatible = "rohm,dh2228fv"; /* appended from boardinfo */ ++ reg = <0>; /* appended from boardinfo */ ++ spi-max-frequency = <2500000>; /* appended from boardinfo */ ++ };//end spidev@0 ++ }; + }; + + &gmac1 { +-- +2.17.1 + diff --git a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0033-De0_Nano_Soc-Add-hps-spi0-device-on-mux-0.patch b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0033-De0_Nano_Soc-Add-hps-spi0-device-on-mux-0.patch new file mode 100644 index 0000000..0d5d03d --- /dev/null +++ b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/0033-De0_Nano_Soc-Add-hps-spi0-device-on-mux-0.patch @@ -0,0 +1,45 @@ +From c92e4ab68b372ea21aad9408374a33e18019c9f7 Mon Sep 17 00:00:00 2001 +From: Michael Brown +Date: Sat, 12 Jan 2019 20:48:14 +0100 +Subject: [PATCH 33/33] De0_Nano_Soc: Add hps spi0 device (on mux=0) + +Signed-off-by: Michael Brown +--- + arch/arm/boot/dts/socfpga.dtsi | 15 ++++++++++++--- + 1 file changed, 12 insertions(+), 3 deletions(-) + +diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi +index dce11432fcbd..ddbd5a180eaa 100644 +--- a/arch/arm/boot/dts/socfpga.dtsi ++++ b/arch/arm/boot/dts/socfpga.dtsi +@@ -786,15 +786,24 @@ + interrupts = <0 39 4>; + }; + +- spi0: spi@fff00000 { ++ spi0: spi@fff00000 { + compatible = "snps,dw-apb-ssi"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0xfff00000 0x1000>; + interrupts = <0 154 4>; +- num-cs = <4>; ++ num-chipselect = <4>; ++ tx-dma-channel = <&pdma 16>; ++ rx-dma-channel = <&pdma 17>; + clocks = <&spi_m_clk>; +- status = "disabled"; ++ status = "okay"; ++ ++ spidev0: spidev@0 { ++ compatible = "rohm,dh2228fv"; ++ reg = <0>; ++ spi-max-frequency = <100000000>; ++ enable-dma = <1>; ++ }; + }; + + spi1: spi@fff01000 { +-- +2.17.1 + diff --git a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/socfpga-4.9.76-ltsi-rt-changeset.patch b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/socfpga-4.9.76-ltsi-rt-changeset.patch index a6724c2..54700dc 100644 --- a/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/socfpga-4.9.76-ltsi-rt-changeset.patch +++ b/SD-Image-Gen/patches/4.9.76-ltsi-rt/current/socfpga-4.9.76-ltsi-rt-changeset.patch @@ -1,7 +1,7 @@ -From a1ae4132a7cb4ed56c51febf801cf56960e61c18 Mon Sep 17 00:00:00 2001 +From 863f395485a705e13a7ba3c49b650f719d3be12a Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Wed, 7 Mar 2018 14:14:18 +0100 -Subject: [PATCH 01/31] disable debug package gen +Subject: [PATCH 01/33] disable debug package gen Signed-off-by: Michael Brown --- @@ -25,10 +25,10 @@ index 5c8c02ffd864..31148aa2e935 100644 2.17.1 -From 8ddb35bb8f54f809a7ba947a77a4c33f99c8da4d Mon Sep 17 00:00:00 2001 +From 9d651948c4bad162eac64a6ecf5b4691dfb989cc Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Tue, 1 May 2018 16:02:19 +0200 -Subject: [PATCH 02/31] Remove gittag from kernel (file) name(s) +Subject: [PATCH 02/33] Remove gittag from kernel (file) name(s) Signed-off-by: Michael Brown --- @@ -48,10 +48,10 @@ index 31148aa2e935..d5758c68e455 100644 2.17.1 -From 3cd6103d065a2bbc680cde90487fe8b490f1e4d2 Mon Sep 17 00:00:00 2001 +From 8b24dee1205097ffbd1443780a8fd8bc0fc12949 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Wed, 7 Mar 2018 14:21:56 +0100 -Subject: [PATCH 03/31] add ext4 root fs support and autofs4 module +Subject: [PATCH 03/33] add ext4 root fs support and autofs4 module Signed-off-by: Michael Brown --- @@ -87,10 +87,10 @@ index d5758c68e455..5ac78d2ef09e 100644 2.17.1 -From e442580d459d4a0dfd783d1815e3f64e8c696e07 Mon Sep 17 00:00:00 2001 +From b81286a31d17e30d8a6af70da23b8c7787bc6170 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Wed, 7 Mar 2018 14:26:50 +0100 -Subject: [PATCH 04/31] add .dtd files to kernel-image .deb +Subject: [PATCH 04/33] add .dtd files to kernel-image .deb Signed-off-by: Michael Brown --- @@ -125,10 +125,10 @@ index 3c575cd07888..d67c791ddc2d 100755 2.17.1 -From 2566730d58e00cc8138d89548cc5b0d6decd616f Mon Sep 17 00:00:00 2001 +From f2eb467110902e85f4f8a7aa50946bdb38e463db Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Wed, 7 Mar 2018 14:33:44 +0100 -Subject: [PATCH 05/31] add generate /boot/extlinux/extlinux.conf and +Subject: [PATCH 05/33] add generate /boot/extlinux/extlinux.conf and /boot/uEnv.txt for uboot boot info Signed-off-by: Michael Brown @@ -172,10 +172,10 @@ index d67c791ddc2d..d6a4058377f4 100755 2.17.1 -From 2ebe92b1919b662912fcd77f9a9b381cbc1923da Mon Sep 17 00:00:00 2001 +From 7cc8a9c6441367bbfe4d367b6d5a5d5c2a1e2b25 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Wed, 7 Mar 2018 15:43:11 +0100 -Subject: [PATCH 06/31] add configfs and fpgacfg dts entities, and dynamic dts +Subject: [PATCH 06/33] add configfs and fpgacfg dts entities, and dynamic dts overlay support Signed-off-by: Michael Brown @@ -212,10 +212,10 @@ index 5ac78d2ef09e..44eb99105dcd 100644 2.17.1 -From d909cb2174d2d7de3521bc0e86c3fc55c895fea3 Mon Sep 17 00:00:00 2001 +From cb14e913b3af5a3f41fc5337c3d4ea8b44faf496 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Sat, 10 Mar 2018 12:55:03 +0100 -Subject: [PATCH 07/31] rename kernel package names to *-socfpga-rt-ltsi +Subject: [PATCH 07/33] rename kernel package names to *-socfpga-rt-ltsi Signed-off-by: Michael Brown --- @@ -243,10 +243,10 @@ index d6a4058377f4..ee58811e94d0 100755 2.17.1 -From 6ea990706300c1b550433968b905ce688cafcd37 Mon Sep 17 00:00:00 2001 +From c4d51ebaf0fd72b6ec4bad6d54bbf2d205702d22 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Mon, 21 May 2018 13:19:43 +0200 -Subject: [PATCH 08/31] Enable bridges in dtb's +Subject: [PATCH 08/33] Enable bridges in dtb's Signed-off-by: Michael Brown --- @@ -277,10 +277,10 @@ index 595eb4f1a761..3de276d42114 100644 2.17.1 -From 0f2a38dc74eafd24ab8c8384ae2bc5048c80df3f Mon Sep 17 00:00:00 2001 +From ce25054a5cd29a0439ec7b0c36ed9c56d60a14d6 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Sat, 10 Mar 2018 13:13:12 +0100 -Subject: [PATCH 09/31] add spidev in dts so driver is loaded +Subject: [PATCH 09/33] add spidev in dts so driver is loaded Signed-off-by: Michael Brown --- @@ -314,10 +314,10 @@ index 3de276d42114..dce11432fcbd 100644 2.17.1 -From 77814709193f81c3e27f563c3979189956d38011 Mon Sep 17 00:00:00 2001 +From f10355556e59c9f1b516e97135810d130aa87588 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Mon, 12 Mar 2018 23:41:23 +0100 -Subject: [PATCH 10/31] set ACL secutity +Subject: [PATCH 10/33] set ACL secutity Signed-off-by: Michael Brown --- @@ -357,10 +357,10 @@ index 44eb99105dcd..bce72c27b9d5 100644 2.17.1 -From 24b707412df5683a277f2ce50e0061eafac979a4 Mon Sep 17 00:00:00 2001 +From 8d2003f8a906701e0f569d93e65fdfa666f32a06 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Fri, 30 Mar 2018 20:41:53 +0200 -Subject: [PATCH 11/31] Enable altvip framebuffer +Subject: [PATCH 11/33] Enable altvip framebuffer Signed-off-by: Michael Brown --- @@ -503,10 +503,10 @@ index bce72c27b9d5..ad7ca9d21361 100644 2.17.1 -From 9ebb634ed31bc383dea4cbcae1f1848dfeca30c1 Mon Sep 17 00:00:00 2001 +From c9317aa2f577862ee595cf4bdeb114e2f223863e Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Sun, 11 Mar 2018 22:21:04 +0100 -Subject: [PATCH 12/31] Added DE-10 Nano with uio, with/without framebuffer +Subject: [PATCH 12/33] Added DE-10 Nano with uio, with/without framebuffer 1024x768 and 1920x1080(hd) dts dtb Signed-off-by: Michael Brown @@ -1098,10 +1098,10 @@ index 000000000000..bfb289855be1 2.17.1 -From de453e438539160ba15487a85f495b2ccb832348 Mon Sep 17 00:00:00 2001 +From ea682e9a715ee7962c92f0a0dd83e333809e12f4 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Fri, 18 May 2018 20:35:35 +0200 -Subject: [PATCH 13/31] Add framebuffer-ii core driver based on Mister, and +Subject: [PATCH 13/33] Add framebuffer-ii core driver based on Mister, and enable it Signed-off-by: Michael Brown @@ -2006,10 +2006,10 @@ index 000000000000..a80ae1a714f7 2.17.1 -From ac16dda0451d6d73f56629afca4f90311cc2d5ab Mon Sep 17 00:00:00 2001 +From ca4835c1d3ff31515598b5d263ba60241aee7bea Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Sun, 8 Apr 2018 22:39:54 +0200 -Subject: [PATCH 14/31] Add audio and midi drivers for holosynth and builtin +Subject: [PATCH 14/33] Add audio and midi drivers for holosynth and builtin audio codec on de1 board Signed-off-by: Michael Brown @@ -4307,10 +4307,10 @@ index 000000000000..1f4268c7387f 2.17.1 -From fb9d96a5fd90231db01520f8ca3a36f7c68bdd3b Mon Sep 17 00:00:00 2001 +From 409f0b04555861a5af789a6435a58bf03573a46e Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Thu, 17 May 2018 10:58:21 +0200 -Subject: [PATCH 15/31] Add Hsynth audio driver with Phat(pcm5102) audio output +Subject: [PATCH 15/33] Add Hsynth audio driver with Phat(pcm5102) audio output Add vipii fb,pidac/hsynth audio dtb for DE10 Nano HD HDMI Signed-off-by: Michael Brown @@ -5269,10 +5269,10 @@ index 000000000000..2d56f0b83f5a 2.17.1 -From fc207a7c2d740d8f7ac177c994fd42c1d77c850d Mon Sep 17 00:00:00 2001 +From b39f7a459d4782d0904487bf0d697c2e59c1aecd Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Fri, 4 May 2018 14:32:56 +0200 -Subject: [PATCH 16/31] add vipii framebuffer dtb for de1_soc +Subject: [PATCH 16/33] add vipii framebuffer dtb for de1_soc Signed-off-by: Michael Brown --- @@ -5588,10 +5588,10 @@ index 000000000000..225e46161c5c 2.17.1 -From 360d12f25adf8aaf5f4fd388f5bd830c7041a45e Mon Sep 17 00:00:00 2001 +From 35c8d2ff12a366f5979580810751004e93c13924 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Thu, 24 May 2018 12:18:18 +0200 -Subject: [PATCH 17/31] div codec mods +Subject: [PATCH 17/33] div codec mods Signed-off-by: Michael Brown --- @@ -5741,10 +5741,10 @@ index 2d56f0b83f5a..3011c2b42579 100644 2.17.1 -From b917c027996462f95af2bffff965f3fbd83f920f Mon Sep 17 00:00:00 2001 +From 7c25073265887c4d237e9b17352e332e614362c6 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Sat, 26 May 2018 21:36:55 +0200 -Subject: [PATCH 18/31] Change uio port name Fix: for machinekit use +Subject: [PATCH 18/33] Change uio port name Fix: for machinekit use Signed-off-by: Michael Brown --- @@ -5782,10 +5782,10 @@ index bfb289855be1..f6ba2c68e527 100644 2.17.1 -From 490d07f514c87a2bab18edbf72d6c0019e6f3f16 Mon Sep 17 00:00:00 2001 +From 74c3cd1db05238daa22597ee604f34b2a91cfbac Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Wed, 30 May 2018 12:33:08 +0200 -Subject: [PATCH 19/31] Terasic dev boards: Make core addresses in qsys +Subject: [PATCH 19/33] Terasic dev boards: Make core addresses in qsys devicetrees consistant Signed-off-by: Michael Brown @@ -6072,10 +6072,10 @@ index 225e46161c5c..c6aaacc3496e 100644 2.17.1 -From 3bc67f6c0513c2478acbc053c7bb31c2b57b46f4 Mon Sep 17 00:00:00 2001 +From 9776ba79f2d0f4ee79aa07c32fcd4e7b076df6e0 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Thu, 31 May 2018 13:46:11 +0200 -Subject: [PATCH 20/31] Test Improve dtb +Subject: [PATCH 20/33] Test Improve dtb Signed-off-by: Michael Brown --- @@ -6161,10 +6161,10 @@ index 1bf089216f35..65d1a56a8a23 100644 2.17.1 -From 94fcb85bd5bc94b3ce79807dadac33f9bb7aaa9d Mon Sep 17 00:00:00 2001 +From ee48f50922a05404fa95eba93abe0c8594311123 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Thu, 31 May 2018 18:08:43 +0200 -Subject: [PATCH 21/31] Add missing .ops to synthpcm5102 codec +Subject: [PATCH 21/33] Add missing .ops to synthpcm5102 codec Signed-off-by: Michael Brown --- @@ -6284,10 +6284,10 @@ index 9791ae3c9608..414414670f15 100644 2.17.1 -From d9d30f5013eee12ab5f2b25620b6289192db4cc8 Mon Sep 17 00:00:00 2001 +From b7a59ad103030d02ce9970912e3a92a5ee73c682 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Fri, 1 Jun 2018 12:52:57 +0200 -Subject: [PATCH 22/31] Make DE1x Devicetree qsys core addresses consistant +Subject: [PATCH 22/33] Make DE1x Devicetree qsys core addresses consistant Signed-off-by: Michael Brown --- @@ -6600,10 +6600,10 @@ index 4925f44d0043..11f0a9cd94db 100644 2.17.1 -From 4bfed542f6da6e441d1d94d96292fbf042fe317e Mon Sep 17 00:00:00 2001 +From 02badf3c0e1871d245637a1e17fe5f9fd61b0e90 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Sat, 2 Jun 2018 22:56:31 +0200 -Subject: [PATCH 23/31] Add builtin audio codec driver for DE1/DE10 SoC +Subject: [PATCH 23/33] Add builtin audio codec driver for DE1/DE10 SoC (wm8731) Add Audio and framebuffer Supporting device trees xga and hd versions @@ -7353,10 +7353,10 @@ index 000000000000..e297ef4b0c0c 2.17.1 -From daa97a667e7005a8196eeb6d1f76111022a97440 Mon Sep 17 00:00:00 2001 +From 97226c1c1f665b00e88d98ea10c1becdc3fef3c3 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Fri, 8 Jun 2018 16:50:10 +0200 -Subject: [PATCH 24/31] Rename Hsynth stream names +Subject: [PATCH 24/33] Rename Hsynth stream names Signed-off-by: Michael Brown --- @@ -7400,10 +7400,10 @@ index 414414670f15..bf40ad2dd911 100644 2.17.1 -From 5ce4b071d4d6df23e7e2aa3a63404a67a254b217 Mon Sep 17 00:00:00 2001 +From b0fffbf455ee8c67488074cc5f6b318bfed11314 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Sun, 10 Jun 2018 17:24:54 +0200 -Subject: [PATCH 25/31] Add irq to De10 Nano vipii fb +Subject: [PATCH 25/33] Add irq to De10 Nano vipii fb Signed-off-by: Michael Brown --- @@ -7438,10 +7438,10 @@ index 4b8b81316cf6..723f2a38e136 100644 2.17.1 -From 96b779110bc7c462df4bd4a6f1843f24781be0dc Mon Sep 17 00:00:00 2001 +From 3f90dc965076274ea97a1af587e1fec1dc5be781 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Sun, 10 Jun 2018 18:13:46 +0200 -Subject: [PATCH 26/31] Usb core fixes +Subject: [PATCH 26/33] Usb core fixes Signed-off-by: Michael Brown --- @@ -7528,10 +7528,10 @@ index fe2fc57bbc90..2de69d5df962 100644 2.17.1 -From cdec557769a648f36cb23919fabbf630a6390c20 Mon Sep 17 00:00:00 2001 +From 6be9c2f317a20a112cd05a08d2fbcaa2ad66c900 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Sun, 10 Jun 2018 23:18:17 +0200 -Subject: [PATCH 27/31] Add kernel debug stuff +Subject: [PATCH 27/33] Add kernel debug stuff Signed-off-by: Michael Brown --- @@ -7556,10 +7556,10 @@ index 4917bafcd7ae..4ca99129e968 100644 2.17.1 -From 4b3ea3bacec6a101bbabad7238e229d62801bcc5 Mon Sep 17 00:00:00 2001 +From 2865d74a0981310f1ad2cda34b9943cdb0e60e8e Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Mon, 11 Jun 2018 16:18:22 +0200 -Subject: [PATCH 28/31] Sounddriver mods +Subject: [PATCH 28/33] Sounddriver mods Signed-off-by: Michael Brown --- @@ -7884,10 +7884,10 @@ index 3011c2b42579..c99a5b485fee 100644 2.17.1 -From 185470269b621f40afd55e274e00a71642e319e8 Mon Sep 17 00:00:00 2001 +From 14ffd12bd41f1042156c1c701870808ea14d4865 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Fri, 15 Jun 2018 02:48:57 +0200 -Subject: [PATCH 29/31] update DE10 devicetrees +Subject: [PATCH 29/33] update DE10 devicetrees Signed-off-by: Michael Brown --- @@ -8068,10 +8068,10 @@ index cc62324122c7..ac06b3c2f5cb 100644 2.17.1 -From 937fc4a8e4da91d092de97f20b69895e82843947 Mon Sep 17 00:00:00 2001 +From 358ace9b9f5cead2ceb5934d80e989fc85e71a4c Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Fri, 12 Oct 2018 20:51:17 +0200 -Subject: [PATCH 30/31] Add devicetree for DE10 Nano Touch screen Quartus +Subject: [PATCH 30/33] Add devicetree for DE10 Nano Touch screen Quartus project Signed-off-by: Michael Brown @@ -8374,10 +8374,10 @@ index 000000000000..d18c9bea582c 2.17.1 -From a49bb7fca4e619a8036aa1bd59025274e441b6ba Mon Sep 17 00:00:00 2001 +From 31e08fcf6ab6b9407b2ef98d57f5b426aa0ff85f Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Tue, 16 Oct 2018 12:46:21 +0200 -Subject: [PATCH 31/31] Add devicetree for DE1 Nano Touch screen Quartus +Subject: [PATCH 31/33] Add devicetree for DE1 Nano Touch screen Quartus project Signed-off-by: Michael Brown @@ -8693,3 +8693,101 @@ index 000000000000..5d39b86b2caa -- 2.17.1 + +From 1c853e0937106e4c3bdfce33dc804f19fa2fdde4 Mon Sep 17 00:00:00 2001 +From: Michael Brown +Date: Sat, 12 Jan 2019 19:36:51 +0100 +Subject: [PATCH 32/33] DE0_Nano_soc: Added devicetree entry for SPI Qsys core + +Signed-off-by: Michael Brown +--- + .../boot/dts/socfpga_cyclone5_de0_sockit.dts | 27 +++++++++++++++++++ + 1 file changed, 27 insertions(+) + +diff --git a/arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts b/arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts +index b280e6494193..b245fa4ad585 100644 +--- a/arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts ++++ b/arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts +@@ -50,6 +50,33 @@ + linux,default-trigger = "heartbeat"; + }; + }; ++ ++ bridge@0xc0000000 { ++ compatible = "altr,bridge-15.1", "simple-bus"; ++ reg = <0xc0000000 0x20000000 0xff200000 0x200000>; ++ #address-cells = <0x2>; ++ #size-cells = <0x1>; ++ ranges = <0x00000001 0x00000000 0xff200000 0x00000020>; ++ ++ spi_3: spi@0x100000000 { ++ compatible = "altr,spi-17.1", "altr,spi-1.0"; ++ reg = <0x00000001 0x00000000 0x00000020>; ++ interrupt-parent = <&intc>; ++ interrupts = <0 44 4>; ++ clocks = <&osc1>; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ bus-num = <0>; ++ num-chipselect = <1>; ++ status = "okay"; ++ }; //end spi@0x100000000 (spi_3) ++ ++ spidev3_fpga: spidev@0 { ++ compatible = "rohm,dh2228fv"; /* appended from boardinfo */ ++ reg = <0>; /* appended from boardinfo */ ++ spi-max-frequency = <2500000>; /* appended from boardinfo */ ++ };//end spidev@0 ++ }; + }; + + &gmac1 { +-- +2.17.1 + + +From c92e4ab68b372ea21aad9408374a33e18019c9f7 Mon Sep 17 00:00:00 2001 +From: Michael Brown +Date: Sat, 12 Jan 2019 20:48:14 +0100 +Subject: [PATCH 33/33] De0_Nano_Soc: Add hps spi0 device (on mux=0) + +Signed-off-by: Michael Brown +--- + arch/arm/boot/dts/socfpga.dtsi | 15 ++++++++++++--- + 1 file changed, 12 insertions(+), 3 deletions(-) + +diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi +index dce11432fcbd..ddbd5a180eaa 100644 +--- a/arch/arm/boot/dts/socfpga.dtsi ++++ b/arch/arm/boot/dts/socfpga.dtsi +@@ -786,15 +786,24 @@ + interrupts = <0 39 4>; + }; + +- spi0: spi@fff00000 { ++ spi0: spi@fff00000 { + compatible = "snps,dw-apb-ssi"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0xfff00000 0x1000>; + interrupts = <0 154 4>; +- num-cs = <4>; ++ num-chipselect = <4>; ++ tx-dma-channel = <&pdma 16>; ++ rx-dma-channel = <&pdma 17>; + clocks = <&spi_m_clk>; +- status = "disabled"; ++ status = "okay"; ++ ++ spidev0: spidev@0 { ++ compatible = "rohm,dh2228fv"; ++ reg = <0>; ++ spi-max-frequency = <100000000>; ++ enable-dma = <1>; ++ }; + }; + + spi1: spi@fff01000 { +-- +2.17.1 + diff --git a/SD-Image-Gen/patches/socfpga-4.9.76-ltsi-rt-changeset.patch b/SD-Image-Gen/patches/socfpga-4.9.76-ltsi-rt-changeset.patch index a6724c2..54700dc 100644 --- a/SD-Image-Gen/patches/socfpga-4.9.76-ltsi-rt-changeset.patch +++ b/SD-Image-Gen/patches/socfpga-4.9.76-ltsi-rt-changeset.patch @@ -1,7 +1,7 @@ -From a1ae4132a7cb4ed56c51febf801cf56960e61c18 Mon Sep 17 00:00:00 2001 +From 863f395485a705e13a7ba3c49b650f719d3be12a Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Wed, 7 Mar 2018 14:14:18 +0100 -Subject: [PATCH 01/31] disable debug package gen +Subject: [PATCH 01/33] disable debug package gen Signed-off-by: Michael Brown --- @@ -25,10 +25,10 @@ index 5c8c02ffd864..31148aa2e935 100644 2.17.1 -From 8ddb35bb8f54f809a7ba947a77a4c33f99c8da4d Mon Sep 17 00:00:00 2001 +From 9d651948c4bad162eac64a6ecf5b4691dfb989cc Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Tue, 1 May 2018 16:02:19 +0200 -Subject: [PATCH 02/31] Remove gittag from kernel (file) name(s) +Subject: [PATCH 02/33] Remove gittag from kernel (file) name(s) Signed-off-by: Michael Brown --- @@ -48,10 +48,10 @@ index 31148aa2e935..d5758c68e455 100644 2.17.1 -From 3cd6103d065a2bbc680cde90487fe8b490f1e4d2 Mon Sep 17 00:00:00 2001 +From 8b24dee1205097ffbd1443780a8fd8bc0fc12949 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Wed, 7 Mar 2018 14:21:56 +0100 -Subject: [PATCH 03/31] add ext4 root fs support and autofs4 module +Subject: [PATCH 03/33] add ext4 root fs support and autofs4 module Signed-off-by: Michael Brown --- @@ -87,10 +87,10 @@ index d5758c68e455..5ac78d2ef09e 100644 2.17.1 -From e442580d459d4a0dfd783d1815e3f64e8c696e07 Mon Sep 17 00:00:00 2001 +From b81286a31d17e30d8a6af70da23b8c7787bc6170 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Wed, 7 Mar 2018 14:26:50 +0100 -Subject: [PATCH 04/31] add .dtd files to kernel-image .deb +Subject: [PATCH 04/33] add .dtd files to kernel-image .deb Signed-off-by: Michael Brown --- @@ -125,10 +125,10 @@ index 3c575cd07888..d67c791ddc2d 100755 2.17.1 -From 2566730d58e00cc8138d89548cc5b0d6decd616f Mon Sep 17 00:00:00 2001 +From f2eb467110902e85f4f8a7aa50946bdb38e463db Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Wed, 7 Mar 2018 14:33:44 +0100 -Subject: [PATCH 05/31] add generate /boot/extlinux/extlinux.conf and +Subject: [PATCH 05/33] add generate /boot/extlinux/extlinux.conf and /boot/uEnv.txt for uboot boot info Signed-off-by: Michael Brown @@ -172,10 +172,10 @@ index d67c791ddc2d..d6a4058377f4 100755 2.17.1 -From 2ebe92b1919b662912fcd77f9a9b381cbc1923da Mon Sep 17 00:00:00 2001 +From 7cc8a9c6441367bbfe4d367b6d5a5d5c2a1e2b25 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Wed, 7 Mar 2018 15:43:11 +0100 -Subject: [PATCH 06/31] add configfs and fpgacfg dts entities, and dynamic dts +Subject: [PATCH 06/33] add configfs and fpgacfg dts entities, and dynamic dts overlay support Signed-off-by: Michael Brown @@ -212,10 +212,10 @@ index 5ac78d2ef09e..44eb99105dcd 100644 2.17.1 -From d909cb2174d2d7de3521bc0e86c3fc55c895fea3 Mon Sep 17 00:00:00 2001 +From cb14e913b3af5a3f41fc5337c3d4ea8b44faf496 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Sat, 10 Mar 2018 12:55:03 +0100 -Subject: [PATCH 07/31] rename kernel package names to *-socfpga-rt-ltsi +Subject: [PATCH 07/33] rename kernel package names to *-socfpga-rt-ltsi Signed-off-by: Michael Brown --- @@ -243,10 +243,10 @@ index d6a4058377f4..ee58811e94d0 100755 2.17.1 -From 6ea990706300c1b550433968b905ce688cafcd37 Mon Sep 17 00:00:00 2001 +From c4d51ebaf0fd72b6ec4bad6d54bbf2d205702d22 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Mon, 21 May 2018 13:19:43 +0200 -Subject: [PATCH 08/31] Enable bridges in dtb's +Subject: [PATCH 08/33] Enable bridges in dtb's Signed-off-by: Michael Brown --- @@ -277,10 +277,10 @@ index 595eb4f1a761..3de276d42114 100644 2.17.1 -From 0f2a38dc74eafd24ab8c8384ae2bc5048c80df3f Mon Sep 17 00:00:00 2001 +From ce25054a5cd29a0439ec7b0c36ed9c56d60a14d6 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Sat, 10 Mar 2018 13:13:12 +0100 -Subject: [PATCH 09/31] add spidev in dts so driver is loaded +Subject: [PATCH 09/33] add spidev in dts so driver is loaded Signed-off-by: Michael Brown --- @@ -314,10 +314,10 @@ index 3de276d42114..dce11432fcbd 100644 2.17.1 -From 77814709193f81c3e27f563c3979189956d38011 Mon Sep 17 00:00:00 2001 +From f10355556e59c9f1b516e97135810d130aa87588 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Mon, 12 Mar 2018 23:41:23 +0100 -Subject: [PATCH 10/31] set ACL secutity +Subject: [PATCH 10/33] set ACL secutity Signed-off-by: Michael Brown --- @@ -357,10 +357,10 @@ index 44eb99105dcd..bce72c27b9d5 100644 2.17.1 -From 24b707412df5683a277f2ce50e0061eafac979a4 Mon Sep 17 00:00:00 2001 +From 8d2003f8a906701e0f569d93e65fdfa666f32a06 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Fri, 30 Mar 2018 20:41:53 +0200 -Subject: [PATCH 11/31] Enable altvip framebuffer +Subject: [PATCH 11/33] Enable altvip framebuffer Signed-off-by: Michael Brown --- @@ -503,10 +503,10 @@ index bce72c27b9d5..ad7ca9d21361 100644 2.17.1 -From 9ebb634ed31bc383dea4cbcae1f1848dfeca30c1 Mon Sep 17 00:00:00 2001 +From c9317aa2f577862ee595cf4bdeb114e2f223863e Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Sun, 11 Mar 2018 22:21:04 +0100 -Subject: [PATCH 12/31] Added DE-10 Nano with uio, with/without framebuffer +Subject: [PATCH 12/33] Added DE-10 Nano with uio, with/without framebuffer 1024x768 and 1920x1080(hd) dts dtb Signed-off-by: Michael Brown @@ -1098,10 +1098,10 @@ index 000000000000..bfb289855be1 2.17.1 -From de453e438539160ba15487a85f495b2ccb832348 Mon Sep 17 00:00:00 2001 +From ea682e9a715ee7962c92f0a0dd83e333809e12f4 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Fri, 18 May 2018 20:35:35 +0200 -Subject: [PATCH 13/31] Add framebuffer-ii core driver based on Mister, and +Subject: [PATCH 13/33] Add framebuffer-ii core driver based on Mister, and enable it Signed-off-by: Michael Brown @@ -2006,10 +2006,10 @@ index 000000000000..a80ae1a714f7 2.17.1 -From ac16dda0451d6d73f56629afca4f90311cc2d5ab Mon Sep 17 00:00:00 2001 +From ca4835c1d3ff31515598b5d263ba60241aee7bea Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Sun, 8 Apr 2018 22:39:54 +0200 -Subject: [PATCH 14/31] Add audio and midi drivers for holosynth and builtin +Subject: [PATCH 14/33] Add audio and midi drivers for holosynth and builtin audio codec on de1 board Signed-off-by: Michael Brown @@ -4307,10 +4307,10 @@ index 000000000000..1f4268c7387f 2.17.1 -From fb9d96a5fd90231db01520f8ca3a36f7c68bdd3b Mon Sep 17 00:00:00 2001 +From 409f0b04555861a5af789a6435a58bf03573a46e Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Thu, 17 May 2018 10:58:21 +0200 -Subject: [PATCH 15/31] Add Hsynth audio driver with Phat(pcm5102) audio output +Subject: [PATCH 15/33] Add Hsynth audio driver with Phat(pcm5102) audio output Add vipii fb,pidac/hsynth audio dtb for DE10 Nano HD HDMI Signed-off-by: Michael Brown @@ -5269,10 +5269,10 @@ index 000000000000..2d56f0b83f5a 2.17.1 -From fc207a7c2d740d8f7ac177c994fd42c1d77c850d Mon Sep 17 00:00:00 2001 +From b39f7a459d4782d0904487bf0d697c2e59c1aecd Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Fri, 4 May 2018 14:32:56 +0200 -Subject: [PATCH 16/31] add vipii framebuffer dtb for de1_soc +Subject: [PATCH 16/33] add vipii framebuffer dtb for de1_soc Signed-off-by: Michael Brown --- @@ -5588,10 +5588,10 @@ index 000000000000..225e46161c5c 2.17.1 -From 360d12f25adf8aaf5f4fd388f5bd830c7041a45e Mon Sep 17 00:00:00 2001 +From 35c8d2ff12a366f5979580810751004e93c13924 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Thu, 24 May 2018 12:18:18 +0200 -Subject: [PATCH 17/31] div codec mods +Subject: [PATCH 17/33] div codec mods Signed-off-by: Michael Brown --- @@ -5741,10 +5741,10 @@ index 2d56f0b83f5a..3011c2b42579 100644 2.17.1 -From b917c027996462f95af2bffff965f3fbd83f920f Mon Sep 17 00:00:00 2001 +From 7c25073265887c4d237e9b17352e332e614362c6 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Sat, 26 May 2018 21:36:55 +0200 -Subject: [PATCH 18/31] Change uio port name Fix: for machinekit use +Subject: [PATCH 18/33] Change uio port name Fix: for machinekit use Signed-off-by: Michael Brown --- @@ -5782,10 +5782,10 @@ index bfb289855be1..f6ba2c68e527 100644 2.17.1 -From 490d07f514c87a2bab18edbf72d6c0019e6f3f16 Mon Sep 17 00:00:00 2001 +From 74c3cd1db05238daa22597ee604f34b2a91cfbac Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Wed, 30 May 2018 12:33:08 +0200 -Subject: [PATCH 19/31] Terasic dev boards: Make core addresses in qsys +Subject: [PATCH 19/33] Terasic dev boards: Make core addresses in qsys devicetrees consistant Signed-off-by: Michael Brown @@ -6072,10 +6072,10 @@ index 225e46161c5c..c6aaacc3496e 100644 2.17.1 -From 3bc67f6c0513c2478acbc053c7bb31c2b57b46f4 Mon Sep 17 00:00:00 2001 +From 9776ba79f2d0f4ee79aa07c32fcd4e7b076df6e0 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Thu, 31 May 2018 13:46:11 +0200 -Subject: [PATCH 20/31] Test Improve dtb +Subject: [PATCH 20/33] Test Improve dtb Signed-off-by: Michael Brown --- @@ -6161,10 +6161,10 @@ index 1bf089216f35..65d1a56a8a23 100644 2.17.1 -From 94fcb85bd5bc94b3ce79807dadac33f9bb7aaa9d Mon Sep 17 00:00:00 2001 +From ee48f50922a05404fa95eba93abe0c8594311123 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Thu, 31 May 2018 18:08:43 +0200 -Subject: [PATCH 21/31] Add missing .ops to synthpcm5102 codec +Subject: [PATCH 21/33] Add missing .ops to synthpcm5102 codec Signed-off-by: Michael Brown --- @@ -6284,10 +6284,10 @@ index 9791ae3c9608..414414670f15 100644 2.17.1 -From d9d30f5013eee12ab5f2b25620b6289192db4cc8 Mon Sep 17 00:00:00 2001 +From b7a59ad103030d02ce9970912e3a92a5ee73c682 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Fri, 1 Jun 2018 12:52:57 +0200 -Subject: [PATCH 22/31] Make DE1x Devicetree qsys core addresses consistant +Subject: [PATCH 22/33] Make DE1x Devicetree qsys core addresses consistant Signed-off-by: Michael Brown --- @@ -6600,10 +6600,10 @@ index 4925f44d0043..11f0a9cd94db 100644 2.17.1 -From 4bfed542f6da6e441d1d94d96292fbf042fe317e Mon Sep 17 00:00:00 2001 +From 02badf3c0e1871d245637a1e17fe5f9fd61b0e90 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Sat, 2 Jun 2018 22:56:31 +0200 -Subject: [PATCH 23/31] Add builtin audio codec driver for DE1/DE10 SoC +Subject: [PATCH 23/33] Add builtin audio codec driver for DE1/DE10 SoC (wm8731) Add Audio and framebuffer Supporting device trees xga and hd versions @@ -7353,10 +7353,10 @@ index 000000000000..e297ef4b0c0c 2.17.1 -From daa97a667e7005a8196eeb6d1f76111022a97440 Mon Sep 17 00:00:00 2001 +From 97226c1c1f665b00e88d98ea10c1becdc3fef3c3 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Fri, 8 Jun 2018 16:50:10 +0200 -Subject: [PATCH 24/31] Rename Hsynth stream names +Subject: [PATCH 24/33] Rename Hsynth stream names Signed-off-by: Michael Brown --- @@ -7400,10 +7400,10 @@ index 414414670f15..bf40ad2dd911 100644 2.17.1 -From 5ce4b071d4d6df23e7e2aa3a63404a67a254b217 Mon Sep 17 00:00:00 2001 +From b0fffbf455ee8c67488074cc5f6b318bfed11314 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Sun, 10 Jun 2018 17:24:54 +0200 -Subject: [PATCH 25/31] Add irq to De10 Nano vipii fb +Subject: [PATCH 25/33] Add irq to De10 Nano vipii fb Signed-off-by: Michael Brown --- @@ -7438,10 +7438,10 @@ index 4b8b81316cf6..723f2a38e136 100644 2.17.1 -From 96b779110bc7c462df4bd4a6f1843f24781be0dc Mon Sep 17 00:00:00 2001 +From 3f90dc965076274ea97a1af587e1fec1dc5be781 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Sun, 10 Jun 2018 18:13:46 +0200 -Subject: [PATCH 26/31] Usb core fixes +Subject: [PATCH 26/33] Usb core fixes Signed-off-by: Michael Brown --- @@ -7528,10 +7528,10 @@ index fe2fc57bbc90..2de69d5df962 100644 2.17.1 -From cdec557769a648f36cb23919fabbf630a6390c20 Mon Sep 17 00:00:00 2001 +From 6be9c2f317a20a112cd05a08d2fbcaa2ad66c900 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Sun, 10 Jun 2018 23:18:17 +0200 -Subject: [PATCH 27/31] Add kernel debug stuff +Subject: [PATCH 27/33] Add kernel debug stuff Signed-off-by: Michael Brown --- @@ -7556,10 +7556,10 @@ index 4917bafcd7ae..4ca99129e968 100644 2.17.1 -From 4b3ea3bacec6a101bbabad7238e229d62801bcc5 Mon Sep 17 00:00:00 2001 +From 2865d74a0981310f1ad2cda34b9943cdb0e60e8e Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Mon, 11 Jun 2018 16:18:22 +0200 -Subject: [PATCH 28/31] Sounddriver mods +Subject: [PATCH 28/33] Sounddriver mods Signed-off-by: Michael Brown --- @@ -7884,10 +7884,10 @@ index 3011c2b42579..c99a5b485fee 100644 2.17.1 -From 185470269b621f40afd55e274e00a71642e319e8 Mon Sep 17 00:00:00 2001 +From 14ffd12bd41f1042156c1c701870808ea14d4865 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Fri, 15 Jun 2018 02:48:57 +0200 -Subject: [PATCH 29/31] update DE10 devicetrees +Subject: [PATCH 29/33] update DE10 devicetrees Signed-off-by: Michael Brown --- @@ -8068,10 +8068,10 @@ index cc62324122c7..ac06b3c2f5cb 100644 2.17.1 -From 937fc4a8e4da91d092de97f20b69895e82843947 Mon Sep 17 00:00:00 2001 +From 358ace9b9f5cead2ceb5934d80e989fc85e71a4c Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Fri, 12 Oct 2018 20:51:17 +0200 -Subject: [PATCH 30/31] Add devicetree for DE10 Nano Touch screen Quartus +Subject: [PATCH 30/33] Add devicetree for DE10 Nano Touch screen Quartus project Signed-off-by: Michael Brown @@ -8374,10 +8374,10 @@ index 000000000000..d18c9bea582c 2.17.1 -From a49bb7fca4e619a8036aa1bd59025274e441b6ba Mon Sep 17 00:00:00 2001 +From 31e08fcf6ab6b9407b2ef98d57f5b426aa0ff85f Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Tue, 16 Oct 2018 12:46:21 +0200 -Subject: [PATCH 31/31] Add devicetree for DE1 Nano Touch screen Quartus +Subject: [PATCH 31/33] Add devicetree for DE1 Nano Touch screen Quartus project Signed-off-by: Michael Brown @@ -8693,3 +8693,101 @@ index 000000000000..5d39b86b2caa -- 2.17.1 + +From 1c853e0937106e4c3bdfce33dc804f19fa2fdde4 Mon Sep 17 00:00:00 2001 +From: Michael Brown +Date: Sat, 12 Jan 2019 19:36:51 +0100 +Subject: [PATCH 32/33] DE0_Nano_soc: Added devicetree entry for SPI Qsys core + +Signed-off-by: Michael Brown +--- + .../boot/dts/socfpga_cyclone5_de0_sockit.dts | 27 +++++++++++++++++++ + 1 file changed, 27 insertions(+) + +diff --git a/arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts b/arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts +index b280e6494193..b245fa4ad585 100644 +--- a/arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts ++++ b/arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts +@@ -50,6 +50,33 @@ + linux,default-trigger = "heartbeat"; + }; + }; ++ ++ bridge@0xc0000000 { ++ compatible = "altr,bridge-15.1", "simple-bus"; ++ reg = <0xc0000000 0x20000000 0xff200000 0x200000>; ++ #address-cells = <0x2>; ++ #size-cells = <0x1>; ++ ranges = <0x00000001 0x00000000 0xff200000 0x00000020>; ++ ++ spi_3: spi@0x100000000 { ++ compatible = "altr,spi-17.1", "altr,spi-1.0"; ++ reg = <0x00000001 0x00000000 0x00000020>; ++ interrupt-parent = <&intc>; ++ interrupts = <0 44 4>; ++ clocks = <&osc1>; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ bus-num = <0>; ++ num-chipselect = <1>; ++ status = "okay"; ++ }; //end spi@0x100000000 (spi_3) ++ ++ spidev3_fpga: spidev@0 { ++ compatible = "rohm,dh2228fv"; /* appended from boardinfo */ ++ reg = <0>; /* appended from boardinfo */ ++ spi-max-frequency = <2500000>; /* appended from boardinfo */ ++ };//end spidev@0 ++ }; + }; + + &gmac1 { +-- +2.17.1 + + +From c92e4ab68b372ea21aad9408374a33e18019c9f7 Mon Sep 17 00:00:00 2001 +From: Michael Brown +Date: Sat, 12 Jan 2019 20:48:14 +0100 +Subject: [PATCH 33/33] De0_Nano_Soc: Add hps spi0 device (on mux=0) + +Signed-off-by: Michael Brown +--- + arch/arm/boot/dts/socfpga.dtsi | 15 ++++++++++++--- + 1 file changed, 12 insertions(+), 3 deletions(-) + +diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi +index dce11432fcbd..ddbd5a180eaa 100644 +--- a/arch/arm/boot/dts/socfpga.dtsi ++++ b/arch/arm/boot/dts/socfpga.dtsi +@@ -786,15 +786,24 @@ + interrupts = <0 39 4>; + }; + +- spi0: spi@fff00000 { ++ spi0: spi@fff00000 { + compatible = "snps,dw-apb-ssi"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0xfff00000 0x1000>; + interrupts = <0 154 4>; +- num-cs = <4>; ++ num-chipselect = <4>; ++ tx-dma-channel = <&pdma 16>; ++ rx-dma-channel = <&pdma 17>; + clocks = <&spi_m_clk>; +- status = "disabled"; ++ status = "okay"; ++ ++ spidev0: spidev@0 { ++ compatible = "rohm,dh2228fv"; ++ reg = <0>; ++ spi-max-frequency = <100000000>; ++ enable-dma = <1>; ++ }; + }; + + spi1: spi@fff01000 { +-- +2.17.1 +