Commit 65ca24bd authored by Oleg Dzhimiev's avatar Oleg Dzhimiev
Browse files

Merge branch 'rocko' into rocko_ethereum

parents 1e345227 a7b15af1

conf/machine/elphel393.conf

+13 −1
Original line number Diff line number Diff line
@@ -30,3 +30,15 @@ PRODUCTION_UBOOT := "u-boot-dtb.img" 
PRODUCTION_DEVICETREE := "devicetree.dtb"

PRODUCTION_KERNEL     := "uImage"

PRODUCTION_ROOTFS     := "rootfs"



# For wic image:

# notes:

#  * + dd'ing is simple

#  * - wic does not use the whole SD card for 2 partitions

# need to actually have devicetree.dtb in deploy dir

IMAGE_BOOT_FILES += " \

                      ${PRODUCTION_BOOT} \

                      ${PRODUCTION_UBOOT} \

                      ${PRODUCTION_DEVICETREE} \

                      ${PRODUCTION_KERNEL} \

                    "

recipes-core/images/core-image-elphel393.bb

+13 −1
Original line number Diff line number Diff line
@@ -9,12 +9,24 @@ IMAGE_INSTALL_append = "u-boot-ezynq" 
IMAGE_INSTALL_append += " \

                         sudo \

                         gcc \

                         gcc-symlinks \

                         cpp \

                         cpp-symlinks \

                         g++ \

                         g++-symlinks \

                         make \

                         coreutils \

                         python-core \

                         python-numpy \

                         python-argparse \

                         python-json \

                         python-xml \

                         python3-opencv \

                         python3-core \

                         python3-numpy \

                         python3-argparse \

                         python3-json \

                         python3-xml \

                         elphel-python-extensions \

                         htop \

                         rsync \
@@ -83,8 +95,8 @@ IMAGE_INSTALL_append += " \ 
# gstreamer1.0-plugins-good \

# gstreamer1.0-plugins-bad \

# gstreamer1.0-rtsp-server \

# opencv-apps \

# python-opencv \

# opencv-apps \

#



inherit extrausers

recipes-devtools/php/files/php.ini

+2 −2
Original line number Diff line number Diff line 
upload_max_filesize = 200M

post_max_size = 200M
 
upload_max_filesize = 512M

post_max_size = 512M

wic/elphel393.wks

0 → 100644
+6 −0
Original line number Diff line number Diff line 
# short-description: Create SD card image for Elphel 10393

# long-description: Creates a partitioned SD card image for Elphel 10393.

# Boot files are located in the first vfat partition.



part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --align 4 --size 16

part /     --source rootfs            --ondisk mmcblk  --fstype=ext4 --label root --align 4