diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2005-04-19 11:43:16 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@rpsys.net> | 2005-04-19 11:43:16 +0000 |
| commit | 4de5c6026e00ad4dfd9fbb072b47bec4e2d97b55 (patch) | |
| tree | fea6a41a9bdd4c77051c0e79bbd085c860a5fe13 | |
| parent | f2d88438d82291cbad7b73a6e5899c1a8ec46892 (diff) | |
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into tim.rpsys.net:/usr/oe/openembedded
2005/04/19 12:42:50+01:00 rpsys.net!RP
linux-oz-2.6: Add some extra modules to the defconfig
BKrev: 4264eed4VHsorJTeHdK23zv67UpRqw
4 files changed, 30 insertions, 8 deletions
diff --git a/packages/linux/linux-openzaurus-2.6.11/defconfig-c7x0 b/packages/linux/linux-openzaurus-2.6.11/defconfig-c7x0 index 0db97a74d7..0827aed09d 100644 --- a/packages/linux/linux-openzaurus-2.6.11/defconfig-c7x0 +++ b/packages/linux/linux-openzaurus-2.6.11/defconfig-c7x0 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.11 -# Mon Apr 18 19:47:51 2005 +# Tue Apr 19 12:37:37 2005 # CONFIG_ARM=y CONFIG_MMU=y @@ -158,7 +158,7 @@ CONFIG_PM=y CONFIG_PREEMPT=y CONFIG_APM=y # CONFIG_ARTHUR is not set -CONFIG_CMDLINE="console=ttyS0,115200n8 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 " +CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 " CONFIG_ALIGNMENT_TRAP=y # @@ -375,11 +375,19 @@ CONFIG_PXA_FICP=y CONFIG_BT=m CONFIG_BT_L2CAP=m CONFIG_BT_SCO=m +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +# CONFIG_BT_BNEP_MC_FILTER is not set +# CONFIG_BT_BNEP_PROTO_FILTER is not set +CONFIG_BT_HIDP=m # # Bluetooth device drivers # CONFIG_BT_HCIUART=m +# CONFIG_BT_HCIUART_H4 is not set +# CONFIG_BT_HCIUART_BCSP is not set CONFIG_BT_HCIDTL1=m CONFIG_BT_HCIBT3C=m CONFIG_BT_HCIBLUECARD=m @@ -568,7 +576,10 @@ CONFIG_HW_CONSOLE=y # # Serial drivers # -# CONFIG_SERIAL_8250 is not set +CONFIG_SERIAL_8250=m +CONFIG_SERIAL_8250_CS=m +CONFIG_SERIAL_8250_NR_UARTS=4 +# CONFIG_SERIAL_8250_EXTENDED is not set # # Non-8250 serial port support diff --git a/packages/linux/linux-openzaurus-2.6.12-rc2-mm3/defconfig-c7x0 b/packages/linux/linux-openzaurus-2.6.12-rc2-mm3/defconfig-c7x0 index 0db97a74d7..0827aed09d 100644 --- a/packages/linux/linux-openzaurus-2.6.12-rc2-mm3/defconfig-c7x0 +++ b/packages/linux/linux-openzaurus-2.6.12-rc2-mm3/defconfig-c7x0 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.11 -# Mon Apr 18 19:47:51 2005 +# Tue Apr 19 12:37:37 2005 # CONFIG_ARM=y CONFIG_MMU=y @@ -158,7 +158,7 @@ CONFIG_PM=y CONFIG_PREEMPT=y CONFIG_APM=y # CONFIG_ARTHUR is not set -CONFIG_CMDLINE="console=ttyS0,115200n8 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 " +CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 " CONFIG_ALIGNMENT_TRAP=y # @@ -375,11 +375,19 @@ CONFIG_PXA_FICP=y CONFIG_BT=m CONFIG_BT_L2CAP=m CONFIG_BT_SCO=m +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +# CONFIG_BT_BNEP_MC_FILTER is not set +# CONFIG_BT_BNEP_PROTO_FILTER is not set +CONFIG_BT_HIDP=m # # Bluetooth device drivers # CONFIG_BT_HCIUART=m +# CONFIG_BT_HCIUART_H4 is not set +# CONFIG_BT_HCIUART_BCSP is not set CONFIG_BT_HCIDTL1=m CONFIG_BT_HCIBT3C=m CONFIG_BT_HCIBLUECARD=m @@ -568,7 +576,10 @@ CONFIG_HW_CONSOLE=y # # Serial drivers # -# CONFIG_SERIAL_8250 is not set +CONFIG_SERIAL_8250=m +CONFIG_SERIAL_8250_CS=m +CONFIG_SERIAL_8250_NR_UARTS=4 +# CONFIG_SERIAL_8250_EXTENDED is not set # # Non-8250 serial port support diff --git a/packages/linux/linux-openzaurus_2.6.11.bb b/packages/linux/linux-openzaurus_2.6.11.bb index 3430083388..daf82dcc7e 100644 --- a/packages/linux/linux-openzaurus_2.6.11.bb +++ b/packages/linux/linux-openzaurus_2.6.11.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}" KV = "${@bb.data.getVar('PV',d,True)}" -PR = "r12" +PR = "r14" DOSRC = "http://www.do13.in-berlin.de/openzaurus" RPSRC = "http://www.rpsys.net/openzaurus/patches" diff --git a/packages/linux/linux-openzaurus_2.6.12-rc2-mm3.bb b/packages/linux/linux-openzaurus_2.6.12-rc2-mm3.bb index 35c6f11948..b9804190f9 100644 --- a/packages/linux/linux-openzaurus_2.6.12-rc2-mm3.bb +++ b/packages/linux/linux-openzaurus_2.6.12-rc2-mm3.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}" KV = "${@bb.data.getVar('PV',d,True)}" -PR = "r0" +PR = "r1" DOSRC = "http://www.do13.in-berlin.de/openzaurus" RPSRC = "http://www.rpsys.net/openzaurus/patches" |