Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
meta-elphel393
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
meta-elphel393
Commits
7a802596
Commit
7a802596
authored
Dec 08, 2013
by
Oleg Dzhimiev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed failed merge
parent
1a4c9f8f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
12 deletions
+1
-12
machine-xilinx-default.inc
conf/machine/include/machine-xilinx-default.inc
+0
-8
tune-zynq.inc
conf/machine/include/tune-zynq.inc
+1
-4
No files found.
conf/machine/include/machine-xilinx-default.inc
View file @
7a802596
...
...
@@ -13,11 +13,3 @@ PREFERRED_VERSION_linux-xlnx ?= "3.10%"
# U-Boot Configuration
#PREFERRED_PROVIDER_u-boot ?= "u-boot-xlnx"
#PREFERRED_VERSION_u-boot-xlnx ?= "v2013.01%"
=======
PREFERRED_VERSION_linux
-
yocto
?=
"3.8%"
PREFERRED_VERSION_linux
-
yocto
-
tiny
?=
"3.8%"
# U-Boot Configuration
PREFERRED_PROVIDER_u
-
boot
?=
"u-boot-xlnx"
PREFERRED_VERSION_u
-
boot
-
xlnx
?=
"v2013.01%"
>>>>>>>
772
ca92533ec8b3afb28c43f9fc0df764372683f
conf/machine/include/tune-zynq.inc
View file @
7a802596
...
...
@@ -20,12 +20,9 @@ KERNEL_IMAGETYPE ?= "uImage"
KERNEL_EXTRA_ARGS_zynq
+=
"UIMAGE_LOADADDR=0x8000"
# File System Configuration
<<<<<<<
HEAD
#IMAGE_FSTYPES ?= "cpio ext2 ext2.gz.u-boot ext2.gz"
IMAGE_FSTYPES
?=
"ext2.gz.u-boot"
=======
IMAGE_FSTYPES
?=
"cpio ext2 ext2.gz.u-boot ext2.gz"
>>>>>>>
772
ca92533ec8b3afb28c43f9fc0df764372683f
IMAGE_CLASSES
+=
"image_types_uboot"
# ezynq-u-boot Configuration
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment