Merge branch 'master' of https://github.com/Elphel/meta-elphel393 (89e5d3c7) · Commits · Elphel / meta-elphel393

conf/machine/boards/elphel393/bootargs-mmc.dtsi

+1 −1

Original line number	Diff line number	Diff line
		/**/
		/ {
		chosen {
		bootargs = "cma=128M console=ttyPS0,115200 root=/dev/mmcblk0p2 rw ip=192.168.0.8 earlyprintk rootwait rootfstype=ext4";
		bootargs = "cma=336M console=ttyPS0,115200 root=/dev/mmcblk0p2 rw ip=192.168.0.8 earlyprintk rootwait rootfstype=ext4";
		linux,stdout-path = "/amba@0/serial@e0000000";
		};
		};

+1 −1

Original line number	Diff line number	Diff line
		/**/
		/ {
		chosen {
		bootargs = "cma=128M console=ttyPS0,115200 root=ubi0:elphel393-rootfs rw ip=192.168.0.8 earlyprintk rootwait rootfstype=ubifs ubi.mtd=4,2048";
		bootargs = "cma=336M console=ttyPS0,115200 root=ubi0:elphel393-rootfs rw ip=192.168.0.8 earlyprintk rootwait rootfstype=ubifs ubi.mtd=4,2048";
		linux,stdout-path = "/amba@0/serial@e0000000";
		};
		};

+1 −1

Original line number	Diff line number	Diff line
		/**/
		/ {
		chosen {
		bootargs = "cma=128M console=ttyPS0,115200 root=/dev/ram rw ip=192.168.0.8 earlyprintk ramdisk_size=262144";
		bootargs = "cma=336M console=ttyPS0,115200 root=/dev/ram rw ip=192.168.0.8 earlyprintk ramdisk_size=262144";
		linux,stdout-path = "/amba@0/serial@e0000000";
		};
		};

+2 −1

Original line number	Diff line number	Diff line
		@@ -186,7 +186,8 @@

		elphel393_mem: elphel393-mem@0 {
		compatible = "elphel,elphel393-mem-1.00";
		memsize = <25600>;
		/memsize = <25600>;/
		memsize = <76800>;
		} ;

		elphel393_init: elphel393-init {

+6 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,9 @@ SRC_URI = "file://controls.html \
		file://setup.js \
		file://setup.php \
		file://index.html \
		file://camogm.html \
		file://camogm.js \
		file://camogm.php \
		"

		S = "${WORKDIR}/"
		@@ -42,6 +45,9 @@ do_install_append() {
		install -m 0644 ${WORKDIR}/setup.js ${D}/www/pages
		install -m 0644 ${WORKDIR}/setup.php ${D}/www/pages
		install -m 0644 ${WORKDIR}/index.html ${D}/www/pages
		install -m 0644 ${WORKDIR}/camogm.html ${D}/www/pages
		install -m 0644 ${WORKDIR}/camogm.js ${D}/www/pages
		install -m 0644 ${WORKDIR}/camogm.php ${D}/www/pages
		}

		PACKAGES = " apps-web"