diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-18 15:33:56 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-18 15:33:56 +0200 |
| commit | e6634dca4894bfe72ee625655259458a48d6c99e (patch) | |
| tree | 59ec2f76242cd95faaf44ca1465b99314612cff3 | |
| parent | b9fa765709891ebfd351b28e809b1e56586d4705 (diff) | |
| parent | d13b61447270ad2c9c61af0037776317354cdae4 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | target/arm/kernel.config | 38 | ||||
| -rw-r--r-- | target/config/Config.in | 2 |
2 files changed, 37 insertions, 3 deletions
diff --git a/target/arm/kernel.config b/target/arm/kernel.config index 4e4a6cf68..d71d50b3e 100644 --- a/target/arm/kernel.config +++ b/target/arm/kernel.config @@ -331,7 +331,10 @@ CONFIG_ATAGS=y CONFIG_ZBOOT_ROM_TEXT=0 CONFIG_ZBOOT_ROM_BSS=0 # CONFIG_ARM_APPENDED_DTB is not set -CONFIG_CMDLINE="" +CONFIG_CMDLINE="console=tty0" +# CONFIG_CMDLINE_FROM_BOOTLOADER is not set +CONFIG_CMDLINE_EXTEND=y +# CONFIG_CMDLINE_FORCE is not set # CONFIG_XIP_KERNEL is not set # CONFIG_KEXEC is not set # CONFIG_CRASH_DUMP is not set @@ -688,9 +691,40 @@ CONFIG_BCMA_POSSIBLE=y # CONFIG_DRM is not set # CONFIG_VGASTATE is not set # CONFIG_VIDEO_OUTPUT_CONTROL is not set -# CONFIG_FB is not set +CONFIG_FB=y +# CONFIG_FIRMWARE_EDID is not set +# CONFIG_FB_DDC is not set +# CONFIG_FB_BOOT_VESA_SUPPORT is not set +# CONFIG_FB_CFB_FILLRECT is not set +# CONFIG_FB_CFB_COPYAREA is not set +# CONFIG_FB_CFB_IMAGEBLIT is not set +# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set +# CONFIG_FB_SYS_FILLRECT is not set +# CONFIG_FB_SYS_COPYAREA is not set +# CONFIG_FB_SYS_IMAGEBLIT is not set +# CONFIG_FB_FOREIGN_ENDIAN is not set +# CONFIG_FB_SYS_FOPS is not set +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_TILEBLITTING is not set + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_BCM2708 is not set +# CONFIG_FB_ARMCLCD is not set +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_GOLDFISH is not set +# CONFIG_FB_VIRTUAL is not set +# CONFIG_FB_METRONOME is not set +# CONFIG_FB_BROADSHEET is not set +# CONFIG_FB_AUO_K190X is not set +# CONFIG_FB_SIMPLE is not set # CONFIG_EXYNOS_VIDEO is not set # CONFIG_BACKLIGHT_LCD_SUPPORT is not set +# CONFIG_LOGO is not set # CONFIG_SOUND is not set # CONFIG_USB_SUPPORT is not set # CONFIG_MMC is not set diff --git a/target/config/Config.in b/target/config/Config.in index f8f59eabf..b3a918bf6 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -462,7 +462,7 @@ config ADK_TARGET_CFLAGS config ADK_TARGET_CMDLINE string - default "rootfstype=ext4 root=/dev/mmcblk0p2 rootwait" if ADK_TARGET_SYSTEM_RASPBERRY_PI + default "console=tty0" if ADK_TARGET_SYSTEM_RASPBERRY_PI default "console=tty no_auto_cmd" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default "console=ttyS0,9600" if ADK_TARGET_SYSTEM_FON_FON2100 default "console=ttyS0,38400" if ADK_TARGET_SYSTEM_PCENGINES_WRAP |