summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apps/ChangeLog.txt5
-rwxr-xr-xnuttx/ChangeLog3
2 files changed, 7 insertions, 1 deletions
diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt
index a183d6153..7f3c76b59 100644
--- a/apps/ChangeLog.txt
+++ b/apps/ChangeLog.txt
@@ -1032,4 +1032,7 @@
build (2014-9-5).
* apps/Makefile, examples/elf/Kconfig, and import/Make.defs: Copy more
logic from nuttx/tools/Config.mk into the Make.defs file (2014-9-5).
- * apps/import/Make.defs: Also need to define CFLAGS (2014-9-5)
+ * apps/import/Make.defs: Also need to define CFLAGS (2015-9-5)
+ * apps/import/scripts/gnu-elf.ld: Add GCC linker script for ELF
+ import builds (2014-9-5).
+
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 0122eb048..f52380e75 100755
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -8411,3 +8411,6 @@
(2014-9-5).
* tools/Makefile.export and mkexport.sh: Need to export the setting of
WINTOOL as well (2014-9-5).
+ * SAMA5D4-EK kernel configuration now builds NSH instead of examples/elf
+ (2014-9-6).
+