[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-531-ga03c279
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-531-ga03c279
|
From: Sébastien S. <ss...@us...> - 2014-12-23 14:10:41
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via a03c2795a572b873dc3b3c155cc3e00857f1987b (commit)
via f3d8536b5c7b66dd2ca375df757439ea19db7364 (commit)
from 4150a6f5c09aac18a6b86361fb3e5795a086d800 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a03c2795a572b873dc3b3c155cc3e00857f1987b
Author: Sébastien Szymanski <ss...@us...>
Date: Tue Dec 23 15:12:34 2014 +0100
[UBOOT] 2014.07: apf6: enable hdmi, netconsole and fix OTG pin ID
muxing
commit f3d8536b5c7b66dd2ca375df757439ea19db7364
Author: Sébastien Szymanski <ss...@us...>
Date: Tue Dec 16 14:03:08 2014 +0100
[U-BOOT] 2014.07: use mmcpart and mmcdev vars in flash_kernel and
flash_dtb commands.
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf6/apf6-u-boot-2014.07.h | 39 +++--
patches/u-boot/2014.07/503-add-apf6.patch | 173 ++++++++++---------
2 files changed, 113 insertions(+), 99 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h b/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h
index 1008b64..463aa75 100644
--- a/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h
+++ b/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h
@@ -16,7 +16,7 @@
#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION 2
+#define CONFIG_ENV_VERSION 4
#define CONFIG_BOARD_NAME apf6
/* SPL */
@@ -68,6 +68,7 @@
#define CONFIG_CMD_EXT4_WRITE
#define CONFIG_CMD_FAT
#define CONFIG_CMD_FS_GENERIC
+#define CONFIG_CMD_HDMIDETECT
#define CONFIG_CMD_MII
#define CONFIG_CMD_MMC
#define CONFIG_CMD_NET
@@ -102,36 +103,35 @@
#define CONFIG_FEC_XCV_TYPE RGMII
#define CONFIG_ETHPRIME "FEC"
#define CONFIG_FEC_MXC_PHYADDR 1
+#define CONFIG_NETCONSOLE
#define CONFIG_PHYLIB
#define CONFIG_PHY_ATHEROS
/* Framebuffer */
-#define CONFIG_VIDEO
-#define CONFIG_VIDEO_IPUV3
+#define CONFIG_BMP_16BPP
#define CONFIG_CFB_CONSOLE
-#define CONFIG_VGA_AS_SINGLE_DEVICE
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
-#define CONFIG_VIDEO_BMP_RLE8
+#define CONFIG_IMX_HDMI
+#define CONFIG_IMX_VIDEO_SKIP
+#define CONFIG_IPUV3_CLK 260000000
#define CONFIG_SPLASH_SCREEN
#define CONFIG_SPLASH_SCREEN_ALIGN
-#define CONFIG_BMP_16BPP
+#define CONFIG_VGA_AS_SINGLE_DEVICE
+#define CONFIG_VIDEO
+#define CONFIG_VIDEO_BMP_RLE8
+#define CONFIG_VIDEO_IPUV3
#define CONFIG_VIDEO_LOGO
-#define CONFIG_VIDEO_BMP_LOGO
-#define CONFIG_IPUV3_CLK 260000000
-#define CONFIG_IMX_HDMI
/* USB Configs */
#define CONFIG_USB_DEVICE
#define CONFIG_USB_EHCI
#define CONFIG_USB_EHCI_MX6
#define CONFIG_USB_STORAGE
-#define CONFIG_USB_KEYBOARD
#define CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP
#define CONFIG_USB_HOST_ETHER
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CONFIG_MXC_USB_FLAGS 0
+#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
/* Gadget part */
#define CONFIG_CI_UDC
#define CONFIG_USB_GADGET
@@ -141,7 +141,7 @@
#define CONFIG_USBDOWNLOAD_GADGET
#define CONFIG_G_DNL_VENDOR_NUM 0x0525
#define CONFIG_G_DNL_PRODUCT_NUM 0xa4a5
-#define CONFIG_G_DNL_MANUFACTURER "ARMadeus Systems"
+#define CONFIG_G_DNL_MANUFACTURER "Armadeus Systems"
/* PCIE */
#define CONFIG_PCI
@@ -184,6 +184,9 @@
"initrd_high=0xffffffff\0" \
"fdt_addr=0x18000000\0" \
"ip_dyn=yes\0" \
+ "stdin=serial\0" \
+ "stout=serial\0" \
+ "sterr=serial\0" \
"mmcdev=0\0" \
"mmcpart=1\0" \
"mmcroot=/dev/mmcblk2p2 ro\0" \
@@ -201,7 +204,7 @@
"echo Flash environment variables erased!\0" \
"download_uboot_spl=tftpboot ${loadaddr} ${board_name}-u-boot.spl\0" \
"flash_uboot_spl=" \
- "if mmc dev ${mmcdev} 1; then " \
+ "if mmc dev 0 1; then " \
"setexpr sz ${filesize} / 0x200; " \
"setexpr sz ${sz} + 1; " \
"if mmc write ${loadaddr} 0x2 ${sz}; then " \
@@ -211,7 +214,7 @@
"fi;\0" \
"download_uboot_img=tftpboot ${loadaddr} ${board_name}-u-boot.img\0" \
"flash_uboot_img=" \
- "if mmc dev ${mmcdev} 1; then " \
+ "if mmc dev 0 1; then " \
"setexpr sz ${filesize} / 0x200; " \
"setexpr sz ${sz} + 1; " \
"if mmc write ${loadaddr} 0x8a ${sz}; then " \
@@ -223,14 +226,14 @@
"download_uboot_img flash_uboot_img\0" \
"download_kernel=tftpboot ${loadaddr} ${board_name}-linux.bin\0" \
"flash_kernel=" \
- "if ext4write mmc 0:1 ${loadaddr} /${board_name}-linux.bin ${filesize}; then " \
+ "if ext4write mmc ${mmcdev}:${mmcpart} ${loadaddr} /${board_name}-linux.bin ${filesize}; then " \
"echo Flashing of kernel succeed; " \
"else echo Flashing of kernel failed; " \
"fi;\0" \
"update_kernel=run download_kernel flash_kernel\0" \
"download_dtb=tftpboot ${loadaddr} ${fdt_file}\0" \
"flash_dtb=" \
- "if ext4write mmc 0:1 ${loadaddr} /dtbs/${fdt_file} ${filesize}; then " \
+ "if ext4write mmc ${mmcdev}:${mmcpart} ${loadaddr} /dtbs/${fdt_file} ${filesize}; then " \
"echo Flashing of dtb succeed; " \
"else echo Flashing of dtb failed; " \
"fi;\0" \
@@ -256,7 +259,9 @@
/* Miscellaneous configurable options */
#define CONFIG_AUTO_COMPLETE
#define CONFIG_CMDLINE_EDITING
+#define CONFIG_CONSOLE_MUX
#define CONFIG_SYS_CBSIZE 256
+#define CONFIG_SYS_CONSOLE_IS_IN_ENV
#define CONFIG_SYS_HUSH_PARSER
#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_PROMPT "BIOS> "
diff --git a/patches/u-boot/2014.07/503-add-apf6.patch b/patches/u-boot/2014.07/503-add-apf6.patch
index 62acd21..06a069d 100644
--- a/patches/u-boot/2014.07/503-add-apf6.patch
+++ b/patches/u-boot/2014.07/503-add-apf6.patch
@@ -1,8 +1,8 @@
Index: uboot-2014.07/boards.cfg
===================================================================
---- uboot-2014.07.orig/boards.cfg 2014-09-15 15:29:00.526533554 +0200
-+++ uboot-2014.07/boards.cfg 2014-09-15 15:29:00.534533691 +0200
-@@ -318,6 +318,7 @@
+--- uboot-2014.07.orig/boards.cfg
++++ uboot-2014.07/boards.cfg
+@@ -318,6 +318,7 @@ Active arm armv7 mx6
Active arm armv7 mx6 - wandboard wandboard_dl wandboard:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL,DDR_MB=1024 Fabio Estevam <fab...@fr...>
Active arm armv7 mx6 - wandboard wandboard_quad wandboard:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,MX6Q,DDR_MB=2048 Fabio Estevam <fab...@fr...>
Active arm armv7 mx6 - wandboard wandboard_solo wandboard:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,MX6S,DDR_MB=512 Fabio Estevam <fab...@fr...>
@@ -12,8 +12,8 @@ Index: uboot-2014.07/boards.cfg
Active arm armv7 mx6 boundary nitrogen6x nitrogen6dl nitrogen6x:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL,DDR_MB=1024 Eric Nelson <eri...@bo...>
Index: uboot-2014.07/board/armadeus/apf6/Makefile
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ uboot-2014.07/board/armadeus/apf6/Makefile 2014-09-15 15:29:00.538533761 +0200
+--- /dev/null
++++ uboot-2014.07/board/armadeus/apf6/Makefile
@@ -0,0 +1,8 @@
+#
+# Copyright (C) 2014, ARMadeus Systems <su...@ar...>
@@ -25,9 +25,9 @@ Index: uboot-2014.07/board/armadeus/apf6/Makefile
+obj-$(CONFIG_SPL_BUILD) += apf6_spl.o
Index: uboot-2014.07/board/armadeus/apf6/apf6.c
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ uboot-2014.07/board/armadeus/apf6/apf6.c 2014-09-15 15:29:36.671153456 +0200
-@@ -0,0 +1,377 @@
+--- /dev/null
++++ uboot-2014.07/board/armadeus/apf6/apf6.c
+@@ -0,0 +1,386 @@
+/*
+ * Copyright (C) 2013 Armadeus systems.
+ *
@@ -36,30 +36,23 @@ Index: uboot-2014.07/board/armadeus/apf6/apf6.c
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
-+#include <common.h>
-+#include <asm/io.h>
+#include <asm/arch/clock.h>
++#include <asm/arch/crm_regs.h>
+#include <asm/arch/imx-regs.h>
+#include <asm/arch/iomux.h>
+#include <asm/arch/mx6-pins.h>
-+#include <asm/arch/crm_regs.h>
++#include <asm/arch/mxc_hdmi.h>
+#include <asm/arch/sys_proto.h>
+#include <asm/gpio.h>
-+#include <asm/imx-common/iomux-v3.h>
-+#include <asm/imx-common/mxc_i2c.h>
+#include <asm/imx-common/boot_mode.h>
-+#include <hwconfig.h>
-+#include <linux/ctype.h>
-+#include <fdt_support.h>
++#include <asm/imx-common/video.h>
++#include <asm/io.h>
++#include <common.h>
+#include <fsl_esdhc.h>
++#include <linux/ctype.h>
+#include <miiphy.h>
+#include <mmc.h>
-+#include <mtd_node.h>
+#include <netdev.h>
-+#include <fdt_support.h>
-+#include <ipu_pixfmt.h>
-+#include <mmc.h>
-+#include <linux/fb.h>
+#include "fpga.h"
+
+DECLARE_GLOBAL_DATA_PTR;
@@ -78,6 +71,12 @@ Index: uboot-2014.07/board/armadeus/apf6/apf6.c
+#define ENET_PAD_CTRL2 (PAD_CTL_PUS_22K_UP | \
+ PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS)
+
++#define FPGA_PAD_CTRL (PAD_CTL_PUS_100K_UP | \
++ PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS)
++
++#define USB_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_PUS_47K_UP | \
++ PAD_CTL_PUE)
++
+#define USDHC2_CD_GPIO IMX_GPIO_NR(1, 2)
+#define ETH_PHY_RESET IMX_GPIO_NR(1, 24)
+
@@ -131,6 +130,27 @@ Index: uboot-2014.07/board/armadeus/apf6/apf6.c
+ IOMUX_PADS(PAD_ENET_TX_EN__GPIO1_IO28 | MUX_PAD_CTRL(NO_PAD_CTRL)),
+};
+
++static iomux_v3_cfg_t const fpga_pads[] = {
++ /* FPGA AS_DATA enet_txd1*/
++ IOMUX_PADS(PAD_ENET_TXD1__GPIO1_IO29 | MUX_PAD_CTRL(FPGA_PAD_CTRL)),
++ /* FPGA DCLK enet_rxd0*/
++ IOMUX_PADS(PAD_ENET_RXD0__GPIO1_IO27 | MUX_PAD_CTRL(FPGA_PAD_CTRL)),
++ /* FPGA CONF_DONE enet_rxd1*/
++ IOMUX_PADS(PAD_ENET_RXD1__GPIO1_IO26 | MUX_PAD_CTRL(FPGA_PAD_CTRL)),
++ /* FPGA NCONFIG EIM_D26*/
++ IOMUX_PADS(PAD_EIM_D26__GPIO3_IO26 | MUX_PAD_CTRL(FPGA_PAD_CTRL)),
++ /* FPGA NSTATUS EIM_D27*/
++ IOMUX_PADS(PAD_EIM_D27__GPIO3_IO27 | MUX_PAD_CTRL(FPGA_PAD_CTRL)),
++ /* FPGA CVP_CONFDONE EIM_D22*/
++ IOMUX_PADS(PAD_EIM_D22__GPIO3_IO22 | MUX_PAD_CTRL(FPGA_PAD_CTRL)),
++ /* FPGA PERSTL0# EIM_D18*/
++ IOMUX_PADS(PAD_EIM_D18__GPIO3_IO18 | MUX_PAD_CTRL(FPGA_PAD_CTRL)),
++};
++
++static iomux_v3_cfg_t const usb_pads[] = {
++ IOMUX_PADS(PAD_GPIO_1__USB_OTG_ID | MUX_PAD_CTRL(USB_PAD_CTRL)),
++};
++
+static void setup_iomux_uart(void)
+{
+ SETUP_IOMUX_PADS(uart4_pads);
@@ -146,6 +166,11 @@ Index: uboot-2014.07/board/armadeus/apf6/apf6.c
+ gpio_set_value(ETH_PHY_RESET, 1);
+}
+
++static void setup_fpga(void)
++{
++ SETUP_IOMUX_PADS(fpga_pads);
++}
++
+static struct fsl_esdhc_cfg usdhc_cfg[2] = {
+ {USDHC3_BASE_ADDR},
+ {USDHC2_BASE_ADDR},
@@ -258,28 +283,41 @@ Index: uboot-2014.07/board/armadeus/apf6/apf6.c
+ .vmode = FB_VMODE_NONINTERLACED
+};
+
-+int board_video_skip(void)
++static void do_enable_hdmi(struct display_info_t const *dev)
+{
-+ int ret;
-+
-+ ret = ipuv3_fb_init(&hdmi, 0, IPU_PIX_FMT_RGB24);
-+
-+ if (ret)
-+ printf("HDMI cannot be configured: %d\n", ret);
-+
-+
-+// imx_enable_hdmi_phy();
-+
-+ return ret;
++ imx_enable_hdmi_phy();
+}
+
++struct display_info_t const displays[] = {{
++ .bus = -1,
++ .addr = 0,
++ .pixfmt = IPU_PIX_FMT_RGB24,
++ .detect = detect_hdmi,
++ .enable = do_enable_hdmi,
++ .mode = {
++ .name = "HDMI",
++ .refresh = 60,
++ .xres = 1024,
++ .yres = 768,
++ .pixclock = 15385,
++ .left_margin = 220,
++ .right_margin = 40,
++ .upper_margin = 21,
++ .lower_margin = 7,
++ .hsync_len = 60,
++ .vsync_len = 10,
++ .sync = FB_SYNC_EXT,
++ .vmode = FB_VMODE_NONINTERLACED
++} } };
++size_t display_count = ARRAY_SIZE(displays);
++
+static void setup_display(void)
+{
+ struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
+ int reg;
+
+ enable_ipu_clock();
-+ //imx_setup_hdmi();
++ imx_setup_hdmi();
+
+ reg = readl(&mxc_ccm->chsccdr);
+ reg |= (CHSCCDR_CLK_SEL_LDB_DI0
@@ -301,34 +339,6 @@ Index: uboot-2014.07/board/armadeus/apf6/apf6.c
+ return 0;
+}
+
-+#define FPGA_PAD_CTRL (PAD_CTL_PUS_100K_UP | \
-+ PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS)
-+
-+
-+static iomux_v3_cfg_t const fpga_pads[] = {
-+ /* FPGA AS_DATA enet_txd1*/
-+ IOMUX_PADS(PAD_ENET_TXD1__GPIO1_IO29 | MUX_PAD_CTRL(FPGA_PAD_CTRL)),
-+ /* FPGA DCLK enet_rxd0*/
-+ IOMUX_PADS(PAD_ENET_RXD0__GPIO1_IO27 | MUX_PAD_CTRL(FPGA_PAD_CTRL)),
-+ /* FPGA CONF_DONE enet_rxd1*/
-+ IOMUX_PADS(PAD_ENET_RXD1__GPIO1_IO26 | MUX_PAD_CTRL(FPGA_PAD_CTRL)),
-+ /* FPGA NCONFIG EIM_D26*/
-+ IOMUX_PADS(PAD_EIM_D26__GPIO3_IO26 | MUX_PAD_CTRL(FPGA_PAD_CTRL)),
-+ /* FPGA NSTATUS EIM_D27*/
-+ IOMUX_PADS(PAD_EIM_D27__GPIO3_IO27 | MUX_PAD_CTRL(FPGA_PAD_CTRL)),
-+ /* FPGA CVP_CONFDONE EIM_D22*/
-+ IOMUX_PADS(PAD_EIM_D22__GPIO3_IO22 | MUX_PAD_CTRL(FPGA_PAD_CTRL)),
-+ /* FPGA PERSTL0# EIM_D18*/
-+ IOMUX_PADS(PAD_EIM_D18__GPIO3_IO18 | MUX_PAD_CTRL(FPGA_PAD_CTRL)),
-+};
-+
-+
-+void setup_fpga(void)
-+{
-+ SETUP_IOMUX_PADS(fpga_pads);
-+}
-+
-+
+int board_early_init_f(void)
+{
+ setup_iomux_uart();
@@ -342,21 +352,14 @@ Index: uboot-2014.07/board/armadeus/apf6/apf6.c
+ return 0;
+}
+
-+/*
-+ * Do not overwrite the console
-+ * Use always serial for U-Boot console
-+ */
-+int overwrite_console(void)
-+{
-+ return 1;
-+}
-+
+int board_late_init(void)
+{
+ u_char *firmware_buffer =
+ (u_char *) (CONFIG_SYS_LOAD_ADDR + CONFIG_SYS_MONITOR_LEN);
+ size_t size = 0;
+
++ SETUP_IOMUX_PADS(usb_pads);
++
+ if (is_cpu_type(MXC_CPU_MX6Q) || is_cpu_type(MXC_CPU_MX6D))
+ setenv("fdt_file", "imx6q-apf6dev.dtb");
+ else if (is_cpu_type(MXC_CPU_MX6DL) || is_cpu_type(MXC_CPU_MX6SOLO))
@@ -380,7 +383,6 @@ Index: uboot-2014.07/board/armadeus/apf6/apf6.c
+ APF6_init_fpga(firmware_buffer, size);
+#endif
+
-+
+ return 0;
+}
+
@@ -393,6 +395,13 @@ Index: uboot-2014.07/board/armadeus/apf6/apf6.c
+
+int board_init(void)
+{
++ struct iomuxc_base_regs *const iomuxc_regs
++ = (struct iomuxc_base_regs *)IOMUXC_BASE_ADDR;
++
++ clrsetbits_le32(&iomuxc_regs->gpr[1],
++ IOMUXC_GPR1_OTG_ID_MASK,
++ IOMUXC_GPR1_OTG_ID_GPIO1);
++
+ /* address of boot parameters */
+ gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
+
@@ -407,8 +416,8 @@ Index: uboot-2014.07/board/armadeus/apf6/apf6.c
+}
Index: uboot-2014.07/board/armadeus/apf6/apf6.cfg
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ uboot-2014.07/board/armadeus/apf6/apf6.cfg 2014-09-15 15:29:00.538533761 +0200
+--- /dev/null
++++ uboot-2014.07/board/armadeus/apf6/apf6.cfg
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2014 ARMadeus Systems <su...@ar...>
@@ -433,8 +442,8 @@ Index: uboot-2014.07/board/armadeus/apf6/apf6.cfg
+#include "clocks.cfg"
Index: uboot-2014.07/board/armadeus/apf6/apf6_spl.c
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ uboot-2014.07/board/armadeus/apf6/apf6_spl.c 2014-09-15 15:29:00.538533761 +0200
+--- /dev/null
++++ uboot-2014.07/board/armadeus/apf6/apf6_spl.c
@@ -0,0 +1,251 @@
+/*
+ * Copyright (C) 2014 ARMadeus systems <su...@ar...>
@@ -689,8 +698,8 @@ Index: uboot-2014.07/board/armadeus/apf6/apf6_spl.c
+}
Index: uboot-2014.07/board/armadeus/apf6/clocks.cfg
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ uboot-2014.07/board/armadeus/apf6/clocks.cfg 2014-09-15 15:29:00.538533761 +0200
+--- /dev/null
++++ uboot-2014.07/board/armadeus/apf6/clocks.cfg
@@ -0,0 +1,25 @@
+/* set the default clock gate to save power */
+DATA 4, CCM_CCGR0, 0x00C03F3F
@@ -719,8 +728,8 @@ Index: uboot-2014.07/board/armadeus/apf6/clocks.cfg
+DATA 4, CCM_CCOSR, 0x000000fb
Index: uboot-2014.07/board/armadeus/apf6/fpga.c
===================================================================
---- /dev/null 1970-01-01 01:00:00.000000000 +0100
-+++ uboot-2014.07/board/armadeus/apf6/fpga.c 2014-10-22 15:38:38.421753366 +0200
+--- /dev/null
++++ uboot-2014.07/board/armadeus/apf6/fpga.c
@@ -0,0 +1,173 @@
+/*
+ * (C) Copyright 2002-2014
@@ -897,8 +906,8 @@ Index: uboot-2014.07/board/armadeus/apf6/fpga.c
+#endif /* CONFIG_FPGA */
Index: uboot-2014.07/board/armadeus/apf6/fpga.h
===================================================================
---- /dev/null 1970-01-01 01:00:00.000000000 +0100
-+++ uboot-2014.07/board/armadeus/apf6/fpga.h 2014-10-22 15:38:49.145753388 +0200
+--- /dev/null
++++ uboot-2014.07/board/armadeus/apf6/fpga.h
@@ -0,0 +1,34 @@
+/*
+ * (C) Copyright 2002-2010
hooks/post-receive
--
armadeus
|