[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-250-gce69447d6
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-250-gce69447d6
|
From: Sébastien S. <ss...@us...> - 2021-04-21 13:27:20
|
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 ce69447d6155f637edde6a4da41e3581c36d0ec3 (commit)
via c7a41abc3b5b4d295fe63245aef461742f58f136 (commit)
from 3f32804ed2108ba6d8c2eab836972b3b7fc5e618 (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 ce69447d6155f637edde6a4da41e3581c36d0ec3
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Apr 21 15:26:16 2021 +0200
[BSP] apf51: fix build
commit c7a41abc3b5b4d295fe63245aef461742f58f136
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Apr 21 15:25:09 2021 +0200
[BSP] apf27: fix build and build fpga_loader on 3.19 kernel
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27_defconfig | 1 +
buildroot/configs/apf51_defconfig | 1 +
.../linux/3.19/0322-armadeus-add_mach_fpga_h.patch | 10 ++++-----
...-Remove-redundant-YYLOC-global-declaratio.patch | 26 ++++++++++++++++++++++
.../linux/modules/fpga/dev_tools/loader/Makefile | 2 +-
.../modules/fpga/dev_tools/loader/fpga-loader.c | 2 +-
6 files changed, 35 insertions(+), 7 deletions(-)
create mode 100644 patches/linux/3.19/0716-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index bfdad8ab2..dc01a9d46 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -10,6 +10,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_19=y
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-ng.config"
BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
BR2_PTHREAD_DEBUG=y
+BR2_GCC_VERSION_7_X=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
BR2_PACKAGE_HOST_GDB=y
BR2_TARGET_OPTIMIZATION="-Os -pipe"
diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index b3c220fce..4a3a457e1 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -11,6 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_19=y
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-ng.config"
BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
BR2_PTHREAD_DEBUG=y
+BR2_GCC_VERSION_7_X=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
BR2_PACKAGE_HOST_GDB=y
BR2_TARGET_OPTIMIZATION="-Os -pipe"
diff --git a/patches/linux/3.19/0322-armadeus-add_mach_fpga_h.patch b/patches/linux/3.19/0322-armadeus-add_mach_fpga_h.patch
index 026047d79..650cfc5cc 100644
--- a/patches/linux/3.19/0322-armadeus-add_mach_fpga_h.patch
+++ b/patches/linux/3.19/0322-armadeus-add_mach_fpga_h.patch
@@ -1,7 +1,7 @@
-Index: linux/include/linux/armadeus_fpga.h
+Index: linux-3.19.8/include/linux/armadeus_fpga.h
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux/include/linux/armadeus_fpga.h 2013-01-02 22:16:56.000000000 +0100
+--- /dev/null
++++ linux-3.19.8/include/linux/armadeus_fpga.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2009-2014 Armadeus Systems
@@ -24,14 +24,14 @@ Index: linux/include/linux/armadeus_fpga.h
+#ifndef __LINUX_ARMADEUS_FPGA_H__
+#define __LINUX_ARMADEUS_FPGA_H__
+
-+#if defined(CONFIG_MACH_APF51) || defined(CONFIG_MACH_MX51) /* DT */
++#if defined(CONFIG_MACH_APF51) || defined(CONFIG_MACH_MX51) || defined(CONFIG_SOC_IMX51) /* DT */
+# define APF51_FPGA_BASE_ADDR 0xb8000000
+# define ARMADEUS_FPGA_BASE_ADDR APF51_FPGA_BASE_ADDR
+# define APF51_FPGA_INT_PIN (IMX_GPIO_NR(4, 11)) /* INITB */
+# define APF51_FPGA_IRQ (gpio_to_irq(APF51_FPGA_INT_PIN))
+# define ARMADEUS_FPGA_IRQ APF51_FPGA_IRQ
+# define IRQ_FPGA_START (MXC_BOARD_IRQ_START + 64)
-+#elif defined(CONFIG_MACH_APF27) || defined(CONFIG_MACH_MX27) /* DT */
++#elif defined(CONFIG_MACH_APF27) || defined(CONFIG_MACH_MX27) || defined(CONFIG_MACH_IMX27_DT) /* DT */
+# define APF27_FPGA_BASE_ADDR 0xd6000000
+# define ARMADEUS_FPGA_BASE_ADDR APF27_FPGA_BASE_ADDR
+# define APF27_FPGA_INT_PIN (GPIO_PORTF | 12)
diff --git a/patches/linux/3.19/0716-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch b/patches/linux/3.19/0716-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch
new file mode 100644
index 000000000..b0de76099
--- /dev/null
+++ b/patches/linux/3.19/0716-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch
@@ -0,0 +1,26 @@
+Index: linux-3.19.8/scripts/dtc/dtc-lexer.l
+===================================================================
+--- linux-3.19.8.orig/scripts/dtc/dtc-lexer.l
++++ linux-3.19.8/scripts/dtc/dtc-lexer.l
+@@ -39,8 +39,6 @@ LINECOMMENT "//".*\n
+ #include "srcpos.h"
+ #include "dtc-parser.tab.h"
+
+-YYLTYPE yylloc;
+-
+ /* CAUTION: this will stop working if we ever use yyless() or yyunput() */
+ #define YY_USER_ACTION \
+ { \
+Index: linux-3.19.8/scripts/dtc/dtc-parser.tab.c_shipped
+===================================================================
+--- linux-3.19.8.orig/scripts/dtc/dtc-parser.tab.c_shipped
++++ linux-3.19.8/scripts/dtc/dtc-parser.tab.c_shipped
+@@ -70,7 +70,7 @@
+ #include "dtc.h"
+ #include "srcpos.h"
+
+-YYLTYPE yylloc;
++extern YYLTYPE yylloc;
+
+ extern int yylex(void);
+ extern void print_error(char const *fmt, ...);
diff --git a/target/linux/modules/fpga/dev_tools/loader/Makefile b/target/linux/modules/fpga/dev_tools/loader/Makefile
index aab32b7dd..70afaa528 100644
--- a/target/linux/modules/fpga/dev_tools/loader/Makefile
+++ b/target/linux/modules/fpga/dev_tools/loader/Makefile
@@ -15,7 +15,7 @@ fpgaloader-objs := xilinx-fpga-loader.o fpga-loader.o
endif
endif
ifneq ($(CONFIG_DTC),)
-ifneq ($(CONFIG_MACH_MX27),)
+ifneq ($(CONFIG_MACH_IMX27_DT),)
obj-y += apf27-fpga-loader.o
endif
else
diff --git a/target/linux/modules/fpga/dev_tools/loader/fpga-loader.c b/target/linux/modules/fpga/dev_tools/loader/fpga-loader.c
index fc789717a..593666af2 100644
--- a/target/linux/modules/fpga/dev_tools/loader/fpga-loader.c
+++ b/target/linux/modules/fpga/dev_tools/loader/fpga-loader.c
@@ -28,7 +28,7 @@
#include <linux/fcntl.h>
#include <linux/platform_device.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "xilinx-fpga-loader.h"
hooks/post-receive
--
armadeus
|