Skip to content

M
meta-elphel393
Commit 83b9753a authored by Mikhail Karpenko's avatar Mikhail Karpenko
Browse files
Options

Merge branch 'master' of https://github.com/Elphel/meta-elphel393

parents 32e9d960 56e3c1b7
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 5 deletions
conf/machine/boards/elphel393/elphel393_mmc.dts
View file @ 83b9753a
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
} ; } ;
chosen { chosen {
/* bootargs = "console=ttyPS0,115200 debug root=/dev/ram rw ip=192.168.0.9 earlyprintk ramdisk_size=262144";*/ /* bootargs = "console=ttyPS0,115200 debug root=/dev/ram rw ip=192.168.0.9 earlyprintk ramdisk_size=262144";*/
bootargs = "cma=128M console=ttyPS0,115200 root=/dev/mmcblk0p2 rw ip=192.168.0.8 earlyprintk rootwait rootfstype=ext4 dyndbg='file elphel393-init.c +p'"; bootargs = "cma=128M console=ttyPS0,115200 root=/dev/mmcblk0p2 rw ip=192.168.0.8 earlyprintk rootwait rootfstype=ext4";
linux,stdout-path = "/amba@0/serial@e0000000"; linux,stdout-path = "/amba@0/serial@e0000000";
} ; } ;
cpus { cpus {
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
compatible = "xlnx,ps7-ethernet-1.00.a"; compatible = "xlnx,ps7-ethernet-1.00.a";
interrupt-parent = <&ps7_scugic_0>; interrupt-parent = <&ps7_scugic_0>;
interrupts = <0 22 4>; interrupts = <0 22 4>;
local-mac-address = [00 0a 35 00 00 00]; local-mac-address = [00 0e 64 10 00 00];
phy-handle = <&phy3>; phy-handle = <&phy3>;
phy-mode = "rgmii-id"; phy-mode = "rgmii-id";
reg = <0xe000b000 0x1000>; reg = <0xe000b000 0x1000>;
......
conf/machine/boards/elphel393/elphel393_nand.dts
View file @ 83b9753a
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
compatible = "xlnx,ps7-ethernet-1.00.a"; compatible = "xlnx,ps7-ethernet-1.00.a";
interrupt-parent = <&ps7_scugic_0>; interrupt-parent = <&ps7_scugic_0>;
interrupts = <0 22 4>; interrupts = <0 22 4>;
local-mac-address = [00 0a 35 00 00 00]; local-mac-address = [00 0e 64 10 00 00];
phy-handle = <&phy3>; phy-handle = <&phy3>;
phy-mode = "rgmii-id"; phy-mode = "rgmii-id";
reg = <0xe000b000 0x1000>; reg = <0xe000b000 0x1000>;
......
conf/machine/boards/elphel393/elphel393_ram.dts
View file @ 83b9753a
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
compatible = "xlnx,ps7-ethernet-1.00.a"; compatible = "xlnx,ps7-ethernet-1.00.a";
interrupt-parent = <&ps7_scugic_0>; interrupt-parent = <&ps7_scugic_0>;
interrupts = <0 22 4>; interrupts = <0 22 4>;
local-mac-address = [00 0a 35 00 00 00]; local-mac-address = [00 0e 64 10 00 00];
phy-handle = <&phy3>; phy-handle = <&phy3>;
phy-mode = "rgmii-id"; phy-mode = "rgmii-id";
reg = <0xe000b000 0x1000>; reg = <0xe000b000 0x1000>;
......
recipes-core/images/core-image-elphel393.bb
View file @ 83b9753a
...@@ -6,6 +6,7 @@ IMAGE_INSTALL = "packagegroup-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${CORE_IMA ...@@ -6,6 +6,7 @@ IMAGE_INSTALL = "packagegroup-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${CORE_IMA
IMAGE_INSTALL_append = "u-boot-ezynq" IMAGE_INSTALL_append = "u-boot-ezynq"
IMAGE_INSTALL_append += " python-core \ IMAGE_INSTALL_append += " python-core \
python-numpy \ python-numpy \
python-argparse \
elphel-python-extensions \ elphel-python-extensions \
htop \ htop \
i2c-tools \ i2c-tools \
......
recipes-kernel/linux/config/elphel393.cfg
View file @ 83b9753a
...@@ -41,4 +41,11 @@ CONFIG_MTD_UBI=y ...@@ -41,4 +41,11 @@ CONFIG_MTD_UBI=y
CONFIG_UBIFS_FS=y CONFIG_UBIFS_FS=y
CONFIG_UBIFS_FS_ADVANCED_COMPR=n CONFIG_UBIFS_FS_ADVANCED_COMPR=n
#CONFIG_UBIFS_FS_LZO=y - default #CONFIG_UBIFS_FS_LZO=y - default
#CONFIG_UBIFS_FS_ZLIB=y - default #CONFIG_UBIFS_FS_ZLIB=y - default
\ No newline at end of file CONFIG_MTD_NAND_OTP=y
CONFIG_SENSORS_JC42=y
#CONFIG_ELPHEL393_INIT=n
CONFIG_ATAGS=n
\ No newline at end of file
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