aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPalmer Dabbelt <palmer@dabbelt.com>2017-06-23 09:55:10 -0700
committerGitHub <noreply@github.com>2017-06-23 09:55:10 -0700
commitec781cec9d5dccb8696b309e554003da86310ac9 (patch)
tree906e13cd6e0da05b81826b7071e71d01c320ad98
parent63f435d619a7ca23b325dda3b4919e56327345f5 (diff)
parent7cd1d1057d3bcd040b9e655fd35f57ccc97e075a (diff)
downloadriscv-tools-ec781cec9d5dccb8696b309e554003da86310ac9.zip
riscv-tools-ec781cec9d5dccb8696b309e554003da86310ac9.tar.gz
riscv-tools-ec781cec9d5dccb8696b309e554003da86310ac9.tar.bz2
Merge branch 'master' into patch-1
-rw-r--r--README.md2
m---------riscv-fesvr0
m---------riscv-isa-sim0
3 files changed, 2 insertions, 0 deletions
diff --git a/README.md b/README.md
index a7ab4c1..9b2c65b 100644
--- a/README.md
+++ b/README.md
@@ -583,6 +583,8 @@ listed as "Cross Compiler prefix" in BusyBox Settings &rarr; Build Options
* `CONFIG_ASH=y`, listed as "ash" in Shells
* `CONFIG_ASH_JOB_CONTROL=n`, listed as "Ash &rarr; Job control" in Shells
* `CONFIG_MOUNT=y`, listed as "mount" in Linux System Utilities
+* `CONFIG_FEATURE_USE_INITTAB=y`, listed as "Support reading an inittab file" in Init Utilities
+
Enter the configuration interface much in the same way as that of the Linux kernel:
diff --git a/riscv-fesvr b/riscv-fesvr
-Subproject 14f61ce4833126b1327926ad12f7d7bc653702b
+Subproject 01932a715edd22ee451d86cde38c7c07dc9bfa7
diff --git a/riscv-isa-sim b/riscv-isa-sim
-Subproject 5307bcf478b6b1bf6d58aacdf1314464721ef17
+Subproject 3a4e89322a8c8dac94185812a238f13789ab392