Commit 9cce7f46 authored by Angus Ainslie's avatar Angus Ainslie

image build : remove imx5 references

we don't need imx5 for images any longer
parent c6e362ce
......@@ -34,7 +34,6 @@ echo "Copying kernel"
mkdir -p ${KERNEL_OUTPUT}/boot
cp arch/arm/boot/zImage ${KERNEL_OUTPUT}/boot/zImage-${KERNEL_VERSION}+
mkdir -p ${KERNEL_OUTPUT}/boot/dtbs
cp arch/arm/boot/dts/imx53-qsb.dtb ${KERNEL_OUTPUT}/boot/dtbs
cp arch/arm/boot/dts/imx6q-nitrogen6*.dtb ${KERNEL_OUTPUT}/boot/dtbs
echo "Copying modules"
......
......@@ -17,7 +17,7 @@ pureos_board=imx6
usage() {
echo "Usage : $1 "
echo " -h Display this help message."
echo " -b [imx5|imx6|imx8] select the board type."
echo " -b [imx6|imx8] select the board type."
}
while getopts ":hb:" opt; do
......@@ -38,7 +38,7 @@ while getopts ":hb:" opt; do
done
case ${pureos_board} in
imx5|imx6)
imx6)
KERNEL_BRANCH=purism-nitrogen6_4.15.x
KERNEL_REPO=https://code.puri.sm/Librem5/linux-nitrogen6.git
DOT_CONFIG=imx6_dot_config
......
......@@ -18,7 +18,7 @@ pureos_board=imx6
usage() {
echo "Usage : $1 "
echo " -h Display this help message."
echo " -b [imx5|imx6|imx8] select the board type."
echo " -b [imx6|imx8] select the board type."
}
......@@ -92,10 +92,6 @@ while getopts ":hb:d:" opt; do
done
case ${pureos_board} in
imx5)
HW_DEFCONFIG=mx53loco_defconfig
ARCH=arm
;;
imx6|nitrogen6qp_max)
HW_DEFCONFIG=nitrogen6qp_max_defconfig
UBOOT_REPO=https://github.com/boundarydevices/u-boot-imx6.git
......
......@@ -6,10 +6,6 @@ git clone https://github.com/Freescale/u-boot-fslc.git
cd u-boot-fslc
git checkout 2017.05+fslc
To configure for the imx53 quickstart board
make ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- mx53loco_defconfig
To configure for the imx6 nitrgoen board
make ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- nitrogen6q_defconfig
......
setenv bootargs ''
setenv initrd_high 0xffffffff
a_base=0x70000000
a_script=0x70800000
a_zImage=0x70800000
a_fdt=0x73000000
a_ramdisk=0x73800000
a_initrd=0x73a00000
a_reset_cause_marker=0x70000080
a_reset_cause=0x70000084
dtbname=##DTBNAME##
if itest.s x${console} == x ; then
console=ttymxc0
fi
if itest.s x${dtype} == x ; then
dtype=mmc
fi
if itest.s x${rfspart} == x ; then
rfspart=2
fi
if itest.s x${disk} == x ; then
disk=0
fi
if load ${dtype} ${disk}:1 ${a_script} uEnv.txt ; then
env import -t ${a_script} ${filesize}
fi
if itest.s x == x${bootdir} ; then
bootdir=/
fi
if itest.s x${bootpart} == x ; then
bootpart=1
fi
if load ${dtype} ${disk}:${bootpart} ${a_fdt} ${bootdir}dtbs/${dtbname} ; then
fdt addr ${a_fdt}
setenv fdt_high 0xffffffff
else
echo "!!!! Error loading ${bootdir}dtbs/${dtbname}";
exit;
fi
fdt resize
if itest.s "x" != "x${cmd_custom}" ; then
run cmd_custom
fi
## HDMI ##
if itest.s "xoff" == "x$fb_hdmi" ; then
setenv bootargs $bootargs video=HDMI-A-1:d
else
if itest.s "x" != "x$force_edid" ; then
echo "------ forcing EDID to /lib/firmware/$force_edid"
setenv bootargs $bootargs drm_kms_helper.edid_firmware=$force_edid
fi
fi
## LVDS ##
if itest.s "xoff" == "x$fb_lvds" ; then
setenv bootargs $bootargs video=LVDS-1:d
elif itest.s "xhannstar7" == "x$fb_lvds" ; then
fdt set /panel-lvds0 compatible "hannstar,hsd070pww1"
elif itest.s "xtm070jdhg30" == "x$fb_lvds" ; then
fdt set /panel-lvds0 compatible "tianma,tm070jdhg30"
elif itest.s "xdt070btft" == "x$fb_lvds" ; then
fdt set /panel-lvds0 compatible "innolux,zj070na-01p"
fi
if itest.s "xoff" == "x$fb_lvds2" ; then
setenv bootargs $bootargs video=LVDS-2:d
elif itest.s "xhannstar7" == "x$fb_lvds2" ; then
fdt set /panel-lvds1 compatible "hannstar,hsd070pww1"
elif itest.s "xtm070jdhg30" == "x$fb_lvds2" ; then
fdt set /panel-lvds1 compatible "tianma,tm070jdhg30"
elif itest.s "xdt070btft" == "x$fb_lvds2" ; then
fdt set /panel-lvds1 compatible "innolux,zj070na-01p"
fi
## LCD ##
if itest.s "xoff" == "x$fb_lcd" ; then
setenv bootargs $bootargs video=VGA-1:d
fi
if itest.s x${rfspart} == x ; then
rfspart=2
fi
if itest.s "x" == "x${root}"; then
part uuid ${dtype} ${disk}:${rfspart} uuid
if itest.s "x" != "x${uuid}"; then
root=PARTUUID=${uuid}
elif test "sata" = "${dtype}" || test "usb" = "${dtype}" ; then
root=/dev/sda${rfspart}
else
root=/dev/mmcblk${disk}p${rfspart}
fi
fi
if itest.s "x" == "x$cma" ; then
cma=256M
fi
if itest.s "x" == "x$vmalloc" ; then
vmalloc=400M
fi
if itest.s "x" != "x$show_fdt" ; then
fdt print /
fi
if itest.s "x" != "x$show_env" ; then
printenv
fi
setenv bootargs "$bootargs console=${console},115200 vmalloc=${vmalloc}"
setenv bootargs "$bootargs cma=${cma} consoleblank=0 root=${root} rootwait"
if itest.s "x" != "x${loglevel}" ; then
setenv bootargs ${bootargs} loglevel=${loglevel}
fi
if itest *${a_reset_cause_marker} == 12345678 ; then
setexpr.l reset_cause *${a_reset_cause}
setenv bootargs $bootargs reset_cause=0x${reset_cause}
fi
if load ${dtype} ${disk}:${bootpart} ${a_zImage} ${bootdir}zImage; then
bootz ${a_zImage} - ${a_fdt}
fi
echo "Error loading kernel image"
......@@ -11,7 +11,7 @@ set -u
usage() {
echo "Usage : $1 "
echo " -h Display this help message."
echo " -b [imx5|imx6|imx8|qemu] select the board type."
echo " -b [imx6|imx8|qemu] select the board type."
echo " -d <distro> optional select the puros distro"
}
......@@ -48,7 +48,7 @@ done
uboot=u-boot-${pureos_board}.imx
case ${pureos_board} in
imx5|imx6|qemu)
imx6|qemu)
arch=armhf
kernel_version=4.15.0-rc7-00002-gffa1c34835ca_4.15.0-rc7-00002-gffa1c34835ca-4
kernel_arch=armhf
......
......@@ -36,9 +36,6 @@ mirror=deb.debian.org
echo "Configuring ${distro} in ${basedir} for board ${pureos_board}"
case ${pureos_board} in
imx5)
fdt_file=imx53-qsb.dtb
;;
imx6)
fdt_file=imx6qp-nitrogen6_max_purism.dtb
;;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment