Charged Higgs bosons produced either in top-quark decays or in association with a top-quark, subsequently decaying via H â Ïν, are searched for in 36.1 fb of proton-proton collision data at TeV recorded with the ATLAS detector. Depending on whether the top-quark produced together with H decays hadronically or leptonically, the search targets Ï+jets and Ï+lepton final states, in both cases with a hadronically decaying Ï-lepton. No evidence of a charged Higgs boson is found. For the mass range of = 90â2000 GeV, upper limits at the 95% confidence level are set on the production cross-section of the charged Higgs boson times the branching fraction in the range 4.2â0.0025 pb. In the mass range 90â160 GeV, assuming the Standard Model cross-section for production, this corresponds to upper limits between 0.25% and 0.031% for the branching fraction .