Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS

device-amd: Commit

device/amd


Commit MetaInfo

Revision63e8d94d6354cc223ef363060e722462928baaab (tree)
Time2011-11-30 16:18:04
AuthorChih-Wei Huang <cwhuang@linu...>
CommiterChih-Wei Huang

Log Message

update for ics-x86

Change Summary

Incremental Difference

--- /dev/null
+++ b/brazos/AT_Translated_Set_2_keyboard.kl
@@ -0,0 +1,14 @@
1+# Copyright (C) 2011 The Android-x86 Open Source Project
2+#
3+# Licensed under the Apache License, Version 2.0 (the "License");
4+# you may not use this file except in compliance with the License.
5+# You may obtain a copy of the License at
6+#
7+# http://www.apache.org/licenses/LICENSE-2.0
8+#
9+
10+key 1 ESCAPE
11+key 114 VOLUME_DOWN
12+key 115 VOLUME_UP
13+#key 143 POWER WAKE
14+key 172 HOME WAKE_DROPPED
--- a/brazos/brazos.mk
+++ b/brazos/brazos.mk
@@ -1,5 +1,6 @@
11 PRODUCT_COPY_FILES := \
2- $(SRC_TARGET_DIR)/board/generic_x86/GenericTouch.idc:system/usr/idc/eGalax_Inc__USB_TouchController.idc \
2+ device/common/generic_x86/GenericTouch.idc:system/usr/idc/eGalax_Inc__USB_TouchController.idc \
3+ $(LOCAL_PATH)/AT_Translated_Set_2_keyboard.kl:system/usr/keylayout/AT_Translated_Set_2_keyboard.kl \
34
45 $(call inherit-product,$(LOCAL_PATH)/../common/generic_amd.mk)
56
--- a/brazos/brazos_defconfig
+++ b/brazos/brazos_defconfig
@@ -1,6 +1,6 @@
11 #
22 # Automatically generated make config: don't edit
3-# Linux/x86 3.0.1 Kernel Configuration
3+# Linux/x86 3.0.8 Kernel Configuration
44 #
55 # CONFIG_64BIT is not set
66 CONFIG_X86_32=y
@@ -566,6 +566,11 @@ CONFIG_NET=y
566566 #
567567 CONFIG_PACKET=y
568568 CONFIG_UNIX=y
569+CONFIG_XFRM=y
570+# CONFIG_XFRM_USER is not set
571+# CONFIG_XFRM_SUB_POLICY is not set
572+# CONFIG_XFRM_MIGRATE is not set
573+# CONFIG_XFRM_STATISTICS is not set
569574 # CONFIG_NET_KEY is not set
570575 CONFIG_INET=y
571576 # CONFIG_IP_MULTICAST is not set
@@ -579,10 +584,10 @@ CONFIG_IP_PNP_DHCP=y
579584 # CONFIG_ARPD is not set
580585 # CONFIG_SYN_COOKIES is not set
581586 # CONFIG_INET_AH is not set
582-# CONFIG_INET_ESP is not set
587+CONFIG_INET_ESP=y
583588 # CONFIG_INET_IPCOMP is not set
584589 # CONFIG_INET_XFRM_TUNNEL is not set
585-# CONFIG_INET_TUNNEL is not set
590+CONFIG_INET_TUNNEL=y
586591 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
587592 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
588593 # CONFIG_INET_XFRM_MODE_BEET is not set
@@ -592,13 +597,188 @@ CONFIG_INET_LRO=y
592597 CONFIG_TCP_CONG_CUBIC=y
593598 CONFIG_DEFAULT_TCP_CONG="cubic"
594599 # CONFIG_TCP_MD5SIG is not set
595-# CONFIG_IPV6 is not set
600+CONFIG_IPV6=y
601+# CONFIG_IPV6_PRIVACY is not set
602+# CONFIG_IPV6_ROUTER_PREF is not set
603+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
604+# CONFIG_INET6_AH is not set
605+# CONFIG_INET6_ESP is not set
606+# CONFIG_INET6_IPCOMP is not set
607+# CONFIG_IPV6_MIP6 is not set
608+# CONFIG_INET6_XFRM_TUNNEL is not set
609+# CONFIG_INET6_TUNNEL is not set
610+CONFIG_INET6_XFRM_MODE_TRANSPORT=y
611+CONFIG_INET6_XFRM_MODE_TUNNEL=y
612+CONFIG_INET6_XFRM_MODE_BEET=y
613+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
614+CONFIG_IPV6_SIT=y
615+# CONFIG_IPV6_SIT_6RD is not set
616+CONFIG_IPV6_NDISC_NODETYPE=y
617+# CONFIG_IPV6_TUNNEL is not set
618+# CONFIG_IPV6_MULTIPLE_TABLES is not set
619+# CONFIG_IPV6_MROUTE is not set
596620 # CONFIG_NETLABEL is not set
597621 CONFIG_ANDROID_PARANOID_NETWORK=y
598622 CONFIG_NET_ACTIVITY_STATS=y
599623 # CONFIG_NETWORK_SECMARK is not set
600624 # CONFIG_NETWORK_PHY_TIMESTAMPING is not set
601-# CONFIG_NETFILTER is not set
625+CONFIG_NETFILTER=y
626+# CONFIG_NETFILTER_DEBUG is not set
627+CONFIG_NETFILTER_ADVANCED=y
628+
629+#
630+# Core Netfilter Configuration
631+#
632+CONFIG_NETFILTER_NETLINK=y
633+CONFIG_NETFILTER_NETLINK_QUEUE=y
634+CONFIG_NETFILTER_NETLINK_LOG=y
635+CONFIG_NF_CONNTRACK=y
636+CONFIG_NF_CONNTRACK_MARK=y
637+CONFIG_NF_CONNTRACK_EVENTS=y
638+# CONFIG_NF_CONNTRACK_TIMESTAMP is not set
639+# CONFIG_NF_CT_PROTO_DCCP is not set
640+# CONFIG_NF_CT_PROTO_SCTP is not set
641+# CONFIG_NF_CT_PROTO_UDPLITE is not set
642+# CONFIG_NF_CONNTRACK_AMANDA is not set
643+# CONFIG_NF_CONNTRACK_FTP is not set
644+# CONFIG_NF_CONNTRACK_H323 is not set
645+# CONFIG_NF_CONNTRACK_IRC is not set
646+# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
647+# CONFIG_NF_CONNTRACK_SNMP is not set
648+# CONFIG_NF_CONNTRACK_PPTP is not set
649+# CONFIG_NF_CONNTRACK_SANE is not set
650+# CONFIG_NF_CONNTRACK_SIP is not set
651+# CONFIG_NF_CONNTRACK_TFTP is not set
652+# CONFIG_NF_CT_NETLINK is not set
653+CONFIG_NETFILTER_TPROXY=y
654+CONFIG_NETFILTER_XTABLES=y
655+
656+#
657+# Xtables combined modules
658+#
659+# CONFIG_NETFILTER_XT_MARK is not set
660+# CONFIG_NETFILTER_XT_CONNMARK is not set
661+
662+#
663+# Xtables targets
664+#
665+# CONFIG_NETFILTER_XT_TARGET_CHECKSUM is not set
666+# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
667+# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
668+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
669+# CONFIG_NETFILTER_XT_TARGET_HL is not set
670+# CONFIG_NETFILTER_XT_TARGET_IDLETIMER is not set
671+# CONFIG_NETFILTER_XT_TARGET_LED is not set
672+# CONFIG_NETFILTER_XT_TARGET_MARK is not set
673+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
674+# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
675+# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
676+# CONFIG_NETFILTER_XT_TARGET_TEE is not set
677+CONFIG_NETFILTER_XT_TARGET_TPROXY=y
678+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
679+# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
680+
681+#
682+# Xtables matches
683+#
684+# CONFIG_NETFILTER_XT_MATCH_ADDRTYPE is not set
685+# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set
686+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
687+# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
688+# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
689+# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
690+# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
691+# CONFIG_NETFILTER_XT_MATCH_CPU is not set
692+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
693+# CONFIG_NETFILTER_XT_MATCH_DEVGROUP is not set
694+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
695+# CONFIG_NETFILTER_XT_MATCH_ESP is not set
696+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
697+# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
698+CONFIG_NETFILTER_XT_MATCH_HL=y
699+# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
700+# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
701+# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
702+# CONFIG_NETFILTER_XT_MATCH_MAC is not set
703+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
704+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
705+# CONFIG_NETFILTER_XT_MATCH_OSF is not set
706+# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
707+# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
708+# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
709+CONFIG_NETFILTER_XT_MATCH_QTAGUID=y
710+# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
711+# CONFIG_NETFILTER_XT_MATCH_QUOTA2 is not set
712+# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
713+# CONFIG_NETFILTER_XT_MATCH_REALM is not set
714+# CONFIG_NETFILTER_XT_MATCH_RECENT is not set
715+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
716+CONFIG_NETFILTER_XT_MATCH_SOCKET=y
717+# CONFIG_NETFILTER_XT_MATCH_STATE is not set
718+# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
719+# CONFIG_NETFILTER_XT_MATCH_STRING is not set
720+# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
721+# CONFIG_NETFILTER_XT_MATCH_TIME is not set
722+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
723+# CONFIG_IP_SET is not set
724+# CONFIG_IP_VS is not set
725+
726+#
727+# IP: Netfilter Configuration
728+#
729+CONFIG_NF_DEFRAG_IPV4=y
730+CONFIG_NF_CONNTRACK_IPV4=y
731+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
732+# CONFIG_IP_NF_QUEUE is not set
733+CONFIG_IP_NF_IPTABLES=y
734+CONFIG_IP_NF_MATCH_AH=y
735+CONFIG_IP_NF_MATCH_ECN=y
736+CONFIG_IP_NF_MATCH_TTL=y
737+CONFIG_IP_NF_FILTER=y
738+CONFIG_IP_NF_TARGET_REJECT=y
739+# CONFIG_IP_NF_TARGET_REJECT_SKERR is not set
740+CONFIG_IP_NF_TARGET_LOG=y
741+# CONFIG_IP_NF_TARGET_ULOG is not set
742+CONFIG_NF_NAT=y
743+CONFIG_NF_NAT_NEEDED=y
744+CONFIG_IP_NF_TARGET_MASQUERADE=y
745+CONFIG_IP_NF_TARGET_NETMAP=y
746+CONFIG_IP_NF_TARGET_REDIRECT=y
747+# CONFIG_NF_NAT_FTP is not set
748+# CONFIG_NF_NAT_IRC is not set
749+# CONFIG_NF_NAT_TFTP is not set
750+# CONFIG_NF_NAT_AMANDA is not set
751+# CONFIG_NF_NAT_PPTP is not set
752+# CONFIG_NF_NAT_H323 is not set
753+# CONFIG_NF_NAT_SIP is not set
754+CONFIG_IP_NF_MANGLE=y
755+# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
756+# CONFIG_IP_NF_TARGET_ECN is not set
757+# CONFIG_IP_NF_TARGET_TTL is not set
758+# CONFIG_IP_NF_RAW is not set
759+# CONFIG_IP_NF_SECURITY is not set
760+# CONFIG_IP_NF_ARPTABLES is not set
761+
762+#
763+# IPv6: Netfilter Configuration
764+#
765+CONFIG_NF_DEFRAG_IPV6=y
766+# CONFIG_NF_CONNTRACK_IPV6 is not set
767+# CONFIG_IP6_NF_QUEUE is not set
768+CONFIG_IP6_NF_IPTABLES=y
769+# CONFIG_IP6_NF_MATCH_AH is not set
770+# CONFIG_IP6_NF_MATCH_EUI64 is not set
771+# CONFIG_IP6_NF_MATCH_FRAG is not set
772+# CONFIG_IP6_NF_MATCH_OPTS is not set
773+# CONFIG_IP6_NF_MATCH_HL is not set
774+# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
775+# CONFIG_IP6_NF_MATCH_MH is not set
776+# CONFIG_IP6_NF_MATCH_RT is not set
777+# CONFIG_IP6_NF_TARGET_LOG is not set
778+# CONFIG_IP6_NF_FILTER is not set
779+# CONFIG_IP6_NF_MANGLE is not set
780+# CONFIG_IP6_NF_RAW is not set
781+# CONFIG_IP6_NF_SECURITY is not set
602782 # CONFIG_IP_DCCP is not set
603783 # CONFIG_IP_SCTP is not set
604784 # CONFIG_RDS is not set
@@ -684,6 +864,7 @@ CONFIG_LIB80211_CRYPT_WEP=m
684864 CONFIG_LIB80211_CRYPT_CCMP=m
685865 CONFIG_LIB80211_CRYPT_TKIP=m
686866 # CONFIG_LIB80211_DEBUG is not set
867+# CONFIG_CFG80211_ALLOW_RECONNECT is not set
687868 CONFIG_MAC80211=m
688869 CONFIG_MAC80211_HAS_RC=y
689870 # CONFIG_MAC80211_RC_PID is not set
@@ -776,7 +957,6 @@ CONFIG_MISC_DEVICES=y
776957 # CONFIG_TIFM_CORE is not set
777958 # CONFIG_ICS932S401 is not set
778959 # CONFIG_ENCLOSURE_SERVICES is not set
779-# CONFIG_KERNEL_DEBUGGER_CORE is not set
780960 # CONFIG_HP_ILO is not set
781961 # CONFIG_APDS9802ALS is not set
782962 # CONFIG_ISL29003 is not set
@@ -3889,6 +4069,7 @@ CONFIG_CRYPTO=y
38894069 #
38904070 CONFIG_CRYPTO_ALGAPI=y
38914071 CONFIG_CRYPTO_ALGAPI2=y
4072+CONFIG_CRYPTO_AEAD=y
38924073 CONFIG_CRYPTO_AEAD2=y
38934074 CONFIG_CRYPTO_BLKCIPHER=y
38944075 CONFIG_CRYPTO_BLKCIPHER2=y
@@ -3904,7 +4085,7 @@ CONFIG_CRYPTO_NULL=m
39044085 # CONFIG_CRYPTO_PCRYPT is not set
39054086 CONFIG_CRYPTO_WORKQUEUE=y
39064087 CONFIG_CRYPTO_CRYPTD=m
3907-# CONFIG_CRYPTO_AUTHENC is not set
4088+CONFIG_CRYPTO_AUTHENC=y
39084089 CONFIG_CRYPTO_TEST=m
39094090
39104091 #
@@ -3939,7 +4120,7 @@ CONFIG_CRYPTO_CRC32C=m
39394120 # CONFIG_CRYPTO_CRC32C_INTEL is not set
39404121 # CONFIG_CRYPTO_GHASH is not set
39414122 CONFIG_CRYPTO_MD4=m
3942-CONFIG_CRYPTO_MD5=m
4123+CONFIG_CRYPTO_MD5=y
39434124 CONFIG_CRYPTO_MICHAEL_MIC=y
39444125 # CONFIG_CRYPTO_RMD128 is not set
39454126 # CONFIG_CRYPTO_RMD160 is not set
@@ -3963,7 +4144,7 @@ CONFIG_CRYPTO_BLOWFISH=m
39634144 CONFIG_CRYPTO_CAMELLIA=m
39644145 CONFIG_CRYPTO_CAST5=m
39654146 CONFIG_CRYPTO_CAST6=m
3966-CONFIG_CRYPTO_DES=m
4147+CONFIG_CRYPTO_DES=y
39674148 CONFIG_CRYPTO_FCRYPT=m
39684149 CONFIG_CRYPTO_KHAZAD=m
39694150 # CONFIG_CRYPTO_SALSA20 is not set
--- a/brazos/init.amd_brazos.rc
+++ b/brazos/init.amd_brazos.rc
@@ -4,6 +4,9 @@ on boot
44 setprop rild.libpath /system/lib/libreference-ril.so
55 setprop rild.libargs "-d /dev/ttyUSB0"
66
7+ setkeycode 0xe025 172
8+ setkeycode 0xe027 1
9+
710 service userinit /system/bin/sh /system/etc/init.sh
811 oneshot
912 disabled
Show on old repository browser