diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-11 12:29:23 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-11 12:29:23 +0100 |
commit | 407f9b8fde3ad9cc55f39f7a548cde6056dab494 (patch) | |
tree | 0375ea8ddab3502bf6883066f43fc7e328d5c704 /package/base-files | |
parent | 2ecefcf609e484d04d1546581191831e07ad71ec (diff) | |
parent | abb858ae43374dc13a5fcef19b9e0ba9442013bb (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/base-files')
-rw-r--r-- | package/base-files/Makefile | 5 | ||||
-rw-r--r-- | package/base-files/src/etc/mdev.conf | 10 |
2 files changed, 5 insertions, 10 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index d9b7878b3..7f68bad96 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -72,10 +72,7 @@ endif ifeq ($(ADK_TARGET_SYSTEM_QEMU_PPC64),y) $(SED) 's#ttyS#hvc#g' $(IDIR_BASE_FILES)/etc/inittab endif -ifeq ($(ADK_TARGET_SYSTEM_QEMU_MICROBLAZE),y) - $(SED) 's#ttyS#ttyUL#g' $(IDIR_BASE_FILES)/etc/inittab -endif -ifeq ($(ADK_TARGET_SYSTEM_QEMU_MICROBLAZEEL),y) +ifeq ($(ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800),y) $(SED) 's#ttyS#ttyUL#g' $(IDIR_BASE_FILES)/etc/inittab endif $(SED) 's#@SPEED@#$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED)#' $(IDIR_BASE_FILES)/etc/inittab diff --git a/package/base-files/src/etc/mdev.conf b/package/base-files/src/etc/mdev.conf index 4cc06251a..fc63d80d9 100644 --- a/package/base-files/src/etc/mdev.conf +++ b/package/base-files/src/etc/mdev.conf @@ -10,11 +10,9 @@ rtc0 root:root 660 @ln -sf /dev/rtc0 /dev/rtc device-mapper 0:0 660 @test -d /dev/mapper || mkdir /dev/mapper tun 0:0 660 >net/tun fb0 root:video 660 -audio root:audio 660 >snd/audio -dsp root:audio 660 >snd/dsp -timer root:audio 660 >snd/timer -controlC0 root:audio 660 >snd/controlC0 -pcmC0D0c root:audio 660 >snd/pcmC0D0c -pcmC0D0p root:audio 660 >snd/pcmC0D0p +snd/timer root:audio 660 +snd/controlC0 root:audio 660 +snd/pcmC0D0c root:audio 660 +snd/pcmC0D0p root:audio 660 msr0 root:root 660 @(mkdir -p /dev/cpu/0 && ln -sf /dev/msr0 /dev/cpu/0/msr) .* 0:0 644 @/lib/mdev/init |